Merge branch 'main' into eas-build-valid-lock

CHANGELOG.md

@@ -10,35 +10,10 @@ This is the log of notable changes to EAS CLI and related packages.
 
 ### 🐛 Bug fixes
 
-- [build-tools] Update the minimum Expo version required for iOS precompiled modules. ([#3677](https://github.com/expo/eas-cli/pull/3677) by [@sjchmiela](https://github.com/sjchmiela))
-- [eas-cli] recommend that users read the docs after connecting Convex ([#3683](https://github.com/expo/eas-cli/pull/3683) by [@fiberjw](https://github.com/fiberjw))
+- [eas-cli] Remove hardcoded `builderEnvironment.image` override in `eas build:resign`. ([#3661](https://github.com/expo/eas-cli/pull/3661) by [@hSATAC](https://github.com/hSATAC))
 
 ### 🧹 Chores
 
-## [18.11.0](https://github.com/expo/eas-cli/releases/tag/v18.11.0) - 2026-05-05
-
-### 🎉 New features
-
-- [eas-cli] Add `--simulator` to `eas build:dev` and `eas build:run` to select which iOS simulator to install and run builds on. ([#3637](https://github.com/expo/eas-cli/pull/3637) by [@mmichels-brex](https://github.com/mmichels-brex))
-
-### 🐛 Bug fixes
-
-- [eas-cli] Fix Convex team invite output after skipped or unnecessary invitations. ([#3672](https://github.com/expo/eas-cli/pull/3672) by [@fiberjw](https://github.com/fiberjw))
-- Make directories marked as read-only writable when creating a tar, to prevent the cross-filesystem issues when extracting the tar. ([#3489](https://github.com/expo/eas-cli/pull/3489) by [@sswrk](https://github.com/sswrk))
-
-## [18.10.0](https://github.com/expo/eas-cli/releases/tag/v18.10.0) - 2026-05-04
-
-### 🎉 New features
-
-- [eas-cli] Add `eas integrations:convex` commands to manage Convex integrations for EAS projects. ([#3575](https://github.com/expo/eas-cli/pull/3575) by [@fiberjw](https://github.com/fiberjw))
-- [eas-cli] New command `observe:logs` for custom events. ([#3638](https://github.com/expo/eas-cli/pull/3638) by [@douglowder](https://github.com/douglowder))
-
-### 🐛 Bug fixes
-
-- [eas-cli] Create portable project archives on all platforms to normalize cross-platform tar metadata and permissions. ([#3234](https://github.com/expo/eas-cli/pull/3234) by [@sjchmiela](https://github.com/sjchmiela))
-- [eas-cli] Remove hardcoded `builderEnvironment.image` override in `eas build:resign`. ([#3661](https://github.com/expo/eas-cli/pull/3661) by [@hSATAC](https://github.com/hSATAC))
-- [eas-cli] Fix `eas update --json` intermittently failing with JSON parse errors during "Computing project fingerprints" by passing `silent: true` to `@expo/fingerprint` to suppress subprocess stdout pollution. ([#3659](https://github.com/expo/eas-cli/pull/3659) by [@Mookiies](https://github.com/Mookiies))
-
 ## [18.9.1](https://github.com/expo/eas-cli/releases/tag/v18.9.1) - 2026-04-30
 
 ## [18.9.0](https://github.com/expo/eas-cli/releases/tag/v18.9.0) - 2026-04-30

lerna.json

@@ -1,5 +1,5 @@
 {
   "npmClient": "yarn",
-  "version": "18.11.0",
+  "version": "18.9.1",
   "$schema": "node_modules/lerna/schemas/lerna-schema.json"
 }

packages/build-tools/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@expo/build-tools",
-  "version": "18.11.0",
+  "version": "18.9.0",
   "bugs": "https://github.com/expo/eas-cli/issues",
   "license": "BUSL-1.1",
   "author": "Expo <[email protected]>",

packages/build-tools/src/__mocks__/fs/promises.ts

@@ -1,7 +1,10 @@
 import { fs } from 'memfs';
 
+const fsRealpath = fs.realpath;
+(fsRealpath as any).native = fsRealpath;
+
 const fsRm = (path: string, options: object): Promise<void> => {
   return fs.promises.rm(path, options);
 };
 
-module.exports = { ...fs.promises, rm: fsRm };
+module.exports = { ...fs.promises, realpath: fsRealpath, rm: fsRm };

packages/build-tools/src/ios/__tests__/pod.test.ts

@@ -66,8 +66,8 @@ describe(installPods, () => {
     });
   });
 
-  it('adds precompiled modules env var for Expo versions well above the minimum', async () => {
-    const ctx = makeIosBuildContext({ expoVersion: '999.0.0' });
+  it('adds precompiled modules env var for Expo versions that support them', async () => {
+    const ctx = makeIosBuildContext({ expoVersion: '55.0.18' });
 
     await installPods(ctx, {});
 
@@ -96,7 +96,7 @@ describe(installPods, () => {
       (spawn as jest.Mock).mock.calls[1][2].env.EXPO_PRECOMPILED_MODULES_BASE_URL
     ).toBeUndefined();
     expect(ctx.logger.info).toHaveBeenCalledWith(
-      'Detected expo=999.0.0; enabling precompiled modules use. Installing pods with additional environment variables.\nEXPO_USE_PRECOMPILED_MODULES=1\nPrecompiled modules pod install environment is configured.'
+      'Detected expo=55.0.18; enabling precompiled modules use. Installing pods with additional environment variables.\nEXPO_USE_PRECOMPILED_MODULES=1\nPrecompiled modules pod install environment is configured.'
     );
   });
 
@@ -107,9 +107,7 @@ describe(installPods, () => {
 
     expect((spawn as jest.Mock).mock.calls[1][2].env.EXPO_USE_PRECOMPILED_MODULES).toBeUndefined();
     expect(ctx.logger.info).toHaveBeenCalledWith(
-      expect.stringMatching(
-        /^Detected expo=55\.0\.17; not enabling precompiled modules use because precompiled modules require expo>=/
-      )
+      'Detected expo=55.0.17; not enabling precompiled modules use because precompiled modules require expo>=55.0.18.'
     );
   });
 
@@ -138,7 +136,7 @@ describe(installPods, () => {
 
   it('does not add precompiled modules env vars without the builder flag', async () => {
     const ctx = makeIosBuildContext({
-      expoVersion: '999.0.0',
+      expoVersion: '55.0.18',
       usePrecompiledModules: false,
     });
 

packages/build-tools/src/ios/pod.ts

@@ -6,7 +6,7 @@ import semver from 'semver';
 
 import { BuildContext } from '../context';
 
-const MIN_PRECOMPILED_MODULES_EXPO_VERSION = '55.0.21';
+const MIN_PRECOMPILED_MODULES_EXPO_VERSION = '55.0.18';
 // const PRECOMPILED_MODULES_BASE_URL = 'https://storage.googleapis.com/eas-build-precompiled-modules/';
 
 export async function installPods<TJob extends Ios.Job>(

packages/build-tools/src/steps/functions/__tests__/maestroFlowDiscovery.test.ts

@@ -1,302 +0,0 @@
-import { vol } from 'memfs';
-
-import { buildFlowNameToPathMap, readFlowName, walkDir } from '../maestroFlowDiscovery';
-import { createMockLogger } from '../../../__tests__/utils/logger';
-
-describe(readFlowName, () => {
-  beforeEach(() => vol.reset());
-
-  it('returns top-level `name` when present', async () => {
-    vol.fromJSON({
-      '/p/login.yml': `appId: com.example\nname: Login Flow\n---\n- launchApp\n`,
-    });
-    expect(await readFlowName('/p/login.yml')).toBe('Login Flow');
-  });
-
-  it('falls back to basename without extension when name absent', async () => {
-    vol.fromJSON({ '/p/login.yml': `appId: com.example\n---\n- launchApp\n` });
-    expect(await readFlowName('/p/login.yml')).toBe('login');
-  });
-
-  it('falls back when name is empty string', async () => {
-    vol.fromJSON({ '/p/login.yml': `name: ""\n` });
-    expect(await readFlowName('/p/login.yml')).toBe('login');
-  });
-
-  it('falls back when name is non-string', async () => {
-    vol.fromJSON({ '/p/login.yml': `name: 42\n` });
-    expect(await readFlowName('/p/login.yml')).toBe('login');
-  });
-
-  it('falls back when YAML is malformed', async () => {
-    vol.fromJSON({ '/p/login.yml': `appId: [unclosed\n` });
-    expect(await readFlowName('/p/login.yml')).toBe('login');
-  });
-
-  it('falls back when file is empty', async () => {
-    vol.fromJSON({ '/p/login.yml': '' });
-    expect(await readFlowName('/p/login.yml')).toBe('login');
-  });
-
-  it('falls back when file does not exist', async () => {
-    expect(await readFlowName('/p/missing.yml')).toBe('missing');
-  });
-
-  it('only parses the first YAML document (commands document errors are ignored)', async () => {
-    vol.fromJSON({
-      '/p/login.yml': `name: Login\n---\n- this is: { malformed yaml\n`,
-    });
-    expect(await readFlowName('/p/login.yml')).toBe('Login');
-  });
-
-  it('handles .yaml extension', async () => {
-    vol.fromJSON({ '/p/checkout.yaml': `name: Checkout\n` });
-    expect(await readFlowName('/p/checkout.yaml')).toBe('Checkout');
-  });
-
-  it('handles a leading `---` document marker', async () => {
-    vol.fromJSON({
-      '/p/login.yml': `---\nappId: com.example\nname: Login\n---\n- launchApp\n`,
-    });
-    expect(await readFlowName('/p/login.yml')).toBe('Login');
-  });
-});
-
-describe(walkDir, () => {
-  beforeEach(() => vol.reset());
-
-  it('collects all .yml/.yaml files recursively, sorted', async () => {
-    const logger = createMockLogger();
-    vol.fromJSON({
-      '/p/flows/a.yml': '',
-      '/p/flows/b.yaml': '',
-      '/p/flows/sub/c.yml': '',
-      '/p/flows/sub/d.YAML': '',
-      '/p/flows/readme.md': '',
-    });
-    const out: string[] = [];
-    await walkDir('/p/flows', new Set(), out, logger);
-    expect(out.sort()).toEqual([
-      '/p/flows/a.yml',
-      '/p/flows/b.yaml',
-      '/p/flows/sub/c.yml',
-      '/p/flows/sub/d.YAML',
-    ]);
-  });
-
-  it('skips files named config.yaml (case-insensitive)', async () => {
-    const logger = createMockLogger();
-    vol.fromJSON({
-      '/p/flows/config.yaml': '',
-      '/p/flows/CONFIG.yaml': '',
-      '/p/flows/login.yml': '',
-    });
-    const out: string[] = [];
-    await walkDir('/p/flows', new Set(), out, logger);
-    expect(out.sort()).toEqual(['/p/flows/login.yml']);
-  });
-
-  it('returns silently when realpath fails (e.g. missing dir)', async () => {
-    const logger = createMockLogger();
-    const out: string[] = [];
-    await walkDir('/p/missing', new Set(), out, logger);
-    expect(out).toEqual([]);
-  });
-});
-
-describe(buildFlowNameToPathMap, () => {
-  beforeEach(() => vol.reset());
-
-  it('builds a map from a single file input (basename name)', async () => {
-    const logger = createMockLogger();
-    vol.fromJSON({ '/proj/flows/login.yml': 'appId: x\n' });
-    const map = await buildFlowNameToPathMap({
-      inputFlowPaths: ['flows/login.yml'],
-      projectRoot: '/proj',
-      logger,
-    });
-    expect(map).toEqual(new Map([['login', 'flows/login.yml']]));
-  });
-
-  it('uses top-level name when present', async () => {
-    const logger = createMockLogger();
-    vol.fromJSON({ '/proj/flows/a.yml': 'name: Login Flow\n' });
-    const map = await buildFlowNameToPathMap({
-      inputFlowPaths: ['flows/a.yml'],
-      projectRoot: '/proj',
-      logger,
-    });
-    expect(map).toEqual(new Map([['Login Flow', 'flows/a.yml']]));
-  });
-
-  it('walks a directory input and adds each flow', async () => {
-    const logger = createMockLogger();
-    vol.fromJSON({
-      '/proj/.maestro/login.yml': 'name: Login\n',
-      '/proj/.maestro/checkout.yml': '',
-      '/proj/.maestro/sub/profile.yml': '',
-    });
-    const map = await buildFlowNameToPathMap({
-      inputFlowPaths: ['.maestro'],
-      projectRoot: '/proj',
-      logger,
-    });
-    expect(map).toEqual(
-      new Map([
-        ['Login', '.maestro/login.yml'],
-        ['checkout', '.maestro/checkout.yml'],
-        ['profile', '.maestro/sub/profile.yml'],
-      ])
-    );
-  });
-
-  it('merges file + directory inputs', async () => {
-    const logger = createMockLogger();
-    vol.fromJSON({
-      '/proj/.maestro/a.yml': '',
-      '/proj/extra/b.yml': '',
-    });
-    const map = await buildFlowNameToPathMap({
-      inputFlowPaths: ['.maestro', 'extra/b.yml'],
-      projectRoot: '/proj',
-      logger,
-    });
-    expect(map).toEqual(
-      new Map([
-        ['a', '.maestro/a.yml'],
-        ['b', 'extra/b.yml'],
-      ])
-    );
-  });
-
-  it('skips non-existent inputs with warn', async () => {
-    const logger = createMockLogger();
-    vol.fromJSON({ '/proj/flows/a.yml': '' });
-    const map = await buildFlowNameToPathMap({
-      inputFlowPaths: ['flows/missing.yml', 'flows/a.yml'],
-      projectRoot: '/proj',
-      logger,
-    });
-    expect(map).toEqual(new Map([['a', 'flows/a.yml']]));
-    expect(logger.warn).toHaveBeenCalledWith(expect.stringContaining('flows/missing.yml'));
-  });
-
-  it('skips workspace config.yaml inside directory inputs', async () => {
-    const logger = createMockLogger();
-    vol.fromJSON({
-      '/proj/.maestro/config.yaml': 'flows:\n  - "*.yml"\n',
-      '/proj/.maestro/login.yml': '',
-    });
-    const map = await buildFlowNameToPathMap({
-      inputFlowPaths: ['.maestro'],
-      projectRoot: '/proj',
-      logger,
-    });
-    expect(map).toEqual(new Map([['login', '.maestro/login.yml']]));
-  });
-
-  it('does NOT skip config.yaml when passed as an explicit file input', async () => {
-    const logger = createMockLogger();
-    vol.fromJSON({
-      '/proj/.maestro/config.yaml': 'name: Workspace Defaults\nflows:\n  - "*.yml"\n',
-    });
-    const map = await buildFlowNameToPathMap({
-      inputFlowPaths: ['.maestro/config.yaml'],
-      projectRoot: '/proj',
-      logger,
-    });
-    expect(map).toEqual(new Map([['Workspace Defaults', '.maestro/config.yaml']]));
-  });
-
-  it('returns null when two files share top-level name', async () => {
-    const logger = createMockLogger();
-    vol.fromJSON({
-      '/proj/a.yml': 'name: Login\n',
-      '/proj/b.yml': 'name: Login\n',
-    });
-    const map = await buildFlowNameToPathMap({
-      inputFlowPaths: ['a.yml', 'b.yml'],
-      projectRoot: '/proj',
-      logger,
-    });
-    expect(map).toBeNull();
-    expect(logger.warn).toHaveBeenCalledWith(expect.stringContaining('"Login"'));
-    expect(logger.warn).toHaveBeenCalledWith(expect.stringContaining('a.yml'));
-    expect(logger.warn).toHaveBeenCalledWith(expect.stringContaining('b.yml'));
-  });
-
-  it('returns null when two files share basename across directories', async () => {
-    const logger = createMockLogger();
-    vol.fromJSON({
-      '/proj/login/index.yml': '',
-      '/proj/checkout/index.yml': '',
-    });
-    const map = await buildFlowNameToPathMap({
-      inputFlowPaths: ['login', 'checkout'],
-      projectRoot: '/proj',
-      logger,
-    });
-    expect(map).toBeNull();
-  });
-
-  it('returns null when name collides with another file basename', async () => {
-    const logger = createMockLogger();
-    vol.fromJSON({
-      '/proj/login.yml': 'name: Other\n',
-      '/proj/Other.yml': '',
-    });
-    const map = await buildFlowNameToPathMap({
-      inputFlowPaths: ['login.yml', 'Other.yml'],
-      projectRoot: '/proj',
-      logger,
-    });
-    expect(map).toBeNull();
-  });
-
-  it('dedupes the same physical file passed via overlapping inputs', async () => {
-    const logger = createMockLogger();
-    vol.fromJSON({ '/proj/.maestro/login.yml': '' });
-    const map = await buildFlowNameToPathMap({
-      inputFlowPaths: ['.maestro', '.maestro/login.yml'],
-      projectRoot: '/proj',
-      logger,
-    });
-    expect(map).toEqual(new Map([['login', '.maestro/login.yml']]));
-    expect(logger.warn).not.toHaveBeenCalled();
-  });
-
-  it('uses absolute fallback when input file lives outside projectRoot', async () => {
-    const logger = createMockLogger();
-    vol.fromJSON({ '/elsewhere/a.yml': '' });
-    const map = await buildFlowNameToPathMap({
-      inputFlowPaths: ['/elsewhere/a.yml'],
-      projectRoot: '/proj',
-      logger,
-    });
-    expect(map).toEqual(new Map([['a', '/elsewhere/a.yml']]));
-  });
-
-  it('absolute directory input under projectRoot yields project-relative children', async () => {
-    const logger = createMockLogger();
-    vol.fromJSON({ '/proj/.maestro/a.yml': '' });
-    const map = await buildFlowNameToPathMap({
-      inputFlowPaths: ['/proj/.maestro'],
-      projectRoot: '/proj',
-      logger,
-    });
-    expect(map).toEqual(new Map([['a', '.maestro/a.yml']]));
-  });
-
-  it('returns null and warns on unexpected helper failure', async () => {
-    const logger = createMockLogger();
-    const map = await buildFlowNameToPathMap({
-      inputFlowPaths: [Symbol('bad') as unknown as string],
-      projectRoot: '/proj',
-      logger,
-    });
-    expect(map).toBeNull();
-    expect(logger.warn).toHaveBeenCalledWith(
-      expect.stringContaining('buildFlowNameToPathMap failed unexpectedly')
-    );
-  });
-});

packages/build-tools/src/steps/functions/__tests__/maestroResultParser.test.ts

@@ -1,18 +1,65 @@
-import { XMLParser } from 'fast-xml-parser';
 import fs from 'fs/promises';
 import { vol } from 'memfs';
 
 import {
   copyLatestAttemptXml,
-  mergeJUnitReports,
-  parseFailedFlowsFromJUnit,
+  parseFlowMetadata,
   parseJUnitTestCases,
   parseMaestroResults,
 } from '../maestroResultParser';
 
-describe(parseMaestroResults, () => {
-  it('parses JUnit results and enriches with name→path map', async () => {
+describe(parseFlowMetadata, () => {
+  it('parses valid ai-*.json', async () => {
     vol.fromJSON({
+      '/tests/2026-01-28_055409/ai-home.json': JSON.stringify({
+        flow_name: 'home',
+        flow_file_path: '/Users/expo/workingdir/build/.maestro/home.yml',
+      }),
+    });
+
+    const result = await parseFlowMetadata('/tests/2026-01-28_055409/ai-home.json');
+    expect(result).toEqual({
+      flow_name: 'home',
+      flow_file_path: '/Users/expo/workingdir/build/.maestro/home.yml',
+    });
+  });
+
+  it('returns null when flow_name is missing', async () => {
+    vol.fromJSON({
+      '/tests/2026-01-28_055409/ai-home.json': JSON.stringify({
+        flow_file_path: '/Users/expo/workingdir/build/.maestro/home.yml',
+      }),
+    });
+
+    const result = await parseFlowMetadata('/tests/2026-01-28_055409/ai-home.json');
+    expect(result).toBeNull();
+  });
+
+  it('returns null when flow_file_path is missing', async () => {
+    vol.fromJSON({
+      '/tests/2026-01-28_055409/ai-home.json': JSON.stringify({
+        flow_name: 'home',
+      }),
+    });
+
+    const result = await parseFlowMetadata('/tests/2026-01-28_055409/ai-home.json');
+    expect(result).toBeNull();
+  });
+
+  it('returns null for invalid JSON', async () => {
+    vol.fromJSON({
+      '/tests/2026-01-28_055409/ai-home.json': 'not json',
+    });
+
+    const result = await parseFlowMetadata('/tests/2026-01-28_055409/ai-home.json');
+    expect(result).toBeNull();
+  });
+});
+
+describe(parseMaestroResults, () => {
+  it('parses JUnit results and enriches with ai-*.json metadata', async () => {
+    vol.fromJSON({
+      // JUnit XML (primary data)
       '/junit/report.xml': [
         '<?xml version="1.0"?>',
         '<testsuites>',
@@ -24,15 +71,18 @@ describe(parseMaestroResults, () => {
         '  </testsuite>',
         '</testsuites>',
       ].join('\n'),
+      // Debug output (for flow_file_path)
+      '/tests/2026-01-28_055409/ai-home.json': JSON.stringify({
+        flow_name: 'home',
+        flow_file_path: '/root/project/.maestro/home.yml',
+      }),
+      '/tests/2026-01-28_055409/ai-login.json': JSON.stringify({
+        flow_name: 'login',
+        flow_file_path: '/root/project/.maestro/login.yml',
+      }),
     });
 
-    const results = await parseMaestroResults(
-      '/junit',
-      new Map([
-        ['home', '.maestro/home.yml'],
-        ['login', '.maestro/login.yml'],
-      ])
-    );
+    const results = await parseMaestroResults('/junit', '/tests', '/root/project');
     expect(results).toHaveLength(2);
     expect(results).toEqual(
       expect.arrayContaining([
@@ -60,7 +110,7 @@ describe(parseMaestroResults, () => {
     );
   });
 
-  it('uses flow name as fallback path when nameToPath is null', async () => {
+  it('calculates retryCount from timestamp directory occurrences', async () => {
     vol.fromJSON({
       '/junit/report.xml': [
         '<?xml version="1.0"?>',
@@ -70,33 +120,49 @@ describe(parseMaestroResults, () => {
         '  </testsuite>',
         '</testsuites>',
       ].join('\n'),
+      // Two timestamp dirs = 1 retry
+      '/tests/2026-01-28_055409/ai-home.json': JSON.stringify({
+        flow_name: 'home',
+        flow_file_path: '/root/project/.maestro/home.yml',
+      }),
+      '/tests/2026-01-28_055420/ai-home.json': JSON.stringify({
+        flow_name: 'home',
+        flow_file_path: '/root/project/.maestro/home.yml',
+      }),
     });
 
-    const results = await parseMaestroResults('/junit', null);
+    const results = await parseMaestroResults('/junit', '/tests', '/root/project');
+    expect(results[0].retryCount).toBe(1);
+  });
+
+  it('uses flow name as fallback path when ai-*.json not found', async () => {
+    vol.fromJSON({
+      '/junit/report.xml': [
+        '<?xml version="1.0"?>',
+        '<testsuites>',
+        '  <testsuite name="Test Suite" tests="1" failures="0">',
+        '    <testcase id="home" name="home" classname="home" time="10.0" status="SUCCESS"/>',
+        '  </testsuite>',
+        '</testsuites>',
+      ].join('\n'),
+      // No ai-*.json files
+    });
+
+    const results = await parseMaestroResults('/junit', '/tests', '/root/project');
     expect(results[0].path).toBe('home');
     expect(results[0].retryCount).toBe(0);
   });
 
-  it('uses flow name as fallback path when name not in map', async () => {
+  it('returns empty array when no JUnit files found', async () => {
     vol.fromJSON({
-      '/junit/report.xml': [
-        '<?xml version="1.0"?>',
-        '<testsuites>',
-        '  <testsuite name="Test Suite" tests="1" failures="0">',
-        '    <testcase id="home" name="home" classname="home" time="10.0" status="SUCCESS"/>',
-        '  </testsuite>',
-        '</testsuites>',
-      ].join('\n'),
+      '/junit/.gitkeep': '',
+      '/tests/2026-01-28_055409/ai-home.json': JSON.stringify({
+        flow_name: 'home',
+        flow_file_path: '/root/project/.maestro/home.yml',
+      }),
     });
 
-    const results = await parseMaestroResults('/junit', new Map());
-    expect(results[0].path).toBe('home');
-  });
-
-  it('returns empty array when no JUnit files found', async () => {
-    vol.fromJSON({ '/junit/.gitkeep': '' });
-
-    const results = await parseMaestroResults('/junit', new Map([['home', '.maestro/home.yml']]));
+    const results = await parseMaestroResults('/junit', '/tests', '/root/project');
     expect(results).toEqual([]);
   });
 
@@ -115,13 +181,44 @@ describe(parseMaestroResults, () => {
         '  </testsuite>',
         '</testsuites>',
       ].join('\n'),
+      '/tests/2026-01-28_055409/ai-home.json': JSON.stringify({
+        flow_name: 'home',
+        flow_file_path: '/root/project/.maestro/home.yml',
+      }),
     });
 
-    const results = await parseMaestroResults('/junit', new Map([['home', '.maestro/home.yml']]));
+    const results = await parseMaestroResults('/junit', '/tests', '/root/project');
     expect(results[0].tags).toEqual(['e2e', 'smoke']);
     expect(results[0].properties).toEqual({ env: 'staging' });
   });
 
+  it('handles reuse_devices=true (junit_report_directory == tests_directory)', async () => {
+    vol.fromJSON({
+      // Same directory for both JUnit and debug output
+      '/maestro-tests/android-maestro-junit.xml': [
+        '<?xml version="1.0"?>',
+        '<testsuites>',
+        '  <testsuite name="Test Suite" tests="1" failures="0">',
+        '    <testcase id="home" name="home" classname="home" time="10.0" status="SUCCESS"/>',
+        '  </testsuite>',
+        '</testsuites>',
+      ].join('\n'),
+      '/maestro-tests/2026-01-28_055409/ai-home.json': JSON.stringify({
+        flow_name: 'home',
+        flow_file_path: '/root/project/.maestro/home.yml',
+      }),
+    });
+
+    const results = await parseMaestroResults('/maestro-tests', '/maestro-tests', '/root/project');
+    expect(results).toEqual([
+      expect.objectContaining({
+        name: 'home',
+        path: '.maestro/home.yml',
+        status: 'passed',
+      }),
+    ]);
+  });
+
   it('returns per-attempt results when multiple JUnit files exist for the same flow', async () => {
     vol.fromJSON({
       // Attempt 0: login FAILED
@@ -144,11 +241,20 @@ describe(parseMaestroResults, () => {
         '  </testsuite>',
         '</testsuites>',
       ].join('\n'),
+      // ai-*.json metadata (2 timestamp dirs = 2 attempts)
+      '/tests/2026-01-28_055409/ai-login.json': JSON.stringify({
+        flow_name: 'login',
+        flow_file_path: '/root/project/.maestro/login.yml',
+      }),
+      '/tests/2026-01-28_055420/ai-login.json': JSON.stringify({
+        flow_name: 'login',
+        flow_file_path: '/root/project/.maestro/login.yml',
+      }),
     });
 
-    const results = await parseMaestroResults('/junit', new Map([['login', '.maestro/login.yml']]));
+    const results = await parseMaestroResults('/junit', '/tests', '/root/project');
 
-    // Should return 2 results — one per attempt; retryCount from filename
+    // Should return 2 results — one per attempt
     expect(results).toHaveLength(2);
     expect(results).toEqual([
       expect.objectContaining({
@@ -194,15 +300,25 @@ describe(parseMaestroResults, () => {
         '  </testsuite>',
         '</testsuites>',
       ].join('\n'),
+      '/tests/2026-01-28_055409/ai-home.json': JSON.stringify({
+        flow_name: 'home',
+        flow_file_path: '/root/project/.maestro/home.yml',
+      }),
+      '/tests/2026-01-28_055409/ai-login.json': JSON.stringify({
+        flow_name: 'login',
+        flow_file_path: '/root/project/.maestro/login.yml',
+      }),
+      '/tests/2026-01-28_055420/ai-home.json': JSON.stringify({
+        flow_name: 'home',
+        flow_file_path: '/root/project/.maestro/home.yml',
+      }),
+      '/tests/2026-01-28_055420/ai-login.json': JSON.stringify({
+        flow_name: 'login',
+        flow_file_path: '/root/project/.maestro/login.yml',
+      }),
     });
 
-    const results = await parseMaestroResults(
-      '/junit-reports',
-      new Map([
-        ['home', '.maestro/home.yml'],
-        ['login', '.maestro/login.yml'],
-      ])
-    );
+    const results = await parseMaestroResults('/junit-reports', '/tests', '/root/project');
 
     // 4 results: 2 flows × 2 attempts
     expect(results).toHaveLength(4);
@@ -216,6 +332,7 @@ describe(parseMaestroResults, () => {
 
   it('returns per-attempt results with sharding (multiple testsuites per attempt file)', async () => {
     vol.fromJSON({
+      // Attempt 0: shard 1 has home (FAILED), shard 2 has login (PASSED)
       '/junit-reports/android-maestro-junit-attempt-0.xml': [
         '<?xml version="1.0"?>',
         '<testsuites>',
@@ -229,6 +346,7 @@ describe(parseMaestroResults, () => {
         '  </testsuite>',
         '</testsuites>',
       ].join('\n'),
+      // Attempt 1: all passed across shards
       '/junit-reports/android-maestro-junit-attempt-1.xml': [
         '<?xml version="1.0"?>',
         '<testsuites>',
@@ -240,15 +358,25 @@ describe(parseMaestroResults, () => {
         '  </testsuite>',
         '</testsuites>',
       ].join('\n'),
+      '/tests/2026-01-28_055409/ai-home.json': JSON.stringify({
+        flow_name: 'home',
+        flow_file_path: '/root/project/.maestro/home.yml',
+      }),
+      '/tests/2026-01-28_055409/ai-login.json': JSON.stringify({
+        flow_name: 'login',
+        flow_file_path: '/root/project/.maestro/login.yml',
+      }),
+      '/tests/2026-01-28_055420/ai-home.json': JSON.stringify({
+        flow_name: 'home',
+        flow_file_path: '/root/project/.maestro/home.yml',
+      }),
+      '/tests/2026-01-28_055420/ai-login.json': JSON.stringify({
+        flow_name: 'login',
+        flow_file_path: '/root/project/.maestro/login.yml',
+      }),
     });
 
-    const results = await parseMaestroResults(
-      '/junit-reports',
-      new Map([
-        ['home', '.maestro/home.yml'],
-        ['login', '.maestro/login.yml'],
-      ])
-    );
+    const results = await parseMaestroResults('/junit-reports', '/tests', '/root/project');
 
     expect(results).toHaveLength(4);
     expect(results).toEqual([
@@ -259,8 +387,52 @@ describe(parseMaestroResults, () => {
     ]);
   });
 
-  it('handles reuse_devices=false (separate junit_report_directory, per-flow files)', async () => {
+  it('backward compat: reuse_devices=true with retries but old single JUnit file', async () => {
     vol.fromJSON({
+      // Single overwritten JUnit (only has final attempt's results)
+      '/maestro-tests/android-maestro-junit.xml': [
+        '<?xml version="1.0"?>',
+        '<testsuites>',
+        '  <testsuite name="Test Suite" tests="2" failures="0">',
+        '    <testcase id="home" name="home" classname="home" time="4.0" status="SUCCESS"/>',
+        '    <testcase id="login" name="login" classname="login" time="2.0" status="SUCCESS"/>',
+        '  </testsuite>',
+        '</testsuites>',
+      ].join('\n'),
+      // 2 timestamp dirs — both flows appear in both (entire suite retried)
+      '/maestro-tests/2026-01-28_055409/ai-home.json': JSON.stringify({
+        flow_name: 'home',
+        flow_file_path: '/root/project/.maestro/home.yml',
+      }),
+      '/maestro-tests/2026-01-28_055409/ai-login.json': JSON.stringify({
+        flow_name: 'login',
+        flow_file_path: '/root/project/.maestro/login.yml',
+      }),
+      '/maestro-tests/2026-01-28_055420/ai-home.json': JSON.stringify({
+        flow_name: 'home',
+        flow_file_path: '/root/project/.maestro/home.yml',
+      }),
+      '/maestro-tests/2026-01-28_055420/ai-login.json': JSON.stringify({
+        flow_name: 'login',
+        flow_file_path: '/root/project/.maestro/login.yml',
+      }),
+    });
+
+    const results = await parseMaestroResults('/maestro-tests', '/maestro-tests', '/root/project');
+
+    // Both flows have 2 occurrences → retryCount = 1 for both
+    expect(results).toHaveLength(2);
+    expect(results).toEqual(
+      expect.arrayContaining([
+        expect.objectContaining({ name: 'home', status: 'passed', retryCount: 1 }),
+        expect.objectContaining({ name: 'login', status: 'passed', retryCount: 1 }),
+      ])
+    );
+  });
+
+  it('handles reuse_devices=false (separate junit_report_directory)', async () => {
+    vol.fromJSON({
+      // JUnit in temp dir (per-flow files)
       '/tmp/maestro-reports-abc123/junit-report-flow-1.xml': [
         '<?xml version="1.0"?>',
         '<testsuites>',
@@ -279,14 +451,21 @@ describe(parseMaestroResults, () => {
         '  </testsuite>',
         '</testsuites>',
       ].join('\n'),
+      // Debug output in default location
+      '/tests/2026-01-28_055409/ai-home.json': JSON.stringify({
+        flow_name: 'home',
+        flow_file_path: '/root/project/.maestro/home.yml',
+      }),
+      '/tests/2026-01-28_055409/ai-login.json': JSON.stringify({
+        flow_name: 'login',
+        flow_file_path: '/root/project/.maestro/login.yml',
+      }),
     });
 
     const results = await parseMaestroResults(
       '/tmp/maestro-reports-abc123',
-      new Map([
-        ['home', '.maestro/home.yml'],
-        ['login', '.maestro/login.yml'],
-      ])
+      '/tests',
+      '/root/project'
     );
     expect(results).toHaveLength(2);
     expect(results).toEqual(
@@ -296,6 +475,51 @@ describe(parseMaestroResults, () => {
       ])
     );
   });
+
+  it('uses raw path when flow_file_path is outside project_root', async () => {
+    vol.fromJSON({
+      '/junit/report.xml': [
+        '<?xml version="1.0"?>',
+        '<testsuites>',
+        '  <testsuite name="Test Suite" tests="1" failures="0">',
+        '    <testcase id="home" name="home" classname="home" time="10.0" status="SUCCESS"/>',
+        '  </testsuite>',
+        '</testsuites>',
+      ].join('\n'),
+      '/tests/2026-01-28_055409/ai-home.json': JSON.stringify({
+        flow_name: 'home',
+        flow_file_path: '/somewhere/else/.maestro/home.yml',
+      }),
+    });
+
+    const results = await parseMaestroResults('/junit', '/tests', '/root/project');
+    expect(results[0].path).toBe('/somewhere/else/.maestro/home.yml');
+  });
+
+  it('filters out non-timestamp directories when scanning debug output', async () => {
+    vol.fromJSON({
+      '/junit/report.xml': [
+        '<?xml version="1.0"?>',
+        '<testsuites>',
+        '  <testsuite name="Test Suite" tests="1" failures="0">',
+        '    <testcase id="home" name="home" classname="home" time="10.0" status="SUCCESS"/>',
+        '  </testsuite>',
+        '</testsuites>',
+      ].join('\n'),
+      '/tests/2026-01-28_055409/ai-home.json': JSON.stringify({
+        flow_name: 'home',
+        flow_file_path: '/root/project/.maestro/home.yml',
+      }),
+      '/tests/not-a-timestamp/ai-home.json': JSON.stringify({
+        flow_name: 'home',
+        flow_file_path: '/root/project/.maestro/home.yml',
+      }),
+    });
+
+    const results = await parseMaestroResults('/junit', '/tests', '/root/project');
+    // Only 1 occurrence (not-a-timestamp dir should be ignored)
+    expect(results[0].retryCount).toBe(0);
+  });
 });
 
 describe(parseJUnitTestCases, () => {
@@ -582,294 +806,6 @@ describe(parseJUnitTestCases, () => {
   });
 });
 
-describe('parseFailedFlowsFromJUnit', () => {
-  it('returns the subset of input flow paths whose testcases failed', async () => {
-    vol.fromJSON({
-      '/tmp/junit-reports/android-maestro-junit-attempt-0.xml': `<?xml version="1.0"?>
-<testsuites>
-  <testsuite>
-    <testcase name="Login" status="SUCCESS" time="1.0" />
-    <testcase name="Search" status="SUCCESS" time="1.0" />
-    <testcase name="Checkout" time="1.0"><failure>something</failure></testcase>
-  </testsuite>
-</testsuites>`,
-    });
-
-    const result = await parseFailedFlowsFromJUnit({
-      junitFile: '/tmp/junit-reports/android-maestro-junit-attempt-0.xml',
-      nameToPath: new Map([
-        ['Login', 'flows/login.yaml'],
-        ['Search', 'flows/search.yaml'],
-        ['Checkout', 'flows/checkout.yaml'],
-      ]),
-    });
-
-    expect(result).toEqual(['flows/checkout.yaml']);
-  });
-
-  it('returns null when a failing testcase has no entry in nameToPath', async () => {
-    vol.fromJSON({
-      '/tmp/junit-reports/attempt-0.xml': `<?xml version="1.0"?>
-<testsuites><testsuite>
-  <testcase name="Login" status="SUCCESS" time="1.0" />
-  <testcase name="Unknown" time="1.0"><failure>x</failure></testcase>
-</testsuite></testsuites>`,
-    });
-
-    const result = await parseFailedFlowsFromJUnit({
-      junitFile: '/tmp/junit-reports/attempt-0.xml',
-      nameToPath: new Map([['Login', 'flows/login.yaml']]),
-    });
-
-    expect(result).toBeNull();
-  });
-
-  it('returns null when two failing testcases share the same name (collision)', async () => {
-    vol.fromJSON({
-      '/tmp/junit-reports/android-maestro-junit-attempt-0.xml': `<?xml version="1.0"?>
-<testsuites><testsuite>
-  <testcase name="Duplicate" time="1.0"><failure>x</failure></testcase>
-  <testcase name="Duplicate" time="1.0"><failure>y</failure></testcase>
-</testsuite></testsuites>`,
-    });
-
-    const result = await parseFailedFlowsFromJUnit({
-      junitFile: '/tmp/junit-reports/android-maestro-junit-attempt-0.xml',
-      nameToPath: new Map([['Duplicate', 'flows/a.yaml']]),
-    });
-
-    expect(result).toBeNull();
-  });
-
-  it('returns null when a failing testcase shares a name with any other testcase (pass or fail)', async () => {
-    vol.fromJSON({
-      '/tmp/junit-reports/android-maestro-junit-attempt-0.xml': `<?xml version="1.0"?>
-<testsuites><testsuite>
-  <testcase name="Shared" status="SUCCESS" time="1.0" />
-  <testcase name="Shared" time="2.0"><failure>x</failure></testcase>
-</testsuite></testsuites>`,
-    });
-
-    const result = await parseFailedFlowsFromJUnit({
-      junitFile: '/tmp/junit-reports/android-maestro-junit-attempt-0.xml',
-      nameToPath: new Map([['Shared', 'flows/a.yaml']]),
-    });
-
-    expect(result).toBeNull();
-  });
-
-  it('returns null when junit file does not exist', async () => {
-    const result = await parseFailedFlowsFromJUnit({
-      junitFile: '/tmp/missing.xml',
-      nameToPath: new Map([['A', 'flows/a.yaml']]),
-    });
-    expect(result).toBeNull();
-  });
-
-  it('returns null when junit file is malformed', async () => {
-    vol.fromJSON({
-      '/tmp/junit-reports/bad.xml': 'this is not xml',
-    });
-    const result = await parseFailedFlowsFromJUnit({
-      junitFile: '/tmp/junit-reports/bad.xml',
-      nameToPath: new Map([['A', 'flows/a.yaml']]),
-    });
-    expect(result).toBeNull();
-  });
-
-  it('returns null when junit XML is truncated mid-tag (partial parse risk)', async () => {
-    // fast-xml-parser can produce a partial parse from truncated XML — without
-    // strict validation, smart retry would only retry the visible failures and
-    // silently skip flows that were cut off.
-    vol.fromJSON({
-      '/tmp/junit-reports/attempt-0.xml': `<?xml version="1.0"?>
-<testsuites><testsuite>
-  <testcase name="A" time="1.0"><failure>x</failure></testcase>
-  <testcase name="B"`, // intentionally truncated mid-tag
-    });
-    const result = await parseFailedFlowsFromJUnit({
-      junitFile: '/tmp/junit-reports/attempt-0.xml',
-      nameToPath: new Map([
-        ['A', 'flows/a.yaml'],
-        ['B', 'flows/b.yaml'],
-      ]),
-    });
-    expect(result).toBeNull();
-  });
-
-  it('returns null when junit XML has unclosed tags (partial parse risk)', async () => {
-    vol.fromJSON({
-      '/tmp/junit-reports/attempt-0.xml': `<?xml version="1.0"?>
-<testsuites><testsuite>
-  <testcase name="A" time="1.0"><failure>x</failure></testcase>
-</testsuite>`, // missing </testsuites>
-    });
-    const result = await parseFailedFlowsFromJUnit({
-      junitFile: '/tmp/junit-reports/attempt-0.xml',
-      nameToPath: new Map([['A', 'flows/a.yaml']]),
-    });
-    expect(result).toBeNull();
-  });
-});
-
-describe('mergeJUnitReports', () => {
-  it('identity-copies a single attempt (preserves suite-level metadata)', async () => {
-    // Single-attempt runs should land in final_report_path with the same
-    // suite-level attributes (tests/failures/time) and non-testcase children
-    // (e.g. <system-out>) that the legacy bash `cp` upload preserved. The
-    // rebuild path used for multi-attempt merges drops these, so the single
-    // case must short-circuit to a byte-equivalent copy.
-    const input = `<?xml version="1.0"?>
-<testsuites>
-  <testsuite name="Maestro Flows" tests="2" failures="0" time="3.0" device="Pixel 7">
-    <testcase name="A" status="SUCCESS" time="1.0" />
-    <testcase name="B" status="SUCCESS" time="2.0" />
-    <system-out>boot complete</system-out>
-  </testsuite>
-</testsuites>`;
-    vol.fromJSON({
-      '/tmp/junit-reports/android-maestro-junit-attempt-0.xml': input,
-    });
-
-    await mergeJUnitReports({
-      sourceDir: '/tmp/junit-reports',
-      outputPath: '/tmp/final.xml',
-    });
-
-    const out = await fs.readFile('/tmp/final.xml', 'utf-8');
-    expect(out).toBe(input);
-  });
-
-  it('keeps the latest attempt per flow name across multiple files', async () => {
-    vol.fromJSON({
-      '/tmp/r/android-maestro-junit-attempt-0.xml': `<?xml version="1.0"?>
-<testsuites><testsuite>
-  <testcase name="A" status="SUCCESS" time="1.0" />
-  <testcase name="B" time="2.0"><failure>bad</failure></testcase>
-</testsuite></testsuites>`,
-      '/tmp/r/android-maestro-junit-attempt-1.xml': `<?xml version="1.0"?>
-<testsuites><testsuite>
-  <testcase name="B" status="SUCCESS" time="3.0" />
-</testsuite></testsuites>`,
-    });
-
-    await mergeJUnitReports({ sourceDir: '/tmp/r', outputPath: '/tmp/final.xml' });
-
-    const out = await fs.readFile('/tmp/final.xml', 'utf-8');
-    const parsed = new XMLParser({ ignoreAttributes: false }).parse(out);
-    const testcases = parsed.testsuites.testsuite.testcase;
-    const a = testcases.find((t: any) => t['@_name'] === 'A');
-    const b = testcases.find((t: any) => t['@_name'] === 'B');
-    expect(a['@_status']).toBe('SUCCESS'); // from attempt 0
-    expect(b['@_status']).toBe('SUCCESS'); // from attempt 1 (latest)
-    expect(b.failure).toBeUndefined();
-  });
-
-  it('throws when source directory contains no *.xml files', async () => {
-    // No per-attempt JUnit files were ever written (maestro crashed before
-    // producing output). Phase 3 in runMaestroTests treats this as a SystemError
-    // — without a throw here, mergeJUnitReports would silently write an empty
-    // <testsuite> and the caller would upload a misleading empty report.
-    vol.fromJSON({
-      '/tmp/r/.gitkeep': '',
-    });
-
-    await expect(
-      mergeJUnitReports({ sourceDir: '/tmp/r', outputPath: '/tmp/final.xml' })
-    ).rejects.toThrow(/no \*\.xml files/);
-  });
-
-  it('throws on invalid XML so caller can fall back to copyLatestAttemptXml', async () => {
-    // Without a throw, mergeJUnitReports would silently emit an empty merged
-    // document and the copy-latest fallback (which only triggers on throw)
-    // would never run.
-    vol.fromJSON({
-      '/tmp/r/android-maestro-junit-attempt-0.xml': 'not xml at all',
-    });
-
-    await expect(
-      mergeJUnitReports({ sourceDir: '/tmp/r', outputPath: '/tmp/final.xml' })
-    ).rejects.toThrow(/invalid XML/);
-  });
-
-  it('throws when every input has <testsuites> but no <testcase> elements', async () => {
-    vol.fromJSON({
-      '/tmp/r/android-maestro-junit-attempt-0.xml': `<?xml version="1.0"?>
-<testsuites><testsuite></testsuite></testsuites>`,
-    });
-
-    await expect(
-      mergeJUnitReports({ sourceDir: '/tmp/r', outputPath: '/tmp/final.xml' })
-    ).rejects.toThrow(/no parseable testcases/);
-  });
-
-  it('throws when any input XML is malformed (even if others parse)', async () => {
-    vol.fromJSON({
-      '/tmp/r/attempt-0.xml': `<?xml version="1.0"?><testsuites><testsuite><testcase name="A" status="SUCCESS" time="1.0"/></testsuite></testsuites>`,
-      '/tmp/r/attempt-1.xml': 'garbage not xml',
-    });
-    await expect(
-      mergeJUnitReports({ sourceDir: '/tmp/r', outputPath: '/tmp/final.xml' })
-    ).rejects.toThrow();
-  });
-
-  it('throws when an input XML is truncated mid-tag (would otherwise partial-parse)', async () => {
-    // fast-xml-parser is lenient and can return partial results from truncated
-    // XML. Without strict validation, mergeJUnitReports would emit a merged
-    // report missing the cut-off flows and Phase 3's copy-latest fallback
-    // would never run. Validation must reject the file.
-    vol.fromJSON({
-      '/tmp/r/attempt-0.xml': `<?xml version="1.0"?>
-<testsuites><testsuite>
-  <testcase name="A" status="SUCCESS" time="1.0"/>
-  <testcase name="B"`, // truncated mid-tag
-    });
-    await expect(
-      mergeJUnitReports({ sourceDir: '/tmp/r', outputPath: '/tmp/final.xml' })
-    ).rejects.toThrow();
-  });
-
-  it('throws when an input XML has unclosed tags (would otherwise partial-parse)', async () => {
-    vol.fromJSON({
-      '/tmp/r/attempt-0.xml': `<?xml version="1.0"?>
-<testsuites><testsuite>
-  <testcase name="A" status="SUCCESS" time="1.0"/>
-</testsuite>`, // missing </testsuites>
-    });
-    await expect(
-      mergeJUnitReports({ sourceDir: '/tmp/r', outputPath: '/tmp/final.xml' })
-    ).rejects.toThrow();
-  });
-
-  it('throws when any input XML parses but has no testcases (even if others have testcases)', async () => {
-    vol.fromJSON({
-      '/tmp/r/attempt-0.xml': `<?xml version="1.0"?><testsuites><testsuite><testcase name="A" status="SUCCESS" time="1.0"/></testsuite></testsuites>`,
-      '/tmp/r/attempt-1.xml': `<?xml version="1.0"?><testsuites></testsuites>`,
-    });
-    await expect(
-      mergeJUnitReports({ sourceDir: '/tmp/r', outputPath: '/tmp/final.xml' })
-    ).rejects.toThrow();
-  });
-
-  it('preserves duplicate names within the same attempt', async () => {
-    vol.fromJSON({
-      '/tmp/r/attempt-0.xml': `<?xml version="1.0"?>
-<testsuites><testsuite>
-  <testcase name="Dup" status="SUCCESS" time="1.0" />
-  <testcase name="Dup" status="SUCCESS" time="2.0" />
-</testsuite></testsuites>`,
-    });
-
-    await mergeJUnitReports({ sourceDir: '/tmp/r', outputPath: '/tmp/final.xml' });
-
-    const out = await fs.readFile('/tmp/final.xml', 'utf-8');
-    const parsed = new XMLParser({ ignoreAttributes: false, isArray: n => n === 'testcase' }).parse(
-      out
-    );
-    expect(parsed.testsuites.testsuite.testcase).toHaveLength(2);
-  });
-});
-
 describe('copyLatestAttemptXml', () => {
   it('picks the highest attempt number', async () => {
     vol.fromJSON({

packages/build-tools/src/steps/functions/__tests__/maestroTests.test.ts

@@ -49,10 +49,10 @@ function createStep(
 describe('createMaestroTestsBuildFunction', () => {
   beforeEach(() => {
     mockedSpawn.mockReset();
-    // Default-stub the merge helper so tests that don't care about it don't
-    // hit the real disk. Individual tests override this.
+    // Default-stub copyLatestAttemptXml so tests that don't care about it
+    // don't hit the real disk. Individual tests override this.
     jest.restoreAllMocks();
-    jest.spyOn(parser, 'mergeJUnitReports').mockResolvedValue();
+    jest.spyOn(parser, 'copyLatestAttemptXml').mockResolvedValue();
   });
 
   it('exports a factory that returns a BuildFunction instance', () => {
@@ -141,34 +141,10 @@ describe('createMaestroTestsBuildFunction', () => {
     expect(mockedSpawn).toHaveBeenCalledTimes(1);
   });
 
-  it('retries only the failed flows on the next attempt (junit mode)', async () => {
-    mockedSpawn.mockRejectedValueOnce(rejectExit1()).mockResolvedValueOnce(SPAWN_SUCCESS);
-    jest.spyOn(parser, 'parseFailedFlowsFromJUnit').mockResolvedValue(['flows/b.yaml']);
-
-    const step = createStep({
-      flow_path: ['flows/a.yaml', 'flows/b.yaml', 'flows/c.yaml'],
-      retries: 1,
-      output_format: 'junit',
-      platform: 'android',
-    });
-    await step.executeAsync();
-
-    // Attempt 0 saw all 3
-    expect(mockedSpawn.mock.calls[0][1]).toEqual(
-      expect.arrayContaining(['flows/a.yaml', 'flows/b.yaml', 'flows/c.yaml'])
-    );
-    // Attempt 1 saw only the failed one
-    const a1Args = mockedSpawn.mock.calls[1][1]!;
-    expect(a1Args).toContain('flows/b.yaml');
-    expect(a1Args).not.toContain('flows/a.yaml');
-    expect(a1Args).not.toContain('flows/c.yaml');
-  });
-
-  it('retries all flows when parseFailedFlowsFromJUnit returns null', async () => {
+  it('retries all flows on failure', async () => {
     const spawnMock = mockedSpawn
       .mockRejectedValueOnce(rejectExit1())
       .mockResolvedValueOnce(SPAWN_SUCCESS);
-    jest.spyOn(parser, 'parseFailedFlowsFromJUnit').mockResolvedValue(null);
 
     const step = createStep({
       flow_path: ['flows/a.yaml', 'flows/b.yaml', 'flows/c.yaml'],
@@ -178,7 +154,6 @@ describe('createMaestroTestsBuildFunction', () => {
     });
     await step.executeAsync();
 
-    // Both attempts saw all 3 flows
     expect(spawnMock.mock.calls[0][1]).toEqual(
       expect.arrayContaining(['flows/a.yaml', 'flows/b.yaml', 'flows/c.yaml'])
     );
@@ -187,48 +162,8 @@ describe('createMaestroTestsBuildFunction', () => {
     );
   });
 
-  it('always retries all flows when output_format is not junit', async () => {
-    const spawnMock = mockedSpawn
-      .mockRejectedValueOnce(rejectExit1())
-      .mockResolvedValueOnce(SPAWN_SUCCESS);
-    const parseSpy = jest.spyOn(parser, 'parseFailedFlowsFromJUnit');
-
-    const step = createStep({
-      flow_path: ['flows/a.yaml', 'flows/b.yaml'],
-      retries: 1,
-      output_format: 'html',
-      platform: 'android',
-    });
-    await step.executeAsync();
-
-    expect(parseSpy).not.toHaveBeenCalled();
-    expect(spawnMock.mock.calls[1][1]).toEqual(
-      expect.arrayContaining(['flows/a.yaml', 'flows/b.yaml'])
-    );
-  });
-
-  it('writes merged junit on success', async () => {
+  it('writes final report via copyLatestAttemptXml on success', async () => {
     mockedSpawn.mockResolvedValue(SPAWN_SUCCESS);
-    const mergeSpy = jest.spyOn(parser, 'mergeJUnitReports').mockResolvedValue();
-
-    const step = createStep({
-      flow_path: ['a.yaml'],
-      output_format: 'junit',
-      platform: 'android',
-    });
-    await step.executeAsync();
-
-    expect(mergeSpy).toHaveBeenCalledWith(
-      expect.objectContaining({
-        sourceDir: expect.stringContaining('junit-reports'),
-        outputPath: expect.stringContaining('android-maestro-junit.xml'),
-      })
-    );
-  });
-
-  it('falls back to copyLatestAttemptXml when mergeJUnitReports throws a data error', async () => {
-    mockedSpawn.mockResolvedValue(SPAWN_SUCCESS);
-    jest.spyOn(parser, 'mergeJUnitReports').mockRejectedValue(new Error('bad xml'));
     const copySpy = jest.spyOn(parser, 'copyLatestAttemptXml').mockResolvedValue();
 
     const step = createStep({
@@ -238,15 +173,19 @@ describe('createMaestroTestsBuildFunction', () => {
     });
     await step.executeAsync();
 
-    expect(copySpy).toHaveBeenCalled();
+    expect(copySpy).toHaveBeenCalledWith(
+      expect.objectContaining({
+        sourceDir: expect.stringContaining('junit-reports'),
+        outputPath: expect.stringContaining('android-maestro-junit.xml'),
+      })
+    );
   });
 
-  it('swallows merge and copy-latest failures when maestro succeeded', async () => {
+  it('swallows copyLatestAttemptXml failure when maestro succeeded', async () => {
     // Throwing on copy failure would mask the real reason for early-failing
     // maestro runs (bad YAML writes no *.xml) and would also wrap a user-side
     // failure as SystemError, which cancels the build's billing.
     mockedSpawn.mockResolvedValue(SPAWN_SUCCESS);
-    jest.spyOn(parser, 'mergeJUnitReports').mockRejectedValue(new Error('bad xml'));
     jest
       .spyOn(parser, 'copyLatestAttemptXml')
       .mockRejectedValue(Object.assign(new Error('no space'), { code: 'ENOSPC' }));
@@ -291,8 +230,6 @@ describe('createMaestroTestsBuildFunction', () => {
         pid: 1,
       })
     );
-    jest.spyOn(parser, 'parseFailedFlowsFromJUnit').mockResolvedValue(['flows/a.yaml']);
-    jest.spyOn(parser, 'mergeJUnitReports').mockResolvedValue();
 
     const step = createStep({
       flow_path: ['flows/a.yaml'],
@@ -361,9 +298,9 @@ describe('createMaestroTestsBuildFunction', () => {
 
   it('accepts output_format casing variations (e.g. JUNIT) case-insensitively', async () => {
     // output_format.toLowerCase() must propagate end-to-end: final_report_path
-    // populated, per-attempt XMLs written into junit-reports/, merge invoked.
+    // populated, per-attempt XMLs written into junit-reports/, copy invoked.
     mockedSpawn.mockResolvedValue(SPAWN_SUCCESS);
-    const mergeSpy = jest.spyOn(parser, 'mergeJUnitReports').mockResolvedValue();
+    const copySpy = jest.spyOn(parser, 'copyLatestAttemptXml').mockResolvedValue();
 
     const step = createStep({
       flow_path: ['flows/a.yaml'],
@@ -372,16 +309,13 @@ describe('createMaestroTestsBuildFunction', () => {
     });
     await step.executeAsync();
 
-    // Phase 1: final_report_path populated
     expect(step.getOutputValueByName('final_report_path')).toMatch(
       /\.maestro\/tests\/android-maestro-junit\.xml$/
     );
-    // Retry loop: --output written into junit-reports/ (not legacy path)
     const args = mockedSpawn.mock.calls[0][1] as string[];
     const outputArg = args.find(a => a.startsWith('--output='));
     expect(outputArg).toMatch(/junit-reports\/android-maestro-junit-attempt-0\.xml$/);
-    // Phase 3: merge invoked
-    expect(mergeSpy).toHaveBeenCalledWith(
+    expect(copySpy).toHaveBeenCalledWith(
       expect.objectContaining({
         sourceDir: expect.stringContaining('junit-reports'),
         outputPath: expect.stringContaining('android-maestro-junit.xml'),

packages/build-tools/src/steps/functions/__tests__/reportMaestroTestResults.test.ts

@@ -72,7 +72,7 @@ describe(createReportMaestroTestResultsFunction, () => {
   it('parses JUnit results and calls GraphQL mutation', async () => {
     vol.fromJSON({
       '/junit/report.xml': JUNIT_PASS,
-      '/root/project/.maestro/home.yml': '',
+      '/tests/2026-01-28_055409/ai-home.json': FLOW_AI,
     });
 
     mockMutationFn.mockResolvedValue({
@@ -83,11 +83,7 @@ describe(createReportMaestroTestResultsFunction, () => {
       },
     });
 
-    await createStep({
-      callInputs: {
-        flow_path: ['.maestro/home.yml'],
-      },
-    }).executeAsync();
+    await createStep().executeAsync();
 
     expect(mockGraphqlClient.mutation).toHaveBeenCalledTimes(1);
     const [, variables] = (mockGraphqlClient.mutation as jest.Mock).mock.calls[0];

packages/build-tools/src/steps/functions/maestroFlowDiscovery.ts

@@ -1,190 +0,0 @@
-import type { bunyan } from '@expo/logger';
-import { asyncResult } from '@expo/results';
-import fs from 'fs/promises';
-import path from 'path';
-import yaml from 'yaml';
-
-const YAML_EXT = /\.ya?ml$/i;
-const WORKSPACE_CONFIG_BASENAME = 'config.yaml';
-
-export interface BuildFlowNameToPathMapArgs {
-  inputFlowPaths: string[];
-  projectRoot: string;
-  logger: bunyan;
-}
-
-interface FlowEntry {
-  name: string;
-  path: string;
-  realpath: string;
-}
-
-export async function buildFlowNameToPathMap(
-  args: BuildFlowNameToPathMapArgs
-): Promise<Map<string, string> | null> {
-  try {
-    const flows = await discoverFlows(args);
-    return dedupAndDetectDuplicates(flows, args.logger);
-  } catch (err: any) {
-    args.logger.warn(`buildFlowNameToPathMap failed unexpectedly: ${err?.message ?? String(err)}`);
-    return null;
-  }
-}
-
-async function discoverFlows({
-  inputFlowPaths,
-  projectRoot,
-  logger,
-}: BuildFlowNameToPathMapArgs): Promise<FlowEntry[]> {
-  const realRootResult = await asyncResult(fs.realpath(projectRoot));
-  const realRoot = realRootResult.ok ? realRootResult.value : projectRoot;
-  const fileLists = await Promise.all(
-    inputFlowPaths.map(async input => {
-      const abs = path.resolve(projectRoot, input);
-      const statResult = await asyncResult(fs.stat(abs));
-      if (!statResult.ok) {
-        logger.warn(`flow_path entry "${input}" not found, skipping`);
-        return [];
-      }
-      const stat = statResult.value;
-      if (stat.isFile() && YAML_EXT.test(abs)) {
-        return [abs];
-      }
-      if (stat.isDirectory()) {
-        const out: string[] = [];
-        await walkDir(abs, new Set(), out, logger);
-        return out;
-      }
-      return [];
-    })
-  );
-  return Promise.all(fileLists.flat().map(absFile => makeEntry(absFile, realRoot)));
-}
-
-async function makeEntry(absFile: string, realRoot: string): Promise<FlowEntry> {
-  const [name, realFileResult] = await Promise.all([
-    readFlowName(absFile),
-    asyncResult(fs.realpath(absFile)),
-  ]);
-  const realFile = realFileResult.ok ? realFileResult.value : absFile;
-  const rel = path.relative(realRoot, realFile);
-  const value = rel.startsWith('..') || path.isAbsolute(rel) ? absFile : rel;
-  return { name, path: value, realpath: realFile };
-}
-
-function dedupAndDetectDuplicates(flows: FlowEntry[], logger: bunyan): Map<string, string> | null {
-  const byKey = new Map<string, FlowEntry>();
-  for (const f of flows) {
-    if (!byKey.has(f.realpath)) {
-      byKey.set(f.realpath, f);
-    }
-  }
-  const unique = [...byKey.values()];
-
-  const nameToPath = new Map<string, string>();
-  const duplicates = new Map<string, string[]>();
-  for (const f of unique) {
-    if (nameToPath.has(f.name)) {
-      const existing = nameToPath.get(f.name)!;
-      const list = duplicates.get(f.name) ?? [existing];
-      list.push(f.path);
-      duplicates.set(f.name, list);
-    }
-    nameToPath.set(f.name, f.path);
-  }
-  if (duplicates.size > 0) {
-    for (const [name, paths] of duplicates) {
-      logger.warn(`Duplicate Maestro flow name "${name}" across paths: ${paths.join(', ')}.`);
-    }
-    logger.warn(
-      'Smart retry disabled for this run; will retry all flows on failure. ' +
-        'Give each Maestro flow a unique name (file basename or top-level name) to enable smart retry.'
-    );
-    return null;
-  }
-  return nameToPath;
-}
-
-export async function walkDir(
-  dir: string,
-  visited: Set<string>,
-  out: string[],
-  logger: bunyan
-): Promise<void> {
-  // Cycle protection: dedup on realpath (fall back to the original path when
-  // realpath fails so we still make progress on missing or restricted dirs).
-  const realResult = await asyncResult(fs.realpath(dir));
-  const real = realResult.ok ? realResult.value : dir;
-  if (visited.has(real)) {
-    return;
-  }
-  visited.add(real);
-
-  let entries;
-  try {
-    entries = await fs.readdir(dir, { withFileTypes: true });
-  } catch (err: any) {
-    logger.warn(`readdir failed for ${dir}: ${err?.message ?? String(err)}`);
-    return;
-  }
-  entries.sort((a, b) => a.name.localeCompare(b.name));
-
-  for (const entry of entries) {
-    const full = path.join(dir, entry.name);
-    if (entry.isSymbolicLink()) {
-      const tgtResult = await asyncResult(fs.stat(full));
-      if (!tgtResult.ok) {
-        continue;
-      }
-      const tgt = tgtResult.value;
-      if (tgt.isDirectory()) {
-        await walkDir(full, visited, out, logger);
-      } else if (tgt.isFile() && isYamlFile(entry.name) && !isWorkspaceConfig(entry.name)) {
-        out.push(full);
-      }
-    } else if (entry.isDirectory()) {
-      await walkDir(full, visited, out, logger);
-    } else if (entry.isFile()) {
-      if (isYamlFile(entry.name) && !isWorkspaceConfig(entry.name)) {
-        out.push(full);
-      }
-    }
-  }
-}
-
-export async function readFlowName(absFile: string): Promise<string> {
-  const ext = path.extname(absFile);
-  const fallback = path.basename(absFile, ext);
-  let content: string;
-  try {
-    content = await fs.readFile(absFile, 'utf-8');
-  } catch {
-    return fallback;
-  }
-
-  let firstDoc;
-  try {
-    const docs = yaml.parseAllDocuments(content);
-    firstDoc = docs[0];
-  } catch {
-    return fallback;
-  }
-  if (!firstDoc || firstDoc.errors.length > 0) {
-    return fallback;
-  }
-
-  const parsed = firstDoc.toJS();
-  const name = parsed?.name;
-  if (typeof name === 'string' && name.length > 0) {
-    return name;
-  }
-  return fallback;
-}
-
-function isYamlFile(name: string): boolean {
-  return YAML_EXT.test(name);
-}
-
-function isWorkspaceConfig(name: string): boolean {
-  return name.toLowerCase() === WORKSPACE_CONFIG_BASENAME;
-}

packages/build-tools/src/steps/functions/maestroResultParser.ts

@@ -1,6 +1,7 @@
-import { XMLBuilder, XMLParser, XMLValidator } from 'fast-xml-parser';
+import { XMLParser } from 'fast-xml-parser';
 import fs from 'fs/promises';
 import path from 'path';
+import { z } from 'zod';
 
 export interface MaestroFlowResult {
   name: string;
@@ -13,9 +14,17 @@ export interface MaestroFlowResult {
   properties: Record<string, string>;
 }
 
+// Maestro's TestDebugReporter creates timestamped directories, e.g. "2024-06-15_143022"
+const TIMESTAMP_DIR_PATTERN = /^\d{4}-\d{2}-\d{2}_\d{6}$/;
+
 // Per-attempt JUnit XML files use `*-attempt-N.xml` names; this extracts N.
 const ATTEMPT_PATTERN = /attempt-(\d+)/;
 
+export function extractFlowKey(filename: string, prefix: string): string | null {
+  const match = filename.match(new RegExp(`^${prefix}-(.+)\\.json$`));
+  return match?.[1] ?? null;
+}
+
 export interface JUnitTestCaseResult {
   name: string;
   status: 'passed' | 'failed';
@@ -32,9 +41,11 @@ const xmlParser = new XMLParser({
   isArray: name => ['testsuite', 'testcase', 'property'].includes(name),
 });
 
-function parseJUnitContent(content: string): JUnitTestCaseResult[] {
+// Internal helper — not exported. Parses a single JUnit XML file.
+async function parseJUnitFile(filePath: string): Promise<JUnitTestCaseResult[]> {
   const results: JUnitTestCaseResult[] = [];
   try {
+    const content = await fs.readFile(filePath, 'utf-8');
     const parsed = xmlParser.parse(content);
 
     const testsuites = parsed?.testsuites?.testsuite;
@@ -98,20 +109,11 @@ function parseJUnitContent(content: string): JUnitTestCaseResult[] {
       }
     }
   } catch {
-    // Malformed XML — return whatever we collected before the parser bailed.
+    // Skip malformed XML files
   }
   return results;
 }
 
-async function parseJUnitFile(filePath: string): Promise<JUnitTestCaseResult[]> {
-  try {
-    const content = await fs.readFile(filePath, 'utf-8');
-    return parseJUnitContent(content);
-  } catch {
-    return [];
-  }
-}
-
 export async function parseJUnitTestCases(junitDirectory: string): Promise<JUnitTestCaseResult[]> {
   let entries: string[];
   try {
@@ -125,16 +127,49 @@ export async function parseJUnitTestCases(junitDirectory: string): Promise<JUnit
     return [];
   }
 
-  const perFile = await Promise.all(
-    xmlFiles.map(f => parseJUnitFile(path.join(junitDirectory, f)))
-  );
-  return perFile.flat();
+  const results: JUnitTestCaseResult[] = [];
+  for (const xmlFile of xmlFiles) {
+    results.push(...(await parseJUnitFile(path.join(junitDirectory, xmlFile))));
+  }
+  return results;
+}
+
+const FlowMetadataFileSchema = z.object({
+  flow_name: z.string(),
+  flow_file_path: z.string(),
+});
+
+type FlowMetadata = z.output<typeof FlowMetadataFileSchema>;
+
+/**
+ * Parses an `ai-*.json` file produced by Maestro's TestDebugReporter.
+ *
+ * The file contains:
+ * - `flow_name`: derived from the YAML `config.name` field if present, otherwise
+ *   the flow filename without extension.
+ *   See: https://github.com/mobile-dev-inc/Maestro/blob/c0e95fd/maestro-cli/src/main/java/maestro/cli/runner/TestRunner.kt#L70
+ * - `flow_file_path`: absolute path to the original flow YAML file.
+ * - `outputs`: screenshot defect data (unused here).
+ *
+ * Filename format: `ai-(flowName).json` where `/` in flowName is replaced with `_`.
+ * See: https://github.com/mobile-dev-inc/Maestro/blob/c0e95fd/maestro-cli/src/main/java/maestro/cli/report/TestDebugReporter.kt#L67
+ */
+export async function parseFlowMetadata(filePath: string): Promise<FlowMetadata | null> {
+  try {
+    const content = await fs.readFile(filePath, 'utf-8');
+    const data = JSON.parse(content);
+    return FlowMetadataFileSchema.parse(data);
+  } catch {
+    return null;
+  }
 }
 
 export async function parseMaestroResults(
   junitDirectory: string,
-  nameToPath: Map<string, string> | null
+  testsDirectory: string,
+  projectRoot: string
 ): Promise<MaestroFlowResult[]> {
+  // 1. Parse JUnit XML files, tracking which file each result came from
   let junitEntries: string[];
   try {
     junitEntries = await fs.readdir(junitDirectory);
@@ -163,8 +198,51 @@ export async function parseMaestroResults(
     return [];
   }
 
+  // 2. Parse ai-*.json from debug output for flow_file_path + retryCount
+  const flowPathMap = new Map<string, string>(); // flowName → flowFilePath
+  const flowOccurrences = new Map<string, number>(); // flowName → count
+
+  let entries: string[];
+  try {
+    entries = await fs.readdir(testsDirectory);
+  } catch {
+    entries = [];
+  }
+
+  const timestampDirs = entries.filter(name => TIMESTAMP_DIR_PATTERN.test(name)).sort();
+
+  for (const dir of timestampDirs) {
+    const dirPath = path.join(testsDirectory, dir);
+    let files: string[];
+    try {
+      files = await fs.readdir(dirPath);
+    } catch {
+      continue;
+    }
+
+    for (const file of files) {
+      const flowKey = extractFlowKey(file, 'ai');
+      if (!flowKey) {
+        continue;
+      }
+
+      const metadata = await parseFlowMetadata(path.join(dirPath, file));
+      if (!metadata) {
+        continue;
+      }
+
+      // Track latest path (last timestamp dir wins)
+      flowPathMap.set(metadata.flow_name, metadata.flow_file_path);
+
+      // Count occurrences for retryCount
+      flowOccurrences.set(metadata.flow_name, (flowOccurrences.get(metadata.flow_name) ?? 0) + 1);
+    }
+  }
+
+  // 3. Merge: JUnit results + ai-*.json metadata
   const results: MaestroFlowResult[] = [];
 
+  // Group results by flow name
   const resultsByName = new Map<string, JUnitResultWithSource[]>();
   for (const entry of junitResultsWithSource) {
     const group = resultsByName.get(entry.result.name) ?? [];
@@ -173,229 +251,83 @@ export async function parseMaestroResults(
   }
 
   for (const [flowName, flowEntries] of resultsByName) {
-    const flowPath = nameToPath?.get(flowName) ?? flowName;
-    // retryCount is derived from each entry's source filename (`attempt-N`);
-    // a single entry from `report.xml` (no marker) collapses to attempt 0.
-    const sorted = flowEntries
-      .map(entry => {
-        const match = entry.sourceFile.match(ATTEMPT_PATTERN);
-        const attemptIndex = match ? parseInt(match[1], 10) : 0;
-        return { ...entry, attemptIndex };
-      })
-      .sort((a, b) => a.attemptIndex - b.attemptIndex);
+    const flowFilePath = flowPathMap.get(flowName);
+    const relativePath = flowFilePath
+      ? await relativizePathAsync(flowFilePath, projectRoot)
+      : flowName;
+
+    if (flowEntries.length === 1) {
+      // Single result for this flow — use ai-*.json occurrence count for retryCount
+      // (backward compat with old-style single JUnit file that gets overwritten)
+      const { result } = flowEntries[0];
+      const occurrences = flowOccurrences.get(flowName) ?? 0;
+      const retryCount = Math.max(0, occurrences - 1);
 
-    for (const { result, attemptIndex } of sorted) {
       results.push({
         name: flowName,
-        path: flowPath,
+        path: relativePath,
         status: result.status,
         errorMessage: result.errorMessage,
         duration: result.duration,
-        retryCount: attemptIndex,
+        retryCount,
         tags: result.tags,
         properties: result.properties,
       });
+    } else {
+      // Multiple results — per-attempt JUnit files. Sort by attempt index from filename.
+      const sorted = flowEntries
+        .map(entry => {
+          const match = entry.sourceFile.match(ATTEMPT_PATTERN);
+          const attemptIndex = match ? parseInt(match[1], 10) : 0;
+          return { ...entry, attemptIndex };
+        })
+        .sort((a, b) => a.attemptIndex - b.attemptIndex);
+
+      for (const { result, attemptIndex } of sorted) {
+        results.push({
+          name: flowName,
+          path: relativePath,
+          status: result.status,
+          errorMessage: result.errorMessage,
+          duration: result.duration,
+          retryCount: attemptIndex,
+          tags: result.tags,
+          properties: result.properties,
+        });
+      }
     }
   }
 
   return results;
 }
 
-/**
- * Returns the subset of `inputFlowPaths` whose testcases failed in the given
- * attempt's JUnit file, or `null` when the result cannot be trusted (caller
- * then falls back to dumb retry — re-run everything).
- *
- * Caller passes a precomputed `nameToPath` map built from the user's
- * `inputFlowPaths`. We translate failed testcase names to flow paths via
- * that map; unknown names → null.
- */
-export async function parseFailedFlowsFromJUnit(args: {
-  junitFile: string;
-  nameToPath: Map<string, string>;
-}): Promise<string[] | null> {
-  // fast-xml-parser is lenient — truncated XML can produce a partial parse
-  // with some testcases dropped. Trusting that subset for smart retry would
-  // skip retries for cut-off flows; reject any malformed XML and fall back
-  // to dumb retry.
-  let content: string;
+async function relativizePathAsync(flowFilePath: string, projectRoot: string): Promise<string> {
+  if (!path.isAbsolute(flowFilePath)) {
+    return flowFilePath;
+  }
+
+  // Resolve symlinks (e.g., /tmp -> /private/tmp on macOS) for consistent comparison
+  let resolvedRoot = projectRoot;
+  let resolvedFlow = flowFilePath;
   try {
-    content = await fs.readFile(args.junitFile, 'utf-8');
-  } catch {
-    return null;
-  }
-  if (XMLValidator.validate(content) !== true) {
-    return null;
-  }
+    resolvedRoot = await fs.realpath(projectRoot);
+  } catch {}
+  try {
+    resolvedFlow = await fs.realpath(flowFilePath);
+  } catch {}
 
-  const testcases = parseJUnitContent(content);
-  if (testcases.length === 0) {
-    return null;
+  const relative = path.relative(resolvedRoot, resolvedFlow);
+  if (relative.startsWith('..')) {
+    return flowFilePath;
   }
-
-  const failing = testcases.filter(tc => tc.status === 'failed');
-  if (failing.length === 0) {
-    return [];
-  }
-
-  // Two testcases with the same name (pass+fail or fail+fail) make it
-  // impossible to map back to a single input flow_path. Signal "unknown".
-  // Complementary to the map-build duplicate check (which catches the case
-  // where tag filter hides duplication from JUnit).
-  const allNameCounts = new Map<string, number>();
-  for (const tc of testcases) {
-    allNameCounts.set(tc.name, (allNameCounts.get(tc.name) ?? 0) + 1);
-  }
-  for (const count of allNameCounts.values()) {
-    if (count > 1) {
-      return null;
-    }
-  }
-
-  const matched: string[] = [];
-  for (const tc of failing) {
-    const p = args.nameToPath.get(tc.name);
-    if (p === undefined) {
-      return null;
-    }
-    matched.push(p);
-  }
-  return matched;
-}
-
-/**
- * Reads every *.xml in sourceDir (per-attempt JUnit files), picks the latest
- * attempt's <testcase> per unique flow name (latest determined from the
- * filename's `attempt-(\d+)` marker; files without the marker = attempt 0),
- * and writes a merged document to outputPath.
- *
- * Throws on empty/malformed/no-testcase input so the caller can fall back to
- * copyLatestAttemptXml — silently dropping bad attempts could keep stale
- * failure rows around and produce a misleading merged report.
- */
-export async function mergeJUnitReports(args: {
-  sourceDir: string;
-  outputPath: string;
-}): Promise<void> {
-  const entries = await fs.readdir(args.sourceDir);
-  const xmlFiles = entries.filter(f => f.endsWith('.xml')).sort();
-
-  if (xmlFiles.length === 0) {
-    throw new Error(`mergeJUnitReports: no *.xml files found in ${args.sourceDir}`);
-  }
-
-  interface FileGroup {
-    attemptIndex: number;
-    filename: string;
-    content: string;
-    testcasesByName: Map<string, unknown[]>;
-  }
-  const contents = await Promise.all(
-    xmlFiles.map(async f => ({
-      filename: f,
-      content: await fs.readFile(path.join(args.sourceDir, f), 'utf-8'),
-    }))
-  );
-  const fileGroups: FileGroup[] = [];
-  for (const { filename, content } of contents) {
-    if (XMLValidator.validate(content) !== true) {
-      throw new Error(`mergeJUnitReports: invalid XML in ${filename}`);
-    }
-    let parsed: any;
-    try {
-      parsed = xmlParser.parse(content);
-    } catch (err) {
-      throw new Error(`mergeJUnitReports: failed to parse ${filename}`, { cause: err });
-    }
-    const testsuites = parsed?.testsuites?.testsuite;
-    if (!Array.isArray(testsuites)) {
-      throw new Error(`mergeJUnitReports: no <testsuite> array in ${filename}`);
-    }
-    const match = filename.match(ATTEMPT_PATTERN);
-    const attemptIndex = match ? parseInt(match[1], 10) : 0;
-    const testcasesByName = new Map<string, unknown[]>();
-    for (const suite of testsuites) {
-      const cases = suite?.testcase;
-      if (!Array.isArray(cases)) {
-        continue;
-      }
-      for (const tc of cases) {
-        const name = tc?.['@_name'];
-        if (typeof name !== 'string') {
-          continue;
-        }
-        const group = testcasesByName.get(name) ?? [];
-        group.push(tc);
-        testcasesByName.set(name, group);
-      }
-    }
-    if (testcasesByName.size === 0) {
-      throw new Error(`mergeJUnitReports: no parseable testcases in ${filename}`);
-    }
-    fileGroups.push({ attemptIndex, filename, content, testcasesByName });
-  }
-
-  // Single attempt: copy the original XML so suite-level metadata (testsuite
-  // attributes, <system-out>, etc.) survives. The rebuild path below would
-  // collapse those to a single attribute-less <testsuite>.
-  if (fileGroups.length === 1) {
-    await fs.writeFile(args.outputPath, fileGroups[0].content);
-    return;
-  }
-
-  // For each unique name, pick the file with the highest attempt index that
-  // contains it (ties broken by sorted filename — later wins). Preserve every
-  // <testcase> element from the winning file for that name, so same-attempt
-  // duplicates survive.
-  const nameToWinningFile = new Map<string, FileGroup>();
-  for (const group of fileGroups) {
-    for (const name of group.testcasesByName.keys()) {
-      const current = nameToWinningFile.get(name);
-      if (!current || group.attemptIndex >= current.attemptIndex) {
-        nameToWinningFile.set(name, group);
-      }
-    }
-  }
-
-  // Emit in first-seen order (iteration over `fileGroups` yields stable order
-  // matching the sorted filename list).
-  const testcases: unknown[] = [];
-  const emitted = new Set<string>();
-  for (const group of fileGroups) {
-    for (const [name, cases] of group.testcasesByName) {
-      if (emitted.has(name)) {
-        continue;
-      }
-      const winner = nameToWinningFile.get(name);
-      if (winner === group) {
-        for (const tc of cases) {
-          testcases.push(tc);
-        }
-        emitted.add(name);
-      }
-    }
-  }
-
-  const builder = new XMLBuilder({
-    ignoreAttributes: false,
-    attributeNamePrefix: '@_',
-    format: true,
-    suppressEmptyNode: true,
-  });
-  const xml = builder.build({
-    testsuites: {
-      testsuite: {
-        testcase: testcases,
-      },
-    },
-  });
-  await fs.writeFile(args.outputPath, xml);
+  return relative;
 }
 
 /**
  * Copies the highest-attempt-index *.xml file from sourceDir to outputPath.
- * Used as a fallback when mergeJUnitReports fails due to data issues but the
- * step still needs to produce final_report_path.
+ * After the maestro retry loop completes, this produces a single canonical
+ * JUnit report at final_report_path matching the bash step's "cp latest
+ * attempt" semantics.
  *
  * Throws if sourceDir contains no *.xml files or if the copy fails.
  */
@@ -410,8 +342,7 @@ export async function copyLatestAttemptXml(args: {
   }
 
   // Pick the file with the highest attempt index. Files without the marker are
-  // treated as attempt 0. Ties are broken by sorted filename — later wins
-  // (same rule as mergeJUnitReports).
+  // treated as attempt 0. Ties are broken by sorted filename — later wins.
   let winner = xmlFiles[0];
   let winnerAttempt = (() => {
     const m = winner.match(ATTEMPT_PATTERN);

packages/build-tools/src/steps/functions/maestroTests.ts

@@ -11,12 +11,7 @@ import fs from 'fs/promises';
 import path from 'path';
 import { z } from 'zod';
 
-import { buildFlowNameToPathMap } from './maestroFlowDiscovery';
-import {
-  copyLatestAttemptXml,
-  mergeJUnitReports,
-  parseFailedFlowsFromJUnit,
-} from './maestroResultParser';
+import { copyLatestAttemptXml } from './maestroResultParser';
 import { sleepAsync } from '../../utils/retry';
 
 const FlowPathSchema = z.array(z.string().min(1)).min(1);
@@ -35,19 +30,6 @@ function parseInput<S extends z.ZodTypeAny>(
   return result.data;
 }
 
-// ENOENT is excluded — "input XML missing" is a data issue, not a storage
-// fault, so the post-loop merge should fall through to copy-latest instead
-// of throwing.
-function isFilesystemError(err: any): boolean {
-  if (!err || typeof err !== 'object') {
-    return false;
-  }
-  const code = err.code;
-  return (
-    code === 'ENOSPC' || code === 'EACCES' || code === 'EROFS' || code === 'EIO' || code === 'EPERM'
-  );
-}
-
 // `outputPath: null` means "let maestro pick" (no --output flag). Junit and
 // other declared formats pass an explicit path so downstream upload steps
 // know where to find the result.
@@ -193,26 +175,13 @@ export function createMaestroTestsBuildFunction(): BuildFunction {
         throw new SystemError('Failed to create JUnit report directory', { cause: err });
       }
 
-      // null → duplicate flow names; smart retry disabled, fall through to
-      // dumb retry (re-run everything) on failure.
-      const nameToPath = await buildFlowNameToPathMap({
-        inputFlowPaths: flowPaths,
-        projectRoot: stepCtx.workingDirectory,
-        logger,
-      });
-
       // Retry loop. spawn-async error shapes:
       //   ENOENT/EACCES → infra (binary missing/not executable) → SystemError.
       //   numeric err.status → maestro exited non-zero → retry.
       //   else (signal-only, OOM kill, unknown) → infra → SystemError, never
       //     downgraded to "tests failed".
-      // Smart retry (junit mode): after a failed attempt, subset to the failing
-      // flows. parseFailedFlowsFromJUnit returns null when the JUnit cannot be
-      // trusted; we then fall through to dumb retry (re-run everything).
-      let flowsToRun: string[] = flowPaths;
       let lastAttemptExitCode: number | null = null;
 
-      const totalAttempts = retries + 1;
       for (let attempt = 0; attempt <= retries; attempt++) {
         const outputPath =
           outputFormat === 'junit'
@@ -221,25 +190,19 @@ export function createMaestroTestsBuildFunction(): BuildFunction {
               ? path.join(testsDirectory, `${platform}-maestro-${outputFormat}.${outputFormat}`)
               : null;
 
-        const maestroArgs = buildMaestroArgs({
-          flow_path: flowsToRun,
-          outputPath,
-          output_format: outputFormat,
-          shards,
-          include_tags: includeTags,
-          exclude_tags: excludeTags,
-        });
-        logger.info(
-          `Running maestro (attempt ${attempt + 1}/${totalAttempts}): maestro ${maestroArgs.join(' ')}`
-        );
-
         try {
-          await spawn('maestro', maestroArgs, {
-            cwd: stepCtx.workingDirectory,
-            env: spawnEnv,
-            logger,
-            signal,
-          });
+          await spawn(
+            'maestro',
+            buildMaestroArgs({
+              flow_path: flowPaths,
+              outputPath,
+              output_format: outputFormat,
+              shards,
+              include_tags: includeTags,
+              exclude_tags: excludeTags,
+            }),
+            { cwd: stepCtx.workingDirectory, env: spawnEnv, logger, signal }
+          );
           lastAttemptExitCode = 0;
         } catch (err: any) {
           if (err && (err.code === 'ENOENT' || err.code === 'EACCES')) {
@@ -256,56 +219,26 @@ export function createMaestroTestsBuildFunction(): BuildFunction {
           break;
         }
 
-        if (outputFormat === 'junit' && outputPath && nameToPath) {
-          const failed = await parseFailedFlowsFromJUnit({
-            junitFile: outputPath,
-            nameToPath,
-          });
-          if (failed !== null && failed.length > 0) {
-            flowsToRun = failed;
-            logger.info(
-              `Test failed; retrying ${failed.length} failed flow(s): ${failed.join(', ')}`
-            );
-          } else {
-            flowsToRun = flowPaths;
-            logger.info('Test failed; could not determine failed subset, retrying all flows');
-          }
-        } else {
-          flowsToRun = flowPaths;
-          logger.info('Test failed, retrying all flows');
-        }
-
+        logger.info('Test failed, retrying...');
         await sleepAsync(2000);
       }
 
-      // Smart merge first; on data errors (bad XML, missing input) fall back
-      // to copy-latest so the caller still gets a single JUnit file.
-      // Filesystem errors short-circuit straight to SystemError.
+      // Copy the latest attempt's JUnit to the final report path so downstream
+      // upload/report steps have a single canonical file.
       if (finalReportPath !== undefined) {
         try {
-          await mergeJUnitReports({
+          await copyLatestAttemptXml({
             sourceDir: junitReportDirectory,
             outputPath: finalReportPath,
           });
-        } catch (mergeErr: any) {
-          if (isFilesystemError(mergeErr)) {
-            throw new SystemError('Failed to write final_report_path', { cause: mergeErr });
-          }
-          logger.warn({ err: mergeErr }, 'Smart merge failed; falling back to copy-latest.');
-          try {
-            await copyLatestAttemptXml({
-              sourceDir: junitReportDirectory,
-              outputPath: finalReportPath,
-            });
-          } catch (copyErr: any) {
-            // Swallow: a copy failure here usually means maestro itself failed
-            // early (bad YAML wrote no *.xml). Throwing SystemError would mask
-            // the real reason and cancel billing for a user-side failure — let
-            // the lastAttemptExitCode check below surface ERR_MAESTRO_TESTS_FAILED.
-            logger.warn(
-              `Failed to produce final_report_path at ${finalReportPath}: ${copyErr?.message ?? copyErr}`
-            );
-          }
+        } catch (copyErr: any) {
+          // Swallow: a copy failure usually means maestro itself failed early
+          // (bad YAML wrote no *.xml). Throwing SystemError here would mask
+          // the real reason and cancel billing for a user-side failure — let
+          // the lastAttemptExitCode check below surface ERR_MAESTRO_TESTS_FAILED.
+          logger.warn(
+            `Failed to produce final_report_path at ${finalReportPath}: ${copyErr?.message ?? copyErr}`
+          );
         }
       }
 
@@ -313,6 +246,7 @@ export function createMaestroTestsBuildFunction(): BuildFunction {
       // or throw (infra). A non-null non-zero status means the user's tests
       // failed every attempt.
       if (lastAttemptExitCode !== 0) {
+        const totalAttempts = retries + 1;
         throw new UserError(
           'ERR_MAESTRO_TESTS_FAILED',
           `Maestro tests failed after ${totalAttempts} attempt${totalAttempts === 1 ? '' : 's'}.`

packages/build-tools/src/steps/functions/reportMaestroTestResults.ts

@@ -1,13 +1,9 @@
 import { BuildFunction, BuildStepInput, BuildStepInputValueTypeName } from '@expo/steps';
 import { graphql } from 'gql.tada';
-import { z } from 'zod';
 
-import { buildFlowNameToPathMap } from './maestroFlowDiscovery';
 import { MaestroFlowResult, parseMaestroResults } from './maestroResultParser';
 import { CustomBuildContext } from '../../customBuildContext';
 
-const FlowPathSchema = z.array(z.string().min(1)).min(1);
-
 const CREATE_MUTATION = graphql(`
   mutation CreateWorkflowDeviceTestCaseResults($input: CreateWorkflowDeviceTestCaseResultsInput!) {
     workflowDeviceTestCaseResult {
@@ -42,11 +38,6 @@ export function createReportMaestroTestResultsFunction(ctx: CustomBuildContext):
         allowedValueTypeName: BuildStepInputValueTypeName.STRING,
         defaultValue: '${{ env.HOME }}/.maestro/tests',
       }),
-      BuildStepInput.createProvider({
-        id: 'flow_path',
-        required: false,
-        allowedValueTypeName: BuildStepInputValueTypeName.JSON,
-      }),
     ],
     fn: async (stepsCtx, { inputs }) => {
       const { logger } = stepsCtx;
@@ -60,26 +51,14 @@ export function createReportMaestroTestResultsFunction(ctx: CustomBuildContext):
         logger.info('No JUnit directory provided, skipping test results report');
         return;
       }
-
-      const flowPathRaw = inputs.flow_path.value;
-      let nameToPath: Map<string, string> | null = null;
-      if (flowPathRaw !== undefined) {
-        const parsed = FlowPathSchema.safeParse(flowPathRaw);
-        if (parsed.success) {
-          nameToPath = await buildFlowNameToPathMap({
-            inputFlowPaths: parsed.data,
-            projectRoot: stepsCtx.workingDirectory,
-            logger,
-          });
-        } else {
-          logger.warn(
-            'Ignoring malformed flow_path input (expected a non-empty array of non-empty strings).'
-          );
-        }
-      }
+      const testsDirectory = inputs.tests_directory.value as string;
 
       try {
-        const flowResults = await parseMaestroResults(junitDirectory, nameToPath);
+        const flowResults = await parseMaestroResults(
+          junitDirectory,
+          testsDirectory,
+          stepsCtx.workingDirectory
+        );
         if (flowResults.length === 0) {
           logger.info('No maestro test results found, skipping report');
           return;

packages/build-tools/src/steps/functions/restoreBuildCache.ts

@@ -20,7 +20,7 @@ import {
   getCcachePath,
 } from '../../utils/cacheKey';
 import { GRADLE_CACHE_KEY_PREFIX, generateGradleCacheKeyAsync } from '../../utils/gradleCacheKey';
-import { TurtleFetchError, turtleFetch } from '../../utils/turtleFetch';
+import { TurtleFetchError } from '../../utils/turtleFetch';
 
 export function createRestoreBuildCacheFunction(): BuildFunction {
   return new BuildFunction({
@@ -277,27 +277,9 @@ export async function restoreGradleCacheAsync({
       logger,
     });
 
-    const hitType = matchedKey === cacheKey ? 'direct_hit' : 'prefix_match';
     logger.info(
-      `Gradle cache restored to ${gradleCachesPath} (${hitType === 'direct_hit' ? 'direct hit' : 'prefix match'})`
+      `Gradle cache restored to ${gradleCachesPath} ${matchedKey === cacheKey ? '(direct hit)' : '(prefix match)'}`
     );
-
-    try {
-      await turtleFetch(new URL('v2/turtle-builds/logs', expoApiServerURL).toString(), 'POST', {
-        json: {
-          buildId: jobId,
-          message: `Gradle cache restored (${hitType})`,
-          tags: {
-            event: 'gradle_cache_restored',
-            cache_hit_type: hitType,
-          },
-        },
-        headers: {
-          Authorization: `Bearer ${robotAccessToken}`,
-        },
-        shouldThrowOnNotOk: false,
-      });
-    } catch {}
   } catch (err: unknown) {
     if (err instanceof TurtleFetchError && err.response?.status === 404) {
       logger.info('No Gradle cache found for this key');

packages/eas-cli/CLAUDE.md

@@ -50,7 +50,7 @@ yarn generate-graphql-code    # Generate TypeScript types from GraphQL schema
 yarn verify-graphql-code      # Verify GraphQL code is up to date (CI check)
 ```
 
-The GraphQL schema is fetched from the API URL resolved by `src/api.ts` and generates:
+The GraphQL schema is fetched from `https://staging-api.expo.dev/graphql` and generates:
 
 - `src/graphql/generated.ts` - 499KB+ of TypeScript types
 - Types for all queries, mutations, and fragments

packages/eas-cli/README.md

@@ -120,13 +120,6 @@ eas --help COMMAND
 * [`eas integrations:asc:connect`](#eas-integrationsascconnect)
 * [`eas integrations:asc:disconnect`](#eas-integrationsascdisconnect)
 * [`eas integrations:asc:status`](#eas-integrationsascstatus)
-* [`eas integrations:convex:connect`](#eas-integrationsconvexconnect)
-* [`eas integrations:convex:dashboard`](#eas-integrationsconvexdashboard)
-* [`eas integrations:convex:project`](#eas-integrationsconvexproject)
-* [`eas integrations:convex:project:delete`](#eas-integrationsconvexprojectdelete)
-* [`eas integrations:convex:team`](#eas-integrationsconvexteam)
-* [`eas integrations:convex:team:delete [CONVEX_TEAM]`](#eas-integrationsconvexteamdelete-convex_team)
-* [`eas integrations:convex:team:invite [CONVEX_TEAM]`](#eas-integrationsconvexteaminvite-convex_team)
 * [`eas login`](#eas-login)
 * [`eas logout`](#eas-logout)
 * [`eas metadata:lint`](#eas-metadatalint)
@@ -190,7 +183,7 @@ ALIASES
   $ eas login
 ```
 
-_See code: [packages/eas-cli/src/commands/account/login.ts](https://github.com/expo/eas-cli/blob/v18.11.0/packages/eas-cli/src/commands/account/login.ts)_
+_See code: [packages/eas-cli/src/commands/account/login.ts](https://github.com/expo/eas-cli/blob/v18.9.1/packages/eas-cli/src/commands/account/login.ts)_
 
 ## `eas account:logout`
 
@@ -207,7 +200,7 @@ ALIASES
   $ eas logout
 ```
 
-_See code: [packages/eas-cli/src/commands/account/logout.ts](https://github.com/expo/eas-cli/blob/v18.11.0/packages/eas-cli/src/commands/account/logout.ts)_
+_See code: [packages/eas-cli/src/commands/account/logout.ts](https://github.com/expo/eas-cli/blob/v18.9.1/packages/eas-cli/src/commands/account/logout.ts)_
 
 ## `eas account:usage [ACCOUNT_NAME]`
 
@@ -229,7 +222,7 @@ DESCRIPTION
   view account usage and billing for the current cycle
 ```
 
-_See code: [packages/eas-cli/src/commands/account/usage.ts](https://github.com/expo/eas-cli/blob/v18.11.0/packages/eas-cli/src/commands/account/usage.ts)_
+_See code: [packages/eas-cli/src/commands/account/usage.ts](https://github.com/expo/eas-cli/blob/v18.9.1/packages/eas-cli/src/commands/account/usage.ts)_
 
 ## `eas account:view`
 
@@ -246,7 +239,7 @@ ALIASES
   $ eas whoami
 ```
 
-_See code: [packages/eas-cli/src/commands/account/view.ts](https://github.com/expo/eas-cli/blob/v18.11.0/packages/eas-cli/src/commands/account/view.ts)_
+_See code: [packages/eas-cli/src/commands/account/view.ts](https://github.com/expo/eas-cli/blob/v18.9.1/packages/eas-cli/src/commands/account/view.ts)_
 
 ## `eas analytics [STATUS]`
 
@@ -260,7 +253,7 @@ DESCRIPTION
   display or change analytics settings
 ```
 
-_See code: [packages/eas-cli/src/commands/analytics.ts](https://github.com/expo/eas-cli/blob/v18.11.0/packages/eas-cli/src/commands/analytics.ts)_
+_See code: [packages/eas-cli/src/commands/analytics.ts](https://github.com/expo/eas-cli/blob/v18.9.1/packages/eas-cli/src/commands/analytics.ts)_
 
 ## `eas autocomplete [SHELL]`
 
@@ -312,7 +305,7 @@ DESCRIPTION
   create a branch
 ```
 
-_See code: [packages/eas-cli/src/commands/branch/create.ts](https://github.com/expo/eas-cli/blob/v18.11.0/packages/eas-cli/src/commands/branch/create.ts)_
+_See code: [packages/eas-cli/src/commands/branch/create.ts](https://github.com/expo/eas-cli/blob/v18.9.1/packages/eas-cli/src/commands/branch/create.ts)_
 
 ## `eas branch:delete [NAME]`
 
@@ -333,7 +326,7 @@ DESCRIPTION
   delete a branch
 ```
 
-_See code: [packages/eas-cli/src/commands/branch/delete.ts](https://github.com/expo/eas-cli/blob/v18.11.0/packages/eas-cli/src/commands/branch/delete.ts)_
+_See code: [packages/eas-cli/src/commands/branch/delete.ts](https://github.com/expo/eas-cli/blob/v18.9.1/packages/eas-cli/src/commands/branch/delete.ts)_
 
 ## `eas branch:list`
 
@@ -353,7 +346,7 @@ DESCRIPTION
   list all branches
 ```
 
-_See code: [packages/eas-cli/src/commands/branch/list.ts](https://github.com/expo/eas-cli/blob/v18.11.0/packages/eas-cli/src/commands/branch/list.ts)_
+_See code: [packages/eas-cli/src/commands/branch/list.ts](https://github.com/expo/eas-cli/blob/v18.9.1/packages/eas-cli/src/commands/branch/list.ts)_
 
 ## `eas branch:rename`
 
@@ -373,7 +366,7 @@ DESCRIPTION
   rename a branch
 ```
 
-_See code: [packages/eas-cli/src/commands/branch/rename.ts](https://github.com/expo/eas-cli/blob/v18.11.0/packages/eas-cli/src/commands/branch/rename.ts)_
+_See code: [packages/eas-cli/src/commands/branch/rename.ts](https://github.com/expo/eas-cli/blob/v18.9.1/packages/eas-cli/src/commands/branch/rename.ts)_
 
 ## `eas branch:view [NAME]`
 
@@ -396,7 +389,7 @@ DESCRIPTION
   view a branch
 ```
 
-_See code: [packages/eas-cli/src/commands/branch/view.ts](https://github.com/expo/eas-cli/blob/v18.11.0/packages/eas-cli/src/commands/branch/view.ts)_
+_See code: [packages/eas-cli/src/commands/branch/view.ts](https://github.com/expo/eas-cli/blob/v18.9.1/packages/eas-cli/src/commands/branch/view.ts)_
 
 ## `eas build`
 
@@ -434,7 +427,7 @@ DESCRIPTION
   start a build
 ```
 
-_See code: [packages/eas-cli/src/commands/build/index.ts](https://github.com/expo/eas-cli/blob/v18.11.0/packages/eas-cli/src/commands/build/index.ts)_
+_See code: [packages/eas-cli/src/commands/build/index.ts](https://github.com/expo/eas-cli/blob/v18.9.1/packages/eas-cli/src/commands/build/index.ts)_
 
 ## `eas build:cancel [BUILD_ID]`
 
@@ -454,7 +447,7 @@ DESCRIPTION
   cancel a build
 ```
 
-_See code: [packages/eas-cli/src/commands/build/cancel.ts](https://github.com/expo/eas-cli/blob/v18.11.0/packages/eas-cli/src/commands/build/cancel.ts)_
+_See code: [packages/eas-cli/src/commands/build/cancel.ts](https://github.com/expo/eas-cli/blob/v18.9.1/packages/eas-cli/src/commands/build/cancel.ts)_
 
 ## `eas build:configure`
 
@@ -472,7 +465,7 @@ DESCRIPTION
   configure the project to support EAS Build
 ```
 
-_See code: [packages/eas-cli/src/commands/build/configure.ts](https://github.com/expo/eas-cli/blob/v18.11.0/packages/eas-cli/src/commands/build/configure.ts)_
+_See code: [packages/eas-cli/src/commands/build/configure.ts](https://github.com/expo/eas-cli/blob/v18.9.1/packages/eas-cli/src/commands/build/configure.ts)_
 
 ## `eas build:delete [BUILD_ID]`
 
@@ -492,7 +485,7 @@ DESCRIPTION
   delete a build
 ```
 
-_See code: [packages/eas-cli/src/commands/build/delete.ts](https://github.com/expo/eas-cli/blob/v18.11.0/packages/eas-cli/src/commands/build/delete.ts)_
+_See code: [packages/eas-cli/src/commands/build/delete.ts](https://github.com/expo/eas-cli/blob/v18.9.1/packages/eas-cli/src/commands/build/delete.ts)_
 
 ## `eas build:dev`
 
@@ -500,16 +493,13 @@ run dev client simulator/emulator build with matching fingerprint or create a ne
 
 ```
 USAGE
-  $ eas build:dev [-p ios|android] [-e PROFILE_NAME] [--skip-build-if-not-found] [--skip-bundler] [--simulator
-    <value>]
+  $ eas build:dev [-p ios|android] [-e PROFILE_NAME] [--skip-build-if-not-found] [--skip-bundler]
 
 FLAGS
   -e, --profile=PROFILE_NAME     Name of the build profile from eas.json. It must be a profile allowing to create
                                  emulator/simulator internal distribution dev client builds. The "development-simulator"
                                  build profile will be selected by default.
   -p, --platform=<option>        <options: ios|android>
-      --simulator=<value>        iOS simulator name or UDID to install and run the development build on. If no value is
-                                 provided, you will be prompted to select a simulator.
       --skip-build-if-not-found  Skip build if no successful build with matching fingerprint is found.
       --skip-bundler             Install and run the development build without starting the bundler server.
 
@@ -517,7 +507,7 @@ DESCRIPTION
   run dev client simulator/emulator build with matching fingerprint or create a new one
 ```
 
-_See code: [packages/eas-cli/src/commands/build/dev.ts](https://github.com/expo/eas-cli/blob/v18.11.0/packages/eas-cli/src/commands/build/dev.ts)_
+_See code: [packages/eas-cli/src/commands/build/dev.ts](https://github.com/expo/eas-cli/blob/v18.9.1/packages/eas-cli/src/commands/build/dev.ts)_
 
 ## `eas build:download`
 
@@ -544,7 +534,7 @@ DESCRIPTION
   download a simulator/emulator build by build ID or fingerprint hash
 ```
 
-_See code: [packages/eas-cli/src/commands/build/download.ts](https://github.com/expo/eas-cli/blob/v18.11.0/packages/eas-cli/src/commands/build/download.ts)_
+_See code: [packages/eas-cli/src/commands/build/download.ts](https://github.com/expo/eas-cli/blob/v18.9.1/packages/eas-cli/src/commands/build/download.ts)_
 
 ## `eas build:inspect`
 
@@ -582,7 +572,7 @@ DESCRIPTION
   inspect the state of the project at specific build stages, useful for troubleshooting
 ```
 
-_See code: [packages/eas-cli/src/commands/build/inspect.ts](https://github.com/expo/eas-cli/blob/v18.11.0/packages/eas-cli/src/commands/build/inspect.ts)_
+_See code: [packages/eas-cli/src/commands/build/inspect.ts](https://github.com/expo/eas-cli/blob/v18.9.1/packages/eas-cli/src/commands/build/inspect.ts)_
 
 ## `eas build:list`
 
@@ -622,7 +612,7 @@ DESCRIPTION
   list all builds for your project
 ```
 
-_See code: [packages/eas-cli/src/commands/build/list.ts](https://github.com/expo/eas-cli/blob/v18.11.0/packages/eas-cli/src/commands/build/list.ts)_
+_See code: [packages/eas-cli/src/commands/build/list.ts](https://github.com/expo/eas-cli/blob/v18.9.1/packages/eas-cli/src/commands/build/list.ts)_
 
 ## `eas build:resign`
 
@@ -652,7 +642,7 @@ DESCRIPTION
   re-sign a build archive
 ```
 
-_See code: [packages/eas-cli/src/commands/build/resign.ts](https://github.com/expo/eas-cli/blob/v18.11.0/packages/eas-cli/src/commands/build/resign.ts)_
+_See code: [packages/eas-cli/src/commands/build/resign.ts](https://github.com/expo/eas-cli/blob/v18.9.1/packages/eas-cli/src/commands/build/resign.ts)_
 
 ## `eas build:run`
 
@@ -661,7 +651,7 @@ run simulator/emulator builds from eas-cli
 ```
 USAGE
   $ eas build:run [--latest | --id <value> | --path <value> | --url <value>] [-p android|ios] [-e PROFILE_NAME]
-    [--simulator <value>] [--offset <value>] [--limit <value>]
+    [--offset <value>] [--limit <value>]
 
 FLAGS
   -e, --profile=PROFILE_NAME  Name of the build profile used to create the build to run. When specified, only builds
@@ -672,15 +662,13 @@ FLAGS
       --limit=<value>         The number of items to fetch each query. Defaults to 50 and is capped at 100.
       --offset=<value>        Start queries from specified index. Use for paginating results. Defaults to 0.
       --path=<value>          Path to the simulator/emulator build archive or app
-      --simulator=<value>     iOS simulator name or UDID to install and run the build on. If no value is provided, you
-                              will be prompted to select a simulator.
       --url=<value>           Simulator/Emulator build archive url
 
 DESCRIPTION
   run simulator/emulator builds from eas-cli
 ```
 
-_See code: [packages/eas-cli/src/commands/build/run.ts](https://github.com/expo/eas-cli/blob/v18.11.0/packages/eas-cli/src/commands/build/run.ts)_
+_See code: [packages/eas-cli/src/commands/build/run.ts](https://github.com/expo/eas-cli/blob/v18.9.1/packages/eas-cli/src/commands/build/run.ts)_
 
 ## `eas build:submit`
 
@@ -732,7 +720,7 @@ DESCRIPTION
   get the latest version from EAS servers
 ```
 
-_See code: [packages/eas-cli/src/commands/build/version/get.ts](https://github.com/expo/eas-cli/blob/v18.11.0/packages/eas-cli/src/commands/build/version/get.ts)_
+_See code: [packages/eas-cli/src/commands/build/version/get.ts](https://github.com/expo/eas-cli/blob/v18.9.1/packages/eas-cli/src/commands/build/version/get.ts)_
 
 ## `eas build:version:set`
 
@@ -750,7 +738,7 @@ DESCRIPTION
   update version of an app
 ```
 
-_See code: [packages/eas-cli/src/commands/build/version/set.ts](https://github.com/expo/eas-cli/blob/v18.11.0/packages/eas-cli/src/commands/build/version/set.ts)_
+_See code: [packages/eas-cli/src/commands/build/version/set.ts](https://github.com/expo/eas-cli/blob/v18.9.1/packages/eas-cli/src/commands/build/version/set.ts)_
 
 ## `eas build:version:sync`
 
@@ -768,7 +756,7 @@ DESCRIPTION
   update a version in native code with a value stored on EAS servers
 ```
 
-_See code: [packages/eas-cli/src/commands/build/version/sync.ts](https://github.com/expo/eas-cli/blob/v18.11.0/packages/eas-cli/src/commands/build/version/sync.ts)_
+_See code: [packages/eas-cli/src/commands/build/version/sync.ts](https://github.com/expo/eas-cli/blob/v18.9.1/packages/eas-cli/src/commands/build/version/sync.ts)_
 
 ## `eas build:view [BUILD_ID]`
 
@@ -785,7 +773,7 @@ DESCRIPTION
   view a build for your project
 ```
 
-_See code: [packages/eas-cli/src/commands/build/view.ts](https://github.com/expo/eas-cli/blob/v18.11.0/packages/eas-cli/src/commands/build/view.ts)_
+_See code: [packages/eas-cli/src/commands/build/view.ts](https://github.com/expo/eas-cli/blob/v18.9.1/packages/eas-cli/src/commands/build/view.ts)_
 
 ## `eas channel:create [NAME]`
 
@@ -806,7 +794,7 @@ DESCRIPTION
   create a channel
 ```
 
-_See code: [packages/eas-cli/src/commands/channel/create.ts](https://github.com/expo/eas-cli/blob/v18.11.0/packages/eas-cli/src/commands/channel/create.ts)_
+_See code: [packages/eas-cli/src/commands/channel/create.ts](https://github.com/expo/eas-cli/blob/v18.9.1/packages/eas-cli/src/commands/channel/create.ts)_
 
 ## `eas channel:delete [NAME]`
 
@@ -827,7 +815,7 @@ DESCRIPTION
   Delete a channel
 ```
 
-_See code: [packages/eas-cli/src/commands/channel/delete.ts](https://github.com/expo/eas-cli/blob/v18.11.0/packages/eas-cli/src/commands/channel/delete.ts)_
+_See code: [packages/eas-cli/src/commands/channel/delete.ts](https://github.com/expo/eas-cli/blob/v18.9.1/packages/eas-cli/src/commands/channel/delete.ts)_
 
 ## `eas channel:edit [NAME]`
 
@@ -849,7 +837,7 @@ DESCRIPTION
   point a channel at a new branch
 ```
 
-_See code: [packages/eas-cli/src/commands/channel/edit.ts](https://github.com/expo/eas-cli/blob/v18.11.0/packages/eas-cli/src/commands/channel/edit.ts)_
+_See code: [packages/eas-cli/src/commands/channel/edit.ts](https://github.com/expo/eas-cli/blob/v18.9.1/packages/eas-cli/src/commands/channel/edit.ts)_
 
 ## `eas channel:insights`
 
@@ -873,7 +861,7 @@ DESCRIPTION
   display adoption, crash, and unique-user insights for a channel + runtime version
 ```
 
-_See code: [packages/eas-cli/src/commands/channel/insights.ts](https://github.com/expo/eas-cli/blob/v18.11.0/packages/eas-cli/src/commands/channel/insights.ts)_
+_See code: [packages/eas-cli/src/commands/channel/insights.ts](https://github.com/expo/eas-cli/blob/v18.9.1/packages/eas-cli/src/commands/channel/insights.ts)_
 
 ## `eas channel:list`
 
@@ -893,7 +881,7 @@ DESCRIPTION
   list all channels
 ```
 
-_See code: [packages/eas-cli/src/commands/channel/list.ts](https://github.com/expo/eas-cli/blob/v18.11.0/packages/eas-cli/src/commands/channel/list.ts)_
+_See code: [packages/eas-cli/src/commands/channel/list.ts](https://github.com/expo/eas-cli/blob/v18.9.1/packages/eas-cli/src/commands/channel/list.ts)_
 
 ## `eas channel:pause [NAME]`
 
@@ -915,7 +903,7 @@ DESCRIPTION
   pause a channel to stop it from sending updates
 ```
 
-_See code: [packages/eas-cli/src/commands/channel/pause.ts](https://github.com/expo/eas-cli/blob/v18.11.0/packages/eas-cli/src/commands/channel/pause.ts)_
+_See code: [packages/eas-cli/src/commands/channel/pause.ts](https://github.com/expo/eas-cli/blob/v18.9.1/packages/eas-cli/src/commands/channel/pause.ts)_
 
 ## `eas channel:resume [NAME]`
 
@@ -937,7 +925,7 @@ DESCRIPTION
   resume a channel to start sending updates
 ```
 
-_See code: [packages/eas-cli/src/commands/channel/resume.ts](https://github.com/expo/eas-cli/blob/v18.11.0/packages/eas-cli/src/commands/channel/resume.ts)_
+_See code: [packages/eas-cli/src/commands/channel/resume.ts](https://github.com/expo/eas-cli/blob/v18.9.1/packages/eas-cli/src/commands/channel/resume.ts)_
 
 ## `eas channel:rollout [CHANNEL]`
 
@@ -972,7 +960,7 @@ DESCRIPTION
   Roll a new branch out on a channel incrementally.
 ```
 
-_See code: [packages/eas-cli/src/commands/channel/rollout.ts](https://github.com/expo/eas-cli/blob/v18.11.0/packages/eas-cli/src/commands/channel/rollout.ts)_
+_See code: [packages/eas-cli/src/commands/channel/rollout.ts](https://github.com/expo/eas-cli/blob/v18.9.1/packages/eas-cli/src/commands/channel/rollout.ts)_
 
 ## `eas channel:view [NAME]`
 
@@ -995,7 +983,7 @@ DESCRIPTION
   view a channel
 ```
 
-_See code: [packages/eas-cli/src/commands/channel/view.ts](https://github.com/expo/eas-cli/blob/v18.11.0/packages/eas-cli/src/commands/channel/view.ts)_
+_See code: [packages/eas-cli/src/commands/channel/view.ts](https://github.com/expo/eas-cli/blob/v18.9.1/packages/eas-cli/src/commands/channel/view.ts)_
 
 ## `eas config`
 
@@ -1016,7 +1004,7 @@ DESCRIPTION
   display project configuration (app.json + eas.json)
 ```
 
-_See code: [packages/eas-cli/src/commands/config.ts](https://github.com/expo/eas-cli/blob/v18.11.0/packages/eas-cli/src/commands/config.ts)_
+_See code: [packages/eas-cli/src/commands/config.ts](https://github.com/expo/eas-cli/blob/v18.9.1/packages/eas-cli/src/commands/config.ts)_
 
 ## `eas credentials`
 
@@ -1033,7 +1021,7 @@ DESCRIPTION
   manage credentials
 ```
 
-_See code: [packages/eas-cli/src/commands/credentials/index.ts](https://github.com/expo/eas-cli/blob/v18.11.0/packages/eas-cli/src/commands/credentials/index.ts)_
+_See code: [packages/eas-cli/src/commands/credentials/index.ts](https://github.com/expo/eas-cli/blob/v18.9.1/packages/eas-cli/src/commands/credentials/index.ts)_
 
 ## `eas credentials:configure-build`
 
@@ -1051,7 +1039,7 @@ DESCRIPTION
   Set up credentials for building your project.
 ```
 
-_See code: [packages/eas-cli/src/commands/credentials/configure-build.ts](https://github.com/expo/eas-cli/blob/v18.11.0/packages/eas-cli/src/commands/credentials/configure-build.ts)_
+_See code: [packages/eas-cli/src/commands/credentials/configure-build.ts](https://github.com/expo/eas-cli/blob/v18.9.1/packages/eas-cli/src/commands/credentials/configure-build.ts)_
 
 ## `eas deploy [options]`
 
@@ -1080,7 +1068,7 @@ ALIASES
   $ eas worker:deploy
 ```
 
-_See code: [packages/eas-cli/src/commands/deploy/index.ts](https://github.com/expo/eas-cli/blob/v18.11.0/packages/eas-cli/src/commands/deploy/index.ts)_
+_See code: [packages/eas-cli/src/commands/deploy/index.ts](https://github.com/expo/eas-cli/blob/v18.9.1/packages/eas-cli/src/commands/deploy/index.ts)_
 
 ## `eas deploy:alias`
 
@@ -1105,7 +1093,7 @@ ALIASES
   $ eas deploy:promote
 ```
 
-_See code: [packages/eas-cli/src/commands/deploy/alias/index.ts](https://github.com/expo/eas-cli/blob/v18.11.0/packages/eas-cli/src/commands/deploy/alias/index.ts)_
+_See code: [packages/eas-cli/src/commands/deploy/alias/index.ts](https://github.com/expo/eas-cli/blob/v18.9.1/packages/eas-cli/src/commands/deploy/alias/index.ts)_
 
 ## `eas deploy:alias:delete [ALIAS_NAME]`
 
@@ -1126,7 +1114,7 @@ ALIASES
   $ eas worker:alias:delete
 ```
 
-_See code: [packages/eas-cli/src/commands/deploy/alias/delete.ts](https://github.com/expo/eas-cli/blob/v18.11.0/packages/eas-cli/src/commands/deploy/alias/delete.ts)_
+_See code: [packages/eas-cli/src/commands/deploy/alias/delete.ts](https://github.com/expo/eas-cli/blob/v18.9.1/packages/eas-cli/src/commands/deploy/alias/delete.ts)_
 
 ## `eas deploy:delete [DEPLOYMENT_ID]`
 
@@ -1147,7 +1135,7 @@ ALIASES
   $ eas worker:delete
 ```
 
-_See code: [packages/eas-cli/src/commands/deploy/delete.ts](https://github.com/expo/eas-cli/blob/v18.11.0/packages/eas-cli/src/commands/deploy/delete.ts)_
+_See code: [packages/eas-cli/src/commands/deploy/delete.ts](https://github.com/expo/eas-cli/blob/v18.9.1/packages/eas-cli/src/commands/deploy/delete.ts)_
 
 ## `eas deploy:promote`
 
@@ -1184,7 +1172,7 @@ DESCRIPTION
   register new Apple Devices to use for internal distribution
 ```
 
-_See code: [packages/eas-cli/src/commands/device/create.ts](https://github.com/expo/eas-cli/blob/v18.11.0/packages/eas-cli/src/commands/device/create.ts)_
+_See code: [packages/eas-cli/src/commands/device/create.ts](https://github.com/expo/eas-cli/blob/v18.9.1/packages/eas-cli/src/commands/device/create.ts)_
 
 ## `eas device:delete`
 
@@ -1204,7 +1192,7 @@ DESCRIPTION
   remove a registered device from your account
 ```
 
-_See code: [packages/eas-cli/src/commands/device/delete.ts](https://github.com/expo/eas-cli/blob/v18.11.0/packages/eas-cli/src/commands/device/delete.ts)_
+_See code: [packages/eas-cli/src/commands/device/delete.ts](https://github.com/expo/eas-cli/blob/v18.9.1/packages/eas-cli/src/commands/device/delete.ts)_
 
 ## `eas device:list`
 
@@ -1225,7 +1213,7 @@ DESCRIPTION
   list all registered devices for your account
 ```
 
-_See code: [packages/eas-cli/src/commands/device/list.ts](https://github.com/expo/eas-cli/blob/v18.11.0/packages/eas-cli/src/commands/device/list.ts)_
+_See code: [packages/eas-cli/src/commands/device/list.ts](https://github.com/expo/eas-cli/blob/v18.9.1/packages/eas-cli/src/commands/device/list.ts)_
 
 ## `eas device:rename`
 
@@ -1246,7 +1234,7 @@ DESCRIPTION
   rename a registered device
 ```
 
-_See code: [packages/eas-cli/src/commands/device/rename.ts](https://github.com/expo/eas-cli/blob/v18.11.0/packages/eas-cli/src/commands/device/rename.ts)_
+_See code: [packages/eas-cli/src/commands/device/rename.ts](https://github.com/expo/eas-cli/blob/v18.9.1/packages/eas-cli/src/commands/device/rename.ts)_
 
 ## `eas device:view [UDID]`
 
@@ -1260,7 +1248,7 @@ DESCRIPTION
   view a device for your project
 ```
 
-_See code: [packages/eas-cli/src/commands/device/view.ts](https://github.com/expo/eas-cli/blob/v18.11.0/packages/eas-cli/src/commands/device/view.ts)_
+_See code: [packages/eas-cli/src/commands/device/view.ts](https://github.com/expo/eas-cli/blob/v18.9.1/packages/eas-cli/src/commands/device/view.ts)_
 
 ## `eas diagnostics`
 
@@ -1274,7 +1262,7 @@ DESCRIPTION
   display environment info
 ```
 
-_See code: [packages/eas-cli/src/commands/diagnostics.ts](https://github.com/expo/eas-cli/blob/v18.11.0/packages/eas-cli/src/commands/diagnostics.ts)_
+_See code: [packages/eas-cli/src/commands/diagnostics.ts](https://github.com/expo/eas-cli/blob/v18.9.1/packages/eas-cli/src/commands/diagnostics.ts)_
 
 ## `eas env:create [ENVIRONMENT]`
 
@@ -1306,7 +1294,7 @@ DESCRIPTION
   create an environment variable for the current project or account
 ```
 
-_See code: [packages/eas-cli/src/commands/env/create.ts](https://github.com/expo/eas-cli/blob/v18.11.0/packages/eas-cli/src/commands/env/create.ts)_
+_See code: [packages/eas-cli/src/commands/env/create.ts](https://github.com/expo/eas-cli/blob/v18.9.1/packages/eas-cli/src/commands/env/create.ts)_
 
 ## `eas env:delete [ENVIRONMENT]`
 
@@ -1332,7 +1320,7 @@ DESCRIPTION
   delete an environment variable for the current project or account
 ```
 
-_See code: [packages/eas-cli/src/commands/env/delete.ts](https://github.com/expo/eas-cli/blob/v18.11.0/packages/eas-cli/src/commands/env/delete.ts)_
+_See code: [packages/eas-cli/src/commands/env/delete.ts](https://github.com/expo/eas-cli/blob/v18.9.1/packages/eas-cli/src/commands/env/delete.ts)_
 
 ## `eas env:exec ENVIRONMENT BASH_COMMAND`
 
@@ -1354,7 +1342,7 @@ DESCRIPTION
   execute a command with environment variables from the selected environment
 ```
 
-_See code: [packages/eas-cli/src/commands/env/exec.ts](https://github.com/expo/eas-cli/blob/v18.11.0/packages/eas-cli/src/commands/env/exec.ts)_
+_See code: [packages/eas-cli/src/commands/env/exec.ts](https://github.com/expo/eas-cli/blob/v18.9.1/packages/eas-cli/src/commands/env/exec.ts)_
 
 ## `eas env:get [ENVIRONMENT]`
 
@@ -1382,7 +1370,7 @@ DESCRIPTION
   view an environment variable for the current project or account
 ```
 
-_See code: [packages/eas-cli/src/commands/env/get.ts](https://github.com/expo/eas-cli/blob/v18.11.0/packages/eas-cli/src/commands/env/get.ts)_
+_See code: [packages/eas-cli/src/commands/env/get.ts](https://github.com/expo/eas-cli/blob/v18.9.1/packages/eas-cli/src/commands/env/get.ts)_
 
 ## `eas env:list [ENVIRONMENT]`
 
@@ -1410,7 +1398,7 @@ DESCRIPTION
   list environment variables for the current project or account
 ```
 
-_See code: [packages/eas-cli/src/commands/env/list.ts](https://github.com/expo/eas-cli/blob/v18.11.0/packages/eas-cli/src/commands/env/list.ts)_
+_See code: [packages/eas-cli/src/commands/env/list.ts](https://github.com/expo/eas-cli/blob/v18.9.1/packages/eas-cli/src/commands/env/list.ts)_
 
 ## `eas env:pull [ENVIRONMENT]`
 
@@ -1433,7 +1421,7 @@ DESCRIPTION
   pull environment variables for the selected environment to .env file
 ```
 
-_See code: [packages/eas-cli/src/commands/env/pull.ts](https://github.com/expo/eas-cli/blob/v18.11.0/packages/eas-cli/src/commands/env/pull.ts)_
+_See code: [packages/eas-cli/src/commands/env/pull.ts](https://github.com/expo/eas-cli/blob/v18.9.1/packages/eas-cli/src/commands/env/pull.ts)_
 
 ## `eas env:push [ENVIRONMENT]`
 
@@ -1455,7 +1443,7 @@ DESCRIPTION
   push environment variables from .env file to the selected environment
 ```
 
-_See code: [packages/eas-cli/src/commands/env/push.ts](https://github.com/expo/eas-cli/blob/v18.11.0/packages/eas-cli/src/commands/env/push.ts)_
+_See code: [packages/eas-cli/src/commands/env/push.ts](https://github.com/expo/eas-cli/blob/v18.9.1/packages/eas-cli/src/commands/env/push.ts)_
 
 ## `eas env:update [ENVIRONMENT]`
 
@@ -1489,7 +1477,7 @@ DESCRIPTION
   update an environment variable on the current project or account
 ```
 
-_See code: [packages/eas-cli/src/commands/env/update.ts](https://github.com/expo/eas-cli/blob/v18.11.0/packages/eas-cli/src/commands/env/update.ts)_
+_See code: [packages/eas-cli/src/commands/env/update.ts](https://github.com/expo/eas-cli/blob/v18.9.1/packages/eas-cli/src/commands/env/update.ts)_
 
 ## `eas fingerprint:compare [HASH1] [HASH2]`
 
@@ -1533,7 +1521,7 @@ EXAMPLES
   $ eas fingerprint:compare <FINGERPRINT-HASH> --update-id <UPDATE-ID> 	 # Compare fingerprint from update against provided fingerprint
 ```
 
-_See code: [packages/eas-cli/src/commands/fingerprint/compare.ts](https://github.com/expo/eas-cli/blob/v18.11.0/packages/eas-cli/src/commands/fingerprint/compare.ts)_
+_See code: [packages/eas-cli/src/commands/fingerprint/compare.ts](https://github.com/expo/eas-cli/blob/v18.9.1/packages/eas-cli/src/commands/fingerprint/compare.ts)_
 
 ## `eas fingerprint:generate`
 
@@ -1564,7 +1552,7 @@ EXAMPLES
   $ eas fingerprint:generate --json --non-interactive --platform android  	 # Output fingerprint json to stdout
 ```
 
-_See code: [packages/eas-cli/src/commands/fingerprint/generate.ts](https://github.com/expo/eas-cli/blob/v18.11.0/packages/eas-cli/src/commands/fingerprint/generate.ts)_
+_See code: [packages/eas-cli/src/commands/fingerprint/generate.ts](https://github.com/expo/eas-cli/blob/v18.9.1/packages/eas-cli/src/commands/fingerprint/generate.ts)_
 
 ## `eas help [COMMAND]`
 
@@ -1643,7 +1631,7 @@ DESCRIPTION
   connect a project to an App Store Connect app
 ```
 
-_See code: [packages/eas-cli/src/commands/integrations/asc/connect.ts](https://github.com/expo/eas-cli/blob/v18.11.0/packages/eas-cli/src/commands/integrations/asc/connect.ts)_
+_See code: [packages/eas-cli/src/commands/integrations/asc/connect.ts](https://github.com/expo/eas-cli/blob/v18.9.1/packages/eas-cli/src/commands/integrations/asc/connect.ts)_
 
 ## `eas integrations:asc:disconnect`
 
@@ -1662,7 +1650,7 @@ DESCRIPTION
   disconnect the current project from its App Store Connect app
 ```
 
-_See code: [packages/eas-cli/src/commands/integrations/asc/disconnect.ts](https://github.com/expo/eas-cli/blob/v18.11.0/packages/eas-cli/src/commands/integrations/asc/disconnect.ts)_
+_See code: [packages/eas-cli/src/commands/integrations/asc/disconnect.ts](https://github.com/expo/eas-cli/blob/v18.9.1/packages/eas-cli/src/commands/integrations/asc/disconnect.ts)_
 
 ## `eas integrations:asc:status`
 
@@ -1680,130 +1668,7 @@ DESCRIPTION
   show the App Store Connect app link status for the current project
 ```
 
-_See code: [packages/eas-cli/src/commands/integrations/asc/status.ts](https://github.com/expo/eas-cli/blob/v18.11.0/packages/eas-cli/src/commands/integrations/asc/status.ts)_
-
-## `eas integrations:convex:connect`
-
-connect Convex to your Expo project
-
-```
-USAGE
-  $ eas integrations:convex:connect [--non-interactive] [--region aws-us-east-1|aws-eu-west-1] [--team-name <value>]
-    [--project-name <value>]
-
-FLAGS
-  --non-interactive       Run the command in non-interactive mode.
-  --project-name=<value>  Name for the Convex project (defaults to app slug)
-  --region=<option>       Convex deployment region (e.g. aws-us-east-1, aws-eu-west-1)
-                          <options: aws-us-east-1|aws-eu-west-1>
-  --team-name=<value>     Name for the new Convex team (defaults to EAS account name)
-
-DESCRIPTION
-  connect Convex to your Expo project
-```
-
-_See code: [packages/eas-cli/src/commands/integrations/convex/connect.ts](https://github.com/expo/eas-cli/blob/v18.11.0/packages/eas-cli/src/commands/integrations/convex/connect.ts)_
-
-## `eas integrations:convex:dashboard`
-
-open the Convex dashboard for the linked Convex project
-
-```
-USAGE
-  $ eas integrations:convex:dashboard
-
-DESCRIPTION
-  open the Convex dashboard for the linked Convex project
-```
-
-_See code: [packages/eas-cli/src/commands/integrations/convex/dashboard.ts](https://github.com/expo/eas-cli/blob/v18.11.0/packages/eas-cli/src/commands/integrations/convex/dashboard.ts)_
-
-## `eas integrations:convex:project`
-
-display the Convex project linked to the current Expo app
-
-```
-USAGE
-  $ eas integrations:convex:project
-
-DESCRIPTION
-  display the Convex project linked to the current Expo app
-```
-
-_See code: [packages/eas-cli/src/commands/integrations/convex/project.ts](https://github.com/expo/eas-cli/blob/v18.11.0/packages/eas-cli/src/commands/integrations/convex/project.ts)_
-
-## `eas integrations:convex:project:delete`
-
-remove the Convex project link for the current Expo app from EAS servers
-
-```
-USAGE
-  $ eas integrations:convex:project:delete [--non-interactive] [-y]
-
-FLAGS
-  -y, --yes              Skip confirmation prompt
-      --non-interactive  Run the command in non-interactive mode.
-
-DESCRIPTION
-  remove the Convex project link for the current Expo app from EAS servers
-```
-
-_See code: [packages/eas-cli/src/commands/integrations/convex/project/delete.ts](https://github.com/expo/eas-cli/blob/v18.11.0/packages/eas-cli/src/commands/integrations/convex/project/delete.ts)_
-
-## `eas integrations:convex:team`
-
-display Convex teams linked to the current Expo app's owner account
-
-```
-USAGE
-  $ eas integrations:convex:team
-
-DESCRIPTION
-  display Convex teams linked to the current Expo app's owner account
-```
-
-_See code: [packages/eas-cli/src/commands/integrations/convex/team.ts](https://github.com/expo/eas-cli/blob/v18.11.0/packages/eas-cli/src/commands/integrations/convex/team.ts)_
-
-## `eas integrations:convex:team:delete [CONVEX_TEAM]`
-
-remove a Convex team link from the current Expo app owner account's EAS servers
-
-```
-USAGE
-  $ eas integrations:convex:team:delete [CONVEX_TEAM] [--non-interactive] [-y]
-
-ARGUMENTS
-  [CONVEX_TEAM]  Slug of the Convex team to remove
-
-FLAGS
-  -y, --yes              Skip confirmation prompt
-      --non-interactive  Run the command in non-interactive mode.
-
-DESCRIPTION
-  remove a Convex team link from the current Expo app owner account's EAS servers
-```
-
-_See code: [packages/eas-cli/src/commands/integrations/convex/team/delete.ts](https://github.com/expo/eas-cli/blob/v18.11.0/packages/eas-cli/src/commands/integrations/convex/team/delete.ts)_
-
-## `eas integrations:convex:team:invite [CONVEX_TEAM]`
-
-send a Convex team invitation to your verified email address
-
-```
-USAGE
-  $ eas integrations:convex:team:invite [CONVEX_TEAM] [--non-interactive]
-
-ARGUMENTS
-  [CONVEX_TEAM]  Slug of the Convex team to invite yourself to
-
-FLAGS
-  --non-interactive  Run the command in non-interactive mode.
-
-DESCRIPTION
-  send a Convex team invitation to your verified email address
-```
-
-_See code: [packages/eas-cli/src/commands/integrations/convex/team/invite.ts](https://github.com/expo/eas-cli/blob/v18.11.0/packages/eas-cli/src/commands/integrations/convex/team/invite.ts)_
+_See code: [packages/eas-cli/src/commands/integrations/asc/status.ts](https://github.com/expo/eas-cli/blob/v18.9.1/packages/eas-cli/src/commands/integrations/asc/status.ts)_
 
 ## `eas login`
 
@@ -1855,7 +1720,7 @@ DESCRIPTION
   validate the local store configuration
 ```
 
-_See code: [packages/eas-cli/src/commands/metadata/lint.ts](https://github.com/expo/eas-cli/blob/v18.11.0/packages/eas-cli/src/commands/metadata/lint.ts)_
+_See code: [packages/eas-cli/src/commands/metadata/lint.ts](https://github.com/expo/eas-cli/blob/v18.9.1/packages/eas-cli/src/commands/metadata/lint.ts)_
 
 ## `eas metadata:pull`
 
@@ -1873,7 +1738,7 @@ DESCRIPTION
   generate the local store configuration from the app stores
 ```
 
-_See code: [packages/eas-cli/src/commands/metadata/pull.ts](https://github.com/expo/eas-cli/blob/v18.11.0/packages/eas-cli/src/commands/metadata/pull.ts)_
+_See code: [packages/eas-cli/src/commands/metadata/pull.ts](https://github.com/expo/eas-cli/blob/v18.9.1/packages/eas-cli/src/commands/metadata/pull.ts)_
 
 ## `eas metadata:push`
 
@@ -1891,7 +1756,7 @@ DESCRIPTION
   sync the local store configuration to the app stores
 ```
 
-_See code: [packages/eas-cli/src/commands/metadata/push.ts](https://github.com/expo/eas-cli/blob/v18.11.0/packages/eas-cli/src/commands/metadata/push.ts)_
+_See code: [packages/eas-cli/src/commands/metadata/push.ts](https://github.com/expo/eas-cli/blob/v18.9.1/packages/eas-cli/src/commands/metadata/push.ts)_
 
 ## `eas new [PATH]`
 
@@ -1943,7 +1808,7 @@ DESCRIPTION
   open the project page in a web browser
 ```
 
-_See code: [packages/eas-cli/src/commands/open.ts](https://github.com/expo/eas-cli/blob/v18.11.0/packages/eas-cli/src/commands/open.ts)_
+_See code: [packages/eas-cli/src/commands/open.ts](https://github.com/expo/eas-cli/blob/v18.9.1/packages/eas-cli/src/commands/open.ts)_
 
 ## `eas project:info`
 
@@ -1957,7 +1822,7 @@ DESCRIPTION
   information about the current project
 ```
 
-_See code: [packages/eas-cli/src/commands/project/info.ts](https://github.com/expo/eas-cli/blob/v18.11.0/packages/eas-cli/src/commands/project/info.ts)_
+_See code: [packages/eas-cli/src/commands/project/info.ts](https://github.com/expo/eas-cli/blob/v18.9.1/packages/eas-cli/src/commands/project/info.ts)_
 
 ## `eas project:init`
 
@@ -1980,7 +1845,7 @@ ALIASES
   $ eas init
 ```
 
-_See code: [packages/eas-cli/src/commands/project/init.ts](https://github.com/expo/eas-cli/blob/v18.11.0/packages/eas-cli/src/commands/project/init.ts)_
+_See code: [packages/eas-cli/src/commands/project/init.ts](https://github.com/expo/eas-cli/blob/v18.9.1/packages/eas-cli/src/commands/project/init.ts)_
 
 ## `eas project:new [PATH]`
 
@@ -2004,7 +1869,7 @@ ALIASES
   $ eas new
 ```
 
-_See code: [packages/eas-cli/src/commands/project/new.ts](https://github.com/expo/eas-cli/blob/v18.11.0/packages/eas-cli/src/commands/project/new.ts)_
+_See code: [packages/eas-cli/src/commands/project/new.ts](https://github.com/expo/eas-cli/blob/v18.9.1/packages/eas-cli/src/commands/project/new.ts)_
 
 ## `eas project:onboarding [TARGET_PROJECT_DIRECTORY]`
 
@@ -2022,7 +1887,7 @@ ALIASES
   $ eas onboarding
 ```
 
-_See code: [packages/eas-cli/src/commands/project/onboarding.ts](https://github.com/expo/eas-cli/blob/v18.11.0/packages/eas-cli/src/commands/project/onboarding.ts)_
+_See code: [packages/eas-cli/src/commands/project/onboarding.ts](https://github.com/expo/eas-cli/blob/v18.9.1/packages/eas-cli/src/commands/project/onboarding.ts)_
 
 ## `eas submit`
 
@@ -2055,7 +1920,7 @@ ALIASES
   $ eas build:submit
 ```
 
-_See code: [packages/eas-cli/src/commands/submit.ts](https://github.com/expo/eas-cli/blob/v18.11.0/packages/eas-cli/src/commands/submit.ts)_
+_See code: [packages/eas-cli/src/commands/submit.ts](https://github.com/expo/eas-cli/blob/v18.9.1/packages/eas-cli/src/commands/submit.ts)_
 
 ## `eas update`
 
@@ -2098,7 +1963,7 @@ DESCRIPTION
   publish an update group
 ```
 
-_See code: [packages/eas-cli/src/commands/update/index.ts](https://github.com/expo/eas-cli/blob/v18.11.0/packages/eas-cli/src/commands/update/index.ts)_
+_See code: [packages/eas-cli/src/commands/update/index.ts](https://github.com/expo/eas-cli/blob/v18.9.1/packages/eas-cli/src/commands/update/index.ts)_
 
 ## `eas update:configure`
 
@@ -2119,7 +1984,7 @@ DESCRIPTION
   configure the project to support EAS Update
 ```
 
-_See code: [packages/eas-cli/src/commands/update/configure.ts](https://github.com/expo/eas-cli/blob/v18.11.0/packages/eas-cli/src/commands/update/configure.ts)_
+_See code: [packages/eas-cli/src/commands/update/configure.ts](https://github.com/expo/eas-cli/blob/v18.9.1/packages/eas-cli/src/commands/update/configure.ts)_
 
 ## `eas update:delete GROUPID`
 
@@ -2140,7 +2005,7 @@ DESCRIPTION
   delete all the updates in an update group
 ```
 
-_See code: [packages/eas-cli/src/commands/update/delete.ts](https://github.com/expo/eas-cli/blob/v18.11.0/packages/eas-cli/src/commands/update/delete.ts)_
+_See code: [packages/eas-cli/src/commands/update/delete.ts](https://github.com/expo/eas-cli/blob/v18.9.1/packages/eas-cli/src/commands/update/delete.ts)_
 
 ## `eas update:edit [GROUPID]`
 
@@ -2165,7 +2030,7 @@ DESCRIPTION
   edit all the updates in an update group
 ```
 
-_See code: [packages/eas-cli/src/commands/update/edit.ts](https://github.com/expo/eas-cli/blob/v18.11.0/packages/eas-cli/src/commands/update/edit.ts)_
+_See code: [packages/eas-cli/src/commands/update/edit.ts](https://github.com/expo/eas-cli/blob/v18.9.1/packages/eas-cli/src/commands/update/edit.ts)_
 
 ## `eas update:insights GROUPID`
 
@@ -2192,7 +2057,7 @@ DESCRIPTION
   display launch, crash, unique-user, and size insights for an update group
 ```
 
-_See code: [packages/eas-cli/src/commands/update/insights.ts](https://github.com/expo/eas-cli/blob/v18.11.0/packages/eas-cli/src/commands/update/insights.ts)_
+_See code: [packages/eas-cli/src/commands/update/insights.ts](https://github.com/expo/eas-cli/blob/v18.9.1/packages/eas-cli/src/commands/update/insights.ts)_
 
 ## `eas update:list`
 
@@ -2219,7 +2084,7 @@ DESCRIPTION
   view the recent updates
 ```
 
-_See code: [packages/eas-cli/src/commands/update/list.ts](https://github.com/expo/eas-cli/blob/v18.11.0/packages/eas-cli/src/commands/update/list.ts)_
+_See code: [packages/eas-cli/src/commands/update/list.ts](https://github.com/expo/eas-cli/blob/v18.9.1/packages/eas-cli/src/commands/update/list.ts)_
 
 ## `eas update:republish`
 
@@ -2257,7 +2122,7 @@ DESCRIPTION
   roll back to an existing update
 ```
 
-_See code: [packages/eas-cli/src/commands/update/republish.ts](https://github.com/expo/eas-cli/blob/v18.11.0/packages/eas-cli/src/commands/update/republish.ts)_
+_See code: [packages/eas-cli/src/commands/update/republish.ts](https://github.com/expo/eas-cli/blob/v18.9.1/packages/eas-cli/src/commands/update/republish.ts)_
 
 ## `eas update:revert-update-rollout`
 
@@ -2285,7 +2150,7 @@ DESCRIPTION
   revert a rollout update for a project
 ```
 
-_See code: [packages/eas-cli/src/commands/update/revert-update-rollout.ts](https://github.com/expo/eas-cli/blob/v18.11.0/packages/eas-cli/src/commands/update/revert-update-rollout.ts)_
+_See code: [packages/eas-cli/src/commands/update/revert-update-rollout.ts](https://github.com/expo/eas-cli/blob/v18.9.1/packages/eas-cli/src/commands/update/revert-update-rollout.ts)_
 
 ## `eas update:roll-back-to-embedded`
 
@@ -2315,7 +2180,7 @@ DESCRIPTION
   roll back to the embedded update
 ```
 
-_See code: [packages/eas-cli/src/commands/update/roll-back-to-embedded.ts](https://github.com/expo/eas-cli/blob/v18.11.0/packages/eas-cli/src/commands/update/roll-back-to-embedded.ts)_
+_See code: [packages/eas-cli/src/commands/update/roll-back-to-embedded.ts](https://github.com/expo/eas-cli/blob/v18.9.1/packages/eas-cli/src/commands/update/roll-back-to-embedded.ts)_
 
 ## `eas update:rollback`
 
@@ -2336,7 +2201,7 @@ DESCRIPTION
   instead execute "eas update:republish" or "eas update:roll-back-to-embedded".
 ```
 
-_See code: [packages/eas-cli/src/commands/update/rollback.ts](https://github.com/expo/eas-cli/blob/v18.11.0/packages/eas-cli/src/commands/update/rollback.ts)_
+_See code: [packages/eas-cli/src/commands/update/rollback.ts](https://github.com/expo/eas-cli/blob/v18.9.1/packages/eas-cli/src/commands/update/rollback.ts)_
 
 ## `eas update:view GROUPID`
 
@@ -2360,7 +2225,7 @@ DESCRIPTION
   update group details
 ```
 
-_See code: [packages/eas-cli/src/commands/update/view.ts](https://github.com/expo/eas-cli/blob/v18.11.0/packages/eas-cli/src/commands/update/view.ts)_
+_See code: [packages/eas-cli/src/commands/update/view.ts](https://github.com/expo/eas-cli/blob/v18.9.1/packages/eas-cli/src/commands/update/view.ts)_
 
 ## `eas upload`
 
@@ -2381,7 +2246,7 @@ DESCRIPTION
   upload a local build and generate a sharable link
 ```
 
-_See code: [packages/eas-cli/src/commands/upload.ts](https://github.com/expo/eas-cli/blob/v18.11.0/packages/eas-cli/src/commands/upload.ts)_
+_See code: [packages/eas-cli/src/commands/upload.ts](https://github.com/expo/eas-cli/blob/v18.9.1/packages/eas-cli/src/commands/upload.ts)_
 
 ## `eas webhook:create`
 
@@ -2403,7 +2268,7 @@ DESCRIPTION
   create a webhook
 ```
 
-_See code: [packages/eas-cli/src/commands/webhook/create.ts](https://github.com/expo/eas-cli/blob/v18.11.0/packages/eas-cli/src/commands/webhook/create.ts)_
+_See code: [packages/eas-cli/src/commands/webhook/create.ts](https://github.com/expo/eas-cli/blob/v18.9.1/packages/eas-cli/src/commands/webhook/create.ts)_
 
 ## `eas webhook:delete [ID]`
 
@@ -2423,7 +2288,7 @@ DESCRIPTION
   delete a webhook
 ```
 
-_See code: [packages/eas-cli/src/commands/webhook/delete.ts](https://github.com/expo/eas-cli/blob/v18.11.0/packages/eas-cli/src/commands/webhook/delete.ts)_
+_See code: [packages/eas-cli/src/commands/webhook/delete.ts](https://github.com/expo/eas-cli/blob/v18.9.1/packages/eas-cli/src/commands/webhook/delete.ts)_
 
 ## `eas webhook:list`
 
@@ -2442,7 +2307,7 @@ DESCRIPTION
   list webhooks
 ```
 
-_See code: [packages/eas-cli/src/commands/webhook/list.ts](https://github.com/expo/eas-cli/blob/v18.11.0/packages/eas-cli/src/commands/webhook/list.ts)_
+_See code: [packages/eas-cli/src/commands/webhook/list.ts](https://github.com/expo/eas-cli/blob/v18.9.1/packages/eas-cli/src/commands/webhook/list.ts)_
 
 ## `eas webhook:update`
 
@@ -2465,7 +2330,7 @@ DESCRIPTION
   update a webhook
 ```
 
-_See code: [packages/eas-cli/src/commands/webhook/update.ts](https://github.com/expo/eas-cli/blob/v18.11.0/packages/eas-cli/src/commands/webhook/update.ts)_
+_See code: [packages/eas-cli/src/commands/webhook/update.ts](https://github.com/expo/eas-cli/blob/v18.9.1/packages/eas-cli/src/commands/webhook/update.ts)_
 
 ## `eas webhook:view ID`
 
@@ -2482,7 +2347,7 @@ DESCRIPTION
   view a webhook
 ```
 
-_See code: [packages/eas-cli/src/commands/webhook/view.ts](https://github.com/expo/eas-cli/blob/v18.11.0/packages/eas-cli/src/commands/webhook/view.ts)_
+_See code: [packages/eas-cli/src/commands/webhook/view.ts](https://github.com/expo/eas-cli/blob/v18.9.1/packages/eas-cli/src/commands/webhook/view.ts)_
 
 ## `eas whoami`
 
@@ -2603,7 +2468,7 @@ DESCRIPTION
   to cancel.
 ```
 
-_See code: [packages/eas-cli/src/commands/workflow/cancel.ts](https://github.com/expo/eas-cli/blob/v18.11.0/packages/eas-cli/src/commands/workflow/cancel.ts)_
+_See code: [packages/eas-cli/src/commands/workflow/cancel.ts](https://github.com/expo/eas-cli/blob/v18.9.1/packages/eas-cli/src/commands/workflow/cancel.ts)_
 
 ## `eas workflow:create [NAME]`
 
@@ -2623,7 +2488,7 @@ DESCRIPTION
   create a new workflow configuration YAML file
 ```
 
-_See code: [packages/eas-cli/src/commands/workflow/create.ts](https://github.com/expo/eas-cli/blob/v18.11.0/packages/eas-cli/src/commands/workflow/create.ts)_
+_See code: [packages/eas-cli/src/commands/workflow/create.ts](https://github.com/expo/eas-cli/blob/v18.9.1/packages/eas-cli/src/commands/workflow/create.ts)_
 
 ## `eas workflow:logs [ID]`
 
@@ -2647,7 +2512,7 @@ DESCRIPTION
   If no ID is passed in, you will be prompted to select from recent workflow runs for the current project.
 ```
 
-_See code: [packages/eas-cli/src/commands/workflow/logs.ts](https://github.com/expo/eas-cli/blob/v18.11.0/packages/eas-cli/src/commands/workflow/logs.ts)_
+_See code: [packages/eas-cli/src/commands/workflow/logs.ts](https://github.com/expo/eas-cli/blob/v18.9.1/packages/eas-cli/src/commands/workflow/logs.ts)_
 
 ## `eas workflow:run FILE`
 
@@ -2687,7 +2552,7 @@ FLAG DESCRIPTIONS
     Exit codes: 0 = success, 11 = failure, 12 = canceled, 13 = wait aborted.
 ```
 
-_See code: [packages/eas-cli/src/commands/workflow/run.ts](https://github.com/expo/eas-cli/blob/v18.11.0/packages/eas-cli/src/commands/workflow/run.ts)_
+_See code: [packages/eas-cli/src/commands/workflow/run.ts](https://github.com/expo/eas-cli/blob/v18.9.1/packages/eas-cli/src/commands/workflow/run.ts)_
 
 ## `eas workflow:runs`
 
@@ -2709,7 +2574,7 @@ DESCRIPTION
   list recent workflow runs for this project, with their IDs, statuses, and timestamps
 ```
 
-_See code: [packages/eas-cli/src/commands/workflow/runs.ts](https://github.com/expo/eas-cli/blob/v18.11.0/packages/eas-cli/src/commands/workflow/runs.ts)_
+_See code: [packages/eas-cli/src/commands/workflow/runs.ts](https://github.com/expo/eas-cli/blob/v18.9.1/packages/eas-cli/src/commands/workflow/runs.ts)_
 
 ## `eas workflow:status [WORKFLOW_RUN_ID]`
 
@@ -2737,7 +2602,7 @@ FLAG DESCRIPTIONS
     Exit codes: 0 = success, 11 = failure, 12 = canceled, 13 = wait aborted.
 ```
 
-_See code: [packages/eas-cli/src/commands/workflow/status.ts](https://github.com/expo/eas-cli/blob/v18.11.0/packages/eas-cli/src/commands/workflow/status.ts)_
+_See code: [packages/eas-cli/src/commands/workflow/status.ts](https://github.com/expo/eas-cli/blob/v18.9.1/packages/eas-cli/src/commands/workflow/status.ts)_
 
 ## `eas workflow:validate PATH`
 
@@ -2757,7 +2622,7 @@ DESCRIPTION
   validate a workflow configuration yaml file
 ```
 
-_See code: [packages/eas-cli/src/commands/workflow/validate.ts](https://github.com/expo/eas-cli/blob/v18.11.0/packages/eas-cli/src/commands/workflow/validate.ts)_
+_See code: [packages/eas-cli/src/commands/workflow/validate.ts](https://github.com/expo/eas-cli/blob/v18.9.1/packages/eas-cli/src/commands/workflow/validate.ts)_
 
 ## `eas workflow:view [ID]`
 
@@ -2779,5 +2644,5 @@ DESCRIPTION
   workflow runs for the current project.
 ```
 
-_See code: [packages/eas-cli/src/commands/workflow/view.ts](https://github.com/expo/eas-cli/blob/v18.11.0/packages/eas-cli/src/commands/workflow/view.ts)_
+_See code: [packages/eas-cli/src/commands/workflow/view.ts](https://github.com/expo/eas-cli/blob/v18.9.1/packages/eas-cli/src/commands/workflow/view.ts)_
 <!-- commandsstop -->

packages/eas-cli/graphql-codegen.ts

@@ -1,28 +0,0 @@
-import type { CodegenConfig } from '@graphql-codegen/cli';
-
-import { getExpoApiBaseUrl } from './src/api';
-
-const schema =
-  process.env.GRAPHQL_SCHEMA_URL ?? new URL('/graphql', getExpoApiBaseUrl()).toString();
-
-const config: CodegenConfig = {
-  overwrite: true,
-  schema,
-  documents: ['src/**/!(*.d).ts'],
-  generates: {
-    'src/graphql/generated.ts': {
-      plugins: ['typescript', 'typescript-operations'],
-      config: {
-        dedupeOperationSuffix: true,
-      },
-      hooks: {
-        afterOneFileWrite: ['node ./scripts/annotate-graphql-codegen.js'],
-      },
-    },
-    './graphql.schema.json': {
-      plugins: ['introspection'],
-    },
-  },
-};
-
-export default config;

packages/eas-cli/graphql-codegen.yml

@@ -0,0 +1,17 @@
+overwrite: true
+schema: 'https://staging-api.expo.dev/graphql'
+documents:
+  - 'src/**/!(*.d).ts'
+generates:
+  src/graphql/generated.ts:
+    plugins:
+      - 'typescript'
+      - 'typescript-operations'
+    config:
+      dedupeOperationSuffix: true
+    hooks:
+      afterOneFileWrite:
+        - 'node ./scripts/annotate-graphql-codegen.js'
+  ./graphql.schema.json:
+    plugins:
+      - 'introspection'

packages/eas-cli/graphql.schema.json

@@ -13961,39 +13961,6 @@
             },
             "isDeprecated": false,
             "deprecationReason": null
-          },
-          {
-            "name": "updates",
-            "description": null,
-            "args": [
-              {
-                "name": "input",
-                "description": null,
-                "type": {
-                  "kind": "NON_NULL",
-                  "name": null,
-                  "ofType": {
-                    "kind": "INPUT_OBJECT",
-                    "name": "AppObserveUpdatesInput",
-                    "ofType": null
-                  }
-                },
-                "defaultValue": null,
-                "isDeprecated": false,
-                "deprecationReason": null
-              }
-            ],
-            "type": {
-              "kind": "NON_NULL",
-              "name": null,
-              "ofType": {
-                "kind": "OBJECT",
-                "name": "AppObserveUpdatesConnection",
-                "ofType": null
-              }
-            },
-            "isDeprecated": false,
-            "deprecationReason": null
           }
         ],
         "inputFields": null,
@@ -16827,447 +16794,6 @@
         "enumValues": null,
         "possibleTypes": null
       },
-      {
-        "kind": "OBJECT",
-        "name": "AppObserveUpdate",
-        "description": null,
-        "fields": [
-          {
-            "name": "appUpdateId",
-            "description": null,
-            "args": [],
-            "type": {
-              "kind": "NON_NULL",
-              "name": null,
-              "ofType": {
-                "kind": "SCALAR",
-                "name": "String",
-                "ofType": null
-              }
-            },
-            "isDeprecated": false,
-            "deprecationReason": null
-          },
-          {
-            "name": "appVersion",
-            "description": null,
-            "args": [],
-            "type": {
-              "kind": "NON_NULL",
-              "name": null,
-              "ofType": {
-                "kind": "SCALAR",
-                "name": "String",
-                "ofType": null
-              }
-            },
-            "isDeprecated": false,
-            "deprecationReason": null
-          },
-          {
-            "name": "downloadCount",
-            "description": null,
-            "args": [],
-            "type": {
-              "kind": "NON_NULL",
-              "name": null,
-              "ofType": {
-                "kind": "SCALAR",
-                "name": "Int",
-                "ofType": null
-              }
-            },
-            "isDeprecated": false,
-            "deprecationReason": null
-          },
-          {
-            "name": "firstSeenAt",
-            "description": null,
-            "args": [],
-            "type": {
-              "kind": "NON_NULL",
-              "name": null,
-              "ofType": {
-                "kind": "SCALAR",
-                "name": "DateTime",
-                "ofType": null
-              }
-            },
-            "isDeprecated": false,
-            "deprecationReason": null
-          },
-          {
-            "name": "medianDownloadTime",
-            "description": null,
-            "args": [],
-            "type": {
-              "kind": "NON_NULL",
-              "name": null,
-              "ofType": {
-                "kind": "SCALAR",
-                "name": "Float",
-                "ofType": null
-              }
-            },
-            "isDeprecated": false,
-            "deprecationReason": null
-          },
-          {
-            "name": "p90DownloadTime",
-            "description": null,
-            "args": [],
-            "type": {
-              "kind": "NON_NULL",
-              "name": null,
-              "ofType": {
-                "kind": "SCALAR",
-                "name": "Float",
-                "ofType": null
-              }
-            },
-            "isDeprecated": false,
-            "deprecationReason": null
-          }
-        ],
-        "inputFields": null,
-        "interfaces": [],
-        "enumValues": null,
-        "possibleTypes": null
-      },
-      {
-        "kind": "OBJECT",
-        "name": "AppObserveUpdateEdge",
-        "description": null,
-        "fields": [
-          {
-            "name": "cursor",
-            "description": null,
-            "args": [],
-            "type": {
-              "kind": "NON_NULL",
-              "name": null,
-              "ofType": {
-                "kind": "SCALAR",
-                "name": "String",
-                "ofType": null
-              }
-            },
-            "isDeprecated": false,
-            "deprecationReason": null
-          },
-          {
-            "name": "node",
-            "description": null,
-            "args": [],
-            "type": {
-              "kind": "NON_NULL",
-              "name": null,
-              "ofType": {
-                "kind": "OBJECT",
-                "name": "AppObserveUpdate",
-                "ofType": null
-              }
-            },
-            "isDeprecated": false,
-            "deprecationReason": null
-          }
-        ],
-        "inputFields": null,
-        "interfaces": [],
-        "enumValues": null,
-        "possibleTypes": null
-      },
-      {
-        "kind": "OBJECT",
-        "name": "AppObserveUpdatesConnection",
-        "description": null,
-        "fields": [
-          {
-            "name": "edges",
-            "description": null,
-            "args": [],
-            "type": {
-              "kind": "NON_NULL",
-              "name": null,
-              "ofType": {
-                "kind": "LIST",
-                "name": null,
-                "ofType": {
-                  "kind": "NON_NULL",
-                  "name": null,
-                  "ofType": {
-                    "kind": "OBJECT",
-                    "name": "AppObserveUpdateEdge",
-                    "ofType": null
-                  }
-                }
-              }
-            },
-            "isDeprecated": false,
-            "deprecationReason": null
-          },
-          {
-            "name": "pageInfo",
-            "description": null,
-            "args": [],
-            "type": {
-              "kind": "NON_NULL",
-              "name": null,
-              "ofType": {
-                "kind": "OBJECT",
-                "name": "PageInfo",
-                "ofType": null
-              }
-            },
-            "isDeprecated": false,
-            "deprecationReason": null
-          },
-          {
-            "name": "totalCount",
-            "description": null,
-            "args": [],
-            "type": {
-              "kind": "NON_NULL",
-              "name": null,
-              "ofType": {
-                "kind": "SCALAR",
-                "name": "Int",
-                "ofType": null
-              }
-            },
-            "isDeprecated": false,
-            "deprecationReason": null
-          },
-          {
-            "name": "totalDownloads",
-            "description": null,
-            "args": [],
-            "type": {
-              "kind": "NON_NULL",
-              "name": null,
-              "ofType": {
-                "kind": "SCALAR",
-                "name": "Int",
-                "ofType": null
-              }
-            },
-            "isDeprecated": false,
-            "deprecationReason": null
-          }
-        ],
-        "inputFields": null,
-        "interfaces": [],
-        "enumValues": null,
-        "possibleTypes": null
-      },
-      {
-        "kind": "INPUT_OBJECT",
-        "name": "AppObserveUpdatesInput",
-        "description": null,
-        "fields": null,
-        "inputFields": [
-          {
-            "name": "after",
-            "description": null,
-            "type": {
-              "kind": "SCALAR",
-              "name": "String",
-              "ofType": null
-            },
-            "defaultValue": null,
-            "isDeprecated": false,
-            "deprecationReason": null
-          },
-          {
-            "name": "endTime",
-            "description": null,
-            "type": {
-              "kind": "NON_NULL",
-              "name": null,
-              "ofType": {
-                "kind": "SCALAR",
-                "name": "DateTime",
-                "ofType": null
-              }
-            },
-            "defaultValue": null,
-            "isDeprecated": false,
-            "deprecationReason": null
-          },
-          {
-            "name": "environment",
-            "description": null,
-            "type": {
-              "kind": "SCALAR",
-              "name": "String",
-              "ofType": null
-            },
-            "defaultValue": null,
-            "isDeprecated": false,
-            "deprecationReason": null
-          },
-          {
-            "name": "first",
-            "description": null,
-            "type": {
-              "kind": "SCALAR",
-              "name": "Int",
-              "ofType": null
-            },
-            "defaultValue": null,
-            "isDeprecated": false,
-            "deprecationReason": null
-          },
-          {
-            "name": "orderBy",
-            "description": null,
-            "type": {
-              "kind": "INPUT_OBJECT",
-              "name": "AppObserveUpdatesOrderBy",
-              "ofType": null
-            },
-            "defaultValue": null,
-            "isDeprecated": false,
-            "deprecationReason": null
-          },
-          {
-            "name": "platform",
-            "description": null,
-            "type": {
-              "kind": "NON_NULL",
-              "name": null,
-              "ofType": {
-                "kind": "ENUM",
-                "name": "AppObservePlatform",
-                "ofType": null
-              }
-            },
-            "defaultValue": null,
-            "isDeprecated": false,
-            "deprecationReason": null
-          },
-          {
-            "name": "startTime",
-            "description": null,
-            "type": {
-              "kind": "NON_NULL",
-              "name": null,
-              "ofType": {
-                "kind": "SCALAR",
-                "name": "DateTime",
-                "ofType": null
-              }
-            },
-            "defaultValue": null,
-            "isDeprecated": false,
-            "deprecationReason": null
-          }
-        ],
-        "interfaces": null,
-        "enumValues": null,
-        "possibleTypes": null
-      },
-      {
-        "kind": "INPUT_OBJECT",
-        "name": "AppObserveUpdatesOrderBy",
-        "description": null,
-        "fields": null,
-        "inputFields": [
-          {
-            "name": "direction",
-            "description": null,
-            "type": {
-              "kind": "NON_NULL",
-              "name": null,
-              "ofType": {
-                "kind": "ENUM",
-                "name": "AppObserveUpdatesOrderByDirection",
-                "ofType": null
-              }
-            },
-            "defaultValue": null,
-            "isDeprecated": false,
-            "deprecationReason": null
-          },
-          {
-            "name": "field",
-            "description": null,
-            "type": {
-              "kind": "NON_NULL",
-              "name": null,
-              "ofType": {
-                "kind": "ENUM",
-                "name": "AppObserveUpdatesOrderByField",
-                "ofType": null
-              }
-            },
-            "defaultValue": null,
-            "isDeprecated": false,
-            "deprecationReason": null
-          }
-        ],
-        "interfaces": null,
-        "enumValues": null,
-        "possibleTypes": null
-      },
-      {
-        "kind": "ENUM",
-        "name": "AppObserveUpdatesOrderByDirection",
-        "description": null,
-        "fields": null,
-        "inputFields": null,
-        "interfaces": null,
-        "enumValues": [
-          {
-            "name": "ASC",
-            "description": null,
-            "isDeprecated": false,
-            "deprecationReason": null
-          },
-          {
-            "name": "DESC",
-            "description": null,
-            "isDeprecated": false,
-            "deprecationReason": null
-          }
-        ],
-        "possibleTypes": null
-      },
-      {
-        "kind": "ENUM",
-        "name": "AppObserveUpdatesOrderByField",
-        "description": null,
-        "fields": null,
-        "inputFields": null,
-        "interfaces": null,
-        "enumValues": [
-          {
-            "name": "DOWNLOAD_COUNT",
-            "description": null,
-            "isDeprecated": false,
-            "deprecationReason": null
-          },
-          {
-            "name": "FIRST_SEEN_AT",
-            "description": null,
-            "isDeprecated": false,
-            "deprecationReason": null
-          },
-          {
-            "name": "MEDIAN_DOWNLOAD_TIME",
-            "description": null,
-            "isDeprecated": false,
-            "deprecationReason": null
-          },
-          {
-            "name": "P90_DOWNLOAD_TIME",
-            "description": null,
-            "isDeprecated": false,
-            "deprecationReason": null
-          }
-        ],
-        "possibleTypes": null
-      },
       {
         "kind": "OBJECT",
         "name": "AppObserveVersionMarkerStatistics",
@@ -25962,18 +25488,6 @@
             "isDeprecated": false,
             "deprecationReason": null
           },
-          {
-            "name": "resolvedImage",
-            "description": null,
-            "args": [],
-            "type": {
-              "kind": "SCALAR",
-              "name": "String",
-              "ofType": null
-            },
-            "isDeprecated": false,
-            "deprecationReason": null
-          },
           {
             "name": "resourceClass",
             "description": "The builder resource class requested by the developer",
@@ -26089,7 +25603,7 @@
               "ofType": null
             },
             "isDeprecated": true,
-            "deprecationReason": "Use 'resolvedImage' for the concrete image the build runs on."
+            "deprecationReason": "Check logs instead."
           },
           {
             "name": "status",
@@ -30311,83 +29825,6 @@
         "enumValues": null,
         "possibleTypes": null
       },
-      {
-        "kind": "OBJECT",
-        "name": "ConvexProjectMutation",
-        "description": null,
-        "fields": [
-          {
-            "name": "deleteConvexProject",
-            "description": null,
-            "args": [
-              {
-                "name": "convexProjectId",
-                "description": null,
-                "type": {
-                  "kind": "NON_NULL",
-                  "name": null,
-                  "ofType": {
-                    "kind": "SCALAR",
-                    "name": "ID",
-                    "ofType": null
-                  }
-                },
-                "defaultValue": null,
-                "isDeprecated": false,
-                "deprecationReason": null
-              }
-            ],
-            "type": {
-              "kind": "NON_NULL",
-              "name": null,
-              "ofType": {
-                "kind": "SCALAR",
-                "name": "ID",
-                "ofType": null
-              }
-            },
-            "isDeprecated": false,
-            "deprecationReason": null
-          },
-          {
-            "name": "setupConvexProject",
-            "description": null,
-            "args": [
-              {
-                "name": "input",
-                "description": null,
-                "type": {
-                  "kind": "NON_NULL",
-                  "name": null,
-                  "ofType": {
-                    "kind": "INPUT_OBJECT",
-                    "name": "SetupConvexProjectInput",
-                    "ofType": null
-                  }
-                },
-                "defaultValue": null,
-                "isDeprecated": false,
-                "deprecationReason": null
-              }
-            ],
-            "type": {
-              "kind": "NON_NULL",
-              "name": null,
-              "ofType": {
-                "kind": "OBJECT",
-                "name": "SetupConvexProjectResult",
-                "ofType": null
-              }
-            },
-            "isDeprecated": false,
-            "deprecationReason": null
-          }
-        ],
-        "inputFields": null,
-        "interfaces": [],
-        "enumValues": null,
-        "possibleTypes": null
-      },
       {
         "kind": "OBJECT",
         "name": "ConvexTeamConnection",
@@ -30409,30 +29846,6 @@
             "isDeprecated": false,
             "deprecationReason": null
           },
-          {
-            "name": "convexProjects",
-            "description": null,
-            "args": [],
-            "type": {
-              "kind": "NON_NULL",
-              "name": null,
-              "ofType": {
-                "kind": "LIST",
-                "name": null,
-                "ofType": {
-                  "kind": "NON_NULL",
-                  "name": null,
-                  "ofType": {
-                    "kind": "OBJECT",
-                    "name": "ConvexProject",
-                    "ofType": null
-                  }
-                }
-              }
-            },
-            "isDeprecated": false,
-            "deprecationReason": null
-          },
           {
             "name": "convexTeamIdentifier",
             "description": null,
@@ -30449,38 +29862,6 @@
             "isDeprecated": false,
             "deprecationReason": null
           },
-          {
-            "name": "convexTeamName",
-            "description": null,
-            "args": [],
-            "type": {
-              "kind": "NON_NULL",
-              "name": null,
-              "ofType": {
-                "kind": "SCALAR",
-                "name": "String",
-                "ofType": null
-              }
-            },
-            "isDeprecated": false,
-            "deprecationReason": null
-          },
-          {
-            "name": "convexTeamSlug",
-            "description": null,
-            "args": [],
-            "type": {
-              "kind": "NON_NULL",
-              "name": null,
-              "ofType": {
-                "kind": "SCALAR",
-                "name": "String",
-                "ofType": null
-              }
-            },
-            "isDeprecated": false,
-            "deprecationReason": null
-          },
           {
             "name": "createdAt",
             "description": null,
@@ -30497,22 +29878,6 @@
             "isDeprecated": false,
             "deprecationReason": null
           },
-          {
-            "name": "hasBeenClaimed",
-            "description": null,
-            "args": [],
-            "type": {
-              "kind": "NON_NULL",
-              "name": null,
-              "ofType": {
-                "kind": "SCALAR",
-                "name": "Boolean",
-                "ofType": null
-              }
-            },
-            "isDeprecated": false,
-            "deprecationReason": null
-          },
           {
             "name": "id",
             "description": null,
@@ -30529,30 +29894,6 @@
             "isDeprecated": false,
             "deprecationReason": null
           },
-          {
-            "name": "invitedAt",
-            "description": null,
-            "args": [],
-            "type": {
-              "kind": "SCALAR",
-              "name": "DateTime",
-              "ofType": null
-            },
-            "isDeprecated": false,
-            "deprecationReason": null
-          },
-          {
-            "name": "invitedEmail",
-            "description": null,
-            "args": [],
-            "type": {
-              "kind": "SCALAR",
-              "name": "String",
-              "ofType": null
-            },
-            "isDeprecated": false,
-            "deprecationReason": null
-          },
           {
             "name": "updatedAt",
             "description": null,
@@ -36017,8 +35358,8 @@
             "deprecationReason": null
           },
           {
-            "name": "ensureDeviceRunSessionStopped",
-            "description": "Ensure a device run session is stopped. Idempotent: if the session has already\nfinished, the existing session is returned unchanged (an ERRORED session stays\nERRORED).",
+            "name": "stopDeviceRunSession",
+            "description": "Stop a device run session",
             "args": [
               {
                 "name": "deviceRunSessionId",
@@ -56361,22 +55702,6 @@
             "isDeprecated": false,
             "deprecationReason": null
           },
-          {
-            "name": "convexProject",
-            "description": null,
-            "args": [],
-            "type": {
-              "kind": "NON_NULL",
-              "name": null,
-              "ofType": {
-                "kind": "OBJECT",
-                "name": "ConvexProjectMutation",
-                "ofType": null
-              }
-            },
-            "isDeprecated": false,
-            "deprecationReason": null
-          },
           {
             "name": "convexTeamConnection",
             "description": null,
@@ -60676,152 +60001,6 @@
         "enumValues": null,
         "possibleTypes": null
       },
-      {
-        "kind": "INPUT_OBJECT",
-        "name": "SetupConvexProjectInput",
-        "description": null,
-        "fields": null,
-        "inputFields": [
-          {
-            "name": "appId",
-            "description": null,
-            "type": {
-              "kind": "NON_NULL",
-              "name": null,
-              "ofType": {
-                "kind": "SCALAR",
-                "name": "ID",
-                "ofType": null
-              }
-            },
-            "defaultValue": null,
-            "isDeprecated": false,
-            "deprecationReason": null
-          },
-          {
-            "name": "convexTeamConnectionId",
-            "description": null,
-            "type": {
-              "kind": "NON_NULL",
-              "name": null,
-              "ofType": {
-                "kind": "SCALAR",
-                "name": "ID",
-                "ofType": null
-              }
-            },
-            "defaultValue": null,
-            "isDeprecated": false,
-            "deprecationReason": null
-          },
-          {
-            "name": "deploymentRegion",
-            "description": null,
-            "type": {
-              "kind": "SCALAR",
-              "name": "String",
-              "ofType": null
-            },
-            "defaultValue": null,
-            "isDeprecated": false,
-            "deprecationReason": null
-          },
-          {
-            "name": "projectName",
-            "description": null,
-            "type": {
-              "kind": "NON_NULL",
-              "name": null,
-              "ofType": {
-                "kind": "SCALAR",
-                "name": "String",
-                "ofType": null
-              }
-            },
-            "defaultValue": null,
-            "isDeprecated": false,
-            "deprecationReason": null
-          }
-        ],
-        "interfaces": null,
-        "enumValues": null,
-        "possibleTypes": null
-      },
-      {
-        "kind": "OBJECT",
-        "name": "SetupConvexProjectResult",
-        "description": null,
-        "fields": [
-          {
-            "name": "convexDeploymentName",
-            "description": null,
-            "args": [],
-            "type": {
-              "kind": "NON_NULL",
-              "name": null,
-              "ofType": {
-                "kind": "SCALAR",
-                "name": "String",
-                "ofType": null
-              }
-            },
-            "isDeprecated": false,
-            "deprecationReason": null
-          },
-          {
-            "name": "convexDeploymentUrl",
-            "description": null,
-            "args": [],
-            "type": {
-              "kind": "NON_NULL",
-              "name": null,
-              "ofType": {
-                "kind": "SCALAR",
-                "name": "String",
-                "ofType": null
-              }
-            },
-            "isDeprecated": false,
-            "deprecationReason": null
-          },
-          {
-            "name": "convexProject",
-            "description": null,
-            "args": [],
-            "type": {
-              "kind": "NON_NULL",
-              "name": null,
-              "ofType": {
-                "kind": "OBJECT",
-                "name": "ConvexProject",
-                "ofType": null
-              }
-            },
-            "isDeprecated": false,
-            "deprecationReason": null
-          },
-          {
-            "name": "deployKey",
-            "description": null,
-            "args": [],
-            "type": {
-              "kind": "NON_NULL",
-              "name": null,
-              "ofType": {
-                "kind": "SCALAR",
-                "name": "String",
-                "ofType": null
-              }
-            },
-            "isDeprecated": false,
-            "deprecationReason": null
-          }
-        ],
-        "inputFields": null,
-        "interfaces": [],
-        "enumValues": null,
-        "possibleTypes": null
-      },
       {
         "kind": "OBJECT",
         "name": "SizeBreakdownCategory",
@@ -62882,22 +62061,6 @@
             "isDeprecated": false,
             "deprecationReason": null
           },
-          {
-            "name": "includedAgentCreditsInCents",
-            "description": null,
-            "args": [],
-            "type": {
-              "kind": "NON_NULL",
-              "name": null,
-              "ofType": {
-                "kind": "SCALAR",
-                "name": "Int",
-                "ofType": null
-              }
-            },
-            "isDeprecated": false,
-            "deprecationReason": null
-          },
           {
             "name": "isDowngrading",
             "description": null,
@@ -79692,12 +78855,6 @@
             "isDeprecated": false,
             "deprecationReason": null
           },
-          {
-            "name": "BRANCH_DELETE",
-            "description": null,
-            "isDeprecated": false,
-            "deprecationReason": null
-          },
           {
             "name": "BUILD",
             "description": null,

packages/eas-cli/package.json

@@ -1,6 +1,6 @@
 {
   "name": "eas-cli",
-  "version": "18.11.0",
+  "version": "18.9.1",
   "description": "EAS command line tool",
   "keywords": [
     "cli",
@@ -37,7 +37,7 @@
     "typecheck-for-build": "tsc --project tsconfig.build.json",
     "test": "jest",
     "version": "yarn run -T oclif readme && node scripts/patch-readme && git add README.md",
-    "generate-graphql-code": "graphql-codegen --config graphql-codegen.ts",
+    "generate-graphql-code": "graphql-codegen --config graphql-codegen.yml",
     "verify-graphql-code": "./scripts/verify-graphql.sh",
     "clean": "rimraf dist build tmp node_modules yarn-error.log \"*.tsbuildinfo\"",
     "copy-new-templates": "rimraf build/commandUtils/new/templates && mkdir -p build/commandUtils/new && cp -r src/commandUtils/new/templates build/commandUtils/new"
@@ -202,7 +202,7 @@
         "description": "manage project and account environment variables"
       },
       "integrations": {
-        "description": "manage third-party service integrations"
+        "description": "manage service connections"
       },
       "metadata": {
         "description": "manage store configuration"

packages/eas-cli/scripts/convex-e2e.ts

@@ -1,346 +0,0 @@
-import { spawn } from 'child_process';
-import fs from 'fs/promises';
-import os from 'os';
-import path from 'path';
-
-/*
- * Manual Convex integration E2E runner.
- *
- * Run from packages/eas-cli with:
- *   yarn ts-node scripts/convex-e2e.ts
- *
- * This uses the deployed EAS API and real authenticated EAS/Convex-backed
- * resources. Cleanup removes EAS-side links when possible, but it does not
- * destroy Convex-side resources.
- *
- * Options:
- *   CONVEX_E2E_KEEP_PROJECT=1 keeps the temp Expo project and skips cleanup.
- *   CONVEX_E2E_SKIP_DASHBOARD=1 skips opening the Convex dashboard.
- *   CONVEX_E2E_ACCOUNT=<account-name> sets the Expo app owner before eas init.
- */
-
-type RunOptions = {
-  cwd?: string;
-  allowFailure?: boolean;
-  env?: NodeJS.ProcessEnv;
-};
-
-type RunResult = {
-  stdout: string;
-  stderr: string;
-  exitCode: number | null;
-};
-
-const KEEP_PROJECT = process.env.CONVEX_E2E_KEEP_PROJECT === '1';
-const SKIP_DASHBOARD = process.env.CONVEX_E2E_SKIP_DASHBOARD === '1';
-const ACCOUNT = process.env.CONVEX_E2E_ACCOUNT;
-const SCRIPT_DIR = __dirname;
-const EAS_CLI_ROOT = path.resolve(SCRIPT_DIR, '..');
-const LOCAL_EAS_BIN = path.join(EAS_CLI_ROOT, 'bin', 'run');
-const TEMP_ROOT_PREFIX = path.join(os.tmpdir(), 'eas-cli-convex-e2e-');
-
-let tempRoot: string | null = null;
-let projectDir: string | null = null;
-let initializedProject = false;
-let initialConvexTeamSlugs: string[] = [];
-let createdConvexTeamSlug: string | null = null;
-
-async function mainAsync(): Promise<void> {
-  try {
-    await assertFileExistsAsync(
-      LOCAL_EAS_BIN,
-      `Local EAS CLI binary not found at ${LOCAL_EAS_BIN}`
-    );
-    await runEasAsync(['whoami']);
-
-    const testName = `convex-e2e-${Date.now().toString(36)}`;
-    tempRoot = await fs.mkdtemp(TEMP_ROOT_PREFIX);
-    projectDir = path.join(tempRoot, testName);
-
-    logStep(`Creating fresh Expo project ${testName}`);
-    await runAsync('npx', ['--yes', 'create-expo-app@latest', projectDir, '--template', 'blank'], {
-      cwd: tempRoot,
-      env: getNpxEnvironment(),
-    });
-
-    await updateAppJsonAsync(projectDir, testName);
-
-    logStep('Creating/linking EAS project');
-    await runEasAsync(['init', '--non-interactive', '--force'], projectDir);
-    initializedProject = true;
-
-    initialConvexTeamSlugs = parseConvexTeamSlugs(
-      (await runEasAsync(['integrations:convex:team'], projectDir)).stdout
-    );
-
-    logStep('Connecting Convex');
-    await runEasAsync(
-      ['integrations:convex:connect', '--non-interactive', '--project-name', testName],
-      projectDir
-    );
-
-    await assertEnvLocalAsync(projectDir);
-    await assertPackageJsonDependencyAsync(projectDir, 'convex');
-
-    const teamOutput = await runEasAsync(['integrations:convex:team'], projectDir);
-    const projectOutput = await runEasAsync(['integrations:convex:project'], projectDir);
-    assertIncludes(
-      projectOutput.stdout,
-      'Dashboard',
-      'Expected project output to include dashboard'
-    );
-
-    const teamSlugsAfterConnect = parseConvexTeamSlugs(teamOutput.stdout);
-    const newTeamSlugs = teamSlugsAfterConnect.filter(
-      slug => !initialConvexTeamSlugs.includes(slug)
-    );
-    createdConvexTeamSlug = newTeamSlugs[0] ?? null;
-    const convexTeamSlug = createdConvexTeamSlug ?? teamSlugsAfterConnect[0];
-
-    if (!convexTeamSlug) {
-      throw new Error('Could not determine a Convex team slug from team output.');
-    }
-
-    await runEasAsync(
-      ['integrations:convex:team:invite', convexTeamSlug, '--non-interactive'],
-      projectDir
-    );
-
-    if (SKIP_DASHBOARD) {
-      logStep('Skipping dashboard command because CONVEX_E2E_SKIP_DASHBOARD=1');
-    } else {
-      await runEasAsync(['integrations:convex:dashboard'], projectDir);
-    }
-
-    logStep('Convex E2E flow completed successfully');
-  } finally {
-    await cleanupAsync();
-  }
-}
-
-async function cleanupAsync(): Promise<void> {
-  if (!projectDir || !tempRoot) {
-    return;
-  }
-
-  if (KEEP_PROJECT) {
-    logStep('Skipping cleanup because CONVEX_E2E_KEEP_PROJECT=1');
-    log(`Temp project kept at: ${projectDir}`);
-    log('EAS-side links and Convex-side resources were left intact.');
-    return;
-  }
-
-  if (initializedProject) {
-    logStep('Cleaning up EAS-side Convex links');
-    const convexTeamSlugToDelete =
-      createdConvexTeamSlug ?? (await getCreatedConvexTeamSlugForCleanupAsync());
-
-    await runCleanupCommandAsync([
-      'integrations:convex:project:delete',
-      '--non-interactive',
-      '--yes',
-    ]);
-
-    if (convexTeamSlugToDelete) {
-      await runCleanupCommandAsync([
-        'integrations:convex:team:delete',
-        convexTeamSlugToDelete,
-        '--non-interactive',
-        '--yes',
-      ]);
-    } else {
-      warn(
-        'No newly-created Convex team link was detected. Skipping team link deletion to avoid removing a pre-existing EAS-side link.'
-      );
-    }
-
-    warn('Convex-side resources are not destroyed by this cleanup.');
-  }
-
-  await fs.rm(tempRoot, { recursive: true, force: true });
-  log(`Removed temp project directory: ${tempRoot}`);
-}
-
-async function getCreatedConvexTeamSlugForCleanupAsync(): Promise<string | null> {
-  if (!projectDir) {
-    return null;
-  }
-  const result = await runEasAsync(['integrations:convex:team'], projectDir, {
-    allowFailure: true,
-  });
-  if (result.exitCode !== 0) {
-    warn('Could not inspect Convex team links during cleanup.');
-    return null;
-  }
-  return (
-    parseConvexTeamSlugs(result.stdout).find(slug => !initialConvexTeamSlugs.includes(slug)) ?? null
-  );
-}
-
-async function runCleanupCommandAsync(args: string[]): Promise<void> {
-  try {
-    const result = await runEasAsync(args, projectDir ?? undefined, { allowFailure: true });
-    if (result.exitCode !== 0) {
-      warn(`Cleanup command exited with ${result.exitCode}: ${args.join(' ')}`);
-    }
-  } catch (error) {
-    warn(`Cleanup command failed: ${args.join(' ')}`);
-    warn(error instanceof Error ? error.message : String(error));
-  }
-}
-
-async function runEasAsync(
-  args: string[],
-  cwd?: string,
-  options: RunOptions = {}
-): Promise<RunResult> {
-  return await runAsync(LOCAL_EAS_BIN, args, { cwd, ...options });
-}
-
-async function runAsync(
-  command: string,
-  args: string[],
-  { cwd, allowFailure = false, env = {} }: RunOptions = {}
-): Promise<RunResult> {
-  const printableCommand = [command, ...args].join(' ');
-  log(`\n$ ${printableCommand}`);
-  if (cwd) {
-    log(`cwd: ${cwd}`);
-  }
-
-  return await new Promise<RunResult>((resolve, reject) => {
-    const child = spawn(command, args, {
-      cwd,
-      env: {
-        ...process.env,
-        ...env,
-        CI: '1',
-      },
-      stdio: ['ignore', 'pipe', 'pipe'],
-    });
-
-    let stdout = '';
-    let stderr = '';
-
-    child.stdout.on('data', data => {
-      const chunk = data.toString();
-      stdout += chunk;
-      process.stdout.write(redact(chunk));
-    });
-
-    child.stderr.on('data', data => {
-      const chunk = data.toString();
-      stderr += chunk;
-      process.stderr.write(redact(chunk));
-    });
-
-    child.on('error', reject);
-    child.on('close', exitCode => {
-      const result = { stdout, stderr, exitCode };
-      if (!allowFailure && exitCode !== 0) {
-        reject(new Error(`Command failed with exit code ${exitCode}: ${printableCommand}`));
-        return;
-      }
-      resolve(result);
-    });
-  });
-}
-
-async function updateAppJsonAsync(appDir: string, testName: string): Promise<void> {
-  const appJsonPath = path.join(appDir, 'app.json');
-  const rawAppJson = await fs.readFile(appJsonPath, 'utf8');
-  const appJson = JSON.parse(rawAppJson);
-  appJson.expo = {
-    ...appJson.expo,
-    name: testName,
-    slug: testName,
-    ...(ACCOUNT ? { owner: ACCOUNT } : {}),
-  };
-  await fs.writeFile(appJsonPath, `${JSON.stringify(appJson, null, 2)}\n`);
-}
-
-async function assertEnvLocalAsync(appDir: string): Promise<void> {
-  const envLocalPath = path.join(appDir, '.env.local');
-  const envLocal = await fs.readFile(envLocalPath, 'utf8');
-  assertIncludes(
-    envLocal,
-    'CONVEX_DEPLOY_KEY=',
-    'Expected .env.local to contain CONVEX_DEPLOY_KEY'
-  );
-  assertIncludes(
-    envLocal,
-    'EXPO_PUBLIC_CONVEX_URL=',
-    'Expected .env.local to contain EXPO_PUBLIC_CONVEX_URL'
-  );
-  log('\nVerified .env.local contains Convex environment variables:');
-  log(redact(envLocal));
-}
-
-async function assertPackageJsonDependencyAsync(
-  appDir: string,
-  packageName: string
-): Promise<void> {
-  const packageJsonPath = path.join(appDir, 'package.json');
-  const packageJson = JSON.parse(await fs.readFile(packageJsonPath, 'utf8'));
-  const dependencies = {
-    ...packageJson.dependencies,
-    ...packageJson.devDependencies,
-  };
-  if (!dependencies[packageName]) {
-    throw new Error(`Expected package.json to include ${packageName}`);
-  }
-  log(`Verified package.json includes ${packageName}@${dependencies[packageName]}`);
-}
-
-function parseConvexTeamSlugs(output: string): string[] {
-  const strippedOutput = stripAnsi(output);
-  return Array.from(strippedOutput.matchAll(/^Team:\s+.+?\s\/\s(.+)$/gm), match => match[1].trim());
-}
-
-function assertIncludes(value: string, expected: string, message: string): void {
-  if (!value.includes(expected)) {
-    throw new Error(message);
-  }
-}
-
-async function assertFileExistsAsync(filePath: string, message: string): Promise<void> {
-  try {
-    await fs.access(filePath);
-  } catch {
-    throw new Error(message);
-  }
-}
-
-function logStep(message: string): void {
-  log(`\n==> ${message}`);
-}
-
-function log(message: string): void {
-  process.stdout.write(`${message}\n`);
-}
-
-function warn(message: string): void {
-  process.stderr.write(`${message}\n`);
-}
-
-function redact(value: string): string {
-  return value
-    .replace(/^CONVEX_DEPLOY_KEY=.*$/gm, 'CONVEX_DEPLOY_KEY=<redacted>')
-    .replace(/dev:[^\s|]+\|[^\s]+/g, 'dev:<redacted>');
-}
-
-function stripAnsi(value: string): string {
-  return value.replace(/\u001b\[[0-9;]*m/g, '');
-}
-
-function getNpxEnvironment(): NodeJS.ProcessEnv {
-  return {
-    npm_config_user_agent: `npm/10 node/${process.versions.node} ${process.platform} ${process.arch}`,
-    npm_execpath: undefined,
-  };
-}
-
-mainAsync().catch(error => {
-  warn(error instanceof Error ? error.message : String(error));
-  process.exitCode = 1;
-});

packages/eas-cli/src/build/__tests__/validateLockfile-test.ts

@@ -1,81 +1,377 @@
+import { Platform } from '@expo/eas-build-job';
 import { vol } from 'memfs';
 
-import { ensureLockfileExistsAsync } from '../validateLockfile';
+import { CommonContext } from '../context';
+import { checkLockfileAsync } from '../validateLockfile';
+import { Client } from '../../vcs/vcs';
 
 jest.mock('fs');
+jest.mock('@expo/package-manager', () => ({
+  NPM_LOCK_FILE: 'package-lock.json',
+  YARN_LOCK_FILE: 'yarn.lock',
+  PNPM_LOCK_FILE: 'pnpm-lock.yaml',
+  BUN_LOCK_FILE: 'bun.lockb',
+  BUN_TEXT_LOCK_FILE: 'bun.lock',
+  resolveWorkspaceRoot: jest.fn(() => null),
+}));
 
-const mockResolveWorkspaceRoot = jest.fn();
-jest.mock('@expo/package-manager', () => {
-  const actual = jest.requireActual('@expo/package-manager');
-  return {
-    ...actual,
-    resolveWorkspaceRoot: (...args: unknown[]) => mockResolveWorkspaceRoot(...args),
-  };
+const { resolveWorkspaceRoot } = jest.requireMock<{
+  resolveWorkspaceRoot: jest.Mock;
+}>('@expo/package-manager');
+
+const mockProcessExit = jest.spyOn(process, 'exit').mockImplementation(() => {
+  throw new Error('process.exit called');
 });
 
+function createMockContext(
+  overrides: Partial<{
+    projectDir: string;
+    requiredPackageManager: string | null;
+    isFileIgnoredAsync: (filePath: string) => Promise<boolean>;
+    getRootPathAsync: () => Promise<string>;
+  }> = {}
+): CommonContext<Platform> {
+  const vcsClient = {
+    isFileIgnoredAsync: overrides.isFileIgnoredAsync ?? (async () => false),
+    getRootPathAsync: overrides.getRootPathAsync ?? (async () => '/project'),
+  } as unknown as Client;
+
+  return {
+    projectDir: overrides.projectDir ?? '/project',
+    requiredPackageManager: overrides.requiredPackageManager ?? null,
+    vcsClient,
+  } as unknown as CommonContext<Platform>;
+}
+
+const PACKAGE_JSON_WITH_REACT = JSON.stringify({
+  dependencies: { react: '19.0.4', 'react-native': '~0.79.0' },
+});
+
+const NPM_LOCKFILE_SYNCED = JSON.stringify({
+  lockfileVersion: 3,
+  packages: {
+    'node_modules/react': { version: '19.0.4' },
+    'node_modules/react-native': { version: '0.79.4' },
+  },
+});
+
+const NPM_LOCKFILE_STALE = JSON.stringify({
+  lockfileVersion: 3,
+  packages: {
+    'node_modules/react': { version: '19.0.0' },
+    'node_modules/react-native': { version: '0.79.4' },
+  },
+});
+
+// bun.lock uses JSONC with trailing commas
+const BUN_LOCKFILE_STALE = `{
+  "lockfileVersion": 1,
+  "workspaces": {
+    "": {
+      "dependencies": {
+        "react": "19.0.4",
+      },
+    },
+  },
+  "packages": {
+    "react": ["[email protected]", "", {}, "sha512-abc"],
+  },
+}`;
+
+const BUN_LOCKFILE_SYNCED = `{
+  "lockfileVersion": 1,
+  "workspaces": {
+    "": {
+      "dependencies": {
+        "react": "19.0.4",
+      },
+    },
+  },
+  "packages": {
+    "react": ["[email protected]", "", {}, "sha512-abc"],
+  },
+}`;
+
+const YARN_LOCKFILE_STALE = `# yarn lockfile v1
+
+[email protected]:
+  version "19.0.0"
+  resolved "https://registry.yarnpkg.com/react/-/react-19.0.0.tgz"
+`;
+
+const YARN_LOCKFILE_SYNCED = `# yarn lockfile v1
+
+[email protected]:
+  version "19.0.4"
+  resolved "https://registry.yarnpkg.com/react/-/react-19.0.4.tgz"
+
+react-native@~0.79.0:
+  version "0.79.4"
+  resolved "https://registry.yarnpkg.com/react-native/-/react-native-0.79.4.tgz"
+`;
+
 beforeEach(() => {
   vol.reset();
-  mockResolveWorkspaceRoot.mockReturnValue(null);
+  resolveWorkspaceRoot.mockReturnValue(null);
+  mockProcessExit.mockClear();
+  delete process.env.EAS_BUILD_SKIP_LOCKFILE_CHECK;
 });
 
-describe(ensureLockfileExistsAsync, () => {
-  it('passes when package-lock.json exists', async () => {
-    vol.fromJSON({ './package-lock.json': '' }, '/app');
-    await expect(ensureLockfileExistsAsync('/app')).resolves.not.toThrow();
+describe(checkLockfileAsync, () => {
+  it('skips all checks when EAS_BUILD_SKIP_LOCKFILE_CHECK is set', async () => {
+    process.env.EAS_BUILD_SKIP_LOCKFILE_CHECK = '1';
+    // This would normally fail — no lockfile, no package manager
+    vol.fromJSON({ '/project/package.json': '{}' });
+    const ctx = createMockContext({ requiredPackageManager: null });
+    await expect(checkLockfileAsync(ctx)).resolves.not.toThrow();
+    expect(mockProcessExit).not.toHaveBeenCalled();
   });
 
-  it('passes when yarn.lock exists', async () => {
-    vol.fromJSON({ './yarn.lock': '' }, '/app');
-    await expect(ensureLockfileExistsAsync('/app')).resolves.not.toThrow();
+  it('exits when no package manager is detected', async () => {
+    vol.fromJSON({ '/project/package.json': '{}' });
+    const ctx = createMockContext({ requiredPackageManager: null });
+    await expect(checkLockfileAsync(ctx)).rejects.toThrow('process.exit called');
+    expect(mockProcessExit).toHaveBeenCalledWith(1);
   });
 
-  it('passes when pnpm-lock.yaml exists', async () => {
-    vol.fromJSON({ './pnpm-lock.yaml': '' }, '/app');
-    await expect(ensureLockfileExistsAsync('/app')).resolves.not.toThrow();
+  it('exits when npm is detected but package-lock.json is missing', async () => {
+    vol.fromJSON({ '/project/package.json': '{}' });
+    const ctx = createMockContext({ requiredPackageManager: 'npm' });
+    await expect(checkLockfileAsync(ctx)).rejects.toThrow('process.exit called');
+    expect(mockProcessExit).toHaveBeenCalledWith(1);
   });
 
-  it('passes when bun.lockb exists', async () => {
-    vol.fromJSON({ './bun.lockb': '' }, '/app');
-    await expect(ensureLockfileExistsAsync('/app')).resolves.not.toThrow();
+  it('does not error when lockfile exists and is in sync', async () => {
+    vol.fromJSON({
+      '/project/package.json': PACKAGE_JSON_WITH_REACT,
+      '/project/package-lock.json': NPM_LOCKFILE_SYNCED,
+    });
+    const ctx = createMockContext({ requiredPackageManager: 'npm' });
+    await expect(checkLockfileAsync(ctx)).resolves.not.toThrow();
+    expect(mockProcessExit).not.toHaveBeenCalled();
   });
 
-  it('passes when bun.lock exists', async () => {
-    vol.fromJSON({ './bun.lock': '' }, '/app');
-    await expect(ensureLockfileExistsAsync('/app')).resolves.not.toThrow();
+  it('exits when lockfile exists but is gitignored', async () => {
+    vol.fromJSON({
+      '/project/package.json': '{}',
+      '/project/yarn.lock': '# yarn lockfile',
+    });
+    const ctx = createMockContext({
+      requiredPackageManager: 'yarn',
+      isFileIgnoredAsync: async () => true,
+    });
+    await expect(checkLockfileAsync(ctx)).rejects.toThrow('process.exit called');
+    expect(mockProcessExit).toHaveBeenCalledWith(1);
   });
 
-  it('throws when no lockfile exists', async () => {
-    vol.fromJSON({ './package.json': '{}' }, '/app');
-    await expect(ensureLockfileExistsAsync('/app')).rejects.toThrow(
-      'No lockfile found in the project directory.'
-    );
+  it('exits when conflicting lockfiles from multiple managers exist', async () => {
+    vol.fromJSON({
+      '/project/package.json': '{}',
+      '/project/package-lock.json': NPM_LOCKFILE_SYNCED,
+      '/project/yarn.lock': '# yarn lockfile',
+    });
+    const ctx = createMockContext({ requiredPackageManager: 'npm' });
+    await expect(checkLockfileAsync(ctx)).rejects.toThrow('process.exit called');
+    expect(mockProcessExit).toHaveBeenCalledWith(1);
   });
 
-  it('passes when lockfile exists in workspace root', async () => {
-    vol.fromJSON(
-      {
-        './packages/my-app/package.json': '{}',
-        './yarn.lock': '',
-      },
-      '/monorepo'
-    );
-    mockResolveWorkspaceRoot.mockReturnValue('/monorepo');
-    await expect(
-      ensureLockfileExistsAsync('/monorepo/packages/my-app')
-    ).resolves.not.toThrow();
+  it('exits when npm lockfile version does not satisfy package.json specifier', async () => {
+    vol.fromJSON({
+      '/project/package.json': PACKAGE_JSON_WITH_REACT,
+      '/project/package-lock.json': NPM_LOCKFILE_STALE,
+    });
+    const ctx = createMockContext({ requiredPackageManager: 'npm' });
+    await expect(checkLockfileAsync(ctx)).rejects.toThrow('process.exit called');
+    expect(mockProcessExit).toHaveBeenCalledWith(1);
   });
 
-  it('throws when no lockfile in project dir or workspace root', async () => {
-    vol.fromJSON(
-      {
-        './packages/my-app/package.json': '{}',
-        './package.json': '{}',
-      },
-      '/monorepo'
-    );
-    mockResolveWorkspaceRoot.mockReturnValue('/monorepo');
-    await expect(ensureLockfileExistsAsync('/monorepo/packages/my-app')).rejects.toThrow(
-      'No lockfile found in the project directory.'
-    );
+  it('exits when bun.lock version does not satisfy package.json specifier', async () => {
+    vol.fromJSON({
+      '/project/package.json': JSON.stringify({ dependencies: { react: '19.0.4' } }),
+      '/project/bun.lock': BUN_LOCKFILE_STALE,
+    });
+    const ctx = createMockContext({ requiredPackageManager: 'bun' });
+    await expect(checkLockfileAsync(ctx)).rejects.toThrow('process.exit called');
+    expect(mockProcessExit).toHaveBeenCalledWith(1);
+  });
+
+  it('does not error when bun.lock is in sync', async () => {
+    vol.fromJSON({
+      '/project/package.json': JSON.stringify({ dependencies: { react: '19.0.4' } }),
+      '/project/bun.lock': BUN_LOCKFILE_SYNCED,
+    });
+    const ctx = createMockContext({ requiredPackageManager: 'bun' });
+    await expect(checkLockfileAsync(ctx)).resolves.not.toThrow();
+    expect(mockProcessExit).not.toHaveBeenCalled();
+  });
+
+  it('exits when yarn lockfile version does not satisfy package.json specifier', async () => {
+    vol.fromJSON({
+      '/project/package.json': JSON.stringify({ dependencies: { react: '19.0.4' } }),
+      '/project/yarn.lock': YARN_LOCKFILE_STALE,
+    });
+    const ctx = createMockContext({ requiredPackageManager: 'yarn' });
+    await expect(checkLockfileAsync(ctx)).rejects.toThrow('process.exit called');
+    expect(mockProcessExit).toHaveBeenCalledWith(1);
+  });
+
+  it('does not error when yarn lockfile is in sync', async () => {
+    vol.fromJSON({
+      '/project/package.json': PACKAGE_JSON_WITH_REACT,
+      '/project/yarn.lock': YARN_LOCKFILE_SYNCED,
+    });
+    const ctx = createMockContext({ requiredPackageManager: 'yarn' });
+    await expect(checkLockfileAsync(ctx)).resolves.not.toThrow();
+    expect(mockProcessExit).not.toHaveBeenCalled();
+  });
+
+  it('finds lockfile at workspace root for monorepos', async () => {
+    vol.fromJSON({
+      '/monorepo/yarn.lock': YARN_LOCKFILE_SYNCED,
+      '/monorepo/packages/app/package.json': PACKAGE_JSON_WITH_REACT,
+    });
+    resolveWorkspaceRoot.mockReturnValue('/monorepo');
+
+    const ctx = createMockContext({
+      projectDir: '/monorepo/packages/app',
+      requiredPackageManager: 'yarn',
+      getRootPathAsync: async () => '/monorepo',
+    });
+    await expect(checkLockfileAsync(ctx)).resolves.not.toThrow();
+    expect(mockProcessExit).not.toHaveBeenCalled();
+  });
+
+  it('does not report a conflict when both bun.lock and bun.lockb are present', async () => {
+    vol.fromJSON({
+      '/project/package.json': JSON.stringify({ dependencies: { react: '19.0.4' } }),
+      '/project/bun.lockb': 'binary',
+      '/project/bun.lock': BUN_LOCKFILE_SYNCED,
+    });
+    const ctx = createMockContext({ requiredPackageManager: 'bun' });
+    await expect(checkLockfileAsync(ctx)).resolves.not.toThrow();
+    expect(mockProcessExit).not.toHaveBeenCalled();
+  });
+
+  it('skips sync check for non-registry specifiers', async () => {
+    vol.fromJSON({
+      '/project/package.json': JSON.stringify({
+        dependencies: {
+          'my-local-pkg': 'file:../local',
+          'my-workspace-pkg': 'workspace:*',
+          react: '19.0.4',
+        },
+      }),
+      '/project/package-lock.json': JSON.stringify({
+        lockfileVersion: 3,
+        packages: {
+          'node_modules/react': { version: '19.0.4' },
+        },
+      }),
+    });
+    const ctx = createMockContext({ requiredPackageManager: 'npm' });
+    await expect(checkLockfileAsync(ctx)).resolves.not.toThrow();
+    expect(mockProcessExit).not.toHaveBeenCalled();
+  });
+
+  describe('peer dependency conflicts', () => {
+    it('exits when a direct dependency has an unsatisfied peer (npm)', async () => {
+      vol.fromJSON({
+        '/project/package.json': JSON.stringify({
+          dependencies: { react: '19.0.0', 'react-dom': '19.2.4' },
+        }),
+        '/project/package-lock.json': JSON.stringify({
+          lockfileVersion: 3,
+          packages: {
+            'node_modules/react': { version: '19.0.0' },
+            'node_modules/react-dom': {
+              version: '19.2.4',
+              peerDependencies: { react: '^19.2.4' },
+            },
+          },
+        }),
+      });
+      const ctx = createMockContext({ requiredPackageManager: 'npm' });
+      await expect(checkLockfileAsync(ctx)).rejects.toThrow('process.exit called');
+      expect(mockProcessExit).toHaveBeenCalledWith(1);
+    });
+
+    it('exits when a direct dependency has an unsatisfied peer (bun)', async () => {
+      vol.fromJSON({
+        '/project/package.json': JSON.stringify({
+          dependencies: { react: '19.0.0', 'react-dom': '19.2.4' },
+        }),
+        '/project/bun.lock': `{
+          "lockfileVersion": 1,
+          "workspaces": { "": { "dependencies": { "react": "19.0.0", "react-dom": "19.2.4" } } },
+          "packages": {
+            "react": ["[email protected]", "", {}, "sha512-abc"],
+            "react-dom": ["[email protected]", "", { "peerDependencies": { "react": "^19.2.4" } }, "sha512-def"],
+          },
+        }`,
+      });
+      const ctx = createMockContext({ requiredPackageManager: 'bun' });
+      await expect(checkLockfileAsync(ctx)).rejects.toThrow('process.exit called');
+      expect(mockProcessExit).toHaveBeenCalledWith(1);
+    });
+
+    it('does not error when peer dependencies are satisfied', async () => {
+      vol.fromJSON({
+        '/project/package.json': JSON.stringify({
+          dependencies: { react: '19.2.4', 'react-dom': '19.2.4' },
+        }),
+        '/project/package-lock.json': JSON.stringify({
+          lockfileVersion: 3,
+          packages: {
+            'node_modules/react': { version: '19.2.4' },
+            'node_modules/react-dom': {
+              version: '19.2.4',
+              peerDependencies: { react: '^19.2.4' },
+            },
+          },
+        }),
+      });
+      const ctx = createMockContext({ requiredPackageManager: 'npm' });
+      await expect(checkLockfileAsync(ctx)).resolves.not.toThrow();
+      expect(mockProcessExit).not.toHaveBeenCalled();
+    });
+
+    it('skips optional peer dependencies (npm peerDependenciesMeta)', async () => {
+      vol.fromJSON({
+        '/project/package.json': JSON.stringify({
+          dependencies: { '@0no-co/graphql.web': '1.2.0' },
+        }),
+        '/project/package-lock.json': JSON.stringify({
+          lockfileVersion: 3,
+          packages: {
+            'node_modules/@0no-co/graphql.web': {
+              version: '1.2.0',
+              peerDependencies: { graphql: '^14.0.0 || ^15.0.0 || ^16.0.0' },
+              peerDependenciesMeta: { graphql: { optional: true } },
+            },
+          },
+        }),
+      });
+      const ctx = createMockContext({ requiredPackageManager: 'npm' });
+      await expect(checkLockfileAsync(ctx)).resolves.not.toThrow();
+      expect(mockProcessExit).not.toHaveBeenCalled();
+    });
+
+    it('skips optional peer dependencies (bun optionalPeers)', async () => {
+      vol.fromJSON({
+        '/project/package.json': JSON.stringify({
+          dependencies: { '@0no-co/graphql.web': '1.2.0' },
+        }),
+        '/project/bun.lock': `{
+          "lockfileVersion": 1,
+          "workspaces": { "": { "dependencies": { "@0no-co/graphql.web": "1.2.0" } } },
+          "packages": {
+            "@0no-co/graphql.web": ["@0no-co/[email protected]", "", { "peerDependencies": { "graphql": "^14.0.0 || ^15.0.0 || ^16.0.0" }, "optionalPeers": ["graphql"] }, "sha512-abc"],
+          },
+        }`,
+      });
+      const ctx = createMockContext({ requiredPackageManager: 'bun' });
+      await expect(checkLockfileAsync(ctx)).resolves.not.toThrow();
+      expect(mockProcessExit).not.toHaveBeenCalled();
+    });
   });
 });

packages/eas-cli/src/build/android/build.ts

@@ -29,7 +29,6 @@ import {
 import { AndroidBuildContext, BuildContext, CommonContext } from '../context';
 import { logCredentialsSource } from '../utils/credentials';
 import {
-  checkAutolinkedNativeModulesAsync,
   checkGoogleServicesFileAsync,
   checkNodeEnvVariable,
   validatePNGsForManagedProjectAsync,
@@ -59,7 +58,6 @@ This means that it will most likely produce an AAB and you will not be able to i
   checkNodeEnvVariable(ctx);
   await checkGoogleServicesFileAsync(ctx);
   await validatePNGsForManagedProjectAsync(ctx);
-  await checkAutolinkedNativeModulesAsync(ctx);
 
   const gradleContext = await resolveGradleBuildContextAsync(
     ctx.projectDir,

packages/eas-cli/src/build/runBuildAndSubmit.ts

@@ -22,8 +22,8 @@ import { createBuildContextAsync } from './createContext';
 import { evaluateConfigWithEnvVarsAsync } from './evaluateConfigWithEnvVarsAsync';
 import { prepareIosBuildAsync } from './ios/build';
 import { LocalBuildMode, LocalBuildOptions } from './local';
-import { ensureLockfileExistsAsync } from './validateLockfile';
 import { ensureExpoDevClientInstalledForDevClientBuildsAsync } from './utils/devClient';
+import { checkLockfileAsync } from './validateLockfile';
 import { printBuildResults, printLogsUrls } from './utils/printBuildInfo';
 import { ensureRepoIsCleanAsync } from './utils/repository';
 import { Analytics } from '../analytics/AnalyticsManager';
@@ -66,7 +66,6 @@ import {
 } from '../project/remoteVersionSource';
 import { confirmAsync } from '../prompts';
 import { getEasBuildRunCachedAppPath, runAsync } from '../run/run';
-import { SimulatorRunTarget } from '../run/ios/run';
 import { isRunnableOnSimulatorOrEmulator } from '../run/utils';
 import { createSubmissionContextAsync } from '../submit/context';
 import {
@@ -105,7 +104,6 @@ export interface BuildFlags {
   freezeCredentials: boolean;
   isVerboseLoggingEnabled?: boolean;
   whatToTest?: string;
-  simulator?: SimulatorRunTarget;
 }
 
 export async function runBuildAndSubmitAsync({
@@ -418,10 +416,8 @@ async function prepareAndStartBuildAsync({
     env,
   });
 
-  if (!lockfileChecked && !flags.localBuildOptions.localBuildMode) {
-    if (!process.env.EAS_BUILD_SKIP_LOCKFILE_CHECK) {
-      await ensureLockfileExistsAsync(projectDir);
-    }
+  if (!lockfileChecked) {
+    await checkLockfileAsync(buildCtx);
     lockfileChecked = true;
   }
 
@@ -590,17 +586,14 @@ function exitWithNonZeroCodeIfSomeBuildsFailed(maybeBuilds: (BuildFragment | nul
   }
 }
 
-export async function downloadAndRunAsync(
-  build: BuildFragment,
-  simulator?: SimulatorRunTarget
-): Promise<void> {
+export async function downloadAndRunAsync(build: BuildFragment): Promise<void> {
   assert(build.artifacts?.applicationArchiveUrl);
   const cachedAppPath = getEasBuildRunCachedAppPath(build.project.id, build.id, build.platform);
 
   if (await pathExists(cachedAppPath)) {
     Log.newLine();
     Log.log(`Using cached app...`);
-    await runAsync(cachedAppPath, build.platform, simulator);
+    await runAsync(cachedAppPath, build.platform);
     return;
   }
 
@@ -609,7 +602,7 @@ export async function downloadAndRunAsync(
     build.platform,
     cachedAppPath
   );
-  await runAsync(buildPath, build.platform, simulator);
+  await runAsync(buildPath, build.platform);
 }
 
 async function maybeDownloadAndRunSimulatorBuildsAsync(
@@ -631,9 +624,9 @@ async function maybeDownloadAndRunSimulatorBuildsAsync(
             } build on ${
               simBuild.platform === AppPlatform.Android ? 'an emulator' : 'a simulator'
             }?`,
-        }));
+          }));
         if (confirm) {
-          await downloadAndRunAsync(simBuild, flags.simulator);
+          await downloadAndRunAsync(simBuild);
         }
       }
     }

packages/eas-cli/src/build/utils/__tests__/repository.test.ts

@@ -1,75 +0,0 @@
-import fs from 'fs-extra';
-import path from 'path';
-import * as tar from 'tar';
-
-import { Client } from '../../../vcs/vcs';
-import { makeProjectTarballAsync } from '../repository';
-
-jest.mock('../../../ora', () => ({
-  ora: jest.fn(() => ({
-    fail: jest.fn(),
-    isSpinning: false,
-    start: jest.fn(),
-    succeed: jest.fn(),
-  })),
-}));
-
-class FakeVcsClient extends Client {
-  public async makeShallowCopyAsync(destinationPath: string): Promise<void> {
-    await fs.mkdirp(path.join(destinationPath, 'bin'));
-    await fs.mkdirp(path.join(destinationPath, 'read-only-dir'));
-
-    await fs.writeFile(path.join(destinationPath, 'bin', 'postcheckout.sh'), '#!/bin/sh\necho hi\n');
-    await fs.writeFile(path.join(destinationPath, 'regular-file.txt'), 'regular file\n');
-    await fs.writeFile(path.join(destinationPath, 'read-only-dir', 'child.txt'), 'child file\n');
-
-    await fs.chmod(path.join(destinationPath, 'bin', 'postcheckout.sh'), 0o755);
-    await fs.chmod(path.join(destinationPath, 'regular-file.txt'), 0o644);
-    await fs.chmod(path.join(destinationPath, 'read-only-dir'), 0o555);
-  }
-
-  public async getRootPathAsync(): Promise<string> {
-    return process.cwd();
-  }
-
-  public canGetLastCommitMessage(): boolean {
-    return false;
-  }
-}
-
-describe(makeProjectTarballAsync, () => {
-  it('creates portable project archives while preserving executable files', async () => {
-    const removeAsync = fs.remove.bind(fs);
-    const removeSpy = jest.spyOn(fs, 'remove').mockImplementation(async targetPath => {
-      await fs.chmod(path.join(targetPath.toString(), 'read-only-dir'), 0o755).catch(() => {});
-      await removeAsync(targetPath);
-    });
-    const projectTarball = await makeProjectTarballAsync(new FakeVcsClient());
-    const entries = new Map<string, tar.ReadEntry>();
-
-    try {
-      await tar.list({
-        file: projectTarball.path,
-        onentry: entry => {
-          entries.set(entry.path, entry);
-        },
-      });
-
-      expect(entries.get('project/bin/postcheckout.sh')?.mode).toBe(0o755);
-      expect(entries.get('project/regular-file.txt')?.mode).toBe(0o644);
-      expect(entries.get('project/read-only-dir/')?.mode).toBe(0o755);
-      expect(entries.has('project/read-only-dir/child.txt')).toBe(true);
-
-      for (const entry of entries.values()) {
-        expect(entry.path.startsWith('project/')).toBe(true);
-        expect(entry.uid).toBeUndefined();
-        expect(entry.gid).toBeUndefined();
-        expect(entry.uname).toBe('');
-        expect(entry.gname).toBe('');
-      }
-    } finally {
-      await fs.remove(projectTarball.path);
-      removeSpy.mockRestore();
-    }
-  });
-});

packages/eas-cli/src/build/utils/repository.ts

@@ -143,24 +143,9 @@ export async function makeProjectTarballAsync(vcsClient: Client): Promise<LocalF
 
   try {
     await vcsClient.makeShallowCopyAsync(shallowClonePath);
-    await tar.create(
-      {
-        cwd: shallowClonePath,
-        file: tarPath,
-        prefix: 'project',
-        gzip: true,
-        portable: true,
-        onWriteEntry(entry) {
-          // Read-only directories may have files inside them. This causes trouble on tar extraction.
-          // Hence, we're forcing the owner write bit on directories in Windows
-          // to avoid this issue.
-          if (entry.type === 'Directory' && entry.stat) {
-            entry.stat.mode |= 0o200;
-          }
-        },
-      },
-      ['.']
-    );
+    await tar.create({ cwd: shallowClonePath, file: tarPath, prefix: 'project', gzip: true }, [
+      '.',
+    ]);
   } catch (err) {
     clearTimeout(timer);
     if (spinner.isSpinning) {

packages/eas-cli/src/build/validate.ts

@@ -1,5 +1,4 @@
 import { Platform, Workflow } from '@expo/eas-build-job';
-import spawnAsync from '@expo/spawn-async';
 import { Errors } from '@oclif/core';
 import fs from 'fs-extra';
 import path from 'path';
@@ -159,90 +158,6 @@ async function validateAndroidPNGsAsync(ctx: CommonContext<Platform.ANDROID>): P
 //   }
 // }
 
-export async function checkAutolinkedNativeModulesAsync(
-  ctx: CommonContext<Platform.ANDROID>
-): Promise<void> {
-  if (ctx.workflow !== Workflow.GENERIC) {
-    return;
-  }
-
-  const settingsGradlePath = await findSettingsGradleAsync(ctx.projectDir);
-  if (!settingsGradlePath) {
-    return;
-  }
-
-  const settingsContent = await fs.readFile(settingsGradlePath, 'utf8');
-  const hasAutolinking =
-    settingsContent.includes('useReactNativeModules') ||
-    settingsContent.includes('applyNativeModulesSettingsGradle') ||
-    settingsContent.includes('native_modules.gradle');
-  if (!hasAutolinking) {
-    return;
-  }
-
-  let rnConfig: Record<string, any>;
-  try {
-    const result = await spawnAsync('npx', ['react-native', 'config'], {
-      cwd: ctx.projectDir,
-      stdio: 'pipe',
-    });
-    rnConfig = JSON.parse(result.stdout);
-  } catch {
-    return;
-  }
-
-  const dependencies = rnConfig.dependencies;
-  if (!dependencies || typeof dependencies !== 'object') {
-    return;
-  }
-
-  const misconfiguredModules: string[] = [];
-  for (const [name, dep] of Object.entries<any>(dependencies)) {
-    const androidConfig = dep?.platforms?.android;
-    if (!androidConfig || !androidConfig.sourceDir) {
-      continue;
-    }
-    const sourceDir = androidConfig.sourceDir;
-    const sourceDirExists = await fs.pathExists(sourceDir);
-    if (!sourceDirExists) {
-      misconfiguredModules.push(name);
-      continue;
-    }
-    const hasBuildGradle =
-      (await fs.pathExists(path.join(sourceDir, 'build.gradle'))) ||
-      (await fs.pathExists(path.join(sourceDir, 'build.gradle.kts')));
-    if (!hasBuildGradle) {
-      misconfiguredModules.push(name);
-    }
-  }
-
-  if (misconfiguredModules.length > 0) {
-    Log.warn(
-      'The following autolinked native modules have missing or incomplete Android build configuration:'
-    );
-    for (const mod of misconfiguredModules) {
-      Log.warn(`  - ${mod}`);
-    }
-    Log.warn('This will likely cause "No variants exist" errors during the build.');
-    Log.warn('Run "npx expo prebuild --clean" to regenerate the native project,');
-    Log.warn('or add "android/" to .gitignore to use the managed workflow.');
-    Log.newLine();
-  }
-}
-
-async function findSettingsGradleAsync(projectDir: string): Promise<string | null> {
-  const candidates = [
-    path.join(projectDir, 'android', 'settings.gradle'),
-    path.join(projectDir, 'android', 'settings.gradle.kts'),
-  ];
-  for (const candidate of candidates) {
-    if (await fs.pathExists(candidate)) {
-      return candidate;
-    }
-  }
-  return null;
-}
-
 async function validatePNGsAsync(configPngs: ConfigPng[]): Promise<void> {
   const validationPromises = configPngs.map(configPng => validatePNGAsync(configPng));
   const validationResults = await Promise.allSettled(validationPromises);

packages/eas-cli/src/build/validateLockfile.ts

@@ -6,42 +6,226 @@ import {
   YARN_LOCK_FILE,
   resolveWorkspaceRoot,
 } from '@expo/package-manager';
-import { pathExists } from 'fs-extra';
+import { Platform } from '@expo/eas-build-job';
+import {
+  LockfileData,
+  findLockfileMismatches,
+  findPeerDependencyConflicts,
+  parseLockfile,
+} from '@expo/lockfile-utils';
+import fs from 'fs-extra';
 import path from 'path';
 
-const LOCKFILE_NAMES = [
-  NPM_LOCK_FILE,
-  YARN_LOCK_FILE,
-  PNPM_LOCK_FILE,
-  BUN_LOCK_FILE,
-  BUN_TEXT_LOCK_FILE,
-];
+import { CommonContext } from './context';
+import Log from '../log';
 
-async function hasLockfileAsync(dir: string): Promise<boolean> {
-  for (const lockfile of LOCKFILE_NAMES) {
-    if (await pathExists(path.join(dir, lockfile))) {
-      return true;
-    }
-  }
-  return false;
+const SKIP_HINT =
+  'To skip this check, set the EAS_BUILD_SKIP_LOCKFILE_CHECK=1 environment variable.';
+
+interface LockfileInfo {
+  /** Filename of the lockfile (e.g. 'yarn.lock') */
+  filename: string;
+  /** Package manager name for display (e.g. 'yarn') */
+  managerName: string;
 }
 
-export async function ensureLockfileExistsAsync(projectDir: string): Promise<void> {
-  if (await hasLockfileAsync(projectDir)) {
+const LOCKFILE_BY_MANAGER: Record<string, LockfileInfo> = {
+  npm: { filename: NPM_LOCK_FILE, managerName: 'npm' },
+  yarn: { filename: YARN_LOCK_FILE, managerName: 'yarn' },
+  pnpm: { filename: PNPM_LOCK_FILE, managerName: 'pnpm' },
+  bun: { filename: BUN_LOCK_FILE, managerName: 'bun' },
+};
+
+const ALL_LOCKFILES: { filename: string; manager: string }[] = [
+  { filename: NPM_LOCK_FILE, manager: 'npm' },
+  { filename: YARN_LOCK_FILE, manager: 'yarn' },
+  { filename: PNPM_LOCK_FILE, manager: 'pnpm' },
+  { filename: BUN_LOCK_FILE, manager: 'bun' },
+  { filename: BUN_TEXT_LOCK_FILE, manager: 'bun' },
+];
+
+/**
+ * Find the lockfile for the given filename by checking the workspace root first
+ * (for monorepos), then the project directory.
+ */
+async function findLockfileAsync(
+  projectDir: string,
+  filename: string
+): Promise<string | null> {
+  const workspaceRoot = resolveWorkspaceRoot(projectDir);
+  if (workspaceRoot) {
+    const workspaceLockfile = path.join(workspaceRoot, filename);
+    if (await fs.pathExists(workspaceLockfile)) {
+      return workspaceLockfile;
+    }
+  }
+
+  const projectLockfile = path.join(projectDir, filename);
+  if (await fs.pathExists(projectLockfile)) {
+    return projectLockfile;
+  }
+
+  return null;
+}
+
+async function readLockfileDataAsync(
+  projectDir: string,
+  lockfilePath: string,
+  manager: string
+): Promise<{ lockfileData: LockfileData; packageJson: Record<string, unknown> } | null> {
+  const packageJsonPath = path.join(projectDir, 'package.json');
+  if (!(await fs.pathExists(packageJsonPath))) {
+    return null;
+  }
+
+  const packageJson = await fs.readJson(packageJsonPath);
+  const lockfileContent = await fs.readFile(lockfilePath, 'utf-8');
+  const lockfileData = parseLockfile(lockfileContent, manager, lockfilePath);
+  if (!lockfileData) {
+    return null;
+  }
+
+  return { lockfileData, packageJson };
+}
+
+/**
+ * Pre-flight lockfile validation for `eas build`. Catches common lockfile
+ * problems before uploading to the builder.
+ */
+export async function checkLockfileAsync<T extends Platform>(
+  ctx: CommonContext<T>
+): Promise<void> {
+  if (process.env.EAS_BUILD_SKIP_LOCKFILE_CHECK) {
+    Log.warn('Skipping lockfile validation (EAS_BUILD_SKIP_LOCKFILE_CHECK is set).');
     return;
   }
 
-  const workspaceRoot = resolveWorkspaceRoot(projectDir);
-  if (workspaceRoot && workspaceRoot !== projectDir) {
-    if (await hasLockfileAsync(workspaceRoot)) {
-      return;
+  const { projectDir, requiredPackageManager, vcsClient } = ctx;
+
+  // --- 1. Lockfile existence ---
+  if (!requiredPackageManager) {
+    Log.error('No lockfile found in the project directory.');
+    Log.error(
+      'A lockfile is required to ensure deterministic dependency installation on the EAS builder.'
+    );
+    Log.error(
+      'Run your package manager\'s install command (e.g. "npm install") to generate one, then commit it to version control.'
+    );
+    Log.error(SKIP_HINT);
+    process.exit(1);
+    return;
+  }
+
+  const lockInfo = LOCKFILE_BY_MANAGER[requiredPackageManager];
+  if (!lockInfo) {
+    // Unknown package manager — nothing we can validate
+    return;
+  }
+
+  // For bun, also check the text lockfile variant
+  const lockfilePath =
+    requiredPackageManager === 'bun'
+      ? (await findLockfileAsync(projectDir, BUN_LOCK_FILE)) ??
+        (await findLockfileAsync(projectDir, BUN_TEXT_LOCK_FILE))
+      : await findLockfileAsync(projectDir, lockInfo.filename);
+
+  if (!lockfilePath) {
+    Log.error(
+      `${lockInfo.managerName} lockfile (${lockInfo.filename}) not found.`
+    );
+    Log.error(
+      `Run "${requiredPackageManager} install" to generate a lockfile, then commit it to version control.`
+    );
+    Log.error(SKIP_HINT);
+    process.exit(1);
+    return;
+  }
+
+  // --- 2. Lockfile tracked in VCS ---
+  const rootDir = path.normalize(await vcsClient.getRootPathAsync());
+  const relativeLockfilePath = path.relative(rootDir, lockfilePath);
+  if (await vcsClient.isFileIgnoredAsync(relativeLockfilePath)) {
+    Log.error(
+      `${lockInfo.managerName} lockfile (${relativeLockfilePath}) is ignored by your version control system and won't be uploaded to the EAS builder.`
+    );
+    Log.error(
+      'Remove the lockfile from .gitignore (and .easignore, if applicable), then commit it.'
+    );
+    Log.error(SKIP_HINT);
+    process.exit(1);
+    return;
+  }
+
+  // --- 3. Conflicting lockfiles ---
+  const foundManagers = new Set<string>();
+  for (const { filename, manager } of ALL_LOCKFILES) {
+    if (await findLockfileAsync(projectDir, filename)) {
+      foundManagers.add(manager);
     }
   }
 
-  throw new Error(
-    `No lockfile found in the project directory.\n` +
-      `A lockfile is required to ensure deterministic dependency installation in EAS.\n` +
-      `Run your package manager's install command (e.g. "npm install") to generate one.\n` +
-      `To skip this check, run this command with EAS_BUILD_SKIP_LOCKFILE_CHECK=1.`
+  if (foundManagers.size > 1) {
+    const managerList = [...foundManagers].sort().join(', ');
+    Log.error(`Conflicting lockfiles detected from multiple package managers: ${managerList}.`);
+    Log.error(
+      'Having lockfiles from multiple package managers can cause install failures on the EAS builder. Remove the lockfiles you do not need and commit the change.'
+    );
+    Log.error(SKIP_HINT);
+    process.exit(1);
+    return;
+  }
+
+  // --- 4 & 5. Parse lockfile for dependency sync and peer dep checks ---
+  // For bun, prefer the text lockfile for parsing (bun.lockb is binary)
+  const parsableLockfilePath =
+    requiredPackageManager === 'bun'
+      ? (await findLockfileAsync(projectDir, BUN_TEXT_LOCK_FILE)) ?? lockfilePath
+      : lockfilePath;
+
+  const parsed = await readLockfileDataAsync(
+    projectDir,
+    parsableLockfilePath,
+    requiredPackageManager
   );
+
+  if (!parsed) {
+    return; // Can't parse — skip remaining checks
+  }
+
+  // --- 4. Lockfile out of sync ---
+  const mismatches = findLockfileMismatches(parsed.packageJson, parsed.lockfileData);
+
+  if (mismatches.length > 0) {
+    Log.error('Lockfile is out of sync with package.json:');
+    for (const m of mismatches) {
+      Log.error(
+        `  ${m.name}: package.json requires ${m.specifier}, but lockfile has ${m.lockedVersion}`
+      );
+    }
+    Log.error(
+      `Run "${requiredPackageManager} install" to update your lockfile, then commit the changes.`
+    );
+    Log.error(SKIP_HINT);
+    process.exit(1);
+    return;
+  }
+
+  // --- 5. Peer dependency conflicts ---
+  const peerConflicts = findPeerDependencyConflicts(parsed.packageJson, parsed.lockfileData);
+
+  if (peerConflicts.length > 0) {
+    Log.error('Peer dependency conflicts detected:');
+    for (const c of peerConflicts) {
+      Log.error(
+        `  ${c.source}@${c.sourceVersion} requires peer ${c.peer}@"${c.peerRange}", but ${c.peer}@${c.installedVersion} is installed`
+      );
+    }
+    Log.error(
+      'Update the conflicting packages to compatible versions, then run ' +
+        `"${requiredPackageManager} install" and commit the changes.`
+    );
+    Log.error(SKIP_HINT);
+    process.exit(1);
+    return;
+  }
 }

packages/eas-cli/src/commandUtils/__tests__/convex-test.ts

@@ -1,137 +0,0 @@
-import dateFormat from 'dateformat';
-
-import {
-  confirmRecentConvexInviteAsync,
-  formatConvexProject,
-  formatConvexTeam,
-  formatConvexTeamConnection,
-  getConvexProjectDashboardUrl,
-  getConvexTeamDashboardUrl,
-} from '../convex';
-import {
-  ConvexProjectData,
-  ConvexTeamConnectionData,
-} from '../../graphql/types/ConvexTeamConnection';
-import Log from '../../log';
-import { confirmAsync } from '../../prompts';
-
-jest.mock('../../log');
-jest.mock('../../prompts');
-
-describe('Convex command utilities', () => {
-  const mockConnection: ConvexTeamConnectionData = {
-    id: 'connection-1',
-    convexTeamIdentifier: 'team-123',
-    convexTeamName: 'Test Team',
-    convexTeamSlug: 'test team',
-    hasBeenClaimed: true,
-    createdAt: '2024-01-01T00:00:00.000Z',
-    updatedAt: '2024-01-01T00:00:00.000Z',
-    invitedAt: '2024-01-02T00:00:00.000Z',
-    invitedEmail: '[email protected]',
-  };
-
-  const mockProject: ConvexProjectData = {
-    id: 'convex-project-1',
-    convexProjectIdentifier: 'project-123',
-    convexProjectName: 'Test Project',
-    convexProjectSlug: 'test project',
-    createdAt: '2024-01-01T00:00:00.000Z',
-    updatedAt: '2024-01-01T00:00:00.000Z',
-    convexTeamConnection: mockConnection,
-  };
-
-  beforeEach(() => {
-    jest.resetAllMocks();
-    jest.spyOn(Log, 'warn').mockImplementation(() => {});
-    jest.mocked(confirmAsync).mockResolvedValue(true);
-  });
-
-  it('builds encoded Convex dashboard URLs', () => {
-    expect(getConvexTeamDashboardUrl(mockConnection)).toBe(
-      'https://dashboard.convex.dev/t/test%20team'
-    );
-    expect(getConvexProjectDashboardUrl(mockProject)).toBe(
-      'https://dashboard.convex.dev/t/test%20team/test%20project'
-    );
-  });
-
-  it('formats team and project metadata with invite details', () => {
-    expect(formatConvexTeam(mockConnection)).toBe('Test Team / test team');
-    expect(formatConvexTeamConnection(mockConnection)).toContain('Test Team / test team');
-    expect(formatConvexTeamConnection(mockConnection)).not.toContain('team-123');
-    expect(formatConvexTeamConnection(mockConnection)).not.toContain('connection-1');
-    expect(formatConvexTeamConnection(mockConnection)).toContain('Claimed');
-    expect(formatConvexTeamConnection(mockConnection)).toContain('Yes');
-    expect(formatConvexTeamConnection(mockConnection)).toContain('[email protected]');
-    expect(formatConvexTeamConnection(mockConnection)).toContain(
-      dateFormat(mockConnection.invitedAt, 'mmm dd HH:MM:ss')
-    );
-    expect(formatConvexProject(mockProject)).toContain('project-123');
-    expect(formatConvexProject(mockProject)).not.toContain('convex-project-1');
-    expect(formatConvexProject(mockProject)).toContain('Test Team / test team');
-    expect(formatConvexProject(mockProject)).not.toContain('team-123');
-  });
-
-  it('does not prompt when the previous invite timestamp is invalid', async () => {
-    await expect(
-      confirmRecentConvexInviteAsync(
-        { ...mockConnection, invitedAt: 'not-a-date' },
-        { nonInteractive: false }
-      )
-    ).resolves.toBe(true);
-
-    expect(confirmAsync).not.toHaveBeenCalled();
-  });
-
-  it('does not prompt when the previous invite is old', async () => {
-    await expect(
-      confirmRecentConvexInviteAsync(
-        {
-          ...mockConnection,
-          invitedAt: new Date(Date.now() - 2 * 60 * 60 * 1000).toISOString(),
-        },
-        { nonInteractive: false }
-      )
-    ).resolves.toBe(true);
-
-    expect(confirmAsync).not.toHaveBeenCalled();
-  });
-
-  it('prompts before resending a recent invite in interactive mode', async () => {
-    jest.mocked(confirmAsync).mockResolvedValue(false);
-    const recentInviteTimestamp = new Date(Date.now() - 5 * 60 * 1000).toISOString();
-
-    await expect(
-      confirmRecentConvexInviteAsync(
-        {
-          ...mockConnection,
-          invitedAt: recentInviteTimestamp,
-        },
-        { nonInteractive: false }
-      )
-    ).resolves.toBe(false);
-
-    expect(confirmAsync).toHaveBeenCalledWith({
-      message: expect.stringContaining('Are you sure you want to send another invite?'),
-    });
-    expect(confirmAsync).toHaveBeenCalledWith({
-      message: expect.stringContaining(dateFormat(recentInviteTimestamp, 'mmm dd HH:MM:ss')),
-    });
-  });
-
-  it('warns and proceeds for recent invites in non-interactive mode', async () => {
-    await expect(
-      confirmRecentConvexInviteAsync(
-        {
-          ...mockConnection,
-          invitedAt: new Date(Date.now() - 5 * 60 * 1000).toISOString(),
-        },
-        { nonInteractive: true }
-      )
-    ).resolves.toBe(true);
-
-    expect(confirmAsync).not.toHaveBeenCalled();
-    expect(Log.warn).toHaveBeenCalledWith(expect.stringContaining('non-interactive mode'));
-  });
-});

packages/eas-cli/src/commandUtils/buildFlags.ts

@@ -1,20 +0,0 @@
-export function preprocessBuildCommandArgs(argv: string[]): string[] {
-  return withOptionalSimulatorValue(argv);
-}
-
-// oclif does not support string flags with optional values. We want "--simulator"
-// to prompt for a simulator, while still supporting "--simulator <name-or-udid>".
-// Insert an empty string value for the bare flag before oclif parses argv.
-function withOptionalSimulatorValue(argv: string[]): string[] {
-  const simulatorFlagIndex = argv.indexOf('--simulator');
-  const simulatorValue = argv[simulatorFlagIndex + 1];
-
-  if (
-    simulatorFlagIndex === -1 ||
-    (simulatorValue !== undefined && !simulatorValue.startsWith('-'))
-  ) {
-    return argv;
-  }
-
-  return [...argv.slice(0, simulatorFlagIndex + 1), '', ...argv.slice(simulatorFlagIndex + 1)];
-}

packages/eas-cli/src/commandUtils/convex.ts

@@ -1,89 +0,0 @@
-import chalk from 'chalk';
-import dateFormat from 'dateformat';
-
-import { ConvexProjectData, ConvexTeamConnectionData } from '../graphql/types/ConvexTeamConnection';
-import Log, { link } from '../log';
-import { confirmAsync } from '../prompts';
-
-const CONVEX_DASHBOARD_HOST = 'https://dashboard.convex.dev';
-const RECENT_INVITE_THRESHOLD_MS = 60 * 60 * 1000;
-
-export function formatConvexInviteTimestamp(timestamp: string): string {
-  return dateFormat(timestamp, 'mmm dd HH:MM:ss');
-}
-
-export function getConvexTeamDashboardUrl(connection: ConvexTeamConnectionData): string {
-  return `${CONVEX_DASHBOARD_HOST}/t/${encodeURIComponent(connection.convexTeamSlug)}`;
-}
-
-export function getConvexProjectDashboardUrl(project: ConvexProjectData): string {
-  return `${getConvexTeamDashboardUrl(project.convexTeamConnection)}/${encodeURIComponent(
-    project.convexProjectSlug
-  )}`;
-}
-
-export function formatConvexTeam(connection: ConvexTeamConnectionData): string {
-  return `${connection.convexTeamName} / ${connection.convexTeamSlug}`;
-}
-
-export function formatConvexTeamConnection(connection: ConvexTeamConnectionData): string {
-  const lines = [
-    `${chalk.bold('Team')}: ${formatConvexTeam(connection)}`,
-    `${chalk.bold('Dashboard')}: ${link(getConvexTeamDashboardUrl(connection), { dim: false })}`,
-    `${chalk.bold('Claimed')}: ${connection.hasBeenClaimed ? 'Yes' : 'No'}`,
-  ];
-
-  if (connection.invitedEmail) {
-    lines.push(`${chalk.bold('Invited email')}: ${connection.invitedEmail}`);
-  }
-  if (connection.invitedAt) {
-    lines.push(`${chalk.bold('Invited at')}: ${formatConvexInviteTimestamp(connection.invitedAt)}`);
-  }
-
-  return lines.join('\n');
-}
-
-export function formatConvexProject(project: ConvexProjectData): string {
-  return [
-    `${chalk.bold('Name')}: ${project.convexProjectName}`,
-    `${chalk.bold('Slug')}: ${project.convexProjectSlug}`,
-    `${chalk.bold('Identifier')}: ${project.convexProjectIdentifier}`,
-    `${chalk.bold('Team')}: ${formatConvexTeam(project.convexTeamConnection)}`,
-    `${chalk.bold('Dashboard')}: ${link(getConvexProjectDashboardUrl(project), { dim: false })}`,
-  ].join('\n');
-}
-
-export function logNoConvexTeams(accountName: string): void {
-  Log.warn(`No Convex team is linked to account ${chalk.bold(accountName)} on EAS.`);
-}
-
-export function logNoConvexProject(projectName: string): void {
-  Log.warn(`No Convex project is linked to Expo app ${chalk.bold(projectName)} on EAS.`);
-}
-
-export async function confirmRecentConvexInviteAsync(
-  connection: ConvexTeamConnectionData,
-  { nonInteractive }: { nonInteractive: boolean }
-): Promise<boolean> {
-  const invitedAt = connection.invitedAt ? new Date(connection.invitedAt) : null;
-  if (!invitedAt || Number.isNaN(invitedAt.getTime())) {
-    return true;
-  }
-
-  const timeSinceInviteMs = Date.now() - invitedAt.getTime();
-  if (timeSinceInviteMs >= RECENT_INVITE_THRESHOLD_MS) {
-    return true;
-  }
-
-  const previousInvite = `A Convex team invite was already sent${connection.invitedEmail ? ` to ${connection.invitedEmail}` : ''} at ${formatConvexInviteTimestamp(connection.invitedAt)}.`;
-  if (nonInteractive) {
-    Log.warn(
-      `${previousInvite} Sending another invite because this command is running in non-interactive mode.`
-    );
-    return true;
-  }
-
-  return await confirmAsync({
-    message: `${previousInvite} Are you sure you want to send another invite?`,
-  });
-}

packages/eas-cli/src/commands/build/dev.ts

@@ -12,7 +12,6 @@ import { evaluateConfigWithEnvVarsAsync } from '../../build/evaluateConfigWithEn
 import { downloadAndRunAsync, runBuildAndSubmitAsync } from '../../build/runBuildAndSubmit';
 import { ensureRepoIsCleanAsync } from '../../build/utils/repository';
 import EasCommand from '../../commandUtils/EasCommand';
-import { preprocessBuildCommandArgs } from '../../commandUtils/buildFlags';
 import { ExpoGraphqlClient } from '../../commandUtils/context/contextUtils/createGraphqlClient';
 import { createFingerprintAsync } from '../../fingerprint/cli';
 import { BuildFragment, BuildStatus, DistributionType } from '../../graphql/generated';
@@ -52,11 +51,6 @@ export default class BuildDev extends EasCommand {
       description: 'Install and run the development build without starting the bundler server.',
       default: false,
     }),
-    simulator: Flags.string({
-      description:
-        'iOS simulator name or UDID to install and run the development build on. If no value is provided, you will be prompted to select a simulator.',
-      multiple: false,
-    }),
   };
 
   static override contextDefinition = {
@@ -69,7 +63,7 @@ export default class BuildDev extends EasCommand {
   };
 
   protected override async runAsync(): Promise<any> {
-    const { flags } = await this.parse(BuildDev, preprocessBuildCommandArgs(this.argv));
+    const { flags } = await this.parse(BuildDev);
 
     const {
       loggedIn: { actor, graphqlClient },
@@ -87,10 +81,6 @@ export default class BuildDev extends EasCommand {
     if (process.platform !== 'darwin' && platform === Platform.IOS) {
       Errors.error('Running iOS builds in simulator is only supported on macOS.', { exit: 1 });
     }
-    if (flags.simulator && platform !== Platform.IOS) {
-      Errors.error('The --simulator flag can only be used with --platform ios.', { exit: 1 });
-    }
-    const simulator = flags.simulator === '' ? true : flags.simulator;
 
     await vcsClient.ensureRepoExistsAsync();
     await ensureRepoIsCleanAsync(vcsClient, flags.nonInteractive);
@@ -142,7 +132,7 @@ export default class BuildDev extends EasCommand {
       );
 
       if (build.artifacts?.applicationArchiveUrl) {
-        await downloadAndRunAsync(build, simulator);
+        await downloadAndRunAsync(build);
         if (!flags['skip-bundler']) {
           await this.startDevServerAsync({ projectDir, platform });
         }
@@ -192,7 +182,6 @@ export default class BuildDev extends EasCommand {
         autoSubmit: false,
         localBuildOptions: {},
         profile: flags.profile ?? DEFAULT_EAS_BUILD_RUN_PROFILE_NAME,
-        simulator,
       },
       actor,
       getDynamicPrivateProjectConfigAsync,

packages/eas-cli/src/commands/build/run.ts

@@ -4,7 +4,6 @@ import { pathExists } from 'fs-extra';
 
 import { getLatestBuildAsync, listAndSelectBuildOnAppAsync } from '../../build/queries';
 import EasCommand from '../../commandUtils/EasCommand';
-import { preprocessBuildCommandArgs } from '../../commandUtils/buildFlags';
 import { ExpoGraphqlClient } from '../../commandUtils/context/contextUtils/createGraphqlClient';
 import {
   EasPaginatedQueryFlags,
@@ -18,7 +17,6 @@ import { appPlatformDisplayNames } from '../../platform';
 import { getDisplayNameForProjectIdAsync } from '../../project/projectUtils';
 import { promptAsync } from '../../prompts';
 import { RunArchiveFlags, getEasBuildRunCachedAppPath, runAsync } from '../../run/run';
-import { SimulatorRunTarget } from '../../run/ios/run';
 import { isRunnableOnSimulatorOrEmulator } from '../../run/utils';
 import {
   downloadAndMaybeExtractAppAsync,
@@ -34,7 +32,6 @@ interface RawRunFlags {
   limit?: number;
   offset?: number;
   profile?: string;
-  simulator?: string;
 }
 
 interface RunCommandFlags {
@@ -43,7 +40,6 @@ interface RunCommandFlags {
   limit?: number;
   offset?: number;
   profile?: string;
-  simulator?: SimulatorRunTarget;
 }
 
 export default class Run extends EasCommand {
@@ -76,11 +72,6 @@ export default class Run extends EasCommand {
         'Name of the build profile used to create the build to run. When specified, only builds created with the specified build profile will be queried.',
       helpValue: 'PROFILE_NAME',
     }),
-    simulator: Flags.string({
-      description:
-        'iOS simulator name or UDID to install and run the build on. If no value is provided, you will be prompted to select a simulator.',
-      multiple: false,
-    }),
     ...EasPaginatedQueryFlags,
   };
 
@@ -91,7 +82,7 @@ export default class Run extends EasCommand {
   };
 
   async runAsync(): Promise<void> {
-    const { flags: rawFlags } = await this.parse(Run, preprocessBuildCommandArgs(this.argv));
+    const { flags: rawFlags } = await this.parse(Run);
     const flags = await this.sanitizeFlagsAsync(rawFlags);
     const queryOptions = getPaginatedQueryOptions(flags);
     const {
@@ -108,11 +99,11 @@ export default class Run extends EasCommand {
       queryOptions
     );
 
-    await runAsync(simulatorBuildPath, flags.selectedPlatform, flags.simulator);
+    await runAsync(simulatorBuildPath, flags.selectedPlatform);
   }
 
   private async sanitizeFlagsAsync(flags: RawRunFlags): Promise<RunCommandFlags> {
-    const { platform, limit, offset, profile, simulator, ...runArchiveFlags } = flags;
+    const { platform, limit, offset, profile, ...runArchiveFlags } = flags;
 
     const selectedPlatform = await resolvePlatformAsync(platform);
 
@@ -121,9 +112,6 @@ export default class Run extends EasCommand {
         exit: 1,
       });
     }
-    if (simulator && selectedPlatform !== AppPlatform.Ios) {
-      Errors.error('The --simulator flag can only be used with --platform ios.', { exit: 1 });
-    }
 
     if (
       runArchiveFlags.path &&
@@ -149,7 +137,6 @@ export default class Run extends EasCommand {
       limit,
       offset,
       profile,
-      simulator: simulator === '' ? true : simulator,
     };
   }
 }

packages/eas-cli/src/commands/integrations/convex/__tests__/connect.test.ts

@@ -1,328 +0,0 @@
-import spawnAsync from '@expo/spawn-async';
-import * as fs from 'fs-extra';
-
-import { getMockOclifConfig } from '../../../../__tests__/commands/utils';
-import { ExpoGraphqlClient } from '../../../../commandUtils/context/contextUtils/createGraphqlClient';
-import { testProjectId } from '../../../../credentials/__tests__/fixtures-constants';
-import { ConvexMutation } from '../../../../graphql/mutations/ConvexMutation';
-import { ConvexQuery } from '../../../../graphql/queries/ConvexQuery';
-import {
-  ConvexTeamConnectionData,
-  SetupConvexProjectResultData,
-} from '../../../../graphql/types/ConvexTeamConnection';
-import Log from '../../../../log';
-import { getOwnerAccountForProjectIdAsync } from '../../../../project/projectUtils';
-import { confirmAsync, promptAsync, selectAsync } from '../../../../prompts';
-import { Actor } from '../../../../user/User';
-import IntegrationsConvexConnect from '../connect';
-
-jest.mock('../../../../graphql/queries/ConvexQuery');
-jest.mock('../../../../graphql/mutations/ConvexMutation');
-jest.mock('../../../../project/projectUtils');
-jest.mock('../../../../prompts');
-jest.mock('@expo/spawn-async');
-jest.mock('fs-extra');
-jest.mock('../../../../log');
-jest.mock('../../../../ora', () => ({
-  ora: () => ({
-    start: jest.fn().mockReturnThis(),
-    succeed: jest.fn().mockReturnThis(),
-    fail: jest.fn().mockReturnThis(),
-  }),
-}));
-
-describe(IntegrationsConvexConnect, () => {
-  const graphqlClient = {} as ExpoGraphqlClient;
-  const mockConfig = getMockOclifConfig();
-  const testProjectDir = '/test/project';
-  const testAccountId = 'test-account-id';
-  const testAccountName = 'testuser';
-
-  const mockActor: Actor = {
-    __typename: 'User',
-    id: 'test-user-id',
-    username: testAccountName,
-    email: '[email protected]',
-    featureGates: {},
-    isExpoAdmin: false,
-    primaryAccount: {
-      id: testAccountId,
-      name: testAccountName,
-      ownerUserActor: null,
-      users: [],
-    },
-    preferences: { onboarding: null },
-    accounts: [],
-  };
-
-  const mockRobotActor: Actor = {
-    __typename: 'Robot',
-    id: 'robot-1',
-    featureGates: {},
-    isExpoAdmin: false,
-    accounts: [],
-  };
-
-  const mockAccount = {
-    id: testAccountId,
-    name: testAccountName,
-    ownerUserActor: { id: 'test-user-id', username: testAccountName },
-    users: [{ role: 'OWNER' as any, actor: { id: 'test-user-id' } }],
-  };
-
-  const mockConnection: ConvexTeamConnectionData = {
-    id: 'connection-1',
-    convexTeamIdentifier: 'team-123',
-    convexTeamName: 'Test Team',
-    convexTeamSlug: 'test-team',
-    hasBeenClaimed: false,
-    createdAt: '2024-01-01T00:00:00.000Z',
-    updatedAt: '2024-01-01T00:00:00.000Z',
-    invitedAt: null,
-    invitedEmail: null,
-  };
-
-  const mockSetupResult: SetupConvexProjectResultData = {
-    convexDeploymentName: 'happy-otter-123',
-    convexDeploymentUrl: 'https://happy-otter-123.convex.cloud',
-    deployKey: 'dev:happy-otter-123|abc123token',
-    convexProject: {
-      id: 'convex-project-1',
-      convexProjectIdentifier: 'project-123',
-      convexProjectName: 'testapp',
-      convexProjectSlug: 'testapp',
-      createdAt: '2024-01-01T00:00:00.000Z',
-      updatedAt: '2024-01-01T00:00:00.000Z',
-      convexTeamConnection: mockConnection,
-    },
-  };
-
-  function createCommand(argv: string[], actor: Actor = mockActor): IntegrationsConvexConnect {
-    const command = new IntegrationsConvexConnect(argv, mockConfig);
-    jest.spyOn(command as any, 'getContextAsync').mockReturnValue({
-      privateProjectConfig: {
-        projectId: testProjectId,
-        exp: { name: 'testapp', slug: 'testapp' },
-        projectDir: testProjectDir,
-      },
-      loggedIn: { graphqlClient, actor },
-    } as never);
-    return command;
-  }
-
-  beforeEach(() => {
-    jest.resetAllMocks();
-    jest.spyOn(Log, 'log').mockImplementation(() => {});
-    jest.spyOn(Log, 'warn').mockImplementation(() => {});
-    jest.spyOn(Log, 'withTick').mockImplementation(() => {});
-    jest.spyOn(Log, 'addNewLineIfNone').mockImplementation(() => {});
-    jest.spyOn(Log, 'newLine').mockImplementation(() => {});
-
-    jest.mocked(fs.pathExists).mockResolvedValue(false as never);
-    jest.mocked(fs.writeFile).mockResolvedValue(undefined as never);
-    jest.mocked(fs.readFile).mockResolvedValue('' as never);
-    jest.mocked(spawnAsync).mockResolvedValue({} as never);
-
-    jest.mocked(getOwnerAccountForProjectIdAsync).mockResolvedValue(mockAccount as any);
-    jest.mocked(selectAsync).mockResolvedValue('aws-us-east-1');
-    jest.mocked(confirmAsync).mockResolvedValue(true);
-    jest.mocked(promptAsync).mockImplementation(async (params: any) => ({
-      [params.name]: params.initial,
-    }));
-    jest.mocked(ConvexMutation.createConvexTeamConnectionAsync).mockResolvedValue(mockConnection);
-    jest.mocked(ConvexMutation.setupConvexProjectAsync).mockResolvedValue(mockSetupResult);
-    jest.mocked(ConvexMutation.sendConvexTeamInviteToVerifiedEmailAsync).mockResolvedValue(true);
-  });
-
-  it('creates a Convex team and project with the new mutation shape', async () => {
-    jest.mocked(ConvexQuery.getConvexTeamConnectionsByAccountIdAsync).mockResolvedValue([]);
-
-    await createCommand([]).runAsync();
-
-    expect(ConvexMutation.createConvexTeamConnectionAsync).toHaveBeenCalledWith(graphqlClient, {
-      accountId: testAccountId,
-      deploymentRegion: 'aws-us-east-1',
-      convexTeamName: testAccountName,
-    });
-    expect(ConvexMutation.setupConvexProjectAsync).toHaveBeenCalledWith(graphqlClient, {
-      appId: testProjectId,
-      convexTeamConnectionId: 'connection-1',
-      deploymentRegion: 'aws-us-east-1',
-      projectName: 'testapp',
-    });
-    expect(ConvexMutation.sendConvexTeamInviteToVerifiedEmailAsync).toHaveBeenCalledWith(
-      graphqlClient,
-      { convexTeamConnectionId: 'connection-1' }
-    );
-    expect(Log.log).toHaveBeenCalledWith(
-      expect.stringContaining('Check your email for an invitation')
-    );
-    expect(Log.log).toHaveBeenCalledWith(expect.stringContaining('npx convex dev'));
-    expect(Log.log).toHaveBeenCalledWith(
-      expect.stringContaining('https://docs.expo.dev/guides/using-convex')
-    );
-    expect(Log.log).toHaveBeenCalledWith(expect.stringContaining('https://docs.convex.dev/'));
-    expect(spawnAsync).toHaveBeenCalledWith('npx', ['expo', 'install', 'convex'], {
-      cwd: testProjectDir,
-      stdio: 'inherit',
-    });
-  });
-
-  it('uses an existing Convex team connection', async () => {
-    jest
-      .mocked(ConvexQuery.getConvexTeamConnectionsByAccountIdAsync)
-      .mockResolvedValue([mockConnection]);
-
-    await createCommand(['--region', 'aws-eu-west-1']).runAsync();
-
-    expect(ConvexMutation.createConvexTeamConnectionAsync).not.toHaveBeenCalled();
-    expect(ConvexMutation.setupConvexProjectAsync).toHaveBeenCalledWith(graphqlClient, {
-      appId: testProjectId,
-      convexTeamConnectionId: 'connection-1',
-      deploymentRegion: 'aws-eu-west-1',
-      projectName: 'testapp',
-    });
-    expect(spawnAsync).toHaveBeenCalledWith('npx', ['expo', 'install', 'convex'], {
-      cwd: testProjectDir,
-      stdio: 'inherit',
-    });
-  });
-
-  it('does not create a Convex team if installing the Convex package fails first', async () => {
-    jest.mocked(ConvexQuery.getConvexTeamConnectionsByAccountIdAsync).mockResolvedValue([]);
-    jest.mocked(spawnAsync).mockRejectedValue(new Error('install failed') as never);
-
-    await expect(createCommand([]).runAsync()).rejects.toThrow('install failed');
-
-    expect(ConvexMutation.createConvexTeamConnectionAsync).not.toHaveBeenCalled();
-    expect(ConvexMutation.setupConvexProjectAsync).not.toHaveBeenCalled();
-  });
-
-  it('skips the verified email invite when the actor has no email', async () => {
-    jest
-      .mocked(ConvexQuery.getConvexTeamConnectionsByAccountIdAsync)
-      .mockResolvedValue([mockConnection]);
-
-    await createCommand([], mockRobotActor).runAsync();
-
-    expect(ConvexMutation.sendConvexTeamInviteToVerifiedEmailAsync).not.toHaveBeenCalled();
-    expect(Log.warn).toHaveBeenCalledWith(
-      expect.stringContaining('Could not determine your verified email address')
-    );
-    expect(Log.warn).not.toHaveBeenCalledWith(expect.stringContaining('Convex dashboard'));
-  });
-
-  it('logs the error when sending a verified email invite fails', async () => {
-    jest
-      .mocked(ConvexQuery.getConvexTeamConnectionsByAccountIdAsync)
-      .mockResolvedValue([mockConnection]);
-    jest
-      .mocked(ConvexMutation.sendConvexTeamInviteToVerifiedEmailAsync)
-      .mockRejectedValue(new Error('Convex invite service unavailable'));
-
-    await createCommand([]).runAsync();
-
-    expect(Log.warn).toHaveBeenCalledWith(
-      expect.stringContaining('Failed to send Convex team invitation to [email protected]')
-    );
-    expect(Log.warn).toHaveBeenCalledWith('Convex invite service unavailable');
-    expect(Log.warn).not.toHaveBeenCalledWith(expect.stringContaining('Convex dashboard'));
-  });
-
-  it('asks before resending a recent team invite for an existing connection', async () => {
-    jest.mocked(confirmAsync).mockResolvedValue(false);
-    jest.mocked(ConvexQuery.getConvexTeamConnectionsByAccountIdAsync).mockResolvedValue([
-      {
-        ...mockConnection,
-        invitedAt: new Date(Date.now() - 5 * 60 * 1000).toISOString(),
-        invitedEmail: '[email protected]',
-      },
-    ]);
-
-    await createCommand([]).runAsync();
-
-    expect(confirmAsync).toHaveBeenCalledWith({
-      message: expect.stringContaining('Are you sure you want to send another invite?'),
-    });
-    expect(ConvexMutation.sendConvexTeamInviteToVerifiedEmailAsync).not.toHaveBeenCalled();
-    expect(Log.warn).toHaveBeenCalledWith('Skipped sending Convex team invitation.');
-    expect(Log.log).not.toHaveBeenCalledWith(
-      expect.stringContaining('Check your email for an invitation')
-    );
-  });
-
-  it('skips sending an invite when the Convex team has already been claimed', async () => {
-    jest.mocked(ConvexQuery.getConvexTeamConnectionsByAccountIdAsync).mockResolvedValue([
-      {
-        ...mockConnection,
-        hasBeenClaimed: true,
-        invitedAt: new Date(Date.now() - 5 * 60 * 1000).toISOString(),
-      },
-    ]);
-
-    await createCommand([]).runAsync();
-
-    expect(confirmAsync).not.toHaveBeenCalledWith({
-      message: expect.stringContaining('Are you sure you want to send another invite?'),
-    });
-    expect(ConvexMutation.sendConvexTeamInviteToVerifiedEmailAsync).not.toHaveBeenCalled();
-    expect(Log.warn).toHaveBeenCalledWith(
-      'Convex team has already been claimed. Skipping Convex team invitation.'
-    );
-    expect(Log.log).not.toHaveBeenCalledWith(
-      expect.stringContaining('Check your email for an invitation')
-    );
-  });
-
-  it('writes the deploy key and Convex URL to .env.local', async () => {
-    jest
-      .mocked(ConvexQuery.getConvexTeamConnectionsByAccountIdAsync)
-      .mockResolvedValue([mockConnection]);
-
-    await createCommand([]).runAsync();
-
-    const envPath = `${testProjectDir}/.env.local`;
-    const writeCall = jest.mocked(fs.writeFile).mock.calls.find(call => call[0] === envPath);
-    expect(writeCall?.[1]).toContain('CONVEX_DEPLOY_KEY=dev:happy-otter-123|abc123token');
-    expect(writeCall?.[1]).toContain('EXPO_PUBLIC_CONVEX_URL=https://happy-otter-123.convex.cloud');
-  });
-
-  it('prompts before overwriting existing Convex .env.local values', async () => {
-    jest
-      .mocked(ConvexQuery.getConvexTeamConnectionsByAccountIdAsync)
-      .mockResolvedValue([mockConnection]);
-    jest.mocked(fs.pathExists).mockResolvedValue(true as never);
-    jest.mocked(fs.readFile).mockResolvedValue('CONVEX_DEPLOY_KEY=old-key\n' as never);
-    jest.mocked(confirmAsync).mockResolvedValue(true);
-
-    await createCommand([]).runAsync();
-
-    expect(confirmAsync).toHaveBeenCalledWith({
-      message: expect.stringContaining('already contains CONVEX_DEPLOY_KEY'),
-    });
-  });
-
-  it('uses defaults in non-interactive mode', async () => {
-    jest.mocked(ConvexQuery.getConvexTeamConnectionsByAccountIdAsync).mockResolvedValue([]);
-
-    await createCommand(['--non-interactive']).runAsync();
-
-    expect(selectAsync).not.toHaveBeenCalled();
-    expect(promptAsync).not.toHaveBeenCalled();
-    expect(ConvexMutation.createConvexTeamConnectionAsync).toHaveBeenCalledWith(
-      graphqlClient,
-      expect.objectContaining({
-        deploymentRegion: 'aws-us-east-1',
-        convexTeamName: testAccountName,
-      })
-    );
-    expect(ConvexMutation.setupConvexProjectAsync).toHaveBeenCalledWith(
-      graphqlClient,
-      expect.objectContaining({
-        appId: testProjectId,
-        deploymentRegion: 'aws-us-east-1',
-        projectName: 'testapp',
-      })
-    );
-  });
-});

packages/eas-cli/src/commands/integrations/convex/__tests__/dashboard.test.ts

@@ -1,126 +0,0 @@
-import openBrowserAsync from 'better-opn';
-
-import { getMockOclifConfig } from '../../../../__tests__/commands/utils';
-import { ExpoGraphqlClient } from '../../../../commandUtils/context/contextUtils/createGraphqlClient';
-import { testProjectId } from '../../../../credentials/__tests__/fixtures-constants';
-import { ConvexQuery } from '../../../../graphql/queries/ConvexQuery';
-import {
-  ConvexProjectData,
-  ConvexTeamConnectionData,
-} from '../../../../graphql/types/ConvexTeamConnection';
-import Log from '../../../../log';
-import { ora } from '../../../../ora';
-import IntegrationsConvexDashboard from '../dashboard';
-
-jest.mock('better-opn');
-jest.mock('../../../../graphql/queries/ConvexQuery');
-jest.mock('../../../../log');
-jest.mock('../../../../ora', () => ({
-  ora: jest.fn(() => ({
-    start: jest.fn().mockReturnThis(),
-    succeed: jest.fn().mockReturnThis(),
-    fail: jest.fn().mockReturnThis(),
-  })),
-}));
-
-describe(IntegrationsConvexDashboard, () => {
-  const graphqlClient = {} as ExpoGraphqlClient;
-  const mockConfig = getMockOclifConfig();
-
-  const mockConnection: ConvexTeamConnectionData = {
-    id: 'connection-1',
-    convexTeamIdentifier: 'team-123',
-    convexTeamName: 'Test Team',
-    convexTeamSlug: 'test team',
-    hasBeenClaimed: false,
-    createdAt: '2024-01-01T00:00:00.000Z',
-    updatedAt: '2024-01-01T00:00:00.000Z',
-    invitedAt: null,
-    invitedEmail: null,
-  };
-
-  const mockProject: ConvexProjectData = {
-    id: 'convex-project-1',
-    convexProjectIdentifier: 'project-123',
-    convexProjectName: 'Test Project',
-    convexProjectSlug: 'test project',
-    createdAt: '2024-01-01T00:00:00.000Z',
-    updatedAt: '2024-01-01T00:00:00.000Z',
-    convexTeamConnection: mockConnection,
-  };
-
-  function createCommand(): IntegrationsConvexDashboard {
-    const command = new IntegrationsConvexDashboard([], mockConfig);
-    jest.spyOn(command as any, 'getContextAsync').mockReturnValue({
-      privateProjectConfig: {
-        projectId: testProjectId,
-        exp: { slug: 'testapp' },
-      },
-      loggedIn: { graphqlClient },
-    } as never);
-    return command;
-  }
-
-  beforeEach(() => {
-    jest.resetAllMocks();
-    jest.spyOn(Log, 'warn').mockImplementation(() => {});
-    jest.mocked(ConvexQuery.getConvexProjectByAppIdAsync).mockResolvedValue(mockProject);
-    jest.mocked(openBrowserAsync).mockResolvedValue({} as never);
-    jest.mocked(ora).mockReturnValue({
-      start: jest.fn().mockReturnThis(),
-      succeed: jest.fn().mockReturnThis(),
-      fail: jest.fn().mockReturnThis(),
-    } as any);
-  });
-
-  it('opens the linked Convex project dashboard', async () => {
-    await createCommand().runAsync();
-
-    expect(openBrowserAsync).toHaveBeenCalledWith(
-      'https://dashboard.convex.dev/t/test%20team/test%20project'
-    );
-  });
-
-  it('logs an empty state when no project link exists', async () => {
-    jest.mocked(ConvexQuery.getConvexProjectByAppIdAsync).mockResolvedValue(null);
-
-    await createCommand().runAsync();
-
-    expect(openBrowserAsync).not.toHaveBeenCalled();
-    expect(Log.warn).toHaveBeenCalledWith(
-      expect.stringContaining('No Convex project is linked to Expo app')
-    );
-  });
-
-  it('fails the spinner when the browser cannot be opened', async () => {
-    jest.mocked(openBrowserAsync).mockResolvedValue(false);
-    const spinner = {
-      start: jest.fn().mockReturnThis(),
-      succeed: jest.fn().mockReturnThis(),
-      fail: jest.fn().mockReturnThis(),
-    };
-    jest.mocked(ora).mockReturnValue(spinner as any);
-
-    await createCommand().runAsync();
-
-    expect(spinner.fail).toHaveBeenCalledWith(
-      expect.stringContaining('Unable to open a web browser')
-    );
-  });
-
-  it('fails the spinner and rethrows when opening the browser throws', async () => {
-    jest.mocked(openBrowserAsync).mockRejectedValue(new Error('open failed'));
-    const spinner = {
-      start: jest.fn().mockReturnThis(),
-      succeed: jest.fn().mockReturnThis(),
-      fail: jest.fn().mockReturnThis(),
-    };
-    jest.mocked(ora).mockReturnValue(spinner as any);
-
-    await expect(createCommand().runAsync()).rejects.toThrow('open failed');
-
-    expect(spinner.fail).toHaveBeenCalledWith(
-      expect.stringContaining('Unable to open a web browser')
-    );
-  });
-});

packages/eas-cli/src/commands/integrations/convex/__tests__/project-delete.test.ts

@@ -1,121 +0,0 @@
-import { getMockOclifConfig } from '../../../../__tests__/commands/utils';
-import { ExpoGraphqlClient } from '../../../../commandUtils/context/contextUtils/createGraphqlClient';
-import { testProjectId } from '../../../../credentials/__tests__/fixtures-constants';
-import { ConvexMutation } from '../../../../graphql/mutations/ConvexMutation';
-import { ConvexQuery } from '../../../../graphql/queries/ConvexQuery';
-import {
-  ConvexProjectData,
-  ConvexTeamConnectionData,
-} from '../../../../graphql/types/ConvexTeamConnection';
-import Log from '../../../../log';
-import { confirmAsync } from '../../../../prompts';
-import IntegrationsConvexProjectDelete from '../project/delete';
-
-jest.mock('../../../../graphql/queries/ConvexQuery');
-jest.mock('../../../../graphql/mutations/ConvexMutation');
-jest.mock('../../../../prompts');
-jest.mock('../../../../log');
-jest.mock('../../../../ora', () => ({
-  ora: () => ({
-    start: jest.fn().mockReturnThis(),
-    succeed: jest.fn().mockReturnThis(),
-    fail: jest.fn().mockReturnThis(),
-  }),
-}));
-
-describe(IntegrationsConvexProjectDelete, () => {
-  const graphqlClient = {} as ExpoGraphqlClient;
-  const mockConfig = getMockOclifConfig();
-
-  const mockConnection: ConvexTeamConnectionData = {
-    id: 'connection-1',
-    convexTeamIdentifier: 'team-123',
-    convexTeamName: 'Test Team',
-    convexTeamSlug: 'test-team',
-    hasBeenClaimed: false,
-    createdAt: '2024-01-01T00:00:00.000Z',
-    updatedAt: '2024-01-01T00:00:00.000Z',
-    invitedAt: null,
-    invitedEmail: null,
-  };
-
-  const mockProject: ConvexProjectData = {
-    id: 'convex-project-1',
-    convexProjectIdentifier: 'project-123',
-    convexProjectName: 'Test Project',
-    convexProjectSlug: 'test-project',
-    createdAt: '2024-01-01T00:00:00.000Z',
-    updatedAt: '2024-01-01T00:00:00.000Z',
-    convexTeamConnection: mockConnection,
-  };
-
-  function createCommand(argv: string[]): IntegrationsConvexProjectDelete {
-    const command = new IntegrationsConvexProjectDelete(argv, mockConfig);
-    jest.spyOn(command as any, 'getContextAsync').mockReturnValue({
-      privateProjectConfig: {
-        projectId: testProjectId,
-        exp: { slug: 'testapp' },
-      },
-      loggedIn: { graphqlClient },
-    } as never);
-    return command;
-  }
-
-  beforeEach(() => {
-    jest.resetAllMocks();
-    jest.spyOn(Log, 'log').mockImplementation(() => {});
-    jest.spyOn(Log, 'warn').mockImplementation(() => {});
-    jest.spyOn(Log, 'error').mockImplementation(() => {});
-    jest.spyOn(Log, 'addNewLineIfNone').mockImplementation(() => {});
-    jest.spyOn(Log, 'newLine').mockImplementation(() => {});
-
-    jest.mocked(ConvexQuery.getConvexProjectByAppIdAsync).mockResolvedValue(mockProject);
-    jest.mocked(ConvexMutation.deleteConvexProjectAsync).mockResolvedValue('convex-project-1');
-    jest.mocked(confirmAsync).mockResolvedValue(true);
-  });
-
-  it('deletes the linked Convex project after confirmation', async () => {
-    await createCommand([]).runAsync();
-
-    expect(confirmAsync).toHaveBeenCalledWith({
-      message: expect.stringContaining('This does not destroy resources on Convex'),
-    });
-    expect(ConvexMutation.deleteConvexProjectAsync).toHaveBeenCalledWith(
-      graphqlClient,
-      'convex-project-1'
-    );
-  });
-
-  it('skips deletion when the user cancels', async () => {
-    jest.mocked(confirmAsync).mockResolvedValue(false);
-
-    await createCommand([]).runAsync();
-
-    expect(ConvexMutation.deleteConvexProjectAsync).not.toHaveBeenCalled();
-    expect(Log.error).toHaveBeenCalledWith('Canceled deletion of the Convex project link');
-  });
-
-  it('uses --yes to skip the confirmation prompt', async () => {
-    await createCommand(['--yes']).runAsync();
-
-    expect(confirmAsync).not.toHaveBeenCalled();
-    expect(Log.warn).toHaveBeenCalledWith(
-      expect.stringContaining('This does not destroy resources on Convex')
-    );
-    expect(ConvexMutation.deleteConvexProjectAsync).toHaveBeenCalledWith(
-      graphqlClient,
-      'convex-project-1'
-    );
-  });
-
-  it('logs an empty state when no project link exists', async () => {
-    jest.mocked(ConvexQuery.getConvexProjectByAppIdAsync).mockResolvedValue(null);
-
-    await createCommand([]).runAsync();
-
-    expect(Log.warn).toHaveBeenCalledWith(
-      expect.stringContaining('No Convex project is linked to Expo app')
-    );
-    expect(ConvexMutation.deleteConvexProjectAsync).not.toHaveBeenCalled();
-  });
-});

packages/eas-cli/src/commands/integrations/convex/__tests__/project.test.ts

@@ -1,79 +0,0 @@
-import { getMockOclifConfig } from '../../../../__tests__/commands/utils';
-import { ExpoGraphqlClient } from '../../../../commandUtils/context/contextUtils/createGraphqlClient';
-import { testProjectId } from '../../../../credentials/__tests__/fixtures-constants';
-import { ConvexQuery } from '../../../../graphql/queries/ConvexQuery';
-import {
-  ConvexProjectData,
-  ConvexTeamConnectionData,
-} from '../../../../graphql/types/ConvexTeamConnection';
-import Log from '../../../../log';
-import IntegrationsConvexProject from '../project';
-
-jest.mock('../../../../graphql/queries/ConvexQuery');
-jest.mock('../../../../log');
-
-describe(IntegrationsConvexProject, () => {
-  const graphqlClient = {} as ExpoGraphqlClient;
-  const mockConfig = getMockOclifConfig();
-
-  const mockConnection: ConvexTeamConnectionData = {
-    id: 'connection-1',
-    convexTeamIdentifier: 'team-123',
-    convexTeamName: 'Test Team',
-    convexTeamSlug: 'test-team',
-    hasBeenClaimed: false,
-    createdAt: '2024-01-01T00:00:00.000Z',
-    updatedAt: '2024-01-01T00:00:00.000Z',
-    invitedAt: null,
-    invitedEmail: null,
-  };
-
-  const mockProject: ConvexProjectData = {
-    id: 'convex-project-1',
-    convexProjectIdentifier: 'project-123',
-    convexProjectName: 'Test Project',
-    convexProjectSlug: 'test-project',
-    createdAt: '2024-01-01T00:00:00.000Z',
-    updatedAt: '2024-01-01T00:00:00.000Z',
-    convexTeamConnection: mockConnection,
-  };
-
-  function createCommand(): IntegrationsConvexProject {
-    const command = new IntegrationsConvexProject([], mockConfig);
-    jest.spyOn(command as any, 'getContextAsync').mockReturnValue({
-      privateProjectConfig: {
-        projectId: testProjectId,
-        exp: { slug: 'testapp' },
-      },
-      loggedIn: { graphqlClient },
-    } as never);
-    return command;
-  }
-
-  beforeEach(() => {
-    jest.resetAllMocks();
-    jest.spyOn(Log, 'log').mockImplementation(() => {});
-    jest.spyOn(Log, 'warn').mockImplementation(() => {});
-  });
-
-  it('prints linked Convex project metadata', async () => {
-    jest.mocked(ConvexQuery.getConvexProjectByAppIdAsync).mockResolvedValue(mockProject);
-
-    await createCommand().runAsync();
-
-    expect(Log.log).toHaveBeenCalledWith(
-      expect.stringContaining('Convex project linked to testapp')
-    );
-    expect(Log.log).toHaveBeenCalledWith(expect.stringContaining('project-123'));
-  });
-
-  it('prints an empty state when no Convex project is linked', async () => {
-    jest.mocked(ConvexQuery.getConvexProjectByAppIdAsync).mockResolvedValue(null);
-
-    await createCommand().runAsync();
-
-    expect(Log.warn).toHaveBeenCalledWith(
-      expect.stringContaining('No Convex project is linked to Expo app')
-    );
-  });
-});

packages/eas-cli/src/commands/integrations/convex/__tests__/team-delete.test.ts

@@ -1,188 +0,0 @@
-import { getMockOclifConfig } from '../../../../__tests__/commands/utils';
-import { ExpoGraphqlClient } from '../../../../commandUtils/context/contextUtils/createGraphqlClient';
-import { testProjectId } from '../../../../credentials/__tests__/fixtures-constants';
-import { ConvexMutation } from '../../../../graphql/mutations/ConvexMutation';
-import { ConvexQuery } from '../../../../graphql/queries/ConvexQuery';
-import { ConvexTeamConnectionData } from '../../../../graphql/types/ConvexTeamConnection';
-import Log from '../../../../log';
-import { getOwnerAccountForProjectIdAsync } from '../../../../project/projectUtils';
-import { confirmAsync, selectAsync } from '../../../../prompts';
-import IntegrationsConvexTeamDelete from '../team/delete';
-
-jest.mock('../../../../graphql/queries/ConvexQuery');
-jest.mock('../../../../graphql/mutations/ConvexMutation');
-jest.mock('../../../../project/projectUtils');
-jest.mock('../../../../prompts');
-jest.mock('../../../../log');
-jest.mock('../../../../ora', () => ({
-  ora: () => ({
-    start: jest.fn().mockReturnThis(),
-    succeed: jest.fn().mockReturnThis(),
-    fail: jest.fn().mockReturnThis(),
-  }),
-}));
-
-describe(IntegrationsConvexTeamDelete, () => {
-  const graphqlClient = {} as ExpoGraphqlClient;
-  const mockConfig = getMockOclifConfig();
-  const testAccountId = 'test-account-id';
-  const testAccountName = 'testuser';
-
-  const mockAccount = {
-    id: testAccountId,
-    name: testAccountName,
-    ownerUserActor: { id: 'test-user-id', username: testAccountName },
-    users: [{ role: 'OWNER' as any, actor: { id: 'test-user-id' } }],
-  };
-
-  const mockConnection: ConvexTeamConnectionData = {
-    id: 'connection-1',
-    convexTeamIdentifier: 'team-123',
-    convexTeamName: 'Test Team',
-    convexTeamSlug: 'test-team',
-    hasBeenClaimed: false,
-    createdAt: '2024-01-01T00:00:00.000Z',
-    updatedAt: '2024-01-01T00:00:00.000Z',
-    invitedAt: '2024-01-02T00:00:00.000Z',
-    invitedEmail: '[email protected]',
-  };
-
-  function createCommand(argv: string[]): IntegrationsConvexTeamDelete {
-    const command = new IntegrationsConvexTeamDelete(argv, mockConfig);
-    jest.spyOn(command as any, 'getContextAsync').mockReturnValue({
-      privateProjectConfig: {
-        projectId: testProjectId,
-      },
-      loggedIn: { graphqlClient },
-    } as never);
-    return command;
-  }
-
-  beforeEach(() => {
-    jest.resetAllMocks();
-    jest.spyOn(Log, 'log').mockImplementation(() => {});
-    jest.spyOn(Log, 'warn').mockImplementation(() => {});
-    jest.spyOn(Log, 'error').mockImplementation(() => {});
-    jest.spyOn(Log, 'addNewLineIfNone').mockImplementation(() => {});
-    jest.spyOn(Log, 'newLine').mockImplementation(() => {});
-
-    jest.mocked(getOwnerAccountForProjectIdAsync).mockResolvedValue(mockAccount as any);
-    jest
-      .mocked(ConvexQuery.getConvexTeamConnectionsByAccountIdAsync)
-      .mockResolvedValue([mockConnection]);
-    jest.mocked(ConvexMutation.deleteConvexTeamConnectionAsync).mockResolvedValue(mockConnection);
-    jest.mocked(confirmAsync).mockResolvedValue(true);
-  });
-
-  it('deletes the selected Convex team link after confirmation', async () => {
-    await createCommand(['test-team']).runAsync();
-
-    expect(confirmAsync).toHaveBeenCalledWith({
-      message: expect.stringContaining('This does not destroy resources on Convex'),
-    });
-    expect(ConvexMutation.deleteConvexTeamConnectionAsync).toHaveBeenCalledWith(
-      graphqlClient,
-      'connection-1'
-    );
-    expect(Log.log).toHaveBeenCalledWith(expect.stringContaining('Test Team / test-team'));
-    expect(Log.log).not.toHaveBeenCalledWith(expect.stringContaining('team-123'));
-  });
-
-  it('skips deletion when the user cancels', async () => {
-    jest.mocked(confirmAsync).mockResolvedValue(false);
-
-    await createCommand(['test-team']).runAsync();
-
-    expect(ConvexMutation.deleteConvexTeamConnectionAsync).not.toHaveBeenCalled();
-    expect(Log.error).toHaveBeenCalledWith('Canceled deletion of the Convex team link');
-  });
-
-  it('uses --yes to skip the confirmation prompt', async () => {
-    await createCommand(['test-team', '--yes']).runAsync();
-
-    expect(confirmAsync).not.toHaveBeenCalled();
-    expect(Log.warn).toHaveBeenCalledWith(
-      expect.stringContaining('This does not destroy resources on Convex')
-    );
-    expect(ConvexMutation.deleteConvexTeamConnectionAsync).toHaveBeenCalledWith(
-      graphqlClient,
-      'connection-1'
-    );
-  });
-
-  it('logs an empty state when no team links exist', async () => {
-    jest.mocked(ConvexQuery.getConvexTeamConnectionsByAccountIdAsync).mockResolvedValue([]);
-
-    await createCommand([]).runAsync();
-
-    expect(Log.warn).toHaveBeenCalledWith(expect.stringContaining('No Convex team is linked'));
-    expect(ConvexMutation.deleteConvexTeamConnectionAsync).not.toHaveBeenCalled();
-  });
-
-  it('throws when the provided team is not linked to the account', async () => {
-    await expect(createCommand(['missing-team']).runAsync()).rejects.toThrow(
-      'Convex team missing-team is not linked to this account.'
-    );
-    expect(ConvexMutation.deleteConvexTeamConnectionAsync).not.toHaveBeenCalled();
-  });
-
-  it('resolves a team by slug when multiple links exist', async () => {
-    jest.mocked(ConvexQuery.getConvexTeamConnectionsByAccountIdAsync).mockResolvedValue([
-      mockConnection,
-      {
-        ...mockConnection,
-        id: 'connection-2',
-        convexTeamIdentifier: 'team-456',
-        convexTeamName: 'Other Team',
-        convexTeamSlug: 'other-team',
-      },
-    ]);
-
-    await createCommand(['other-team', '--non-interactive', '--yes']).runAsync();
-
-    expect(ConvexMutation.deleteConvexTeamConnectionAsync).toHaveBeenCalledWith(
-      graphqlClient,
-      'connection-2'
-    );
-  });
-
-  it('requires a team slug in non-interactive mode when multiple links exist', async () => {
-    jest.mocked(ConvexQuery.getConvexTeamConnectionsByAccountIdAsync).mockResolvedValue([
-      mockConnection,
-      {
-        ...mockConnection,
-        id: 'connection-2',
-        convexTeamName: 'Other Team',
-        convexTeamSlug: 'other-team',
-      },
-    ]);
-
-    await expect(createCommand(['--non-interactive']).runAsync()).rejects.toThrow(
-      'Convex team slug must be provided'
-    );
-  });
-
-  it('prompts to select a team link when multiple links exist in interactive mode', async () => {
-    const otherConnection = {
-      ...mockConnection,
-      id: 'connection-2',
-      convexTeamName: 'Other Team',
-      convexTeamSlug: 'other-team',
-    };
-    jest
-      .mocked(ConvexQuery.getConvexTeamConnectionsByAccountIdAsync)
-      .mockResolvedValue([mockConnection, otherConnection]);
-    jest.mocked(selectAsync).mockResolvedValue(otherConnection);
-
-    await createCommand(['--yes']).runAsync();
-
-    expect(selectAsync).toHaveBeenCalledWith(
-      'Select a Convex team link to remove',
-      expect.any(Array)
-    );
-    expect(ConvexMutation.deleteConvexTeamConnectionAsync).toHaveBeenCalledWith(
-      graphqlClient,
-      'connection-2'
-    );
-  });
-});

packages/eas-cli/src/commands/integrations/convex/__tests__/team-invite.test.ts

@@ -1,245 +0,0 @@
-import dateFormat from 'dateformat';
-
-import { getMockOclifConfig } from '../../../../__tests__/commands/utils';
-import { ExpoGraphqlClient } from '../../../../commandUtils/context/contextUtils/createGraphqlClient';
-import { testProjectId } from '../../../../credentials/__tests__/fixtures-constants';
-import { ConvexMutation } from '../../../../graphql/mutations/ConvexMutation';
-import { ConvexQuery } from '../../../../graphql/queries/ConvexQuery';
-import { ConvexTeamConnectionData } from '../../../../graphql/types/ConvexTeamConnection';
-import Log from '../../../../log';
-import { getOwnerAccountForProjectIdAsync } from '../../../../project/projectUtils';
-import { confirmAsync, selectAsync } from '../../../../prompts';
-import IntegrationsConvexTeamInvite from '../team/invite';
-
-jest.mock('../../../../graphql/queries/ConvexQuery');
-jest.mock('../../../../graphql/mutations/ConvexMutation');
-jest.mock('../../../../project/projectUtils');
-jest.mock('../../../../prompts');
-jest.mock('../../../../log');
-jest.mock('../../../../ora', () => ({
-  ora: () => ({
-    start: jest.fn().mockReturnThis(),
-    succeed: jest.fn().mockReturnThis(),
-    fail: jest.fn().mockReturnThis(),
-  }),
-}));
-
-describe(IntegrationsConvexTeamInvite, () => {
-  const graphqlClient = {} as ExpoGraphqlClient;
-  const mockConfig = getMockOclifConfig();
-  const testAccountId = 'test-account-id';
-  const testAccountName = 'testuser';
-
-  const mockActor = {
-    __typename: 'User',
-    id: 'test-user-id',
-    email: '[email protected]',
-    accounts: [],
-  };
-
-  const mockAccount = {
-    id: testAccountId,
-    name: testAccountName,
-    ownerUserActor: { id: 'test-user-id', username: testAccountName },
-    users: [{ role: 'OWNER' as any, actor: { id: 'test-user-id' } }],
-  };
-
-  const mockConnection: ConvexTeamConnectionData = {
-    id: 'connection-1',
-    convexTeamIdentifier: 'team-123',
-    convexTeamName: 'Test Team',
-    convexTeamSlug: 'test-team',
-    hasBeenClaimed: false,
-    createdAt: '2024-01-01T00:00:00.000Z',
-    updatedAt: '2024-01-01T00:00:00.000Z',
-    invitedAt: '2024-01-02T00:00:00.000Z',
-    invitedEmail: '[email protected]',
-  };
-
-  function createCommand(
-    argv: string[],
-    actor: { __typename: string; [key: string]: any } = mockActor
-  ): IntegrationsConvexTeamInvite {
-    const command = new IntegrationsConvexTeamInvite(argv, mockConfig);
-    jest.spyOn(command as any, 'getContextAsync').mockReturnValue({
-      privateProjectConfig: {
-        projectId: testProjectId,
-      },
-      loggedIn: { graphqlClient, actor },
-    } as never);
-    return command;
-  }
-
-  beforeEach(() => {
-    jest.resetAllMocks();
-    jest.spyOn(Log, 'log').mockImplementation(() => {});
-    jest.spyOn(Log, 'warn').mockImplementation(() => {});
-    jest.spyOn(Log, 'addNewLineIfNone').mockImplementation(() => {});
-    jest.spyOn(Log, 'newLine').mockImplementation(() => {});
-
-    jest.mocked(getOwnerAccountForProjectIdAsync).mockResolvedValue(mockAccount as any);
-    jest
-      .mocked(ConvexQuery.getConvexTeamConnectionsByAccountIdAsync)
-      .mockResolvedValue([mockConnection]);
-    jest.mocked(ConvexMutation.sendConvexTeamInviteToVerifiedEmailAsync).mockResolvedValue(true);
-    jest.mocked(confirmAsync).mockResolvedValue(true);
-  });
-
-  it('sends an invite for the linked Convex team', async () => {
-    await createCommand([]).runAsync();
-
-    expect(ConvexMutation.sendConvexTeamInviteToVerifiedEmailAsync).toHaveBeenCalledWith(
-      graphqlClient,
-      { convexTeamConnectionId: 'connection-1' }
-    );
-  });
-
-  it('prints previous invite metadata when it exists', async () => {
-    await createCommand([]).runAsync();
-
-    expect(Log.log).toHaveBeenCalledWith(expect.stringContaining('Test Team / test-team'));
-    expect(Log.log).not.toHaveBeenCalledWith(expect.stringContaining('team-123'));
-    expect(Log.log).not.toHaveBeenCalledWith(expect.stringContaining('connection-1'));
-    expect(Log.log).toHaveBeenCalledWith(expect.stringContaining('Previous invite'));
-    expect(Log.log).toHaveBeenCalledWith(expect.stringContaining('Claimed'));
-    expect(Log.log).toHaveBeenCalledWith(expect.stringContaining('No'));
-    expect(Log.log).toHaveBeenCalledWith(expect.stringContaining('[email protected]'));
-    expect(Log.log).toHaveBeenCalledWith(
-      expect.stringContaining(dateFormat(mockConnection.invitedAt, 'mmm dd HH:MM:ss'))
-    );
-  });
-
-  it('prompts before resending a recent invite', async () => {
-    jest.mocked(ConvexQuery.getConvexTeamConnectionsByAccountIdAsync).mockResolvedValue([
-      {
-        ...mockConnection,
-        invitedAt: new Date(Date.now() - 5 * 60 * 1000).toISOString(),
-      },
-    ]);
-
-    await createCommand([]).runAsync();
-
-    expect(confirmAsync).toHaveBeenCalledWith({
-      message: expect.stringContaining('Are you sure you want to send another invite?'),
-    });
-    expect(ConvexMutation.sendConvexTeamInviteToVerifiedEmailAsync).toHaveBeenCalled();
-  });
-
-  it('skips resending a recent invite when the user does not confirm', async () => {
-    jest.mocked(confirmAsync).mockResolvedValue(false);
-    jest.mocked(ConvexQuery.getConvexTeamConnectionsByAccountIdAsync).mockResolvedValue([
-      {
-        ...mockConnection,
-        invitedAt: new Date(Date.now() - 5 * 60 * 1000).toISOString(),
-      },
-    ]);
-
-    await createCommand([]).runAsync();
-
-    expect(ConvexMutation.sendConvexTeamInviteToVerifiedEmailAsync).not.toHaveBeenCalled();
-    expect(Log.warn).toHaveBeenCalledWith('Skipped sending Convex team invitation.');
-  });
-
-  it('skips sending an invite when the Convex team has already been claimed', async () => {
-    jest.mocked(ConvexQuery.getConvexTeamConnectionsByAccountIdAsync).mockResolvedValue([
-      {
-        ...mockConnection,
-        hasBeenClaimed: true,
-        invitedAt: new Date(Date.now() - 5 * 60 * 1000).toISOString(),
-      },
-    ]);
-
-    await createCommand([]).runAsync();
-
-    expect(confirmAsync).not.toHaveBeenCalled();
-    expect(ConvexMutation.sendConvexTeamInviteToVerifiedEmailAsync).not.toHaveBeenCalled();
-    expect(Log.warn).toHaveBeenCalledWith(
-      'Convex team has already been claimed. Skipping Convex team invitation.'
-    );
-  });
-
-  it('resends recent invites in non-interactive mode with a warning', async () => {
-    jest.mocked(ConvexQuery.getConvexTeamConnectionsByAccountIdAsync).mockResolvedValue([
-      {
-        ...mockConnection,
-        invitedAt: new Date(Date.now() - 5 * 60 * 1000).toISOString(),
-      },
-    ]);
-
-    await createCommand(['--non-interactive']).runAsync();
-
-    expect(confirmAsync).not.toHaveBeenCalled();
-    expect(Log.warn).toHaveBeenCalledWith(expect.stringContaining('non-interactive mode'));
-    expect(ConvexMutation.sendConvexTeamInviteToVerifiedEmailAsync).toHaveBeenCalled();
-  });
-
-  it('skips the invite when the actor has no email', async () => {
-    await createCommand([], { __typename: 'Robot', id: 'robot-1' }).runAsync();
-
-    expect(ConvexMutation.sendConvexTeamInviteToVerifiedEmailAsync).not.toHaveBeenCalled();
-    expect(Log.warn).toHaveBeenCalledWith(
-      expect.stringContaining('Could not determine your verified email address')
-    );
-    expect(Log.warn).not.toHaveBeenCalledWith(expect.stringContaining('Convex dashboard'));
-  });
-
-  it('selects a team link when multiple are available', async () => {
-    const otherConnection = {
-      ...mockConnection,
-      id: 'connection-2',
-      convexTeamName: 'Other Team',
-      convexTeamSlug: 'other-team',
-    };
-    jest
-      .mocked(ConvexQuery.getConvexTeamConnectionsByAccountIdAsync)
-      .mockResolvedValue([mockConnection, otherConnection]);
-    jest.mocked(selectAsync).mockResolvedValue(otherConnection);
-
-    await createCommand([]).runAsync();
-
-    expect(selectAsync).toHaveBeenCalledWith(
-      'Select a Convex team link to invite yourself to',
-      expect.any(Array)
-    );
-    expect(ConvexMutation.sendConvexTeamInviteToVerifiedEmailAsync).toHaveBeenCalledWith(
-      graphqlClient,
-      { convexTeamConnectionId: 'connection-2' }
-    );
-  });
-
-  it('resolves a team by slug when multiple links exist', async () => {
-    jest.mocked(ConvexQuery.getConvexTeamConnectionsByAccountIdAsync).mockResolvedValue([
-      mockConnection,
-      {
-        ...mockConnection,
-        id: 'connection-2',
-        convexTeamIdentifier: 'team-456',
-        convexTeamName: 'Other Team',
-        convexTeamSlug: 'other-team',
-      },
-    ]);
-
-    await createCommand(['other-team', '--non-interactive']).runAsync();
-
-    expect(ConvexMutation.sendConvexTeamInviteToVerifiedEmailAsync).toHaveBeenCalledWith(
-      graphqlClient,
-      { convexTeamConnectionId: 'connection-2' }
-    );
-  });
-
-  it('requires a team slug in non-interactive mode when multiple links exist', async () => {
-    jest.mocked(ConvexQuery.getConvexTeamConnectionsByAccountIdAsync).mockResolvedValue([
-      mockConnection,
-      {
-        ...mockConnection,
-        id: 'connection-2',
-        convexTeamName: 'Other Team',
-        convexTeamSlug: 'other-team',
-      },
-    ]);
-
-    await expect(createCommand(['--non-interactive']).runAsync()).rejects.toThrow(
-      'Convex team slug must be provided'
-    );
-  });
-});

packages/eas-cli/src/commands/integrations/convex/__tests__/team.test.ts

@@ -1,81 +0,0 @@
-import { getMockOclifConfig } from '../../../../__tests__/commands/utils';
-import { ExpoGraphqlClient } from '../../../../commandUtils/context/contextUtils/createGraphqlClient';
-import { testProjectId } from '../../../../credentials/__tests__/fixtures-constants';
-import { ConvexQuery } from '../../../../graphql/queries/ConvexQuery';
-import { ConvexTeamConnectionData } from '../../../../graphql/types/ConvexTeamConnection';
-import Log from '../../../../log';
-import { getOwnerAccountForProjectIdAsync } from '../../../../project/projectUtils';
-import IntegrationsConvexTeam from '../team';
-
-jest.mock('../../../../graphql/queries/ConvexQuery');
-jest.mock('../../../../project/projectUtils');
-jest.mock('../../../../log');
-
-describe(IntegrationsConvexTeam, () => {
-  const graphqlClient = {} as ExpoGraphqlClient;
-  const mockConfig = getMockOclifConfig();
-  const testAccountId = 'test-account-id';
-  const testAccountName = 'testuser';
-
-  const mockAccount = {
-    id: testAccountId,
-    name: testAccountName,
-    ownerUserActor: { id: 'test-user-id', username: testAccountName },
-    users: [{ role: 'OWNER' as any, actor: { id: 'test-user-id' } }],
-  };
-
-  const mockConnection: ConvexTeamConnectionData = {
-    id: 'connection-1',
-    convexTeamIdentifier: 'team-123',
-    convexTeamName: 'Test Team',
-    convexTeamSlug: 'test-team',
-    hasBeenClaimed: true,
-    createdAt: '2024-01-01T00:00:00.000Z',
-    updatedAt: '2024-01-01T00:00:00.000Z',
-    invitedAt: null,
-    invitedEmail: null,
-  };
-
-  function createCommand(): IntegrationsConvexTeam {
-    const command = new IntegrationsConvexTeam([], mockConfig);
-    jest.spyOn(command as any, 'getContextAsync').mockReturnValue({
-      privateProjectConfig: {
-        projectId: testProjectId,
-      },
-      loggedIn: { graphqlClient },
-    } as never);
-    return command;
-  }
-
-  beforeEach(() => {
-    jest.resetAllMocks();
-    jest.spyOn(Log, 'log').mockImplementation(() => {});
-    jest.spyOn(Log, 'warn').mockImplementation(() => {});
-    jest.spyOn(Log, 'newLine').mockImplementation(() => {});
-    jest.mocked(getOwnerAccountForProjectIdAsync).mockResolvedValue(mockAccount as any);
-  });
-
-  it('prints linked Convex team metadata', async () => {
-    jest
-      .mocked(ConvexQuery.getConvexTeamConnectionsByAccountIdAsync)
-      .mockResolvedValue([mockConnection]);
-
-    await createCommand().runAsync();
-
-    expect(Log.log).toHaveBeenCalledWith(
-      expect.stringContaining('Convex teams linked to @testuser')
-    );
-    expect(Log.log).toHaveBeenCalledWith(expect.stringContaining('Test Team / test-team'));
-    expect(Log.log).toHaveBeenCalledWith(expect.stringContaining('Claimed'));
-    expect(Log.log).toHaveBeenCalledWith(expect.stringContaining('Yes'));
-    expect(Log.log).not.toHaveBeenCalledWith(expect.stringContaining('team-123'));
-  });
-
-  it('prints an empty state when no Convex teams are linked', async () => {
-    jest.mocked(ConvexQuery.getConvexTeamConnectionsByAccountIdAsync).mockResolvedValue([]);
-
-    await createCommand().runAsync();
-
-    expect(Log.warn).toHaveBeenCalledWith(expect.stringContaining('No Convex team is linked'));
-  });
-});

packages/eas-cli/src/commands/integrations/convex/connect.ts

@@ -1,365 +0,0 @@
-import spawnAsync from '@expo/spawn-async';
-import { Flags } from '@oclif/core';
-import chalk from 'chalk';
-import dotenv from 'dotenv';
-import * as fs from 'fs-extra';
-import path from 'path';
-
-import EasCommand from '../../../commandUtils/EasCommand';
-import { confirmRecentConvexInviteAsync, formatConvexTeam } from '../../../commandUtils/convex';
-import { EASNonInteractiveFlag } from '../../../commandUtils/flags';
-import { ConvexMutation } from '../../../graphql/mutations/ConvexMutation';
-import { ConvexQuery } from '../../../graphql/queries/ConvexQuery';
-import { ConvexTeamConnectionData } from '../../../graphql/types/ConvexTeamConnection';
-import Log from '../../../log';
-import { ora } from '../../../ora';
-import { getOwnerAccountForProjectIdAsync } from '../../../project/projectUtils';
-import { confirmAsync, promptAsync, selectAsync } from '../../../prompts';
-import { Actor } from '../../../user/User';
-
-const CONVEX_REGIONS = [
-  { title: 'US East (aws-us-east-1)', value: 'aws-us-east-1' },
-  { title: 'EU West (aws-eu-west-1)', value: 'aws-eu-west-1' },
-];
-
-const DEFAULT_REGION = 'aws-us-east-1';
-
-type TeamInviteResult = 'sent' | 'skipped' | 'failed';
-
-export default class IntegrationsConvexConnect extends EasCommand {
-  static override description = 'connect Convex to your Expo project';
-
-  static override contextDefinition = {
-    ...this.ContextOptions.ProjectConfig,
-  };
-
-  static override flags = {
-    ...EASNonInteractiveFlag,
-    region: Flags.string({
-      description: 'Convex deployment region (e.g. aws-us-east-1, aws-eu-west-1)',
-      options: CONVEX_REGIONS.map(r => r.value),
-    }),
-    'team-name': Flags.string({
-      description: 'Name for the new Convex team (defaults to EAS account name)',
-    }),
-    'project-name': Flags.string({
-      description: 'Name for the Convex project (defaults to app slug)',
-    }),
-  };
-
-  async runAsync(): Promise<void> {
-    const {
-      flags: {
-        region: regionFlag,
-        'team-name': teamNameFlag,
-        'project-name': projectNameFlag,
-        'non-interactive': nonInteractive,
-      },
-    } = await this.parse(IntegrationsConvexConnect);
-
-    const {
-      privateProjectConfig: { projectId, exp, projectDir },
-      loggedIn: { graphqlClient, actor },
-    } = await this.getContextAsync(IntegrationsConvexConnect, {
-      nonInteractive,
-      withServerSideEnvironment: null,
-    });
-
-    const account = await getOwnerAccountForProjectIdAsync(graphqlClient, projectId);
-
-    // 1. Check for existing Convex team connections
-    const existingConnections = await ConvexQuery.getConvexTeamConnectionsByAccountIdAsync(
-      graphqlClient,
-      account.id
-    );
-
-    const region = await this.resolveRegionAsync(regionFlag, nonInteractive);
-    let connection: ConvexTeamConnectionData | null = null;
-    let teamName: string | null = null;
-
-    if (existingConnections.length === 0) {
-      // 2a. No connection - resolve a team name and create it after local package install succeeds
-      teamName = await this.resolveTeamNameAsync(teamNameFlag, account.name, nonInteractive);
-    } else if (existingConnections.length === 1) {
-      // 2b. Single existing connection
-      connection = existingConnections[0];
-      Log.withTick(`Using existing Convex team ${chalk.bold(formatConvexTeam(connection))}`);
-    } else {
-      // 2c. Multiple connections - prompt to select
-      connection = await this.selectConnectionAsync(existingConnections, nonInteractive);
-    }
-
-    // 3. Resolve project name before project setup mutation
-    const projectName = await this.resolveProjectNameAsync(
-      projectNameFlag,
-      exp.slug,
-      nonInteractive
-    );
-
-    // 4. Install the Convex package before creating new server-side resources
-    await this.installConvexPackageAsync(projectDir);
-
-    if (!connection) {
-      const spinner = ora('Creating Convex team').start();
-      try {
-        connection = await ConvexMutation.createConvexTeamConnectionAsync(graphqlClient, {
-          accountId: account.id,
-          deploymentRegion: region,
-          convexTeamName: teamName ?? account.name,
-        });
-        spinner.succeed(`Created Convex team ${chalk.bold(formatConvexTeam(connection))}`);
-      } catch (error) {
-        spinner.fail('Failed to create Convex team');
-        throw error;
-      }
-    }
-
-    // 5. Set up Convex project
-    const spinner = ora('Setting up Convex project').start();
-    let setupResult;
-    try {
-      setupResult = await ConvexMutation.setupConvexProjectAsync(graphqlClient, {
-        appId: projectId,
-        convexTeamConnectionId: connection.id,
-        deploymentRegion: region,
-        projectName,
-      });
-      spinner.succeed(
-        `Created Convex project ${chalk.bold(projectName)} with deployment ${chalk.bold(setupResult.convexDeploymentName)}`
-      );
-    } catch (error) {
-      spinner.fail('Failed to set up Convex project');
-      throw error;
-    }
-
-    // 6. Send team invite (non-fatal)
-    const teamInviteResult = await this.sendTeamInviteAsync(graphqlClient, connection, actor, {
-      nonInteractive,
-    });
-
-    // 7. Write deploy key and URL to .env.local
-    await this.writeEnvLocalAsync(
-      projectDir,
-      setupResult.deployKey,
-      setupResult.convexDeploymentUrl,
-      nonInteractive
-    );
-
-    // 8. Success message
-    Log.addNewLineIfNone();
-    Log.log(chalk.green('Convex is ready!'));
-    Log.newLine();
-    Log.log('Next steps:');
-    Log.log(`  1. Start the Convex dev server: ${chalk.cyan('npx convex dev')}`);
-    Log.log(
-      `  2. Learn how to connect to your new Convex database by following our quickstart guide: ${chalk.cyan('https://docs.expo.dev/guides/using-convex')}`
-    );
-    Log.log(`  3. Read more about Convex: ${chalk.cyan('https://docs.convex.dev/')}`);
-    Log.newLine();
-    if (teamInviteResult === 'sent') {
-      Log.log(
-        `Check your email for an invitation to join your Convex team. Accept it for full dashboard access.`
-      );
-    }
-  }
-
-  private async resolveRegionAsync(
-    flagValue: string | undefined,
-    nonInteractive: boolean
-  ): Promise<string> {
-    if (flagValue) {
-      return flagValue;
-    }
-    if (nonInteractive) {
-      return DEFAULT_REGION;
-    }
-    return await selectAsync('Select a Convex deployment region', CONVEX_REGIONS);
-  }
-
-  private async resolveTeamNameAsync(
-    flagValue: string | undefined,
-    accountName: string,
-    nonInteractive: boolean
-  ): Promise<string> {
-    if (flagValue) {
-      return flagValue;
-    }
-    if (nonInteractive) {
-      return accountName;
-    }
-    const { teamName } = await promptAsync({
-      type: 'text',
-      name: 'teamName',
-      message: 'Convex team name',
-      initial: accountName,
-      validate: (value: string) => (value.trim() ? true : 'Team name cannot be empty'),
-    });
-    return teamName;
-  }
-
-  private async resolveProjectNameAsync(
-    flagValue: string | undefined,
-    slug: string,
-    nonInteractive: boolean
-  ): Promise<string> {
-    if (flagValue) {
-      return flagValue;
-    }
-    if (nonInteractive) {
-      return slug;
-    }
-    const { projectName } = await promptAsync({
-      type: 'text',
-      name: 'projectName',
-      message: 'Convex project name',
-      initial: slug,
-      validate: (value: string) => (value.trim() ? true : 'Project name cannot be empty'),
-    });
-    return projectName;
-  }
-
-  private async selectConnectionAsync(
-    connections: ConvexTeamConnectionData[],
-    nonInteractive: boolean
-  ): Promise<ConvexTeamConnectionData> {
-    if (nonInteractive) {
-      return connections[0];
-    }
-    const choices = connections.map(c => ({
-      title: `${formatConvexTeam(c)} (created ${new Date(c.createdAt).toLocaleDateString()})`,
-      value: c,
-    }));
-    return await selectAsync('Select a Convex team connection', choices);
-  }
-
-  private getActorEmail(actor: Actor): string | null {
-    return actor.__typename === 'User' ? actor.email : null;
-  }
-
-  private async sendTeamInviteAsync(
-    graphqlClient: Parameters<typeof ConvexMutation.sendConvexTeamInviteToVerifiedEmailAsync>[0],
-    connection: ConvexTeamConnectionData,
-    actor: Actor,
-    { nonInteractive }: { nonInteractive: boolean }
-  ): Promise<TeamInviteResult> {
-    if (connection.hasBeenClaimed) {
-      Log.warn('Convex team has already been claimed. Skipping Convex team invitation.');
-      return 'skipped';
-    }
-
-    const email = this.getActorEmail(actor);
-    if (!email) {
-      Log.warn(
-        `Could not determine your verified email address, so no Convex team invitation was sent. Run ${chalk.cyan(
-          'eas integrations:convex:team:invite'
-        )} after signing in with a user account.`
-      );
-      return 'skipped';
-    }
-
-    if (!(await confirmRecentConvexInviteAsync(connection, { nonInteractive }))) {
-      Log.warn('Skipped sending Convex team invitation.');
-      return 'skipped';
-    }
-
-    try {
-      await ConvexMutation.sendConvexTeamInviteToVerifiedEmailAsync(graphqlClient, {
-        convexTeamConnectionId: connection.id,
-      });
-      Log.withTick(`Sent Convex team invitation to ${chalk.bold(email)}`);
-      return 'sent';
-    } catch (error) {
-      Log.warn(
-        `Failed to send Convex team invitation to ${email}. Run ${chalk.cyan(
-          'eas integrations:convex:team:invite'
-        )} to retry.`
-      );
-      Log.warn(error instanceof Error ? error.message : String(error));
-      return 'failed';
-    }
-  }
-
-  private async installConvexPackageAsync(projectDir: string): Promise<void> {
-    Log.newLine();
-    Log.log(`Running ${chalk.bold('npx expo install convex')}`);
-    Log.newLine();
-
-    try {
-      await spawnAsync('npx', ['expo', 'install', 'convex'], {
-        cwd: projectDir,
-        stdio: 'inherit',
-      });
-      Log.withTick(`Installed the ${chalk.bold('convex')} npm package`);
-    } catch (error) {
-      Log.warn(
-        `Failed to install the ${chalk.bold('convex')} npm package. Run ${chalk.cyan(
-          'npx expo install convex'
-        )} from your project directory, then run ${chalk.cyan('npx convex dev')}.`
-      );
-      throw error;
-    }
-  }
-
-  private async writeEnvLocalAsync(
-    projectDir: string,
-    deployKey: string,
-    convexUrl: string,
-    nonInteractive: boolean
-  ): Promise<void> {
-    const envPath = path.join(projectDir, '.env.local');
-    let existingContent: Record<string, string> = {};
-    let rawContent = '';
-
-    if (await fs.pathExists(envPath)) {
-      rawContent = await fs.readFile(envPath, 'utf8');
-      existingContent = dotenv.parse(rawContent);
-
-      if (existingContent.CONVEX_DEPLOY_KEY && !nonInteractive) {
-        const overwrite = await confirmAsync({
-          message: `.env.local already contains CONVEX_DEPLOY_KEY. Overwrite Convex values?`,
-        });
-        if (!overwrite) {
-          Log.log('Skipping .env.local update. Deploy key:');
-          Log.log(`  CONVEX_DEPLOY_KEY=${deployKey}`);
-          Log.log(`  EXPO_PUBLIC_CONVEX_URL=${convexUrl}`);
-          return;
-        }
-      }
-    }
-
-    const updatedContent = this.mergeEnvContent(rawContent, {
-      CONVEX_DEPLOY_KEY: deployKey,
-      EXPO_PUBLIC_CONVEX_URL: convexUrl,
-    });
-
-    await fs.writeFile(envPath, updatedContent);
-    Log.withTick(`Wrote Convex config to ${chalk.bold('.env.local')}`);
-  }
-
-  private mergeEnvContent(rawContent: string, newVars: Record<string, string>): string {
-    let content = rawContent;
-    const keysToAdd: Record<string, string> = { ...newVars };
-
-    for (const [key, value] of Object.entries(newVars)) {
-      // Replace existing line if present
-      const regex = new RegExp(`^${key}=.*$`, 'm');
-      if (regex.test(content)) {
-        content = content.replace(regex, `${key}=${value}`);
-        delete keysToAdd[key];
-      }
-    }
-
-    // Append any keys that weren't already in the file
-    const remaining = Object.entries(keysToAdd);
-    if (remaining.length > 0) {
-      if (content.length > 0 && !content.endsWith('\n')) {
-        content += '\n';
-      }
-      for (const [key, value] of remaining) {
-        content += `${key}=${value}\n`;
-      }
-    }
-
-    return content;
-  }
-}

packages/eas-cli/src/commands/integrations/convex/dashboard.ts

@@ -1,46 +0,0 @@
-import openBrowserAsync from 'better-opn';
-
-import EasCommand from '../../../commandUtils/EasCommand';
-import { getConvexProjectDashboardUrl, logNoConvexProject } from '../../../commandUtils/convex';
-import { ConvexQuery } from '../../../graphql/queries/ConvexQuery';
-import { ora } from '../../../ora';
-
-export default class IntegrationsConvexDashboard extends EasCommand {
-  static override description = 'open the Convex dashboard for the linked Convex project';
-
-  static override contextDefinition = {
-    ...this.ContextOptions.ProjectConfig,
-  };
-
-  async runAsync(): Promise<void> {
-    const {
-      privateProjectConfig: { projectId, exp },
-      loggedIn: { graphqlClient },
-    } = await this.getContextAsync(IntegrationsConvexDashboard, {
-      nonInteractive: false,
-      withServerSideEnvironment: null,
-    });
-
-    const convexProject = await ConvexQuery.getConvexProjectByAppIdAsync(graphqlClient, projectId);
-
-    if (!convexProject) {
-      logNoConvexProject(exp.slug);
-      return;
-    }
-
-    const dashboardUrl = getConvexProjectDashboardUrl(convexProject);
-    const failedMessage = `Unable to open a web browser. Convex dashboard is available at: ${dashboardUrl}`;
-    const spinner = ora(`Opening ${dashboardUrl}`).start();
-    try {
-      const opened = await openBrowserAsync(dashboardUrl);
-      if (opened) {
-        spinner.succeed(`Opened ${dashboardUrl}`);
-      } else {
-        spinner.fail(failedMessage);
-      }
-    } catch (error) {
-      spinner.fail(failedMessage);
-      throw error;
-    }
-  }
-}

packages/eas-cli/src/commands/integrations/convex/project.ts

@@ -1,34 +0,0 @@
-import chalk from 'chalk';
-
-import EasCommand from '../../../commandUtils/EasCommand';
-import { formatConvexProject, logNoConvexProject } from '../../../commandUtils/convex';
-import { ConvexQuery } from '../../../graphql/queries/ConvexQuery';
-import Log from '../../../log';
-
-export default class IntegrationsConvexProject extends EasCommand {
-  static override description = 'display the Convex project linked to the current Expo app';
-
-  static override contextDefinition = {
-    ...this.ContextOptions.ProjectConfig,
-  };
-
-  async runAsync(): Promise<void> {
-    const {
-      privateProjectConfig: { projectId, exp },
-      loggedIn: { graphqlClient },
-    } = await this.getContextAsync(IntegrationsConvexProject, {
-      nonInteractive: false,
-      withServerSideEnvironment: null,
-    });
-
-    const convexProject = await ConvexQuery.getConvexProjectByAppIdAsync(graphqlClient, projectId);
-
-    if (!convexProject) {
-      logNoConvexProject(exp.slug);
-      return;
-    }
-
-    Log.log(chalk.bold(`Convex project linked to ${exp.slug}`));
-    Log.log(formatConvexProject(convexProject));
-  }
-}

packages/eas-cli/src/commands/integrations/convex/project/delete.ts

@@ -1,87 +0,0 @@
-import { Flags } from '@oclif/core';
-import chalk from 'chalk';
-
-import EasCommand from '../../../../commandUtils/EasCommand';
-import {
-  formatConvexProject,
-  getConvexProjectDashboardUrl,
-  logNoConvexProject,
-} from '../../../../commandUtils/convex';
-import { EASNonInteractiveFlag } from '../../../../commandUtils/flags';
-import { ConvexMutation } from '../../../../graphql/mutations/ConvexMutation';
-import { ConvexQuery } from '../../../../graphql/queries/ConvexQuery';
-import Log, { link } from '../../../../log';
-import { ora } from '../../../../ora';
-import { confirmAsync } from '../../../../prompts';
-
-export default class IntegrationsConvexProjectDelete extends EasCommand {
-  static override description =
-    'remove the Convex project link for the current Expo app from EAS servers';
-
-  static override flags = {
-    ...EASNonInteractiveFlag,
-    yes: Flags.boolean({
-      char: 'y',
-      description: 'Skip confirmation prompt',
-      default: false,
-    }),
-  };
-
-  static override contextDefinition = {
-    ...this.ContextOptions.ProjectConfig,
-  };
-
-  async runAsync(): Promise<void> {
-    const {
-      flags: { 'non-interactive': nonInteractive, yes },
-    } = await this.parse(IntegrationsConvexProjectDelete);
-
-    const {
-      privateProjectConfig: { projectId, exp },
-      loggedIn: { graphqlClient },
-    } = await this.getContextAsync(IntegrationsConvexProjectDelete, {
-      nonInteractive,
-      withServerSideEnvironment: null,
-    });
-
-    const convexProject = await ConvexQuery.getConvexProjectByAppIdAsync(graphqlClient, projectId);
-
-    if (!convexProject) {
-      logNoConvexProject(exp.slug);
-      return;
-    }
-
-    Log.addNewLineIfNone();
-    Log.log(formatConvexProject(convexProject));
-    Log.newLine();
-
-    const dashboardUrl = getConvexProjectDashboardUrl(convexProject);
-    if (!nonInteractive && !yes) {
-      const confirmed = await confirmAsync({
-        message: `Remove this Convex project link from EAS servers? This does not destroy resources on Convex. Convex dashboard: ${link(
-          dashboardUrl,
-          { dim: false }
-        )}`,
-      });
-      if (!confirmed) {
-        Log.error('Canceled deletion of the Convex project link');
-        return;
-      }
-    } else {
-      Log.warn(
-        `Removing the Convex project link from EAS servers. This does not destroy resources on Convex: ${dashboardUrl}`
-      );
-    }
-
-    const spinner = ora('Removing Convex project link').start();
-    try {
-      await ConvexMutation.deleteConvexProjectAsync(graphqlClient, convexProject.id);
-      spinner.succeed(
-        `Removed Convex project ${chalk.bold(convexProject.convexProjectName)} from EAS servers`
-      );
-    } catch (error) {
-      spinner.fail('Failed to remove Convex project link');
-      throw error;
-    }
-  }
-}

packages/eas-cli/src/commands/integrations/convex/team.ts

@@ -1,45 +0,0 @@
-import chalk from 'chalk';
-
-import EasCommand from '../../../commandUtils/EasCommand';
-import { formatConvexTeamConnection, logNoConvexTeams } from '../../../commandUtils/convex';
-import { ConvexQuery } from '../../../graphql/queries/ConvexQuery';
-import Log from '../../../log';
-import { getOwnerAccountForProjectIdAsync } from '../../../project/projectUtils';
-
-export default class IntegrationsConvexTeam extends EasCommand {
-  static override description =
-    "display Convex teams linked to the current Expo app's owner account";
-
-  static override contextDefinition = {
-    ...this.ContextOptions.ProjectConfig,
-  };
-
-  async runAsync(): Promise<void> {
-    const {
-      privateProjectConfig: { projectId },
-      loggedIn: { graphqlClient },
-    } = await this.getContextAsync(IntegrationsConvexTeam, {
-      nonInteractive: false,
-      withServerSideEnvironment: null,
-    });
-
-    const account = await getOwnerAccountForProjectIdAsync(graphqlClient, projectId);
-    const connections = await ConvexQuery.getConvexTeamConnectionsByAccountIdAsync(
-      graphqlClient,
-      account.id
-    );
-
-    if (connections.length === 0) {
-      logNoConvexTeams(account.name);
-      return;
-    }
-
-    Log.log(chalk.bold(`Convex teams linked to @${account.name}`));
-    for (const [index, connection] of connections.entries()) {
-      if (index > 0) {
-        Log.newLine();
-      }
-      Log.log(formatConvexTeamConnection(connection));
-    }
-  }
-}

packages/eas-cli/src/commands/integrations/convex/team/delete.ts

@@ -1,138 +0,0 @@
-import { Args, Flags } from '@oclif/core';
-import chalk from 'chalk';
-
-import EasCommand from '../../../../commandUtils/EasCommand';
-import {
-  formatConvexTeam,
-  formatConvexTeamConnection,
-  getConvexTeamDashboardUrl,
-  logNoConvexTeams,
-} from '../../../../commandUtils/convex';
-import { EASNonInteractiveFlag } from '../../../../commandUtils/flags';
-import { ConvexMutation } from '../../../../graphql/mutations/ConvexMutation';
-import { ConvexQuery } from '../../../../graphql/queries/ConvexQuery';
-import { ConvexTeamConnectionData } from '../../../../graphql/types/ConvexTeamConnection';
-import Log, { link } from '../../../../log';
-import { ora } from '../../../../ora';
-import { getOwnerAccountForProjectIdAsync } from '../../../../project/projectUtils';
-import { confirmAsync, selectAsync } from '../../../../prompts';
-
-export default class IntegrationsConvexTeamDelete extends EasCommand {
-  static override description =
-    "remove a Convex team link from the current Expo app owner account's EAS servers";
-
-  static override args = {
-    CONVEX_TEAM: Args.string({
-      required: false,
-      description: 'Slug of the Convex team to remove',
-    }),
-  };
-
-  static override flags = {
-    ...EASNonInteractiveFlag,
-    yes: Flags.boolean({
-      char: 'y',
-      description: 'Skip confirmation prompt',
-      default: false,
-    }),
-  };
-
-  static override contextDefinition = {
-    ...this.ContextOptions.ProjectConfig,
-  };
-
-  async runAsync(): Promise<void> {
-    const {
-      args: { CONVEX_TEAM: team },
-      flags: { 'non-interactive': nonInteractive, yes },
-    } = await this.parse(IntegrationsConvexTeamDelete);
-
-    const {
-      privateProjectConfig: { projectId },
-      loggedIn: { graphqlClient },
-    } = await this.getContextAsync(IntegrationsConvexTeamDelete, {
-      nonInteractive,
-      withServerSideEnvironment: null,
-    });
-
-    const account = await getOwnerAccountForProjectIdAsync(graphqlClient, projectId);
-    const connections = await ConvexQuery.getConvexTeamConnectionsByAccountIdAsync(
-      graphqlClient,
-      account.id
-    );
-
-    if (connections.length === 0) {
-      logNoConvexTeams(account.name);
-      return;
-    }
-
-    const connection = await this.resolveConnectionAsync(connections, team, nonInteractive);
-
-    Log.addNewLineIfNone();
-    Log.log(formatConvexTeamConnection(connection));
-    Log.newLine();
-
-    const dashboardUrl = getConvexTeamDashboardUrl(connection);
-    if (!nonInteractive && !yes) {
-      const confirmed = await confirmAsync({
-        message: `Remove this Convex team link from EAS servers? This does not destroy resources on Convex. Convex dashboard: ${link(
-          dashboardUrl,
-          { dim: false }
-        )}`,
-      });
-      if (!confirmed) {
-        Log.error('Canceled deletion of the Convex team link');
-        return;
-      }
-    } else {
-      Log.warn(
-        `Removing the Convex team link from EAS servers. This does not destroy resources on Convex: ${dashboardUrl}`
-      );
-    }
-
-    const spinner = ora('Removing Convex team link').start();
-    try {
-      await ConvexMutation.deleteConvexTeamConnectionAsync(graphqlClient, connection.id);
-      spinner.succeed(
-        `Removed Convex team ${chalk.bold(formatConvexTeam(connection))} from EAS servers`
-      );
-    } catch (error) {
-      spinner.fail('Failed to remove Convex team link');
-      throw error;
-    }
-  }
-
-  private async resolveConnectionAsync(
-    connections: ConvexTeamConnectionData[],
-    team: string | undefined,
-    nonInteractive: boolean
-  ): Promise<ConvexTeamConnectionData> {
-    if (team) {
-      const connection = connections.find(
-        item => item.convexTeamSlug === team || item.convexTeamName === team || item.id === team
-      );
-      if (!connection) {
-        throw new Error(`Convex team ${team} is not linked to this account.`);
-      }
-      return connection;
-    }
-
-    if (connections.length === 1) {
-      return connections[0];
-    }
-
-    if (nonInteractive) {
-      throw new Error(
-        'Convex team slug must be provided in non-interactive mode when multiple Convex team links exist.'
-      );
-    }
-
-    return await selectAsync(
-      'Select a Convex team link to remove',
-      connections.map(connection => ({
-        title: formatConvexTeam(connection),
-        value: connection,
-      }))
-    );
-  }
-}

packages/eas-cli/src/commands/integrations/convex/team/invite.ts

@@ -1,166 +0,0 @@
-import { Args } from '@oclif/core';
-import chalk from 'chalk';
-
-import EasCommand from '../../../../commandUtils/EasCommand';
-import {
-  confirmRecentConvexInviteAsync,
-  formatConvexInviteTimestamp,
-  formatConvexTeam,
-  getConvexTeamDashboardUrl,
-  logNoConvexTeams,
-} from '../../../../commandUtils/convex';
-import { EASNonInteractiveFlag } from '../../../../commandUtils/flags';
-import { ConvexMutation } from '../../../../graphql/mutations/ConvexMutation';
-import { ConvexQuery } from '../../../../graphql/queries/ConvexQuery';
-import { ConvexTeamConnectionData } from '../../../../graphql/types/ConvexTeamConnection';
-import Log, { link } from '../../../../log';
-import { ora } from '../../../../ora';
-import { getOwnerAccountForProjectIdAsync } from '../../../../project/projectUtils';
-import { selectAsync } from '../../../../prompts';
-
-export default class IntegrationsConvexTeamInvite extends EasCommand {
-  static override description = 'send a Convex team invitation to your verified email address';
-
-  static override args = {
-    CONVEX_TEAM: Args.string({
-      required: false,
-      description: 'Slug of the Convex team to invite yourself to',
-    }),
-  };
-
-  static override flags = {
-    ...EASNonInteractiveFlag,
-  };
-
-  static override contextDefinition = {
-    ...this.ContextOptions.ProjectConfig,
-  };
-
-  async runAsync(): Promise<void> {
-    const {
-      args: { CONVEX_TEAM: team },
-      flags: { 'non-interactive': nonInteractive },
-    } = await this.parse(IntegrationsConvexTeamInvite);
-
-    const {
-      privateProjectConfig: { projectId },
-      loggedIn: { graphqlClient, actor },
-    } = await this.getContextAsync(IntegrationsConvexTeamInvite, {
-      nonInteractive,
-      withServerSideEnvironment: null,
-    });
-
-    const email = this.getActorEmail(actor);
-    if (!email) {
-      Log.warn(
-        `Could not determine your verified email address, so no Convex team invitation was sent. Run ${chalk.cyan(
-          'eas integrations:convex:team:invite'
-        )} after signing in with a user account.`
-      );
-      return;
-    }
-
-    const account = await getOwnerAccountForProjectIdAsync(graphqlClient, projectId);
-    const connections = await ConvexQuery.getConvexTeamConnectionsByAccountIdAsync(
-      graphqlClient,
-      account.id
-    );
-
-    if (connections.length === 0) {
-      logNoConvexTeams(account.name);
-      return;
-    }
-
-    const connection = await this.resolveConnectionAsync(connections, team, nonInteractive);
-
-    Log.addNewLineIfNone();
-    this.logTeam(connection);
-    this.logPreviousInvite(connection);
-    Log.newLine();
-
-    if (connection.hasBeenClaimed) {
-      Log.warn('Convex team has already been claimed. Skipping Convex team invitation.');
-      return;
-    }
-
-    if (!(await confirmRecentConvexInviteAsync(connection, { nonInteractive }))) {
-      Log.warn('Skipped sending Convex team invitation.');
-      return;
-    }
-
-    const spinner = ora(`Sending Convex team invitation to ${email}`).start();
-    try {
-      await ConvexMutation.sendConvexTeamInviteToVerifiedEmailAsync(graphqlClient, {
-        convexTeamConnectionId: connection.id,
-      });
-      spinner.succeed(
-        `Sent Convex team invitation to ${chalk.bold(email)} for ${chalk.bold(formatConvexTeam(connection))}`
-      );
-      Log.log(`Convex dashboard: ${link(getConvexTeamDashboardUrl(connection), { dim: false })}`);
-    } catch (error) {
-      spinner.fail('Failed to send Convex team invitation');
-      throw error;
-    }
-  }
-
-  private getActorEmail(actor: { __typename: string; [key: string]: any }): string | null {
-    return 'email' in actor && typeof actor.email === 'string' ? actor.email : null;
-  }
-
-  private logTeam(connection: ConvexTeamConnectionData): void {
-    Log.log(chalk.bold(`Convex team ${formatConvexTeam(connection)}`));
-    Log.log(
-      `${chalk.bold('Dashboard')}: ${link(getConvexTeamDashboardUrl(connection), { dim: false })}`
-    );
-    Log.log(`${chalk.bold('Claimed')}: ${connection.hasBeenClaimed ? 'Yes' : 'No'}`);
-  }
-
-  private logPreviousInvite(connection: ConvexTeamConnectionData): void {
-    if (!connection.invitedEmail && !connection.invitedAt) {
-      return;
-    }
-
-    Log.newLine();
-    Log.log(chalk.bold('Previous invite'));
-    if (connection.invitedEmail) {
-      Log.log(`${chalk.bold('Email')}: ${connection.invitedEmail}`);
-    }
-    if (connection.invitedAt) {
-      Log.log(`${chalk.bold('Sent at')}: ${formatConvexInviteTimestamp(connection.invitedAt)}`);
-    }
-  }
-
-  private async resolveConnectionAsync(
-    connections: ConvexTeamConnectionData[],
-    team: string | undefined,
-    nonInteractive: boolean
-  ): Promise<ConvexTeamConnectionData> {
-    if (team) {
-      const connection = connections.find(
-        item => item.convexTeamSlug === team || item.convexTeamName === team || item.id === team
-      );
-      if (!connection) {
-        throw new Error(`Convex team ${team} is not linked to this account.`);
-      }
-      return connection;
-    }
-
-    if (connections.length === 1) {
-      return connections[0];
-    }
-
-    if (nonInteractive) {
-      throw new Error(
-        'Convex team slug must be provided in non-interactive mode when multiple Convex team links exist.'
-      );
-    }
-
-    return await selectAsync(
-      'Select a Convex team link to invite yourself to',
-      connections.map(connection => ({
-        title: formatConvexTeam(connection),
-        value: connection,
-      }))
-    );
-  }
-}

packages/eas-cli/src/commands/observe/__tests__/logs.test.ts

@@ -1,381 +0,0 @@
-import { ExpoGraphqlClient } from '../../../commandUtils/context/contextUtils/createGraphqlClient';
-import { getMockOclifConfig } from '../../../__tests__/commands/utils';
-import { AppObservePlatform } from '../../../graphql/generated';
-import { ObserveQuery } from '../../../graphql/queries/ObserveQuery';
-import { fetchObserveCustomEventsAsync } from '../../../observe/fetchCustomEvents';
-import {
-  buildObserveCustomEventNamesJson,
-  buildObserveCustomEventsEmptyWithSuggestionsJson,
-  buildObserveCustomEventsEmptyWithSuggestionsTable,
-  buildObserveCustomEventsJson,
-} from '../../../observe/formatCustomEvents';
-import { enableJsonOutput, printJsonOnlyOutput } from '../../../utils/json';
-import ObserveLogs from '../logs';
-
-jest.mock('../../../observe/fetchCustomEvents');
-jest.mock('../../../observe/formatCustomEvents', () => ({
-  buildObserveCustomEventsTable: jest.fn().mockReturnValue('table'),
-  buildObserveCustomEventsJson: jest.fn().mockReturnValue({}),
-  buildObserveCustomEventNamesTable: jest.fn().mockReturnValue('names-table'),
-  buildObserveCustomEventNamesJson: jest.fn().mockReturnValue({ names: [], isTruncated: false }),
-  buildObserveCustomEventsEmptyWithSuggestionsTable: jest
-    .fn()
-    .mockReturnValue('empty-with-suggestions-table'),
-  buildObserveCustomEventsEmptyWithSuggestionsJson: jest.fn().mockReturnValue({
-    filteredEventName: 'my_event',
-    events: [],
-    availableEventNames: [],
-    availableEventNamesIsTruncated: false,
-  }),
-}));
-jest.mock('../../../graphql/queries/ObserveQuery', () => ({
-  ObserveQuery: {
-    customEventNamesAsync: jest.fn(),
-  },
-}));
-jest.mock('../../../log');
-jest.mock('../../../utils/json');
-
-const mockFetchObserveCustomEventsAsync = jest.mocked(fetchObserveCustomEventsAsync);
-const mockBuildObserveCustomEventsJson = jest.mocked(buildObserveCustomEventsJson);
-const mockBuildObserveCustomEventNamesJson = jest.mocked(buildObserveCustomEventNamesJson);
-const mockBuildObserveCustomEventsEmptyWithSuggestionsTable = jest.mocked(
-  buildObserveCustomEventsEmptyWithSuggestionsTable
-);
-const mockBuildObserveCustomEventsEmptyWithSuggestionsJson = jest.mocked(
-  buildObserveCustomEventsEmptyWithSuggestionsJson
-);
-const mockCustomEventNamesAsync = jest.mocked(ObserveQuery.customEventNamesAsync);
-const mockEnableJsonOutput = jest.mocked(enableJsonOutput);
-const mockPrintJsonOnlyOutput = jest.mocked(printJsonOnlyOutput);
-
-describe(ObserveLogs, () => {
-  const graphqlClient = {} as any as ExpoGraphqlClient;
-  const mockConfig = getMockOclifConfig();
-  const projectId = 'test-project-id';
-
-  beforeEach(() => {
-    jest.clearAllMocks();
-    mockFetchObserveCustomEventsAsync.mockResolvedValue({
-      events: [],
-      pageInfo: { hasNextPage: false, hasPreviousPage: false },
-    });
-    mockCustomEventNamesAsync.mockResolvedValue({ names: [], isTruncated: false });
-  });
-
-  function createCommand(argv: string[]): ObserveLogs {
-    const command = new ObserveLogs(argv, mockConfig);
-    // @ts-expect-error
-    jest.spyOn(command, 'getContextAsync').mockReturnValue({
-      projectId,
-      loggedIn: { graphqlClient },
-    });
-    return command;
-  }
-
-  it('passes eventName arg to fetchObserveCustomEventsAsync', async () => {
-    mockFetchObserveCustomEventsAsync.mockResolvedValue({
-      events: [{ id: 'evt-1' } as any],
-      pageInfo: { hasNextPage: false, hasPreviousPage: false },
-    });
-    const command = createCommand(['my_event']);
-    await command.runAsync();
-
-    const options = mockFetchObserveCustomEventsAsync.mock.calls[0][2];
-    expect(options.eventName).toBe('my_event');
-    expect(mockCustomEventNamesAsync).not.toHaveBeenCalled();
-  });
-
-  it('routes to customEventNamesAsync when no positional arg is provided', async () => {
-    const command = createCommand([]);
-    await command.runAsync();
-
-    expect(mockCustomEventNamesAsync).toHaveBeenCalledTimes(1);
-    expect(mockFetchObserveCustomEventsAsync).not.toHaveBeenCalled();
-  });
-
-  it('routes to fetchObserveCustomEventsAsync when --all-events is set with no positional arg', async () => {
-    const command = createCommand(['--all-events']);
-    await command.runAsync();
-
-    expect(mockFetchObserveCustomEventsAsync).toHaveBeenCalledTimes(1);
-    expect(mockCustomEventNamesAsync).not.toHaveBeenCalled();
-    const options = mockFetchObserveCustomEventsAsync.mock.calls[0][2];
-    expect(options.eventName).toBeUndefined();
-  });
-
-  it('throws when both an event name argument and --all-events are provided', async () => {
-    const command = createCommand(['my_event', '--all-events']);
-    await expect(command.runAsync()).rejects.toThrow(
-      '--all-events cannot be combined with an event name argument'
-    );
-    expect(mockFetchObserveCustomEventsAsync).not.toHaveBeenCalled();
-    expect(mockCustomEventNamesAsync).not.toHaveBeenCalled();
-  });
-
-  it('passes the resolved time range and platform to customEventNamesAsync', async () => {
-    const now = new Date('2025-06-15T12:00:00.000Z');
-    jest.useFakeTimers({ now });
-
-    const command = createCommand(['--days', '7', '--platform', 'ios']);
-    await command.runAsync();
-
-    expect(mockCustomEventNamesAsync).toHaveBeenCalledWith(graphqlClient, {
-      appId: projectId,
-      startTime: '2025-06-08T12:00:00.000Z',
-      endTime: '2025-06-15T12:00:00.000Z',
-      platform: AppObservePlatform.Ios,
-    });
-
-    jest.useRealTimers();
-  });
-
-  it('uses --days to compute start/end time range when an event name is provided', async () => {
-    const now = new Date('2025-06-15T12:00:00.000Z');
-    jest.useFakeTimers({ now });
-
-    const command = createCommand(['my_event', '--days', '7']);
-    await command.runAsync();
-
-    const options = mockFetchObserveCustomEventsAsync.mock.calls[0][2];
-    expect(options.endTime).toBe('2025-06-15T12:00:00.000Z');
-    expect(options.startTime).toBe('2025-06-08T12:00:00.000Z');
-
-    jest.useRealTimers();
-  });
-
-  it('uses explicit --start and --end when provided', async () => {
-    const command = createCommand([
-      'my_event',
-      '--start',
-      '2025-01-01T00:00:00.000Z',
-      '--end',
-      '2025-02-01T00:00:00.000Z',
-    ]);
-    await command.runAsync();
-
-    const options = mockFetchObserveCustomEventsAsync.mock.calls[0][2];
-    expect(options.startTime).toBe('2025-01-01T00:00:00.000Z');
-    expect(options.endTime).toBe('2025-02-01T00:00:00.000Z');
-  });
-
-  it('rejects --days combined with --start', async () => {
-    const command = createCommand([
-      'my_event',
-      '--days',
-      '7',
-      '--start',
-      '2025-01-01T00:00:00.000Z',
-    ]);
-    await expect(command.runAsync()).rejects.toThrow();
-  });
-
-  it('passes --limit to fetchObserveCustomEventsAsync', async () => {
-    const command = createCommand(['my_event', '--limit', '42']);
-    await command.runAsync();
-
-    const options = mockFetchObserveCustomEventsAsync.mock.calls[0][2];
-    expect(options.limit).toBe(42);
-  });
-
-  it('passes --after cursor', async () => {
-    const command = createCommand(['my_event', '--after', 'cursor-xyz']);
-    await command.runAsync();
-
-    const options = mockFetchObserveCustomEventsAsync.mock.calls[0][2];
-    expect(options.after).toBe('cursor-xyz');
-  });
-
-  it('passes --platform ios as AppObservePlatform.Ios', async () => {
-    const command = createCommand(['my_event', '--platform', 'ios']);
-    await command.runAsync();
-
-    const options = mockFetchObserveCustomEventsAsync.mock.calls[0][2];
-    expect(options.platform).toBe(AppObservePlatform.Ios);
-  });
-
-  it('passes --app-version', async () => {
-    const command = createCommand(['my_event', '--app-version', '2.1.0']);
-    await command.runAsync();
-
-    const options = mockFetchObserveCustomEventsAsync.mock.calls[0][2];
-    expect(options.appVersion).toBe('2.1.0');
-  });
-
-  it('passes --update-id', async () => {
-    const command = createCommand(['my_event', '--update-id', 'update-xyz']);
-    await command.runAsync();
-
-    const options = mockFetchObserveCustomEventsAsync.mock.calls[0][2];
-    expect(options.updateId).toBe('update-xyz');
-  });
-
-  it('passes --session-id', async () => {
-    const command = createCommand(['my_event', '--session-id', 'session-xyz']);
-    await command.runAsync();
-
-    const options = mockFetchObserveCustomEventsAsync.mock.calls[0][2];
-    expect(options.sessionId).toBe('session-xyz');
-  });
-
-  it('does not pass platform, appVersion, updateId, or sessionId when flags are not provided', async () => {
-    const command = createCommand(['my_event']);
-    await command.runAsync();
-
-    const options = mockFetchObserveCustomEventsAsync.mock.calls[0][2];
-    expect(options.platform).toBeUndefined();
-    expect(options.appVersion).toBeUndefined();
-    expect(options.updateId).toBeUndefined();
-    expect(options.sessionId).toBeUndefined();
-  });
-
-  it('calls enableJsonOutput and printJsonOnlyOutput when --json is provided with an event name', async () => {
-    const mockEvents = [
-      {
-        id: 'evt-1',
-        eventName: 'my_event',
-        timestamp: '2025-01-15T10:30:00.000Z',
-        appVersion: '1.0.0',
-        appBuildNumber: '42',
-        deviceModel: 'iPhone 15',
-        deviceOs: 'iOS',
-        deviceOsVersion: '17.0',
-        countryCode: 'US',
-        sessionId: 'session-1',
-        easClientId: 'client-1',
-        properties: [],
-      },
-    ];
-    mockFetchObserveCustomEventsAsync.mockResolvedValue({
-      events: mockEvents as any,
-      pageInfo: { hasNextPage: false, hasPreviousPage: false },
-    });
-
-    const command = createCommand(['my_event', '--json', '--non-interactive']);
-    await command.runAsync();
-
-    expect(mockEnableJsonOutput).toHaveBeenCalled();
-    expect(mockBuildObserveCustomEventsJson).toHaveBeenCalledWith(
-      mockEvents,
-      expect.objectContaining({ hasNextPage: false })
-    );
-    expect(mockPrintJsonOnlyOutput).toHaveBeenCalled();
-  });
-
-  it('falls back to fetching event names and renders the empty-with-suggestions table when filtered fetch returns 0 events', async () => {
-    mockFetchObserveCustomEventsAsync.mockResolvedValue({
-      events: [],
-      pageInfo: { hasNextPage: false, hasPreviousPage: false },
-    });
-    const mockNames = [
-      { eventName: 'foo', count: 10 },
-      { eventName: 'bar', count: 5 },
-    ];
-    mockCustomEventNamesAsync.mockResolvedValue({
-      names: mockNames as any,
-      isTruncated: false,
-    });
-
-    const command = createCommand(['my_event']);
-    await command.runAsync();
-
-    expect(mockFetchObserveCustomEventsAsync).toHaveBeenCalledTimes(1);
-    expect(mockCustomEventNamesAsync).toHaveBeenCalledTimes(1);
-    expect(mockBuildObserveCustomEventsEmptyWithSuggestionsTable).toHaveBeenCalledWith(
-      'my_event',
-      mockNames,
-      expect.objectContaining({ isTruncated: false })
-    );
-  });
-
-  it('does not call customEventNamesAsync when filtered fetch returns at least one event', async () => {
-    mockFetchObserveCustomEventsAsync.mockResolvedValue({
-      events: [
-        {
-          id: 'evt-1',
-          eventName: 'my_event',
-          timestamp: '2025-01-15T10:30:00.000Z',
-          appVersion: '1.0.0',
-          appBuildNumber: '42',
-          deviceModel: 'iPhone 15',
-          deviceOs: 'iOS',
-          deviceOsVersion: '17.0',
-          easClientId: 'client-1',
-          properties: [],
-        } as any,
-      ],
-      pageInfo: { hasNextPage: false, hasPreviousPage: false },
-    });
-
-    const command = createCommand(['my_event']);
-    await command.runAsync();
-
-    expect(mockCustomEventNamesAsync).not.toHaveBeenCalled();
-    expect(mockBuildObserveCustomEventsEmptyWithSuggestionsTable).not.toHaveBeenCalled();
-  });
-
-  it('emits empty-with-suggestions JSON when filtered fetch returns 0 events and --json is set', async () => {
-    mockFetchObserveCustomEventsAsync.mockResolvedValue({
-      events: [],
-      pageInfo: { hasNextPage: false, hasPreviousPage: false },
-    });
-    const mockNames = [{ eventName: 'foo', count: 10 }];
-    mockCustomEventNamesAsync.mockResolvedValue({
-      names: mockNames as any,
-      isTruncated: false,
-    });
-
-    const command = createCommand(['my_event', '--json', '--non-interactive']);
-    await command.runAsync();
-
-    expect(mockEnableJsonOutput).toHaveBeenCalled();
-    expect(mockBuildObserveCustomEventsEmptyWithSuggestionsJson).toHaveBeenCalledWith(
-      'my_event',
-      mockNames,
-      false
-    );
-    expect(mockBuildObserveCustomEventsJson).not.toHaveBeenCalled();
-    expect(mockPrintJsonOnlyOutput).toHaveBeenCalled();
-  });
-
-  it('does not run the empty-with-suggestions fallback when no event name is provided (event names mode)', async () => {
-    mockCustomEventNamesAsync.mockResolvedValue({ names: [], isTruncated: false });
-
-    const command = createCommand([]);
-    await command.runAsync();
-
-    expect(mockBuildObserveCustomEventsEmptyWithSuggestionsTable).not.toHaveBeenCalled();
-    expect(mockBuildObserveCustomEventsEmptyWithSuggestionsJson).not.toHaveBeenCalled();
-  });
-
-  it('does not run the empty-with-suggestions fallback for --all-events with 0 results', async () => {
-    mockFetchObserveCustomEventsAsync.mockResolvedValue({
-      events: [],
-      pageInfo: { hasNextPage: false, hasPreviousPage: false },
-    });
-
-    const command = createCommand(['--all-events']);
-    await command.runAsync();
-
-    expect(mockCustomEventNamesAsync).not.toHaveBeenCalled();
-    expect(mockBuildObserveCustomEventsEmptyWithSuggestionsTable).not.toHaveBeenCalled();
-  });
-
-  it('emits JSON of event names + counts when --json is provided without an event name', async () => {
-    const mockNames = [
-      { eventName: 'foo', count: 10 },
-      { eventName: 'bar', count: 5 },
-    ];
-    mockCustomEventNamesAsync.mockResolvedValue({
-      names: mockNames as any,
-      isTruncated: false,
-    });
-
-    const command = createCommand(['--json', '--non-interactive']);
-    await command.runAsync();
-
-    expect(mockEnableJsonOutput).toHaveBeenCalled();
-    expect(mockBuildObserveCustomEventNamesJson).toHaveBeenCalledWith(mockNames, false);
-    expect(mockPrintJsonOnlyOutput).toHaveBeenCalled();
-  });
-});

packages/eas-cli/src/commands/observe/events.ts

@@ -4,6 +4,7 @@ import EasCommand from '../../commandUtils/EasCommand';
 import { EasCommandError } from '../../commandUtils/errors';
 import { EasNonInteractiveAndJsonFlags } from '../../commandUtils/flags';
 import { getLimitFlagWithCustomValues } from '../../commandUtils/pagination';
+import { AppObservePlatform, AppPlatform } from '../../graphql/generated';
 import Log from '../../log';
 import {
   EventsOrderPreset,
@@ -13,12 +14,6 @@ import {
 } from '../../observe/fetchEvents';
 import { METRIC_ALIASES, METRIC_SHORT_NAMES, resolveMetricName } from '../../observe/metricNames';
 import { buildObserveEventsJson, buildObserveEventsTable } from '../../observe/formatEvents';
-import {
-  allowedPlatformFlagValues,
-  appObservePlatformFromFlag,
-  appPlatformsFromFlag,
-} from '../../observe/platforms';
-import { resolveObserveCommandContextAsync } from '../../observe/resolveProjectContext';
 import { resolveTimeRange } from '../../observe/startAndEndTime';
 import { selectAsync } from '../../prompts';
 import { enableJsonOutput, printJsonOnlyOutput } from '../../utils/json';
@@ -46,7 +41,7 @@ export default class ObserveEvents extends EasCommand {
     })(),
     platform: Flags.option({
       description: 'Filter by platform',
-      options: allowedPlatformFlagValues,
+      options: Object.values(AppObservePlatform).map(s => s.toLowerCase()),
     })(),
     after: Flags.string({
       description:
@@ -93,13 +88,22 @@ export default class ObserveEvents extends EasCommand {
   async runAsync(): Promise<void> {
     const { flags, args } = await this.parse(ObserveEvents);
 
-    const { projectId, graphqlClient } = await resolveObserveCommandContextAsync({
-      command: this,
-      commandClass: ObserveEvents,
-      loggedInOnlyContextDefinition: ObserveEvents.loggedInOnlyContextDefinition,
-      projectIdOverride: flags['project-id'],
-      nonInteractive: flags['non-interactive'],
-    });
+    let projectId: string;
+    let graphqlClient;
+    if (flags['project-id']) {
+      projectId = flags['project-id'];
+      const ctx = await this.getContextAsync(
+        { contextDefinition: ObserveEvents.loggedInOnlyContextDefinition },
+        { nonInteractive: flags['non-interactive'] }
+      );
+      graphqlClient = ctx.loggedIn.graphqlClient;
+    } else {
+      const ctx = await this.getContextAsync(ObserveEvents, {
+        nonInteractive: flags['non-interactive'],
+      });
+      projectId = ctx.projectId;
+      graphqlClient = ctx.loggedIn.graphqlClient;
+    }
 
     if (flags.json) {
       enableJsonOutput();
@@ -126,8 +130,15 @@ export default class ObserveEvents extends EasCommand {
 
     const { daysBack, startTime, endTime } = resolveTimeRange(flags);
 
-    const platform = appObservePlatformFromFlag(flags.platform);
-    const platforms = appPlatformsFromFlag(flags.platform);
+    const platform = flags.platform
+      ? flags.platform === 'android'
+        ? AppObservePlatform.Android
+        : AppObservePlatform.Ios
+      : undefined;
+
+    const platforms: AppPlatform[] = platform
+      ? [platform === AppObservePlatform.Android ? AppPlatform.Android : AppPlatform.Ios]
+      : [AppPlatform.Android, AppPlatform.Ios];
 
     const [{ events, pageInfo }, totalEventCount] = await Promise.all([
       fetchObserveEventsAsync(graphqlClient, projectId, {

packages/eas-cli/src/commands/observe/logs.ts

@@ -1,194 +0,0 @@
-import { Args, Flags } from '@oclif/core';
-
-import EasCommand from '../../commandUtils/EasCommand';
-import { EasNonInteractiveAndJsonFlags } from '../../commandUtils/flags';
-import { getLimitFlagWithCustomValues } from '../../commandUtils/pagination';
-import Log from '../../log';
-import { ObserveQuery } from '../../graphql/queries/ObserveQuery';
-import { fetchObserveCustomEventsAsync } from '../../observe/fetchCustomEvents';
-import {
-  buildObserveCustomEventNamesJson,
-  buildObserveCustomEventNamesTable,
-  buildObserveCustomEventsEmptyWithSuggestionsJson,
-  buildObserveCustomEventsEmptyWithSuggestionsTable,
-  buildObserveCustomEventsJson,
-  buildObserveCustomEventsTable,
-} from '../../observe/formatCustomEvents';
-import { allowedPlatformFlagValues, appObservePlatformFromFlag } from '../../observe/platforms';
-import { resolveObserveCommandContextAsync } from '../../observe/resolveProjectContext';
-import { resolveTimeRange } from '../../observe/startAndEndTime';
-import { enableJsonOutput, printJsonOnlyOutput } from '../../utils/json';
-
-const DEFAULT_EVENTS_LIMIT = 10;
-
-export default class ObserveLogs extends EasCommand {
-  static override hidden = true;
-  static override description =
-    'display individual custom events (logs) emitted by the app, filtered by the event name in the argument. With no arguments, a list of the available event names and associated event counts is returned.';
-
-  static override args = {
-    eventName: Args.string({
-      description: 'Custom event name to filter by',
-      required: false,
-    }),
-  };
-
-  static override flags = {
-    platform: Flags.option({
-      description: 'Filter by platform',
-      options: allowedPlatformFlagValues,
-    })(),
-    after: Flags.string({
-      description:
-        'Cursor for pagination. Use the endCursor from a previous query to fetch the next page.',
-    }),
-    limit: getLimitFlagWithCustomValues({
-      defaultTo: DEFAULT_EVENTS_LIMIT,
-      limit: 100,
-    }),
-    start: Flags.string({
-      description: 'Start of time range (ISO date)',
-      exclusive: ['days'],
-    }),
-    end: Flags.string({
-      description: 'End of time range (ISO date)',
-      exclusive: ['days'],
-    }),
-    days: Flags.integer({
-      description: 'Show events from the last N days (mutually exclusive with --start/--end)',
-      min: 1,
-      exclusive: ['start', 'end'],
-    }),
-    'app-version': Flags.string({
-      description: 'Filter by app version',
-    }),
-    'update-id': Flags.string({
-      description: 'Filter by EAS update ID',
-    }),
-    'session-id': Flags.string({
-      description: 'Filter by session ID',
-    }),
-    'all-events': Flags.boolean({
-      description:
-        'When no event name argument is provided, list all events across all event names instead of a summary of event names + counts.',
-      default: false,
-    }),
-    'project-id': Flags.string({
-      description: 'EAS project ID (defaults to the project ID of the current directory)',
-    }),
-    ...EasNonInteractiveAndJsonFlags,
-  };
-
-  static override contextDefinition = {
-    ...this.ContextOptions.ProjectId,
-    ...this.ContextOptions.LoggedIn,
-  };
-
-  private static loggedInOnlyContextDefinition = {
-    ...this.ContextOptions.LoggedIn,
-  };
-
-  async runAsync(): Promise<void> {
-    const { flags, args } = await this.parse(ObserveLogs);
-
-    if (args.eventName && flags['all-events']) {
-      throw new Error(
-        '--all-events cannot be combined with an event name argument. Pass an event name to filter by it, or pass --all-events to list all events across all event names.'
-      );
-    }
-
-    const { projectId, graphqlClient } = await resolveObserveCommandContextAsync({
-      command: this,
-      commandClass: ObserveLogs,
-      loggedInOnlyContextDefinition: ObserveLogs.loggedInOnlyContextDefinition,
-      projectIdOverride: flags['project-id'],
-      nonInteractive: flags['non-interactive'],
-    });
-
-    if (flags.json) {
-      enableJsonOutput();
-    } else {
-      Log.warn('EAS Observe is in preview and subject to breaking changes.');
-    }
-
-    const { daysBack, startTime, endTime } = resolveTimeRange(flags);
-
-    const platform = appObservePlatformFromFlag(flags.platform);
-
-    if (!args.eventName && !flags['all-events']) {
-      const { names, isTruncated } = await ObserveQuery.customEventNamesAsync(graphqlClient, {
-        appId: projectId,
-        startTime,
-        endTime,
-        platform,
-      });
-
-      if (flags.json) {
-        printJsonOnlyOutput(buildObserveCustomEventNamesJson(names, isTruncated));
-      } else {
-        Log.addNewLineIfNone();
-        Log.log(
-          buildObserveCustomEventNamesTable(names, {
-            daysBack,
-            startTime,
-            endTime,
-            isTruncated,
-          })
-        );
-      }
-      return;
-    }
-
-    const { events, pageInfo } = await fetchObserveCustomEventsAsync(graphqlClient, projectId, {
-      eventName: args.eventName,
-      limit: flags.limit ?? DEFAULT_EVENTS_LIMIT,
-      ...(flags.after && { after: flags.after }),
-      startTime,
-      endTime,
-      platform,
-      appVersion: flags['app-version'],
-      updateId: flags['update-id'],
-      sessionId: flags['session-id'],
-    });
-
-    if (args.eventName && events.length === 0) {
-      const { names, isTruncated } = await ObserveQuery.customEventNamesAsync(graphqlClient, {
-        appId: projectId,
-        startTime,
-        endTime,
-        platform,
-      });
-
-      if (flags.json) {
-        printJsonOnlyOutput(
-          buildObserveCustomEventsEmptyWithSuggestionsJson(args.eventName, names, isTruncated)
-        );
-      } else {
-        Log.addNewLineIfNone();
-        Log.log(
-          buildObserveCustomEventsEmptyWithSuggestionsTable(args.eventName, names, {
-            daysBack,
-            startTime,
-            endTime,
-            isTruncated,
-          })
-        );
-      }
-      return;
-    }
-
-    if (flags.json) {
-      printJsonOnlyOutput(buildObserveCustomEventsJson(events, pageInfo));
-    } else {
-      Log.addNewLineIfNone();
-      Log.log(
-        buildObserveCustomEventsTable(events, pageInfo, {
-          eventName: args.eventName,
-          daysBack,
-          startTime,
-          endTime,
-        })
-      );
-    }
-  }
-}

packages/eas-cli/src/commands/observe/metrics.ts

@@ -2,6 +2,7 @@ import { Flags } from '@oclif/core';
 
 import EasCommand from '../../commandUtils/EasCommand';
 import { EasNonInteractiveAndJsonFlags } from '../../commandUtils/flags';
+import { AppObservePlatform, AppPlatform } from '../../graphql/generated';
 import Log from '../../log';
 import { fetchObserveMetricsAsync } from '../../observe/fetchMetrics';
 import {
@@ -11,8 +12,6 @@ import {
   resolveStatKey,
 } from '../../observe/formatMetrics';
 import { METRIC_ALIASES, resolveMetricName } from '../../observe/metricNames';
-import { allowedPlatformFlagValues, appPlatformsFromFlag } from '../../observe/platforms';
-import { resolveObserveCommandContextAsync } from '../../observe/resolveProjectContext';
 import { resolveTimeRange } from '../../observe/startAndEndTime';
 import { enableJsonOutput, printJsonOnlyOutput } from '../../utils/json';
 
@@ -43,7 +42,7 @@ export default class ObserveMetrics extends EasCommand {
   static override flags = {
     platform: Flags.option({
       description: 'Filter by platform',
-      options: allowedPlatformFlagValues,
+      options: Object.values(AppObservePlatform).map(s => s.toLowerCase()),
     })(),
     metric: Flags.option({
       description: 'Metric name to display (can be specified multiple times).',
@@ -86,13 +85,22 @@ export default class ObserveMetrics extends EasCommand {
   async runAsync(): Promise<void> {
     const { flags } = await this.parse(ObserveMetrics);
 
-    const { projectId, graphqlClient } = await resolveObserveCommandContextAsync({
-      command: this,
-      commandClass: ObserveMetrics,
-      loggedInOnlyContextDefinition: ObserveMetrics.loggedInOnlyContextDefinition,
-      projectIdOverride: flags['project-id'],
-      nonInteractive: flags['non-interactive'],
-    });
+    let projectId: string;
+    let graphqlClient;
+    if (flags['project-id']) {
+      projectId = flags['project-id'];
+      const ctx = await this.getContextAsync(
+        { contextDefinition: ObserveMetrics.loggedInOnlyContextDefinition },
+        { nonInteractive: flags['non-interactive'] }
+      );
+      graphqlClient = ctx.loggedIn.graphqlClient;
+    } else {
+      const ctx = await this.getContextAsync(ObserveMetrics, {
+        nonInteractive: flags['non-interactive'],
+      });
+      projectId = ctx.projectId;
+      graphqlClient = ctx.loggedIn.graphqlClient;
+    }
 
     if (flags.json) {
       enableJsonOutput();
@@ -106,7 +114,9 @@ export default class ObserveMetrics extends EasCommand {
 
     const { daysBack, startTime, endTime } = resolveTimeRange(flags);
 
-    const platforms = appPlatformsFromFlag(flags.platform);
+    const platforms: AppPlatform[] = flags.platform
+      ? [flags.platform === 'android' ? AppPlatform.Android : AppPlatform.Ios]
+      : [AppPlatform.Android, AppPlatform.Ios];
 
     const { metricsMap, buildNumbersMap, updateIdsMap, totalEventCounts } =
       await fetchObserveMetricsAsync(

packages/eas-cli/src/commands/observe/versions.ts

@@ -2,11 +2,10 @@ import { Flags } from '@oclif/core';
 
 import EasCommand from '../../commandUtils/EasCommand';
 import { EasNonInteractiveAndJsonFlags } from '../../commandUtils/flags';
+import { AppObservePlatform, AppPlatform } from '../../graphql/generated';
 import Log from '../../log';
 import { fetchObserveVersionsAsync } from '../../observe/fetchVersions';
 import { buildObserveVersionsJson, buildObserveVersionsTable } from '../../observe/formatVersions';
-import { allowedPlatformFlagValues, appPlatformsFromFlag } from '../../observe/platforms';
-import { resolveObserveCommandContextAsync } from '../../observe/resolveProjectContext';
 import { resolveTimeRange } from '../../observe/startAndEndTime';
 import { enableJsonOutput, printJsonOnlyOutput } from '../../utils/json';
 
@@ -17,7 +16,7 @@ export default class ObserveVersions extends EasCommand {
   static override flags = {
     platform: Flags.option({
       description: 'Filter by platform',
-      options: allowedPlatformFlagValues,
+      options: Object.values(AppObservePlatform).map(s => s.toLowerCase()),
     })(),
     start: Flags.string({
       description: 'Start of time range (ISO date)',
@@ -50,13 +49,22 @@ export default class ObserveVersions extends EasCommand {
   async runAsync(): Promise<void> {
     const { flags } = await this.parse(ObserveVersions);
 
-    const { projectId, graphqlClient } = await resolveObserveCommandContextAsync({
-      command: this,
-      commandClass: ObserveVersions,
-      loggedInOnlyContextDefinition: ObserveVersions.loggedInOnlyContextDefinition,
-      projectIdOverride: flags['project-id'],
-      nonInteractive: flags['non-interactive'],
-    });
+    let projectId: string;
+    let graphqlClient;
+    if (flags['project-id']) {
+      projectId = flags['project-id'];
+      const ctx = await this.getContextAsync(
+        { contextDefinition: ObserveVersions.loggedInOnlyContextDefinition },
+        { nonInteractive: flags['non-interactive'] }
+      );
+      graphqlClient = ctx.loggedIn.graphqlClient;
+    } else {
+      const ctx = await this.getContextAsync(ObserveVersions, {
+        nonInteractive: flags['non-interactive'],
+      });
+      projectId = ctx.projectId;
+      graphqlClient = ctx.loggedIn.graphqlClient;
+    }
 
     if (flags.json) {
       enableJsonOutput();
@@ -66,7 +74,9 @@ export default class ObserveVersions extends EasCommand {
 
     const { startTime, endTime } = resolveTimeRange(flags);
 
-    const platforms = appPlatformsFromFlag(flags.platform);
+    const platforms: AppPlatform[] = flags.platform
+      ? [flags.platform === 'android' ? AppPlatform.Android : AppPlatform.Ios]
+      : [AppPlatform.Android, AppPlatform.Ios];
 
     const results = await fetchObserveVersionsAsync(
       graphqlClient,

packages/eas-cli/src/commands/simulator/start.ts

@@ -2,7 +2,6 @@ import { Flags } from '@oclif/core';
 
 import { getBareJobRunUrl } from '../../build/utils/url';
 import EasCommand from '../../commandUtils/EasCommand';
-import { ExpoGraphqlClient } from '../../commandUtils/context/contextUtils/createGraphqlClient';
 import { EASNonInteractiveFlag } from '../../commandUtils/flags';
 import {
   AppPlatform,
@@ -77,7 +76,6 @@ export default class SimulatorStart extends EasCommand {
 
     const createSpinner = ora('🚀 Creating device run session').start();
     let deviceRunSessionId: string;
-    let jobRunUrl: string;
     try {
       const session = await DeviceRunSessionMutation.createDeviceRunSessionAsync(graphqlClient, {
         appId: projectId,
@@ -87,7 +85,7 @@ export default class SimulatorStart extends EasCommand {
       });
       deviceRunSessionId = session.id;
       const jobRunId = nullthrows(session.turtleJobRun?.id, 'Expected device run session to start');
-      jobRunUrl = getBareJobRunUrl(session.app.ownerAccount.name, session.app.slug, jobRunId);
+      const jobRunUrl = getBareJobRunUrl(session.app.ownerAccount.name, session.app.slug, jobRunId);
       createSpinner.succeed(
         `Device run session created (id: ${deviceRunSessionId}) ${link(jobRunUrl)}`
       );
@@ -111,7 +109,7 @@ export default class SimulatorStart extends EasCommand {
           session.status === DeviceRunSessionStatus.Stopped
         ) {
           throw new Error(
-            `Device run session ${deviceRunSessionId} ${session.status.toLowerCase()} before the ${flags.type} daemon was ready. ${link(jobRunUrl)}`
+            `Device run session ${deviceRunSessionId} ${session.status.toLowerCase()} before the ${flags.type} daemon was ready.`
           );
         }
 
@@ -122,7 +120,7 @@ export default class SimulatorStart extends EasCommand {
           jobRunStatus === JobRunStatus.Finished
         ) {
           throw new Error(
-            `Turtle job run for device run session ${deviceRunSessionId} ${jobRunStatus.toLowerCase()} before the ${flags.type} daemon was ready. ${link(jobRunUrl)}`
+            `Turtle job run for device run session ${deviceRunSessionId} ${jobRunStatus.toLowerCase()} before the ${flags.type} daemon was ready.`
           );
         }
 
@@ -137,15 +135,13 @@ export default class SimulatorStart extends EasCommand {
       }
     } catch (err) {
       pollSpinner.fail(`Failed while polling for ${flags.type} daemon logs`);
-      await ensureDeviceRunSessionStoppedSafelyAsync(graphqlClient, deviceRunSessionId);
       throw err;
     }
 
     if (!result.ready) {
       pollSpinner.fail(`Timed out waiting for ${flags.type} daemon to start`);
-      await ensureDeviceRunSessionStoppedSafelyAsync(graphqlClient, deviceRunSessionId);
       throw new Error(
-        `Timed out after ${Math.round(POLL_TIMEOUT_MS / 1000)}s waiting for ${flags.type} daemon to start. ${link(jobRunUrl)}`
+        `Timed out after ${Math.round(POLL_TIMEOUT_MS / 1000)}s waiting for ${flags.type} daemon to start.`
       );
     }
 
@@ -154,127 +150,9 @@ export default class SimulatorStart extends EasCommand {
     Log.newLine();
     Log.log(result.message);
     Log.newLine();
-
-    if (flags['non-interactive']) {
-      Log.log(
-        `When you are done, stop the session with: eas simulator:stop --id ${deviceRunSessionId}`
-      );
-      return;
-    }
-
-    await waitForSessionEndOrInterruptAsync({
-      graphqlClient,
-      deviceRunSessionId,
-      jobRunUrl,
-    });
-  }
-}
-
-async function waitForSessionEndOrInterruptAsync({
-  graphqlClient,
-  deviceRunSessionId,
-  jobRunUrl,
-}: {
-  graphqlClient: ExpoGraphqlClient;
-  deviceRunSessionId: string;
-  jobRunUrl: string;
-}): Promise<void> {
-  const spinner = ora(
-    `Device run session active — press Ctrl+C to stop, or run \`eas simulator:stop --id ${deviceRunSessionId}\` from another shell`
-  ).start();
-
-  const abortController = new AbortController();
-  const { signal } = abortController;
-  const abortPromise = new Promise<void>(resolve => {
-    signal.addEventListener(
-      'abort',
-      () => {
-        resolve();
-      },
-      { once: true }
+    Log.log(
+      `When you are done, stop the session with: eas simulator:stop --id ${deviceRunSessionId}`
     );
-  });
-  const sigintHandler = (): void => {
-    if (signal.aborted) {
-      // Force exit on a second Ctrl+C in case cleanup is hanging. The session may still be
-      // running on EAS, so tell the user how to make sure it gets terminated.
-      spinner.fail(
-        `Aborted before the device run session could be stopped. Run \`eas simulator:stop --id ${deviceRunSessionId}\` to terminate it and avoid unexpected charges.`
-      );
-      process.exit(130);
-    }
-    abortController.abort();
-  };
-  process.on('SIGINT', sigintHandler);
-
-  try {
-    while (!signal.aborted) {
-      let session;
-      try {
-        session = await DeviceRunSessionQuery.byIdAsync(graphqlClient, deviceRunSessionId);
-      } catch (err) {
-        Log.debug(
-          `Failed to poll device run session: ${err instanceof Error ? err.message : String(err)}`
-        );
-        await Promise.race([sleepAsync(POLL_INTERVAL_MS), abortPromise]);
-        continue;
-      }
-
-      const jobRunStatus = session.turtleJobRun?.status;
-      if (
-        session.status === DeviceRunSessionStatus.Errored ||
-        jobRunStatus === JobRunStatus.Errored
-      ) {
-        spinner.fail(`Device run session errored. ${link(jobRunUrl)}`);
-        throw new Error(`Device run session ${deviceRunSessionId} errored.`);
-      }
-      if (
-        session.status === DeviceRunSessionStatus.Stopped ||
-        jobRunStatus === JobRunStatus.Canceled ||
-        jobRunStatus === JobRunStatus.Finished
-      ) {
-        spinner.succeed(`Device run session ended. ${link(jobRunUrl)}`);
-        return;
-      }
-
-      await Promise.race([sleepAsync(POLL_INTERVAL_MS), abortPromise]);
-    }
-
-    spinner.text = 'Stopping device run session...';
-    const stopped = await ensureDeviceRunSessionStoppedSafelyAsync(
-      graphqlClient,
-      deviceRunSessionId
-    );
-    if (stopped) {
-      spinner.succeed('Device run session stopped');
-    } else {
-      spinner.fail(
-        `Could not confirm the device run session was stopped. Run \`eas simulator:stop --id ${deviceRunSessionId}\` to terminate it and avoid unexpected charges.`
-      );
-    }
-  } finally {
-    process.removeListener('SIGINT', sigintHandler);
-  }
-}
-
-async function ensureDeviceRunSessionStoppedSafelyAsync(
-  graphqlClient: ExpoGraphqlClient,
-  deviceRunSessionId: string
-): Promise<boolean> {
-  try {
-    await DeviceRunSessionMutation.ensureDeviceRunSessionStoppedAsync(
-      graphqlClient,
-      deviceRunSessionId
-    );
-    return true;
-  } catch (err) {
-    // Cleanup is best-effort; surface the failure but don't mask the original error.
-    Log.warn(
-      `Failed to stop device run session ${deviceRunSessionId}: ${
-        err instanceof Error ? err.message : String(err)
-      }`
-    );
-    return false;
   }
 }
 

packages/eas-cli/src/commands/simulator/stop.ts

@@ -33,7 +33,7 @@ export default class SimulatorStop extends EasCommand {
 
     const stopSpinner = ora(`🛑 Stopping device run session ${flags.id}`).start();
     try {
-      const session = await DeviceRunSessionMutation.ensureDeviceRunSessionStoppedAsync(
+      const session = await DeviceRunSessionMutation.stopDeviceRunSessionAsync(
         graphqlClient,
         flags.id
       );

packages/eas-cli/src/fingerprint/cli.ts

@@ -103,7 +103,6 @@ async function createFingerprintWithoutLoggingAsync(
   if (options.debug) {
     fingerprintOptions.debug = true;
   }
-  fingerprintOptions.silent = true;
 
   return await withTemporaryEnvAsync(options.env ?? {}, () =>
     Fingerprint.createFingerprintAsync(projectDir, fingerprintOptions)

packages/eas-cli/src/graphql/generated.ts

@@ -2094,7 +2094,6 @@ export type AppObserve = {
   events: AppObserveEventsConnection;
   timeSeries: AppObserveTimeSeries;
   totalEventCount: Scalars['Int']['output'];
-  updates: AppObserveUpdatesConnection;
 };
 
 
@@ -2146,11 +2145,6 @@ export type AppObserveTimeSeriesArgs = {
   input: AppObserveTimeSeriesInput;
 };
 
-
-export type AppObserveUpdatesArgs = {
-  input: AppObserveUpdatesInput;
-};
-
 export type AppObserveAppBuildNumber = {
   __typename?: 'AppObserveAppBuildNumber';
   appBuildNumber: Scalars['String']['output'];
@@ -2434,57 +2428,6 @@ export type AppObserveTimeSeriesStatistics = {
   p99?: Maybe<Scalars['Float']['output']>;
 };
 
-export type AppObserveUpdate = {
-  __typename?: 'AppObserveUpdate';
-  appUpdateId: Scalars['String']['output'];
-  appVersion: Scalars['String']['output'];
-  downloadCount: Scalars['Int']['output'];
-  firstSeenAt: Scalars['DateTime']['output'];
-  medianDownloadTime: Scalars['Float']['output'];
-  p90DownloadTime: Scalars['Float']['output'];
-};
-
-export type AppObserveUpdateEdge = {
-  __typename?: 'AppObserveUpdateEdge';
-  cursor: Scalars['String']['output'];
-  node: AppObserveUpdate;
-};
-
-export type AppObserveUpdatesConnection = {
-  __typename?: 'AppObserveUpdatesConnection';
-  edges: Array<AppObserveUpdateEdge>;
-  pageInfo: PageInfo;
-  totalCount: Scalars['Int']['output'];
-  totalDownloads: Scalars['Int']['output'];
-};
-
-export type AppObserveUpdatesInput = {
-  after?: InputMaybe<Scalars['String']['input']>;
-  endTime: Scalars['DateTime']['input'];
-  environment?: InputMaybe<Scalars['String']['input']>;
-  first?: InputMaybe<Scalars['Int']['input']>;
-  orderBy?: InputMaybe<AppObserveUpdatesOrderBy>;
-  platform: AppObservePlatform;
-  startTime: Scalars['DateTime']['input'];
-};
-
-export type AppObserveUpdatesOrderBy = {
-  direction: AppObserveUpdatesOrderByDirection;
-  field: AppObserveUpdatesOrderByField;
-};
-
-export enum AppObserveUpdatesOrderByDirection {
-  Asc = 'ASC',
-  Desc = 'DESC'
-}
-
-export enum AppObserveUpdatesOrderByField {
-  DownloadCount = 'DOWNLOAD_COUNT',
-  FirstSeenAt = 'FIRST_SEEN_AT',
-  MedianDownloadTime = 'MEDIAN_DOWNLOAD_TIME',
-  P90DownloadTime = 'P90_DOWNLOAD_TIME'
-}
-
 export type AppObserveVersionMarkerStatistics = {
   __typename?: 'AppObserveVersionMarkerStatistics';
   average?: Maybe<Scalars['Float']['output']>;
@@ -3673,7 +3616,6 @@ export type Build = ActivityTimelineProjectActivity & BuildOrBuildJob & {
   releaseChannel?: Maybe<Scalars['String']['output']>;
   requiredPackageManager?: Maybe<Scalars['String']['output']>;
   resolvedEnvironment?: Maybe<Scalars['EnvironmentVariableEnvironment']['output']>;
-  resolvedImage?: Maybe<Scalars['String']['output']>;
   /**
    * The builder resource class requested by the developer
    * @deprecated Use resourceClassDisplayName instead
@@ -3687,7 +3629,7 @@ export type Build = ActivityTimelineProjectActivity & BuildOrBuildJob & {
   /** @deprecated Use 'runtime' field instead. */
   runtimeVersion?: Maybe<Scalars['String']['output']>;
   sdkVersion?: Maybe<Scalars['String']['output']>;
-  /** @deprecated Use 'resolvedImage' for the concrete image the build runs on. */
+  /** @deprecated Check logs instead. */
   selectedImage?: Maybe<Scalars['String']['output']>;
   status: BuildStatus;
   submissions: Array<Submission>;
@@ -4289,34 +4231,12 @@ export type ConvexProject = {
   updatedAt: Scalars['DateTime']['output'];
 };
 
-export type ConvexProjectMutation = {
-  __typename?: 'ConvexProjectMutation';
-  deleteConvexProject: Scalars['ID']['output'];
-  setupConvexProject: SetupConvexProjectResult;
-};
-
-
-export type ConvexProjectMutationDeleteConvexProjectArgs = {
-  convexProjectId: Scalars['ID']['input'];
-};
-
-
-export type ConvexProjectMutationSetupConvexProjectArgs = {
-  input: SetupConvexProjectInput;
-};
-
 export type ConvexTeamConnection = {
   __typename?: 'ConvexTeamConnection';
   account: Account;
-  convexProjects: Array<ConvexProject>;
   convexTeamIdentifier: Scalars['String']['output'];
-  convexTeamName: Scalars['String']['output'];
-  convexTeamSlug: Scalars['String']['output'];
   createdAt: Scalars['DateTime']['output'];
-  hasBeenClaimed: Scalars['Boolean']['output'];
   id: Scalars['ID']['output'];
-  invitedAt?: Maybe<Scalars['DateTime']['output']>;
-  invitedEmail?: Maybe<Scalars['String']['output']>;
   updatedAt: Scalars['DateTime']['output'];
 };
 
@@ -5044,12 +4964,8 @@ export type DeviceRunSessionMutation = {
   __typename?: 'DeviceRunSessionMutation';
   /** Create a device run session */
   createDeviceRunSession: DeviceRunSession;
-  /**
-   * Ensure a device run session is stopped. Idempotent: if the session has already
-   * finished, the existing session is returned unchanged (an ERRORED session stays
-   * ERRORED).
-   */
-  ensureDeviceRunSessionStopped: DeviceRunSession;
+  /** Stop a device run session */
+  stopDeviceRunSession: DeviceRunSession;
 };
 
 
@@ -5058,7 +4974,7 @@ export type DeviceRunSessionMutationCreateDeviceRunSessionArgs = {
 };
 
 
-export type DeviceRunSessionMutationEnsureDeviceRunSessionStoppedArgs = {
+export type DeviceRunSessionMutationStopDeviceRunSessionArgs = {
   deviceRunSessionId: Scalars['ID']['input'];
 };
 
@@ -7920,7 +7836,6 @@ export type RootMutation = {
   build: BuildMutation;
   /** Mutations that create, update, and delete Build Annotations */
   buildAnnotation: BuildAnnotationMutation;
-  convexProject: ConvexProjectMutation;
   convexTeamConnection: ConvexTeamConnectionMutation;
   customDomain: CustomDomainMutation;
   deployments: DeploymentsMutation;
@@ -8519,21 +8434,6 @@ export type SentryProjectMutationDeleteSentryProjectArgs = {
   sentryProjectId: Scalars['ID']['input'];
 };
 
-export type SetupConvexProjectInput = {
-  appId: Scalars['ID']['input'];
-  convexTeamConnectionId: Scalars['ID']['input'];
-  deploymentRegion?: InputMaybe<Scalars['String']['input']>;
-  projectName: Scalars['String']['input'];
-};
-
-export type SetupConvexProjectResult = {
-  __typename?: 'SetupConvexProjectResult';
-  convexDeploymentName: Scalars['String']['output'];
-  convexDeploymentUrl: Scalars['String']['output'];
-  convexProject: ConvexProject;
-  deployKey: Scalars['String']['output'];
-};
-
 export type SizeBreakdownCategory = {
   __typename?: 'SizeBreakdownCategory';
   assetCount: Scalars['Int']['output'];
@@ -8850,7 +8750,6 @@ export type SubscriptionDetails = {
   endedAt?: Maybe<Scalars['DateTime']['output']>;
   futureSubscription?: Maybe<FutureSubscription>;
   id: Scalars['ID']['output'];
-  includedAgentCreditsInCents: Scalars['Int']['output'];
   isDowngrading?: Maybe<Scalars['Boolean']['output']>;
   meteredBillingStatus: MeteredBillingStatus;
   name?: Maybe<Scalars['String']['output']>;
@@ -11066,7 +10965,6 @@ export enum WorkflowJobStatus {
 
 export enum WorkflowJobType {
   AppleDeviceRegistrationRequest = 'APPLE_DEVICE_REGISTRATION_REQUEST',
-  BranchDelete = 'BRANCH_DELETE',
   Build = 'BUILD',
   Custom = 'CUSTOM',
   Deploy = 'DEPLOY',
@@ -12006,41 +11904,6 @@ export type RetryIosBuildMutationVariables = Exact<{
 
 export type RetryIosBuildMutation = { __typename?: 'RootMutation', build: { __typename?: 'BuildMutation', retryIosBuild: { __typename?: 'Build', id: string, status: BuildStatus, platform: AppPlatform, logFiles: Array<string>, channel?: string | null, distribution?: DistributionType | null, iosEnterpriseProvisioning?: BuildIosEnterpriseProvisioning | null, buildProfile?: string | null, sdkVersion?: string | null, appVersion?: string | null, appBuildVersion?: string | null, runtimeVersion?: string | null, gitCommitHash?: string | null, gitCommitMessage?: string | null, initialQueuePosition?: number | null, queuePosition?: number | null, estimatedWaitTimeLeftSeconds?: number | null, priority: BuildPriority, createdAt: any, updatedAt: any, message?: string | null, completedAt?: any | null, expirationDate?: any | null, isForIosSimulator: boolean, error?: { __typename?: 'BuildError', errorCode: string, message: string, docsUrl?: string | null } | null, artifacts?: { __typename?: 'BuildArtifacts', buildUrl?: string | null, xcodeBuildLogsUrl?: string | null, applicationArchiveUrl?: string | null, buildArtifactsUrl?: string | null } | null, fingerprint?: { __typename?: 'Fingerprint', id: string, hash: string } | null, initiatingActor?: { __typename: 'PartnerActor', id: string, displayName: string } | { __typename: 'Robot', id: string, displayName: string } | { __typename: 'SSOUser', id: string, displayName: string } | { __typename: 'User', id: string, displayName: string } | null, project: { __typename: 'App', id: string, name: string, slug: string, ownerAccount: { __typename?: 'Account', id: string, name: string } } | { __typename: 'Snack', id: string, name: string, slug: string }, metrics?: { __typename?: 'BuildMetrics', buildWaitTime?: number | null, buildQueueTime?: number | null, buildDuration?: number | null } | null } } };
 
-export type CreateConvexTeamConnectionMutationVariables = Exact<{
-  convexTeamConnectionData: CreateConvexTeamConnectionInput;
-}>;
-
-
-export type CreateConvexTeamConnectionMutation = { __typename?: 'RootMutation', convexTeamConnection: { __typename?: 'ConvexTeamConnectionMutation', createConvexTeamConnection: { __typename?: 'ConvexTeamConnection', id: string, convexTeamIdentifier: string, convexTeamName: string, convexTeamSlug: string, hasBeenClaimed: boolean, createdAt: any, updatedAt: any, invitedAt?: any | null, invitedEmail?: string | null } } };
-
-export type DeleteConvexTeamConnectionMutationVariables = Exact<{
-  convexTeamConnectionId: Scalars['ID']['input'];
-}>;
-
-
-export type DeleteConvexTeamConnectionMutation = { __typename?: 'RootMutation', convexTeamConnection: { __typename?: 'ConvexTeamConnectionMutation', deleteConvexTeamConnection: { __typename?: 'ConvexTeamConnection', id: string, convexTeamIdentifier: string, convexTeamName: string, convexTeamSlug: string, hasBeenClaimed: boolean, createdAt: any, updatedAt: any, invitedAt?: any | null, invitedEmail?: string | null } } };
-
-export type SetupConvexProjectMutationVariables = Exact<{
-  input: SetupConvexProjectInput;
-}>;
-
-
-export type SetupConvexProjectMutation = { __typename?: 'RootMutation', convexProject: { __typename?: 'ConvexProjectMutation', setupConvexProject: { __typename?: 'SetupConvexProjectResult', convexDeploymentName: string, convexDeploymentUrl: string, deployKey: string, convexProject: { __typename?: 'ConvexProject', id: string, convexProjectIdentifier: string, convexProjectName: string, convexProjectSlug: string, createdAt: any, updatedAt: any, convexTeamConnection: { __typename?: 'ConvexTeamConnection', id: string, convexTeamIdentifier: string, convexTeamName: string, convexTeamSlug: string, hasBeenClaimed: boolean, createdAt: any, updatedAt: any, invitedAt?: any | null, invitedEmail?: string | null } } } } };
-
-export type DeleteConvexProjectMutationVariables = Exact<{
-  convexProjectId: Scalars['ID']['input'];
-}>;
-
-
-export type DeleteConvexProjectMutation = { __typename?: 'RootMutation', convexProject: { __typename?: 'ConvexProjectMutation', deleteConvexProject: string } };
-
-export type SendConvexTeamInviteToVerifiedEmailMutationVariables = Exact<{
-  input: SendConvexTeamInviteToVerifiedEmailInput;
-}>;
-
-
-export type SendConvexTeamInviteToVerifiedEmailMutation = { __typename?: 'RootMutation', convexTeamConnection: { __typename?: 'ConvexTeamConnectionMutation', sendConvexTeamInviteToVerifiedEmail: boolean } };
-
 export type CreateDeviceRunSessionMutationVariables = Exact<{
   deviceRunSessionInput: CreateDeviceRunSessionInput;
 }>;
@@ -12048,12 +11911,12 @@ export type CreateDeviceRunSessionMutationVariables = Exact<{
 
 export type CreateDeviceRunSessionMutation = { __typename?: 'RootMutation', deviceRunSession: { __typename?: 'DeviceRunSessionMutation', createDeviceRunSession: { __typename?: 'DeviceRunSession', id: string, status: DeviceRunSessionStatus, app: { __typename?: 'App', id: string, slug: string, ownerAccount: { __typename?: 'Account', id: string, name: string } }, turtleJobRun?: { __typename?: 'JobRun', id: string } | null } } };
 
-export type EnsureDeviceRunSessionStoppedMutationVariables = Exact<{
+export type StopDeviceRunSessionMutationVariables = Exact<{
   deviceRunSessionId: Scalars['ID']['input'];
 }>;
 
 
-export type EnsureDeviceRunSessionStoppedMutation = { __typename?: 'RootMutation', deviceRunSession: { __typename?: 'DeviceRunSessionMutation', ensureDeviceRunSessionStopped: { __typename?: 'DeviceRunSession', id: string, status: DeviceRunSessionStatus } } };
+export type StopDeviceRunSessionMutation = { __typename?: 'RootMutation', deviceRunSession: { __typename?: 'DeviceRunSessionMutation', stopDeviceRunSession: { __typename?: 'DeviceRunSession', id: string, status: DeviceRunSessionStatus } } };
 
 export type CreateEnvironmentSecretForAccountMutationVariables = Exact<{
   input: CreateEnvironmentSecretInput;
@@ -12522,20 +12385,6 @@ export type ViewUpdateChannelsPaginatedOnAppQueryVariables = Exact<{
 
 export type ViewUpdateChannelsPaginatedOnAppQuery = { __typename?: 'RootQuery', app: { __typename?: 'AppQuery', byId: { __typename?: 'App', id: string, channelsPaginated: { __typename?: 'AppChannelsConnection', edges: Array<{ __typename?: 'AppChannelEdge', cursor: string, node: { __typename?: 'UpdateChannel', id: string, name: string, branchMapping: string } }>, pageInfo: { __typename?: 'PageInfo', hasNextPage: boolean, hasPreviousPage: boolean, startCursor?: string | null, endCursor?: string | null } } } } };
 
-export type ConvexTeamConnectionsByAccountIdQueryVariables = Exact<{
-  accountId: Scalars['String']['input'];
-}>;
-
-
-export type ConvexTeamConnectionsByAccountIdQuery = { __typename?: 'RootQuery', account: { __typename?: 'AccountQuery', byId: { __typename?: 'Account', id: string, convexTeamConnections: Array<{ __typename?: 'ConvexTeamConnection', id: string, convexTeamIdentifier: string, convexTeamName: string, convexTeamSlug: string, hasBeenClaimed: boolean, createdAt: any, updatedAt: any, invitedAt?: any | null, invitedEmail?: string | null }> } } };
-
-export type ConvexProjectByAppIdQueryVariables = Exact<{
-  appId: Scalars['String']['input'];
-}>;
-
-
-export type ConvexProjectByAppIdQuery = { __typename?: 'RootQuery', app: { __typename?: 'AppQuery', byId: { __typename?: 'App', id: string, convexProject?: { __typename?: 'ConvexProject', id: string, convexProjectIdentifier: string, convexProjectName: string, convexProjectSlug: string, createdAt: any, updatedAt: any, convexTeamConnection: { __typename?: 'ConvexTeamConnection', id: string, convexTeamIdentifier: string, convexTeamName: string, convexTeamSlug: string, hasBeenClaimed: boolean, createdAt: any, updatedAt: any, invitedAt?: any | null, invitedEmail?: string | null } } | null } } };
-
 export type DeviceRunSessionByIdQueryVariables = Exact<{
   deviceRunSessionId: Scalars['ID']['input'];
 }>;
@@ -12643,27 +12492,6 @@ export type AppObserveEventsQueryVariables = Exact<{
 
 export type AppObserveEventsQuery = { __typename?: 'RootQuery', app: { __typename?: 'AppQuery', byId: { __typename?: 'App', id: string, observe: { __typename?: 'AppObserve', events: { __typename?: 'AppObserveEventsConnection', pageInfo: { __typename?: 'PageInfo', hasNextPage: boolean, hasPreviousPage: boolean, endCursor?: string | null }, edges: Array<{ __typename?: 'AppObserveEventEdge', cursor: string, node: { __typename?: 'AppObserveEvent', id: string, metricName: string, metricValue: number, timestamp: any, appVersion: string, appBuildNumber: string, appUpdateId?: string | null, deviceModel: string, deviceOs: string, deviceOsVersion: string, countryCode?: string | null, sessionId?: string | null, easClientId: string, customParams?: any | null } }> } } } } };
 
-export type AppObserveCustomEventListQueryVariables = Exact<{
-  appId: Scalars['String']['input'];
-  filter?: InputMaybe<AppObserveCustomEventListFilter>;
-  first?: InputMaybe<Scalars['Int']['input']>;
-  after?: InputMaybe<Scalars['String']['input']>;
-}>;
-
-
-export type AppObserveCustomEventListQuery = { __typename?: 'RootQuery', app: { __typename?: 'AppQuery', byId: { __typename?: 'App', id: string, observe: { __typename?: 'AppObserve', customEventList: { __typename?: 'AppObserveCustomEventListConnection', pageInfo: { __typename?: 'PageInfo', hasNextPage: boolean, hasPreviousPage: boolean, endCursor?: string | null }, edges: Array<{ __typename?: 'AppObserveCustomEventEdge', cursor: string, node: { __typename?: 'AppObserveCustomEvent', id: string, eventName: string, timestamp: any, sessionId?: string | null, severityNumber?: number | null, severityText?: string | null, appVersion: string, appBuildNumber: string, appUpdateId?: string | null, appEasBuildId?: string | null, deviceOs: string, deviceOsVersion: string, deviceModel: string, environment?: string | null, easClientId: string, countryCode?: string | null, properties: Array<{ __typename?: 'AppObserveEventProperty', key: string, value: string, type: AppObservePropertyType }> } }> } } } } };
-
-export type AppObserveCustomEventNamesQueryVariables = Exact<{
-  appId: Scalars['String']['input'];
-  startTime: Scalars['DateTime']['input'];
-  endTime: Scalars['DateTime']['input'];
-  platform?: InputMaybe<AppObservePlatform>;
-  environment?: InputMaybe<Scalars['String']['input']>;
-}>;
-
-
-export type AppObserveCustomEventNamesQuery = { __typename?: 'RootQuery', app: { __typename?: 'AppQuery', byId: { __typename?: 'App', id: string, observe: { __typename?: 'AppObserve', customEventNames: { __typename?: 'AppObserveCustomEventNames', isTruncated: boolean, names: Array<{ __typename?: 'AppObserveCustomEventName', eventName: string, count: number }> } } } } };
-
 export type GetAssetMetadataQueryVariables = Exact<{
   storageKeys: Array<Scalars['String']['input']> | Scalars['String']['input'];
 }>;
@@ -12844,12 +12672,6 @@ export type BuildWithSubmissionsFragment = { __typename?: 'Build', id: string, s
 
 export type BuildWithFingerprintFragment = { __typename?: 'Build', id: string, status: BuildStatus, platform: AppPlatform, logFiles: Array<string>, channel?: string | null, distribution?: DistributionType | null, iosEnterpriseProvisioning?: BuildIosEnterpriseProvisioning | null, buildProfile?: string | null, sdkVersion?: string | null, appVersion?: string | null, appBuildVersion?: string | null, runtimeVersion?: string | null, gitCommitHash?: string | null, gitCommitMessage?: string | null, initialQueuePosition?: number | null, queuePosition?: number | null, estimatedWaitTimeLeftSeconds?: number | null, priority: BuildPriority, createdAt: any, updatedAt: any, message?: string | null, completedAt?: any | null, expirationDate?: any | null, isForIosSimulator: boolean, fingerprint?: { __typename?: 'Fingerprint', id: string, hash: string, debugInfoUrl?: string | null, builds: { __typename?: 'AppBuildsConnection', edges: Array<{ __typename?: 'AppBuildEdge', node: { __typename?: 'Build', platform: AppPlatform, id: string } }> }, updates: { __typename?: 'AppUpdatesConnection', edges: Array<{ __typename?: 'AppUpdateEdge', node: { __typename?: 'Update', id: string, platform: string } }> } } | null, error?: { __typename?: 'BuildError', errorCode: string, message: string, docsUrl?: string | null } | null, artifacts?: { __typename?: 'BuildArtifacts', buildUrl?: string | null, xcodeBuildLogsUrl?: string | null, applicationArchiveUrl?: string | null, buildArtifactsUrl?: string | null } | null, initiatingActor?: { __typename: 'PartnerActor', id: string, displayName: string } | { __typename: 'Robot', id: string, displayName: string } | { __typename: 'SSOUser', id: string, displayName: string } | { __typename: 'User', id: string, displayName: string } | null, project: { __typename: 'App', id: string, name: string, slug: string, ownerAccount: { __typename?: 'Account', id: string, name: string } } | { __typename: 'Snack', id: string, name: string, slug: string }, metrics?: { __typename?: 'BuildMetrics', buildWaitTime?: number | null, buildQueueTime?: number | null, buildDuration?: number | null } | null };
 
-export type ConvexTeamConnectionFragment = { __typename?: 'ConvexTeamConnection', id: string, convexTeamIdentifier: string, convexTeamName: string, convexTeamSlug: string, hasBeenClaimed: boolean, createdAt: any, updatedAt: any, invitedAt?: any | null, invitedEmail?: string | null };
-
-export type ConvexProjectFragment = { __typename?: 'ConvexProject', id: string, convexProjectIdentifier: string, convexProjectName: string, convexProjectSlug: string, createdAt: any, updatedAt: any, convexTeamConnection: { __typename?: 'ConvexTeamConnection', id: string, convexTeamIdentifier: string, convexTeamName: string, convexTeamSlug: string, hasBeenClaimed: boolean, createdAt: any, updatedAt: any, invitedAt?: any | null, invitedEmail?: string | null } };
-
-export type SetupConvexProjectResultFragment = { __typename?: 'SetupConvexProjectResult', convexDeploymentName: string, convexDeploymentUrl: string, deployKey: string, convexProject: { __typename?: 'ConvexProject', id: string, convexProjectIdentifier: string, convexProjectName: string, convexProjectSlug: string, createdAt: any, updatedAt: any, convexTeamConnection: { __typename?: 'ConvexTeamConnection', id: string, convexTeamIdentifier: string, convexTeamName: string, convexTeamSlug: string, hasBeenClaimed: boolean, createdAt: any, updatedAt: any, invitedAt?: any | null, invitedEmail?: string | null } } };
-
 export type EnvironmentSecretFragment = { __typename?: 'EnvironmentSecret', id: string, name: string, type: EnvironmentSecretType, createdAt: any };
 
 export type EnvironmentVariableFragment = { __typename?: 'EnvironmentVariable', id: string, name: string, value?: string | null, environments?: Array<any> | null, createdAt: any, updatedAt: any, scope: EnvironmentVariableScope, visibility?: EnvironmentVariableVisibility | null, type: EnvironmentSecretType };
@@ -12860,8 +12682,6 @@ export type FingerprintFragment = { __typename?: 'Fingerprint', id: string, hash
 
 export type AppObserveTimeSeriesFragment = { __typename?: 'AppObserveTimeSeries', eventCount: number, appVersionMarkers: Array<{ __typename?: 'AppObserveAppVersion', appVersion: string, firstSeenAt: any, eventCount: number, uniqueUserCount: number, buildNumbers: Array<{ __typename?: 'AppObserveAppBuildNumber', appBuildNumber: string, firstSeenAt: any, eventCount: number, uniqueUserCount: number, easBuilds: Array<{ __typename?: 'AppObserveAppEasBuild', easBuildId: string, firstSeenAt: any, eventCount: number, uniqueUserCount: number }> }>, updates: Array<{ __typename?: 'AppObserveAppUpdate', appUpdateId: string, firstSeenAt: any, eventCount: number, uniqueUserCount: number, easBuilds: Array<{ __typename?: 'AppObserveAppEasBuild', easBuildId: string, firstSeenAt: any, eventCount: number, uniqueUserCount: number }> }>, metrics: Array<{ __typename?: 'AppObserveAppVersionMetric', metricName: string, eventCount: number, statistics: { __typename?: 'AppObserveVersionMarkerStatistics', min?: number | null, max?: number | null, median?: number | null, average?: number | null, p80?: number | null, p90?: number | null, p99?: number | null } }> }>, statistics: { __typename?: 'AppObserveTimeSeriesStatistics', min?: number | null, max?: number | null, median?: number | null, average?: number | null, p80?: number | null, p90?: number | null, p99?: number | null } };
 
-export type AppObserveCustomEventFragment = { __typename?: 'AppObserveCustomEvent', id: string, eventName: string, timestamp: any, sessionId?: string | null, severityNumber?: number | null, severityText?: string | null, appVersion: string, appBuildNumber: string, appUpdateId?: string | null, appEasBuildId?: string | null, deviceOs: string, deviceOsVersion: string, deviceModel: string, environment?: string | null, easClientId: string, countryCode?: string | null, properties: Array<{ __typename?: 'AppObserveEventProperty', key: string, value: string, type: AppObservePropertyType }> };
-
 export type AppObserveEventFragment = { __typename?: 'AppObserveEvent', id: string, metricName: string, metricValue: number, timestamp: any, appVersion: string, appBuildNumber: string, appUpdateId?: string | null, deviceModel: string, deviceOs: string, deviceOsVersion: string, countryCode?: string | null, sessionId?: string | null, easClientId: string, customParams?: any | null };
 
 export type AppObserveAppVersionFragment = { __typename?: 'AppObserveAppVersion', appVersion: string, firstSeenAt: any, eventCount: number, uniqueUserCount: number, buildNumbers: Array<{ __typename?: 'AppObserveAppBuildNumber', appBuildNumber: string, firstSeenAt: any, eventCount: number, uniqueUserCount: number, easBuilds: Array<{ __typename?: 'AppObserveAppEasBuild', easBuildId: string, firstSeenAt: any, eventCount: number, uniqueUserCount: number }> }>, updates: Array<{ __typename?: 'AppObserveAppUpdate', appUpdateId: string, firstSeenAt: any, eventCount: number, uniqueUserCount: number, easBuilds: Array<{ __typename?: 'AppObserveAppEasBuild', easBuildId: string, firstSeenAt: any, eventCount: number, uniqueUserCount: number }> }>, metrics: Array<{ __typename?: 'AppObserveAppVersionMetric', metricName: string, eventCount: number, statistics: { __typename?: 'AppObserveVersionMarkerStatistics', min?: number | null, max?: number | null, median?: number | null, average?: number | null, p80?: number | null, p90?: number | null, p99?: number | null } }> };

packages/eas-cli/src/graphql/mutations/ConvexMutation.ts

@@ -1,196 +0,0 @@
-import { print } from 'graphql';
-import gql from 'graphql-tag';
-
-import { ExpoGraphqlClient } from '../../commandUtils/context/contextUtils/createGraphqlClient';
-import { withErrorHandlingAsync } from '../client';
-import {
-  CreateConvexTeamConnectionInput,
-  SendConvexTeamInviteToVerifiedEmailInput,
-  SetupConvexProjectInput,
-} from '../generated';
-import {
-  ConvexProjectFragmentNode,
-  ConvexTeamConnectionData,
-  ConvexTeamConnectionFragmentNode,
-  SetupConvexProjectResultData,
-  SetupConvexProjectResultFragmentNode,
-} from '../types/ConvexTeamConnection';
-
-type CreateConvexTeamConnectionMutation = {
-  convexTeamConnection: {
-    createConvexTeamConnection: ConvexTeamConnectionData;
-  };
-};
-
-type CreateConvexTeamConnectionMutationVariables = {
-  convexTeamConnectionData: CreateConvexTeamConnectionInput;
-};
-
-type DeleteConvexTeamConnectionMutation = {
-  convexTeamConnection: {
-    deleteConvexTeamConnection: ConvexTeamConnectionData;
-  };
-};
-
-type DeleteConvexTeamConnectionMutationVariables = {
-  convexTeamConnectionId: string;
-};
-
-type SetupConvexProjectMutation = {
-  convexProject: {
-    setupConvexProject: SetupConvexProjectResultData;
-  };
-};
-
-type SetupConvexProjectMutationVariables = {
-  input: SetupConvexProjectInput;
-};
-
-type DeleteConvexProjectMutation = {
-  convexProject: {
-    deleteConvexProject: string;
-  };
-};
-
-type DeleteConvexProjectMutationVariables = {
-  convexProjectId: string;
-};
-
-type SendConvexTeamInviteToVerifiedEmailMutation = {
-  convexTeamConnection: {
-    sendConvexTeamInviteToVerifiedEmail: boolean;
-  };
-};
-
-type SendConvexTeamInviteToVerifiedEmailMutationVariables = {
-  input: SendConvexTeamInviteToVerifiedEmailInput;
-};
-
-export const ConvexMutation = {
-  async createConvexTeamConnectionAsync(
-    graphqlClient: ExpoGraphqlClient,
-    input: CreateConvexTeamConnectionInput
-  ): Promise<ConvexTeamConnectionData> {
-    const data = await withErrorHandlingAsync(
-      graphqlClient
-        .mutation<CreateConvexTeamConnectionMutation, CreateConvexTeamConnectionMutationVariables>(
-          gql`
-            mutation CreateConvexTeamConnection(
-              $convexTeamConnectionData: CreateConvexTeamConnectionInput!
-            ) {
-              convexTeamConnection {
-                createConvexTeamConnection(
-                  convexTeamConnectionData: $convexTeamConnectionData
-                ) {
-                  id
-                  ...ConvexTeamConnectionFragment
-                }
-              }
-            }
-            ${print(ConvexTeamConnectionFragmentNode)}
-          `,
-          { convexTeamConnectionData: input }
-        )
-        .toPromise()
-    );
-    return data.convexTeamConnection.createConvexTeamConnection;
-  },
-
-  async deleteConvexTeamConnectionAsync(
-    graphqlClient: ExpoGraphqlClient,
-    convexTeamConnectionId: string
-  ): Promise<ConvexTeamConnectionData> {
-    const data = await withErrorHandlingAsync(
-      graphqlClient
-        .mutation<DeleteConvexTeamConnectionMutation, DeleteConvexTeamConnectionMutationVariables>(
-          gql`
-            mutation DeleteConvexTeamConnection($convexTeamConnectionId: ID!) {
-              convexTeamConnection {
-                deleteConvexTeamConnection(
-                  convexTeamConnectionId: $convexTeamConnectionId
-                ) {
-                  id
-                  ...ConvexTeamConnectionFragment
-                }
-              }
-            }
-            ${print(ConvexTeamConnectionFragmentNode)}
-          `,
-          { convexTeamConnectionId }
-        )
-        .toPromise()
-    );
-    return data.convexTeamConnection.deleteConvexTeamConnection;
-  },
-
-  async setupConvexProjectAsync(
-    graphqlClient: ExpoGraphqlClient,
-    input: SetupConvexProjectInput
-  ): Promise<SetupConvexProjectResultData> {
-    const data = await withErrorHandlingAsync(
-      graphqlClient
-        .mutation<SetupConvexProjectMutation, SetupConvexProjectMutationVariables>(
-          gql`
-            mutation SetupConvexProject($input: SetupConvexProjectInput!) {
-              convexProject {
-                setupConvexProject(input: $input) {
-                  ...SetupConvexProjectResultFragment
-                }
-              }
-            }
-            ${print(ConvexTeamConnectionFragmentNode)}
-            ${print(ConvexProjectFragmentNode)}
-            ${print(SetupConvexProjectResultFragmentNode)}
-          `,
-          { input }
-        )
-        .toPromise()
-    );
-    return data.convexProject.setupConvexProject;
-  },
-
-  async deleteConvexProjectAsync(
-    graphqlClient: ExpoGraphqlClient,
-    convexProjectId: string
-  ): Promise<string> {
-    const data = await withErrorHandlingAsync(
-      graphqlClient
-        .mutation<DeleteConvexProjectMutation, DeleteConvexProjectMutationVariables>(
-          gql`
-            mutation DeleteConvexProject($convexProjectId: ID!) {
-              convexProject {
-                deleteConvexProject(convexProjectId: $convexProjectId)
-              }
-            }
-          `,
-          { convexProjectId }
-        )
-        .toPromise()
-    );
-    return data.convexProject.deleteConvexProject;
-  },
-
-  async sendConvexTeamInviteToVerifiedEmailAsync(
-    graphqlClient: ExpoGraphqlClient,
-    input: SendConvexTeamInviteToVerifiedEmailInput
-  ): Promise<boolean> {
-    const data = await withErrorHandlingAsync(
-      graphqlClient
-        .mutation<
-          SendConvexTeamInviteToVerifiedEmailMutation,
-          SendConvexTeamInviteToVerifiedEmailMutationVariables
-        >(
-          gql`
-            mutation SendConvexTeamInviteToVerifiedEmail($input: SendConvexTeamInviteToVerifiedEmailInput!) {
-              convexTeamConnection {
-                sendConvexTeamInviteToVerifiedEmail(input: $input)
-              }
-            }
-          `,
-          { input }
-        )
-        .toPromise()
-    );
-    return data.convexTeamConnection.sendConvexTeamInviteToVerifiedEmail;
-  },
-};

packages/eas-cli/src/graphql/mutations/DeviceRunSessionMutation.ts

@@ -6,8 +6,8 @@ import {
   CreateDeviceRunSessionInput,
   CreateDeviceRunSessionMutation,
   CreateDeviceRunSessionMutationVariables,
-  EnsureDeviceRunSessionStoppedMutation,
-  EnsureDeviceRunSessionStoppedMutationVariables,
+  StopDeviceRunSessionMutation,
+  StopDeviceRunSessionMutationVariables,
 } from '../generated';
 
 export const DeviceRunSessionMutation = {
@@ -46,22 +46,17 @@ export const DeviceRunSessionMutation = {
     );
     return data.deviceRunSession.createDeviceRunSession;
   },
-  async ensureDeviceRunSessionStoppedAsync(
+  async stopDeviceRunSessionAsync(
     graphqlClient: ExpoGraphqlClient,
     deviceRunSessionId: string
-  ): Promise<
-    EnsureDeviceRunSessionStoppedMutation['deviceRunSession']['ensureDeviceRunSessionStopped']
-  > {
+  ): Promise<StopDeviceRunSessionMutation['deviceRunSession']['stopDeviceRunSession']> {
     const data = await withErrorHandlingAsync(
       graphqlClient
-        .mutation<
-          EnsureDeviceRunSessionStoppedMutation,
-          EnsureDeviceRunSessionStoppedMutationVariables
-        >(
+        .mutation<StopDeviceRunSessionMutation, StopDeviceRunSessionMutationVariables>(
           gql`
-            mutation EnsureDeviceRunSessionStoppedMutation($deviceRunSessionId: ID!) {
+            mutation StopDeviceRunSessionMutation($deviceRunSessionId: ID!) {
               deviceRunSession {
-                ensureDeviceRunSessionStopped(deviceRunSessionId: $deviceRunSessionId) {
+                stopDeviceRunSession(deviceRunSessionId: $deviceRunSessionId) {
                   id
                   status
                 }
@@ -73,6 +68,6 @@ export const DeviceRunSessionMutation = {
         )
         .toPromise()
     );
-    return data.deviceRunSession.ensureDeviceRunSessionStopped;
+    return data.deviceRunSession.stopDeviceRunSession;
   },
 };

packages/eas-cli/src/graphql/queries/ConvexQuery.ts

@@ -1,102 +0,0 @@
-import { print } from 'graphql';
-import gql from 'graphql-tag';
-
-import { ExpoGraphqlClient } from '../../commandUtils/context/contextUtils/createGraphqlClient';
-import { withErrorHandlingAsync } from '../client';
-import {
-  ConvexProjectData,
-  ConvexProjectFragmentNode,
-  ConvexTeamConnectionData,
-  ConvexTeamConnectionFragmentNode,
-} from '../types/ConvexTeamConnection';
-
-type ConvexTeamConnectionsByAccountIdQuery = {
-  account: {
-    byId: {
-      id: string;
-      convexTeamConnections: ConvexTeamConnectionData[];
-    };
-  };
-};
-
-type ConvexTeamConnectionsByAccountIdQueryVariables = {
-  accountId: string;
-};
-
-type ConvexProjectByAppIdQuery = {
-  app: {
-    byId: {
-      id: string;
-      convexProject?: ConvexProjectData | null;
-    };
-  };
-};
-
-type ConvexProjectByAppIdQueryVariables = {
-  appId: string;
-};
-
-export const ConvexQuery = {
-  async getConvexTeamConnectionsByAccountIdAsync(
-    graphqlClient: ExpoGraphqlClient,
-    accountId: string
-  ): Promise<ConvexTeamConnectionData[]> {
-    const data = await withErrorHandlingAsync(
-      graphqlClient
-        .query<
-          ConvexTeamConnectionsByAccountIdQuery,
-          ConvexTeamConnectionsByAccountIdQueryVariables
-        >(
-          gql`
-            query ConvexTeamConnectionsByAccountId($accountId: String!) {
-              account {
-                byId(accountId: $accountId) {
-                  id
-                  convexTeamConnections {
-                    id
-                    ...ConvexTeamConnectionFragment
-                  }
-                }
-              }
-            }
-            ${print(ConvexTeamConnectionFragmentNode)}
-          `,
-          { accountId }
-        )
-        .toPromise()
-    );
-
-    return data.account.byId.convexTeamConnections;
-  },
-
-  async getConvexProjectByAppIdAsync(
-    graphqlClient: ExpoGraphqlClient,
-    appId: string
-  ): Promise<ConvexProjectData | null> {
-    const data = await withErrorHandlingAsync(
-      graphqlClient
-        .query<ConvexProjectByAppIdQuery, ConvexProjectByAppIdQueryVariables>(
-          gql`
-            query ConvexProjectByAppId($appId: String!) {
-              app {
-                byId(appId: $appId) {
-                  id
-                  convexProject {
-                    id
-                    ...ConvexProjectFragment
-                  }
-                }
-              }
-            }
-            ${print(ConvexTeamConnectionFragmentNode)}
-            ${print(ConvexProjectFragmentNode)}
-          `,
-          { appId },
-          { additionalTypenames: ['App', 'ConvexProject'] }
-        )
-        .toPromise()
-    );
-
-    return data.app.byId.convexProject ?? null;
-  },
-};

packages/eas-cli/src/graphql/queries/ObserveQuery.ts

@@ -4,9 +4,6 @@ import { ExpoGraphqlClient } from '../../commandUtils/context/contextUtils/creat
 import { withErrorHandlingAsync } from '../client';
 import {
   AppObserveAppVersion,
-  AppObserveCustomEvent,
-  AppObserveCustomEventListFilter,
-  AppObserveCustomEventName,
   AppObserveEvent,
   AppObserveEventsFilter,
   AppObserveEventsOrderBy,
@@ -19,9 +16,8 @@ import {
 import { print } from 'graphql';
 import {
   AppObserveAppVersionFragmentNode,
-  AppObserveCustomEventFragmentNode,
-  AppObserveEventFragmentNode,
   AppObserveTimeSeriesFragmentNode,
+  AppObserveEventFragmentNode,
 } from '../types/Observe';
 
 export type AppObserveTimeSeriesResult = {
@@ -87,52 +83,6 @@ type AppObserveEventsQueryVariables = {
   orderBy?: AppObserveEventsOrderBy;
 };
 
-type AppObserveCustomEventListQuery = {
-  app: {
-    byId: {
-      id: string;
-      observe: {
-        customEventList: {
-          pageInfo: PageInfo;
-          edges: Array<{
-            cursor: string;
-            node: AppObserveCustomEvent;
-          }>;
-        };
-      };
-    };
-  };
-};
-
-type AppObserveCustomEventListQueryVariables = {
-  appId: string;
-  filter?: AppObserveCustomEventListFilter;
-  first?: number;
-  after?: string;
-};
-
-type AppObserveCustomEventNamesQuery = {
-  app: {
-    byId: {
-      id: string;
-      observe: {
-        customEventNames: {
-          isTruncated: boolean;
-          names: AppObserveCustomEventName[];
-        };
-      };
-    };
-  };
-};
-
-type AppObserveCustomEventNamesQueryVariables = {
-  appId: string;
-  startTime: string;
-  endTime: string;
-  platform?: AppObservePlatform;
-  environment?: string;
-};
-
 export const ObserveQuery = {
   async timeSeriesAsync(
     graphqlClient: ExpoGraphqlClient,
@@ -286,116 +236,4 @@ export const ObserveQuery = {
       pageInfo,
     };
   },
-
-  async customEventListAsync(
-    graphqlClient: ExpoGraphqlClient,
-    variables: AppObserveCustomEventListQueryVariables
-  ): Promise<{ events: AppObserveCustomEvent[]; pageInfo: PageInfo }> {
-    const data = await withErrorHandlingAsync(
-      graphqlClient
-        .query<AppObserveCustomEventListQuery, AppObserveCustomEventListQueryVariables>(
-          gql`
-            query AppObserveCustomEventList(
-              $appId: String!
-              $filter: AppObserveCustomEventListFilter
-              $first: Int
-              $after: String
-            ) {
-              app {
-                byId(appId: $appId) {
-                  id
-                  observe {
-                    customEventList(filter: $filter, first: $first, after: $after) {
-                      pageInfo {
-                        hasNextPage
-                        hasPreviousPage
-                        endCursor
-                      }
-                      edges {
-                        cursor
-                        node {
-                          id
-                          ...AppObserveCustomEventFragment
-                        }
-                      }
-                    }
-                  }
-                }
-              }
-            }
-            ${print(AppObserveCustomEventFragmentNode)}
-          `,
-          variables
-        )
-        .toPromise()
-    );
-
-    const { edges, pageInfo } = data.app.byId.observe.customEventList;
-    return {
-      events: edges.map(edge => edge.node),
-      pageInfo,
-    };
-  },
-
-  async customEventNamesAsync(
-    graphqlClient: ExpoGraphqlClient,
-    {
-      appId,
-      startTime,
-      endTime,
-      platform,
-      environment,
-    }: {
-      appId: string;
-      startTime: string;
-      endTime: string;
-      platform?: AppObservePlatform;
-      environment?: string;
-    }
-  ): Promise<{ names: AppObserveCustomEventName[]; isTruncated: boolean }> {
-    const data = await withErrorHandlingAsync(
-      graphqlClient
-        .query<AppObserveCustomEventNamesQuery, AppObserveCustomEventNamesQueryVariables>(
-          gql`
-            query AppObserveCustomEventNames(
-              $appId: String!
-              $startTime: DateTime!
-              $endTime: DateTime!
-              $platform: AppObservePlatform
-              $environment: String
-            ) {
-              app {
-                byId(appId: $appId) {
-                  id
-                  observe {
-                    customEventNames(
-                      startTime: $startTime
-                      endTime: $endTime
-                      platform: $platform
-                      environment: $environment
-                    ) {
-                      isTruncated
-                      names {
-                        eventName
-                        count
-                      }
-                    }
-                  }
-                }
-              }
-            }
-          `,
-          {
-            appId,
-            startTime,
-            endTime,
-            ...(platform && { platform }),
-            ...(environment && { environment }),
-          }
-        )
-        .toPromise()
-    );
-
-    return data.app.byId.observe.customEventNames;
-  },
 };

packages/eas-cli/src/graphql/types/ConvexTeamConnection.ts

@@ -1,76 +0,0 @@
-import gql from 'graphql-tag';
-
-import { ConvexProject, ConvexTeamConnection, SetupConvexProjectResult } from '../generated';
-
-export type ConvexTeamConnectionData = Pick<
-  ConvexTeamConnection,
-  | 'id'
-  | 'convexTeamIdentifier'
-  | 'convexTeamName'
-  | 'convexTeamSlug'
-  | 'hasBeenClaimed'
-  | 'createdAt'
-  | 'updatedAt'
-  | 'invitedAt'
-  | 'invitedEmail'
->;
-
-export type ConvexProjectData = Pick<
-  ConvexProject,
-  | 'id'
-  | 'convexProjectIdentifier'
-  | 'convexProjectName'
-  | 'convexProjectSlug'
-  | 'createdAt'
-  | 'updatedAt'
-> & {
-  convexTeamConnection: ConvexTeamConnectionData;
-};
-
-export type SetupConvexProjectResultData = Pick<
-  SetupConvexProjectResult,
-  'convexDeploymentName' | 'convexDeploymentUrl' | 'deployKey'
-> & {
-  convexProject: ConvexProjectData;
-};
-
-export const ConvexTeamConnectionFragmentNode = gql`
-  fragment ConvexTeamConnectionFragment on ConvexTeamConnection {
-    id
-    convexTeamIdentifier
-    convexTeamName
-    convexTeamSlug
-    hasBeenClaimed
-    createdAt
-    updatedAt
-    invitedAt
-    invitedEmail
-  }
-`;
-
-export const ConvexProjectFragmentNode = gql`
-  fragment ConvexProjectFragment on ConvexProject {
-    id
-    convexProjectIdentifier
-    convexProjectName
-    convexProjectSlug
-    createdAt
-    updatedAt
-    convexTeamConnection {
-      id
-      ...ConvexTeamConnectionFragment
-    }
-  }
-`;
-
-export const SetupConvexProjectResultFragmentNode = gql`
-  fragment SetupConvexProjectResultFragment on SetupConvexProjectResult {
-    convexDeploymentName
-    convexDeploymentUrl
-    deployKey
-    convexProject {
-      id
-      ...ConvexProjectFragment
-    }
-  }
-`;

packages/eas-cli/src/graphql/types/Observe.ts

@@ -18,32 +18,6 @@ export const AppObserveTimeSeriesFragmentNode = gql`
   }
 `;
 
-export const AppObserveCustomEventFragmentNode = gql`
-  fragment AppObserveCustomEventFragment on AppObserveCustomEvent {
-    id
-    eventName
-    timestamp
-    sessionId
-    severityNumber
-    severityText
-    properties {
-      key
-      value
-      type
-    }
-    appVersion
-    appBuildNumber
-    appUpdateId
-    appEasBuildId
-    deviceOs
-    deviceOsVersion
-    deviceModel
-    environment
-    easClientId
-    countryCode
-  }
-`;
-
 export const AppObserveEventFragmentNode = gql`
   fragment AppObserveEventFragment on AppObserveEvent {
     id

packages/eas-cli/src/observe/__tests__/fetchCustomEvents.test.ts

@@ -1,152 +0,0 @@
-import { AppObserveCustomEvent, AppObservePlatform } from '../../graphql/generated';
-import { ObserveQuery } from '../../graphql/queries/ObserveQuery';
-import { fetchObserveCustomEventsAsync } from '../fetchCustomEvents';
-
-jest.mock('../../graphql/queries/ObserveQuery');
-
-function makeCustomEvent(overrides: Partial<AppObserveCustomEvent> = {}): AppObserveCustomEvent {
-  return {
-    __typename: 'AppObserveCustomEvent' as const,
-    id: 'evt-1',
-    eventName: 'my_event',
-    timestamp: '2025-01-01T00:00:00.000Z',
-    appVersion: '1.0.0',
-    appBuildNumber: '1',
-    deviceModel: 'iPhone 15',
-    deviceOs: 'iOS',
-    deviceOsVersion: '17.0',
-    easClientId: 'client-1',
-    properties: [],
-    ...overrides,
-  } as AppObserveCustomEvent;
-}
-
-describe('fetchObserveCustomEventsAsync', () => {
-  const mockCustomEventListAsync = jest.mocked(ObserveQuery.customEventListAsync);
-  const mockGraphqlClient = {} as any;
-
-  beforeEach(() => {
-    mockCustomEventListAsync.mockClear();
-    mockCustomEventListAsync.mockResolvedValue({
-      events: [],
-      pageInfo: { hasNextPage: false, hasPreviousPage: false },
-    });
-  });
-
-  it('passes appId, time range, and limit to customEventListAsync', async () => {
-    await fetchObserveCustomEventsAsync(mockGraphqlClient, 'project-123', {
-      limit: 25,
-      startTime: '2025-01-01T00:00:00.000Z',
-      endTime: '2025-03-01T00:00:00.000Z',
-    });
-
-    expect(mockCustomEventListAsync).toHaveBeenCalledTimes(1);
-    const callArgs = mockCustomEventListAsync.mock.calls[0][1];
-    expect(callArgs.appId).toBe('project-123');
-    expect(callArgs.first).toBe(25);
-    expect(callArgs.filter?.startTime).toBe('2025-01-01T00:00:00.000Z');
-    expect(callArgs.filter?.endTime).toBe('2025-03-01T00:00:00.000Z');
-  });
-
-  it('forwards eventName filter when provided', async () => {
-    await fetchObserveCustomEventsAsync(mockGraphqlClient, 'project-123', {
-      limit: 10,
-      eventName: 'my_event',
-      startTime: '2025-01-01T00:00:00.000Z',
-      endTime: '2025-03-01T00:00:00.000Z',
-    });
-
-    const filter = mockCustomEventListAsync.mock.calls[0][1].filter;
-    expect(filter?.eventName).toBe('my_event');
-  });
-
-  it('forwards platform, appVersion, and sessionId filters when provided', async () => {
-    await fetchObserveCustomEventsAsync(mockGraphqlClient, 'project-123', {
-      limit: 10,
-      platform: AppObservePlatform.Ios,
-      appVersion: '2.1.0',
-      sessionId: 'session-xyz',
-      startTime: '2025-01-01T00:00:00.000Z',
-      endTime: '2025-03-01T00:00:00.000Z',
-    });
-
-    const filter = mockCustomEventListAsync.mock.calls[0][1].filter;
-    expect(filter?.platform).toBe(AppObservePlatform.Ios);
-    expect(filter?.appVersion).toBe('2.1.0');
-    expect(filter?.sessionId).toBe('session-xyz');
-  });
-
-  it('maps updateId to appUpdateId when provided', async () => {
-    await fetchObserveCustomEventsAsync(mockGraphqlClient, 'project-123', {
-      limit: 10,
-      updateId: 'update-xyz',
-      startTime: '2025-01-01T00:00:00.000Z',
-      endTime: '2025-03-01T00:00:00.000Z',
-    });
-
-    const filter = mockCustomEventListAsync.mock.calls[0][1].filter;
-    expect(filter?.appUpdateId).toBe('update-xyz');
-  });
-
-  it('does not send appUpdateId when updateId is undefined', async () => {
-    await fetchObserveCustomEventsAsync(mockGraphqlClient, 'project-123', {
-      limit: 10,
-      startTime: '2025-01-01T00:00:00.000Z',
-      endTime: '2025-03-01T00:00:00.000Z',
-    });
-
-    const filter = mockCustomEventListAsync.mock.calls[0][1].filter;
-    expect(filter).not.toHaveProperty('appUpdateId');
-  });
-
-  it('does not send optional filters when their inputs are undefined', async () => {
-    await fetchObserveCustomEventsAsync(mockGraphqlClient, 'project-123', {
-      limit: 10,
-      startTime: '2025-01-01T00:00:00.000Z',
-      endTime: '2025-03-01T00:00:00.000Z',
-    });
-
-    const filter = mockCustomEventListAsync.mock.calls[0][1].filter;
-    expect(filter).not.toHaveProperty('eventName');
-    expect(filter).not.toHaveProperty('platform');
-    expect(filter).not.toHaveProperty('appVersion');
-    expect(filter).not.toHaveProperty('appUpdateId');
-    expect(filter).not.toHaveProperty('sessionId');
-  });
-
-  it('forwards after cursor when provided', async () => {
-    await fetchObserveCustomEventsAsync(mockGraphqlClient, 'project-123', {
-      limit: 10,
-      after: 'cursor-abc',
-      startTime: '2025-01-01T00:00:00.000Z',
-      endTime: '2025-03-01T00:00:00.000Z',
-    });
-
-    expect(mockCustomEventListAsync.mock.calls[0][1].after).toBe('cursor-abc');
-  });
-
-  it('does not send after when not provided', async () => {
-    await fetchObserveCustomEventsAsync(mockGraphqlClient, 'project-123', {
-      limit: 10,
-      startTime: '2025-01-01T00:00:00.000Z',
-      endTime: '2025-03-01T00:00:00.000Z',
-    });
-
-    expect(mockCustomEventListAsync.mock.calls[0][1]).not.toHaveProperty('after');
-  });
-
-  it('returns the events and pageInfo from the underlying query', async () => {
-    const events = [makeCustomEvent()];
-    const pageInfo = { hasNextPage: true, hasPreviousPage: false, endCursor: 'cursor-end' };
-    mockCustomEventListAsync.mockResolvedValue({ events, pageInfo });
-
-    const result = await fetchObserveCustomEventsAsync(mockGraphqlClient, 'project-123', {
-      limit: 10,
-      startTime: '2025-01-01T00:00:00.000Z',
-      endTime: '2025-03-01T00:00:00.000Z',
-    });
-
-    expect(result.events).toBe(events);
-    expect(result.pageInfo).toBe(pageInfo);
-  });
-});

packages/eas-cli/src/observe/__tests__/fetchMetrics.test.ts

@@ -1,4 +1,4 @@
-import { AppObserveAppVersion, AppObservePlatform, AppPlatform } from '../../graphql/generated';
+import { AppObservePlatform, AppPlatform } from '../../graphql/generated';
 import { ObserveQuery } from '../../graphql/queries/ObserveQuery';
 import { makeMetricsKey } from '../formatMetrics';
 import { fetchObserveMetricsAsync } from '../fetchMetrics';
@@ -21,7 +21,7 @@ function makeAppVersion(
       p99: number;
     };
   }>
-): AppObserveAppVersion {
+) {
   return {
     __typename: 'AppObserveAppVersion' as const,
     appVersion,

packages/eas-cli/src/observe/__tests__/formatCustomEvents.test.ts

@@ -1,389 +0,0 @@
-import { AppObserveCustomEvent, PageInfo } from '../../graphql/generated';
-import {
-  buildObserveCustomEventNamesTable,
-  buildObserveCustomEventsEmptyWithSuggestionsJson,
-  buildObserveCustomEventsEmptyWithSuggestionsTable,
-  buildObserveCustomEventsJson,
-  buildObserveCustomEventsTable,
-} from '../formatCustomEvents';
-
-function makeCustomEvent(overrides: Partial<AppObserveCustomEvent> = {}): AppObserveCustomEvent {
-  return {
-    __typename: 'AppObserveCustomEvent' as const,
-    id: 'evt-1',
-    eventName: 'my_event',
-    timestamp: '2025-01-15T10:30:00.000Z',
-    appVersion: '1.0.0',
-    appBuildNumber: '42',
-    deviceModel: 'iPhone 15',
-    deviceOs: 'iOS',
-    deviceOsVersion: '17.0',
-    easClientId: 'client-1',
-    properties: [],
-    ...overrides,
-  } as AppObserveCustomEvent;
-}
-
-const noNextPage: PageInfo = { hasNextPage: false, hasPreviousPage: false };
-const withNextPage: PageInfo = {
-  hasNextPage: true,
-  hasPreviousPage: false,
-  endCursor: 'cursor-abc',
-};
-
-describe(buildObserveCustomEventsTable, () => {
-  it('formats events into aligned columns', () => {
-    const events = [
-      makeCustomEvent({
-        eventName: 'login',
-        appVersion: '1.2.0',
-        appBuildNumber: '42',
-        deviceOs: 'iOS',
-        deviceOsVersion: '17.0',
-        deviceModel: 'iPhone 15',
-        countryCode: 'US',
-        timestamp: '2025-01-15T10:30:00.000Z',
-      }),
-      makeCustomEvent({
-        id: 'evt-2',
-        eventName: 'checkout',
-        appVersion: '1.1.0',
-        appBuildNumber: '38',
-        deviceOs: 'Android',
-        deviceOsVersion: '14',
-        deviceModel: 'Pixel 8',
-        countryCode: 'PL',
-        timestamp: '2025-01-14T08:15:00.000Z',
-      }),
-    ];
-
-    const output = buildObserveCustomEventsTable(events, noNextPage);
-
-    expect(output).toMatchInlineSnapshot(`
-"Timestamp                      Event     App Version  Platform    Device     Country
------------------------------  --------  -----------  ----------  ---------  -------
-Jan 15, 2025, 10:30:00.000 AM  login     1.2.0 (42)   iOS 17.0    iPhone 15  US     
-Jan 14, 2025, 08:15:00.000 AM  checkout  1.1.0 (38)   Android 14  Pixel 8    PL     "
-`);
-  });
-
-  it('returns yellow warning for empty events', () => {
-    const output = buildObserveCustomEventsTable([], noNextPage);
-    expect(output).toContain('No custom events found.');
-  });
-
-  it('shows event name in summary header when an event name option is provided', () => {
-    const events = [makeCustomEvent({ eventName: 'login' })];
-    const output = buildObserveCustomEventsTable(events, noNextPage, {
-      eventName: 'login',
-      daysBack: 30,
-    });
-
-    expect(output).toContain('login events for the last 30 days');
-  });
-
-  it('shows the generic "Custom events" subject when no event name option is provided', () => {
-    const events = [makeCustomEvent()];
-    const output = buildObserveCustomEventsTable(events, noNextPage, {
-      daysBack: 30,
-    });
-
-    expect(output).toContain('Custom events for the last 30 days');
-  });
-
-  it('shows date range in summary header when start/end provided', () => {
-    const events = [makeCustomEvent()];
-    const output = buildObserveCustomEventsTable(events, noNextPage, {
-      eventName: 'login',
-      startTime: '2025-01-01T00:00:00.000Z',
-      endTime: '2025-02-01T00:00:00.000Z',
-    });
-
-    expect(output).toContain('login events from Jan 1, 2025 to Feb 1, 2025');
-  });
-
-  it('appends total event count to summary header when provided', () => {
-    const events = [makeCustomEvent()];
-    const output = buildObserveCustomEventsTable(events, noNextPage, {
-      eventName: 'login',
-      daysBack: 7,
-      totalEventCount: 1234,
-    });
-
-    expect(output).toContain('login events for the last 7 days — 1,234 total events');
-  });
-
-  it('shows - for null countryCode', () => {
-    const events = [makeCustomEvent({ countryCode: null })];
-    const output = buildObserveCustomEventsTable(events, noNextPage);
-
-    const lines = output.split('\n');
-    const dataLine = lines[2]; // header, separator, first data row
-    expect(dataLine).toContain('-');
-  });
-
-  it('appends next page hint when hasNextPage is true', () => {
-    const events = [makeCustomEvent()];
-    const output = buildObserveCustomEventsTable(events, withNextPage);
-
-    expect(output).toContain('Next page: --after cursor-abc');
-  });
-
-  it('does not append next page hint when hasNextPage is false', () => {
-    const events = [makeCustomEvent()];
-    const output = buildObserveCustomEventsTable(events, noNextPage);
-
-    expect(output).not.toContain('Next page');
-  });
-
-  it('omits the Event column when an event name option is provided (single-event view)', () => {
-    const events = [makeCustomEvent({ eventName: 'login' })];
-    const output = buildObserveCustomEventsTable(events, noNextPage, {
-      eventName: 'login',
-    });
-
-    // The summary header still mentions "login events" but the table should
-    // not have an "Event" column header.
-    const headerLine = output.split('\n').find(line => line.includes('Timestamp'));
-    expect(headerLine).not.toContain('Event ');
-  });
-
-  it('shows the Severity column when at least one event has severityText', () => {
-    const events = [makeCustomEvent({ severityText: 'INFO' }), makeCustomEvent({ id: 'evt-2' })];
-    const output = buildObserveCustomEventsTable(events, noNextPage);
-
-    expect(output).toContain('Severity');
-    expect(output).toContain('INFO');
-  });
-
-  it('shows the Severity column with the number as fallback when only severityNumber is set', () => {
-    const events = [makeCustomEvent({ severityNumber: 9 })];
-    const output = buildObserveCustomEventsTable(events, noNextPage);
-
-    expect(output).toContain('Severity');
-    expect(output).toContain('9');
-  });
-
-  it('hides the Severity column when no event has any severity data', () => {
-    const events = [makeCustomEvent()];
-    const output = buildObserveCustomEventsTable(events, noNextPage);
-
-    expect(output).not.toContain('Severity');
-  });
-
-  it('prefers severityText when both severityText and severityNumber are set', () => {
-    const events = [makeCustomEvent({ severityText: 'WARN', severityNumber: 13 })];
-    const output = buildObserveCustomEventsTable(events, noNextPage);
-
-    expect(output).toContain('WARN');
-    // The number alone should not appear when text is present.
-    expect(output).not.toMatch(/\b13\b/);
-  });
-
-  it('falls back to "-" for events that have no severity but the column is visible', () => {
-    const events = [makeCustomEvent({ severityText: 'INFO' }), makeCustomEvent({ id: 'evt-2' })];
-    const output = buildObserveCustomEventsTable(events, noNextPage);
-
-    // The second row's severity cell is "-".
-    const lines = output.split('\n');
-    // header + separator + 2 data rows
-    expect(lines[3]).toMatch(/-/);
-  });
-});
-
-describe(buildObserveCustomEventsJson, () => {
-  it('preserves both severityText and severityNumber in the JSON output', () => {
-    const events = [makeCustomEvent({ severityText: 'INFO', severityNumber: 9 })];
-    const result = buildObserveCustomEventsJson(events, noNextPage);
-
-    expect(result.events[0].severityText).toBe('INFO');
-    expect(result.events[0].severityNumber).toBe(9);
-  });
-
-  it('returns null severity fields when not set', () => {
-    const events = [makeCustomEvent()];
-    const result = buildObserveCustomEventsJson(events, noNextPage);
-
-    expect(result.events[0].severityText).toBeNull();
-    expect(result.events[0].severityNumber).toBeNull();
-  });
-
-  it('maps event to JSON shape with all relevant fields and pageInfo', () => {
-    const events = [
-      makeCustomEvent({
-        id: 'evt-1',
-        eventName: 'login',
-        timestamp: '2025-01-15T10:30:00.000Z',
-        sessionId: 'session-1',
-        severityText: 'INFO',
-        severityNumber: 9,
-        appVersion: '1.0.0',
-        appBuildNumber: '42',
-        appUpdateId: 'update-xyz',
-        appEasBuildId: 'build-abc',
-        deviceModel: 'iPhone 15',
-        deviceOs: 'iOS',
-        deviceOsVersion: '17.0',
-        countryCode: 'US',
-        environment: 'production',
-        easClientId: 'client-1',
-        properties: [
-          { __typename: 'AppObserveEventProperty', key: 'foo', value: 'bar', type: 'STRING' },
-        ] as any,
-      }),
-    ];
-
-    const result = buildObserveCustomEventsJson(events, withNextPage);
-
-    expect(result).toEqual({
-      events: [
-        {
-          id: 'evt-1',
-          eventName: 'login',
-          timestamp: '2025-01-15T10:30:00.000Z',
-          sessionId: 'session-1',
-          severityText: 'INFO',
-          severityNumber: 9,
-          properties: [{ key: 'foo', value: 'bar', type: 'STRING' }],
-          appVersion: '1.0.0',
-          appBuildNumber: '42',
-          appUpdateId: 'update-xyz',
-          appEasBuildId: 'build-abc',
-          deviceModel: 'iPhone 15',
-          deviceOs: 'iOS',
-          deviceOsVersion: '17.0',
-          countryCode: 'US',
-          environment: 'production',
-          easClientId: 'client-1',
-        },
-      ],
-      pageInfo: {
-        hasNextPage: true,
-        endCursor: 'cursor-abc',
-      },
-    });
-  });
-
-  it('handles null optional fields', () => {
-    const events = [
-      makeCustomEvent({
-        countryCode: null,
-        sessionId: null,
-        appUpdateId: null,
-        appEasBuildId: null,
-        environment: null,
-      }),
-    ];
-
-    const result = buildObserveCustomEventsJson(events, noNextPage);
-
-    expect(result.events[0].countryCode).toBeNull();
-    expect(result.events[0].sessionId).toBeNull();
-    expect(result.events[0].appUpdateId).toBeNull();
-    expect(result.events[0].appEasBuildId).toBeNull();
-    expect(result.events[0].environment).toBeNull();
-  });
-
-  it('returns empty events array for empty input', () => {
-    const result = buildObserveCustomEventsJson([], noNextPage);
-    expect(result.events).toEqual([]);
-    expect(result.pageInfo).toEqual({ hasNextPage: false, endCursor: null });
-  });
-});
-
-describe(buildObserveCustomEventNamesTable, () => {
-  it('returns yellow warning when names list is empty', () => {
-    const output = buildObserveCustomEventNamesTable([]);
-    expect(output).toContain('No custom event names found.');
-  });
-
-  it('shows event names with counts', () => {
-    const output = buildObserveCustomEventNamesTable([
-      { __typename: 'AppObserveCustomEventName', eventName: 'foo', count: 10 },
-      { __typename: 'AppObserveCustomEventName', eventName: 'bar', count: 5 },
-    ]);
-    expect(output).toContain('foo');
-    expect(output).toContain('10');
-    expect(output).toContain('bar');
-    expect(output).toContain('5');
-  });
-
-  it('appends a truncation notice when isTruncated is true', () => {
-    const output = buildObserveCustomEventNamesTable(
-      [{ __typename: 'AppObserveCustomEventName', eventName: 'foo', count: 10 }],
-      { isTruncated: true }
-    );
-    expect(output).toContain('Result is truncated');
-  });
-});
-
-describe(buildObserveCustomEventsEmptyWithSuggestionsTable, () => {
-  it('shows the filtered event name and the available event names', () => {
-    const output = buildObserveCustomEventsEmptyWithSuggestionsTable('login', [
-      { __typename: 'AppObserveCustomEventName', eventName: 'foo', count: 10 },
-      { __typename: 'AppObserveCustomEventName', eventName: 'bar', count: 5 },
-    ]);
-
-    expect(output).toContain('No events found matching "login"');
-    expect(output).toContain('Available event names in this time range:');
-    expect(output).toContain('foo');
-    expect(output).toContain('10');
-    expect(output).toContain('bar');
-    expect(output).toContain('5');
-  });
-
-  it('falls back to "no event names found" message when names list is also empty', () => {
-    const output = buildObserveCustomEventsEmptyWithSuggestionsTable('login', []);
-
-    expect(output).toContain('No events found matching "login"');
-    expect(output).toContain('No custom event names found in this time range.');
-  });
-
-  it('appends a truncation notice when isTruncated is set', () => {
-    const output = buildObserveCustomEventsEmptyWithSuggestionsTable(
-      'login',
-      [{ __typename: 'AppObserveCustomEventName', eventName: 'foo', count: 10 }],
-      { isTruncated: true }
-    );
-
-    expect(output).toContain('Result is truncated');
-  });
-
-  it('includes the time range description in the message when provided', () => {
-    const output = buildObserveCustomEventsEmptyWithSuggestionsTable(
-      'login',
-      [{ __typename: 'AppObserveCustomEventName', eventName: 'foo', count: 10 }],
-      { daysBack: 7 }
-    );
-
-    expect(output).toContain('No events found matching "login" for the last 7 days.');
-  });
-});
-
-describe(buildObserveCustomEventsEmptyWithSuggestionsJson, () => {
-  it('returns the filtered event name, empty events array, and available names', () => {
-    const result = buildObserveCustomEventsEmptyWithSuggestionsJson(
-      'login',
-      [
-        { __typename: 'AppObserveCustomEventName', eventName: 'foo', count: 10 },
-        { __typename: 'AppObserveCustomEventName', eventName: 'bar', count: 5 },
-      ],
-      false
-    );
-
-    expect(result).toEqual({
-      filteredEventName: 'login',
-      events: [],
-      availableEventNames: [
-        { eventName: 'foo', count: 10 },
-        { eventName: 'bar', count: 5 },
-      ],
-      availableEventNamesIsTruncated: false,
-    });
-  });
-
-  it('preserves the isTruncated flag', () => {
-    const result = buildObserveCustomEventsEmptyWithSuggestionsJson('login', [], true);
-    expect(result.availableEventNamesIsTruncated).toBe(true);
-  });
-});

packages/eas-cli/src/observe/__tests__/formatMetrics.test.ts

@@ -1,12 +1,12 @@
 import { AppPlatform } from '../../graphql/generated';
 import {
-  type MetricValues,
   ObserveMetricsMap,
   StatisticKey,
   buildObserveMetricsJson,
   buildObserveMetricsTable,
   makeMetricsKey,
   resolveStatKey,
+  type MetricValues,
 } from '../formatMetrics';
 
 const DEFAULT_STATS_TABLE: StatisticKey[] = ['median', 'eventCount'];

packages/eas-cli/src/observe/fetchCustomEvents.ts

@@ -1,48 +0,0 @@
-import { ExpoGraphqlClient } from '../commandUtils/context/contextUtils/createGraphqlClient';
-import {
-  AppObserveCustomEvent,
-  AppObserveCustomEventListFilter,
-  AppObservePlatform,
-  PageInfo,
-} from '../graphql/generated';
-import { ObserveQuery } from '../graphql/queries/ObserveQuery';
-
-interface FetchCustomEventsOptions {
-  eventName?: string;
-  limit: number;
-  after?: string;
-  startTime: string;
-  endTime: string;
-  platform?: AppObservePlatform;
-  appVersion?: string;
-  updateId?: string;
-  sessionId?: string;
-}
-
-interface FetchCustomEventsResult {
-  events: AppObserveCustomEvent[];
-  pageInfo: PageInfo;
-}
-
-export async function fetchObserveCustomEventsAsync(
-  graphqlClient: ExpoGraphqlClient,
-  appId: string,
-  options: FetchCustomEventsOptions
-): Promise<FetchCustomEventsResult> {
-  const filter: AppObserveCustomEventListFilter = {
-    startTime: options.startTime,
-    endTime: options.endTime,
-    ...(options.eventName && { eventName: options.eventName }),
-    ...(options.platform && { platform: options.platform }),
-    ...(options.appVersion && { appVersion: options.appVersion }),
-    ...(options.updateId && { appUpdateId: options.updateId }),
-    ...(options.sessionId && { sessionId: options.sessionId }),
-  };
-
-  return await ObserveQuery.customEventListAsync(graphqlClient, {
-    appId,
-    filter,
-    first: options.limit,
-    ...(options.after && { after: options.after }),
-  });
-}

packages/eas-cli/src/observe/formatCustomEvents.ts

@@ -1,237 +0,0 @@
-import chalk from 'chalk';
-
-import { AppObserveCustomEvent, AppObserveCustomEventName, PageInfo } from '../graphql/generated';
-import renderTextTable from '../utils/renderTextTable';
-import { buildTimeRangeDescription, formatLogTimestamp } from './formatUtils';
-
-function formatSeverity(event: AppObserveCustomEvent): string {
-  if (event.severityText) {
-    return event.severityText;
-  }
-  if (event.severityNumber != null) {
-    return String(event.severityNumber);
-  }
-  return '-';
-}
-
-export interface ObserveCustomEventPropertyJson {
-  key: string;
-  value: string;
-  type: string;
-}
-
-export interface ObserveCustomEventJson {
-  id: string;
-  eventName: string;
-  timestamp: string;
-  sessionId: string | null;
-  severityNumber: number | null;
-  severityText: string | null;
-  properties: ObserveCustomEventPropertyJson[];
-  appVersion: string;
-  appBuildNumber: string;
-  appUpdateId: string | null;
-  appEasBuildId: string | null;
-  deviceModel: string;
-  deviceOs: string;
-  deviceOsVersion: string;
-  countryCode: string | null;
-  environment: string | null;
-  easClientId: string;
-}
-
-export interface BuildCustomEventsTableOptions {
-  eventName?: string;
-  daysBack?: number;
-  startTime?: string;
-  endTime?: string;
-  totalEventCount?: number;
-}
-
-export function buildObserveCustomEventsTable(
-  events: AppObserveCustomEvent[],
-  pageInfo: PageInfo,
-  options?: BuildCustomEventsTableOptions
-): string {
-  if (events.length === 0) {
-    return chalk.yellow('No custom events found.');
-  }
-
-  const showEventName = !options?.eventName;
-  const hasSeverity = events.some(e => e.severityText != null || e.severityNumber != null);
-
-  const headers = [
-    'Timestamp',
-    ...(showEventName ? ['Event'] : []),
-    ...(hasSeverity ? ['Severity'] : []),
-    'App Version',
-    'Platform',
-    'Device',
-    'Country',
-  ];
-
-  const rows: string[][] = events.map(event => [
-    formatLogTimestamp(event.timestamp),
-    ...(showEventName ? [event.eventName] : []),
-    ...(hasSeverity ? [formatSeverity(event)] : []),
-    `${event.appVersion} (${event.appBuildNumber})`,
-    `${event.deviceOs} ${event.deviceOsVersion}`,
-    event.deviceModel,
-    event.countryCode ?? '-',
-  ]);
-
-  const lines: string[] = [];
-
-  if (options) {
-    const timeDesc = buildTimeRangeDescription(options);
-    const totalDesc =
-      options.totalEventCount != null
-        ? ` — ${options.totalEventCount.toLocaleString()} total events`
-        : '';
-    const subject = options.eventName ? `${options.eventName} events` : 'Custom events';
-    lines.push(chalk.bold(`${subject} ${timeDesc}${totalDesc}`.trim()), '');
-  }
-
-  lines.push(renderTextTable(headers, rows));
-
-  if (pageInfo.hasNextPage && pageInfo.endCursor) {
-    lines.push('', `Next page: --after ${pageInfo.endCursor}`);
-  }
-
-  return lines.join('\n');
-}
-
-export function buildObserveCustomEventsJson(
-  events: AppObserveCustomEvent[],
-  pageInfo: PageInfo
-): {
-  events: ObserveCustomEventJson[];
-  pageInfo: { hasNextPage: boolean; endCursor: string | null };
-} {
-  return {
-    events: events.map(event => ({
-      id: event.id,
-      eventName: event.eventName,
-      timestamp: event.timestamp,
-      sessionId: event.sessionId ?? null,
-      severityNumber: event.severityNumber ?? null,
-      severityText: event.severityText ?? null,
-      properties: event.properties.map(p => ({
-        key: p.key,
-        value: p.value,
-        type: p.type,
-      })),
-      appVersion: event.appVersion,
-      appBuildNumber: event.appBuildNumber,
-      appUpdateId: event.appUpdateId ?? null,
-      appEasBuildId: event.appEasBuildId ?? null,
-      deviceModel: event.deviceModel,
-      deviceOs: event.deviceOs,
-      deviceOsVersion: event.deviceOsVersion,
-      countryCode: event.countryCode ?? null,
-      environment: event.environment ?? null,
-      easClientId: event.easClientId,
-    })),
-    pageInfo: {
-      hasNextPage: pageInfo.hasNextPage,
-      endCursor: pageInfo.endCursor ?? null,
-    },
-  };
-}
-
-export interface BuildEmptyCustomEventsWithSuggestionsOptions {
-  daysBack?: number;
-  startTime?: string;
-  endTime?: string;
-  isTruncated?: boolean;
-}
-
-export function buildObserveCustomEventsEmptyWithSuggestionsTable(
-  eventName: string,
-  names: AppObserveCustomEventName[],
-  options?: BuildEmptyCustomEventsWithSuggestionsOptions
-): string {
-  const lines: string[] = [];
-  const timeDesc = options ? buildTimeRangeDescription(options) : '';
-  lines.push(chalk.yellow(`No events found matching "${eventName}" ${timeDesc}.`.trim()));
-
-  if (names.length === 0) {
-    lines.push('', chalk.yellow('No custom event names found in this time range.'));
-    return lines.join('\n');
-  }
-
-  lines.push('', 'Available event names in this time range:', '');
-
-  const headers = ['Event Name', 'Count'];
-  const rows: string[][] = names.map(n => [n.eventName, n.count.toLocaleString()]);
-  lines.push(renderTextTable(headers, rows));
-
-  if (options?.isTruncated) {
-    lines.push('', chalk.yellow('Result is truncated; not all event names are shown.'));
-  }
-
-  return lines.join('\n');
-}
-
-export function buildObserveCustomEventsEmptyWithSuggestionsJson(
-  eventName: string,
-  names: AppObserveCustomEventName[],
-  isTruncated: boolean
-): {
-  filteredEventName: string;
-  events: [];
-  availableEventNames: Array<{ eventName: string; count: number }>;
-  availableEventNamesIsTruncated: boolean;
-} {
-  return {
-    filteredEventName: eventName,
-    events: [],
-    availableEventNames: names.map(n => ({ eventName: n.eventName, count: n.count })),
-    availableEventNamesIsTruncated: isTruncated,
-  };
-}
-
-export interface BuildCustomEventNamesTableOptions {
-  daysBack?: number;
-  startTime?: string;
-  endTime?: string;
-  isTruncated?: boolean;
-}
-
-export function buildObserveCustomEventNamesTable(
-  names: AppObserveCustomEventName[],
-  options?: BuildCustomEventNamesTableOptions
-): string {
-  if (names.length === 0) {
-    return chalk.yellow('No custom event names found.');
-  }
-
-  const headers = ['Event Name', 'Count'];
-  const rows: string[][] = names.map(n => [n.eventName, n.count.toLocaleString()]);
-
-  const lines: string[] = [];
-
-  if (options) {
-    const timeDesc = buildTimeRangeDescription(options);
-    const subject = 'Custom event names';
-    lines.push(chalk.bold(`${subject} ${timeDesc}`.trim()), '');
-  }
-
-  lines.push(renderTextTable(headers, rows));
-
-  if (options?.isTruncated) {
-    lines.push('', chalk.yellow('Result is truncated; not all event names are shown.'));
-  }
-
-  return lines.join('\n');
-}
-
-export function buildObserveCustomEventNamesJson(
-  names: AppObserveCustomEventName[],
-  isTruncated: boolean
-): { names: Array<{ eventName: string; count: number }>; isTruncated: boolean } {
-  return {
-    names: names.map(n => ({ eventName: n.eventName, count: n.count })),
-    isTruncated,
-  };
-}

packages/eas-cli/src/observe/formatEvents.ts

@@ -1,10 +1,19 @@
 import chalk from 'chalk';
 
 import { AppObserveEvent, PageInfo } from '../graphql/generated';
-import renderTextTable from '../utils/renderTextTable';
-import { buildTimeRangeDescription, formatTimestamp } from './formatUtils';
 import { getMetricDisplayName } from './metricNames';
 
+function formatTimestamp(isoString: string): string {
+  const date = new Date(isoString);
+  return date.toLocaleDateString('en-US', {
+    year: 'numeric',
+    month: 'short',
+    day: 'numeric',
+    hour: '2-digit',
+    minute: '2-digit',
+  });
+}
+
 export interface ObserveEventJson {
   id: string;
   metricName: string;
@@ -22,6 +31,15 @@ export interface ObserveEventJson {
   customParams: { [key: string]: any } | null;
 }
 
+function formatDate(isoString: string): string {
+  const date = new Date(isoString);
+  return date.toLocaleDateString('en-US', {
+    year: 'numeric',
+    month: 'short',
+    day: 'numeric',
+  });
+}
+
 function resolveCustomParams(event: AppObserveEvent): { [key: string]: any } | null {
   return event.customParams ?? null;
 }
@@ -65,11 +83,24 @@ export function buildObserveEventsTable(
     formatTimestamp(event.timestamp),
   ]);
 
+  const colWidths = headers.map((h, i) => Math.max(h.length, ...rows.map(r => r[i].length)));
+
+  const headerLine = headers.map((h, i) => h.padEnd(colWidths[i])).join('  ');
+  const separatorLine = colWidths.map(w => '-'.repeat(w)).join('  ');
+  const dataLines = rows.map(row => row.map((cell, i) => cell.padEnd(colWidths[i])).join('  '));
+
   const lines: string[] = [];
 
   if (options) {
     const metricDisplay = getMetricDisplayName(options.metricName);
-    const timeDesc = buildTimeRangeDescription(options);
+    let timeDesc: string;
+    if (options.daysBack) {
+      timeDesc = `for the last ${options.daysBack} days`;
+    } else if (options.startTime && options.endTime) {
+      timeDesc = `from ${formatDate(options.startTime)} to ${formatDate(options.endTime)}`;
+    } else {
+      timeDesc = '';
+    }
     const totalDesc =
       options.totalEventCount != null
         ? ` — ${options.totalEventCount.toLocaleString()} total events`
@@ -77,7 +108,7 @@ export function buildObserveEventsTable(
     lines.push(chalk.bold(`${metricDisplay} events ${timeDesc}${totalDesc}`.trim()), '');
   }
 
-  lines.push(renderTextTable(headers, rows));
+  lines.push(chalk.bold(headerLine), separatorLine, ...dataLines);
 
   if (pageInfo.hasNextPage && pageInfo.endCursor) {
     lines.push('', `Next page: --after ${pageInfo.endCursor}`);

packages/eas-cli/src/observe/formatMetrics.ts

@@ -4,7 +4,6 @@ import { EasCommandError } from '../commandUtils/errors';
 import { AppPlatform } from '../graphql/generated';
 import { appPlatformDisplayNames } from '../platform';
 import renderTextTable from '../utils/renderTextTable';
-import { buildTimeRangeDescription } from './formatUtils';
 import { getMetricDisplayName } from './metricNames';
 
 export type StatisticKey =
@@ -170,6 +169,13 @@ function buildStatsDescription(displayStats: StatisticKey[]): string {
   return displayStats.map(s => STAT_DISPLAY_NAMES[s]).join(', ');
 }
 
+function buildTimeRangeDescription(daysBack?: number): string {
+  if (daysBack) {
+    return `for the last ${daysBack} days`;
+  }
+  return '';
+}
+
 export function buildObserveMetricsTable(
   metricsMap: ObserveMetricsMap,
   metricNames: string[],
@@ -191,7 +197,7 @@ export function buildObserveMetricsTable(
 
   // Build summary header
   const statsDesc = displayStats.length > 0 ? buildStatsDescription(displayStats) : 'Event count';
-  const timeDesc = buildTimeRangeDescription({ daysBack: options?.daysBack });
+  const timeDesc = buildTimeRangeDescription(options?.daysBack);
   const countSuffix = hasEventCount && displayStats.length > 0 ? ' (event count)' : '';
   const summaryLine = `${statsDesc} values${countSuffix}${timeDesc ? ` ${timeDesc}` : ''}`;
 

packages/eas-cli/src/observe/formatUtils.ts

@@ -1,65 +0,0 @@
-/**
- * Format an ISO timestamp for display in event tables (minute precision).
- * Uses the runtime's default locale.
- */
-export function formatTimestamp(isoString: string): string {
-  const date = new Date(isoString);
-  return date.toLocaleDateString(undefined, {
-    year: 'numeric',
-    month: 'short',
-    day: 'numeric',
-    hour: '2-digit',
-    minute: '2-digit',
-  });
-}
-
-/**
- * Format an ISO timestamp for display in log tables (millisecond precision).
- * Use this instead of formatTimestamp when the table represents individual
- * log entries where sub-minute resolution matters. Uses the runtime's
- * default locale.
- */
-export function formatLogTimestamp(isoString: string): string {
-  const date = new Date(isoString);
-  return date.toLocaleDateString(undefined, {
-    year: 'numeric',
-    month: 'short',
-    day: 'numeric',
-    hour: '2-digit',
-    minute: '2-digit',
-    second: '2-digit',
-    fractionalSecondDigits: 3,
-  });
-}
-
-/**
- * Format an ISO timestamp for display as a date only (no time). Uses the
- * runtime's default locale.
- */
-export function formatDate(isoString: string): string {
-  const date = new Date(isoString);
-  return date.toLocaleDateString(undefined, {
-    year: 'numeric',
-    month: 'short',
-    day: 'numeric',
-  });
-}
-
-/**
- * Build the time-range fragment used in summary headers, e.g.
- * "for the last 7 days" or "from Jan 1, 2025 to Feb 1, 2025".
- * Returns an empty string when no range information is provided.
- */
-export function buildTimeRangeDescription(options: {
-  daysBack?: number;
-  startTime?: string;
-  endTime?: string;
-}): string {
-  if (options.daysBack) {
-    return `for the last ${options.daysBack} days`;
-  }
-  if (options.startTime && options.endTime) {
-    return `from ${formatDate(options.startTime)} to ${formatDate(options.endTime)}`;
-  }
-  return '';
-}

packages/eas-cli/src/observe/formatVersions.ts

@@ -8,7 +8,15 @@ import {
 import { appPlatformDisplayNames } from '../platform';
 import renderTextTable from '../utils/renderTextTable';
 import { AppVersionsResult } from './fetchVersions';
-import { formatDate } from './formatUtils';
+
+function formatDate(isoString: string): string {
+  const date = new Date(isoString);
+  return date.toLocaleDateString('en-US', {
+    year: 'numeric',
+    month: 'short',
+    day: 'numeric',
+  });
+}
 
 export interface AppVersionJson {
   platform: string;

packages/eas-cli/src/observe/platforms.ts

@@ -1,53 +0,0 @@
-import { AppObservePlatform, AppPlatform } from '../graphql/generated';
-
-/**
- * Allowed values for the --platform flag in observe commands.
- * Derived from the AppObservePlatform enum so new platforms added on
- * the server are automatically picked up.
- */
-export const allowedPlatformFlagValues = Object.values(AppObservePlatform).map(s =>
-  s.toLowerCase()
-);
-
-const defaultAppObservePlatform = AppObservePlatform.Ios;
-const defaultAppPlatform = AppPlatform.Ios;
-
-type PlatformFlagValue = (typeof allowedPlatformFlagValues)[number];
-
-/**
- * Resolve a single AppObservePlatform from a --platform flag value.
- * Returns undefined when no flag was provided.
- */
-export function appObservePlatformFromFlag(
-  flag: PlatformFlagValue | undefined
-): AppObservePlatform | undefined {
-  if (!flag) {
-    return undefined;
-  }
-  switch (flag) {
-    case 'android':
-      return AppObservePlatform.Android;
-    case 'ios':
-      return AppObservePlatform.Ios;
-  }
-  return defaultAppObservePlatform;
-}
-
-/**
- * Resolve a list of AppPlatform values from a --platform flag value.
- * Returns the single matching platform when a flag is provided, or all
- * known platforms when no flag is provided (so the caller queries every
- * platform).
- */
-export function appPlatformsFromFlag(flag: PlatformFlagValue | undefined): AppPlatform[] {
-  if (!flag) {
-    return [AppPlatform.Android, AppPlatform.Ios];
-  }
-  switch (flag) {
-    case 'android':
-      return [AppPlatform.Android];
-    case 'ios':
-      return [AppPlatform.Ios];
-  }
-  return [defaultAppPlatform];
-}

packages/eas-cli/src/observe/resolveProjectContext.ts

@@ -1,43 +0,0 @@
-import EasCommand, { ContextInput } from '../commandUtils/EasCommand';
-import { ExpoGraphqlClient } from '../commandUtils/context/contextUtils/createGraphqlClient';
-
-/**
- * Shared context resolution for observe commands.
- *
- * If `projectIdOverride` is provided (typically via `--project-id`), the
- * helper only requires the LoggedIn context (so the command can run outside
- * of a project directory). Otherwise it uses the full context definition,
- * which derives the project ID from the local app config.
- */
-export async function resolveObserveCommandContextAsync({
-  command,
-  commandClass,
-  loggedInOnlyContextDefinition,
-  projectIdOverride,
-  nonInteractive,
-}: {
-  command: EasCommand;
-  commandClass: { contextDefinition: ContextInput<any> };
-  loggedInOnlyContextDefinition: ContextInput<any>;
-  projectIdOverride?: string;
-  nonInteractive: boolean;
-}): Promise<{ projectId: string; graphqlClient: ExpoGraphqlClient }> {
-  // `getContextAsync` is `protected` on EasCommand; cast to access from this helper.
-  const commandWithContextAccess = command as unknown as {
-    getContextAsync: (
-      cls: { contextDefinition: ContextInput<any> },
-      options: { nonInteractive: boolean }
-    ) => Promise<any>;
-  };
-
-  if (projectIdOverride) {
-    const ctx = await commandWithContextAccess.getContextAsync(
-      { contextDefinition: loggedInOnlyContextDefinition },
-      { nonInteractive }
-    );
-    return { projectId: projectIdOverride, graphqlClient: ctx.loggedIn.graphqlClient };
-  }
-
-  const ctx = await commandWithContextAccess.getContextAsync(commandClass, { nonInteractive });
-  return { projectId: ctx.projectId, graphqlClient: ctx.loggedIn.graphqlClient };
-}

packages/eas-cli/src/run/ios/run.ts

@@ -4,20 +4,10 @@ import path from 'path';
 import * as simulator from './simulator';
 import { validateSystemRequirementsAsync } from './systemRequirements';
 
-export type SimulatorRunTarget = true | string | undefined;
-
-export async function runAppOnIosSimulatorAsync(
-  appPath: string,
-  simulatorRunTarget?: SimulatorRunTarget
-): Promise<void> {
+export async function runAppOnIosSimulatorAsync(appPath: string): Promise<void> {
   await validateSystemRequirementsAsync();
 
-  const selectedSimulator =
-    simulatorRunTarget === true
-      ? await simulator.selectSimulatorAsync({ forcePrompt: true })
-      : simulatorRunTarget
-        ? await simulator.getIosSimulatorByIdOrNameAsync(simulatorRunTarget)
-        : await simulator.selectSimulatorAsync();
+  const selectedSimulator = await simulator.selectSimulatorAsync();
   await simulator.ensureSimulatorBootedAsync(selectedSimulator);
 
   await simulator.ensureSimulatorAppOpenedAsync(selectedSimulator.udid);

packages/eas-cli/src/run/ios/simulator.ts

@@ -18,10 +18,8 @@ interface IosSimulator {
   lastBootedAt?: Date;
 }
 
-export async function selectSimulatorAsync({
-  forcePrompt = false,
-}: { forcePrompt?: boolean } = {}): Promise<IosSimulator> {
-  const bootedSimulator = forcePrompt ? undefined : await getFirstBootedIosSimulatorAsync();
+export async function selectSimulatorAsync(): Promise<IosSimulator> {
+  const bootedSimulator = await getFirstBootedIosSimulatorAsync();
 
   if (bootedSimulator) {
     return bootedSimulator;
@@ -39,25 +37,10 @@ export async function selectSimulatorAsync({
       value: simulator,
     })),
   });
-  if (!selectedSimulator) {
-    throw new Error('No simulator selected.');
-  }
 
   return selectedSimulator;
 }
 
-export async function getIosSimulatorByIdOrNameAsync(simulator: string): Promise<IosSimulator> {
-  const simulators = await getAvaliableIosSimulatorsListAsync();
-  const selectedSimulator = simulators.find(
-    availableSimulator =>
-      availableSimulator.udid === simulator || availableSimulator.name === simulator
-  );
-  if (!selectedSimulator) {
-    throw new Error(`Could not find an available iOS simulator with name or UDID "${simulator}".`);
-  }
-  return selectedSimulator;
-}
-
 export async function getFirstBootedIosSimulatorAsync(): Promise<IosSimulator | undefined> {
   const bootedSimulators = await getAvaliableIosSimulatorsListAsync('booted');
 

packages/eas-cli/src/run/run.ts

@@ -1,7 +1,7 @@
 import path from 'path';
 
 import { runAppOnAndroidEmulatorAsync } from './android/run';
-import { SimulatorRunTarget, runAppOnIosSimulatorAsync } from './ios/run';
+import { runAppOnIosSimulatorAsync } from './ios/run';
 import { AppPlatform } from '../graphql/generated';
 import { getEasBuildRunCacheDirectoryPath } from '../utils/paths';
 
@@ -14,11 +14,10 @@ export interface RunArchiveFlags {
 
 export async function runAsync(
   simulatorBuildPath: string,
-  selectedPlatform: AppPlatform,
-  simulator?: SimulatorRunTarget
+  selectedPlatform: AppPlatform
 ): Promise<void> {
   if (selectedPlatform === AppPlatform.Ios) {
-    await runAppOnIosSimulatorAsync(simulatorBuildPath, simulator);
+    await runAppOnIosSimulatorAsync(simulatorBuildPath);
   } else {
     await runAppOnAndroidEmulatorAsync(simulatorBuildPath);
   }

packages/local-build-plugin/package.json

@@ -1,6 +1,6 @@
 {
   "name": "eas-cli-local-build-plugin",
-  "version": "18.11.0",
+  "version": "18.9.0",
   "description": "Tool for running EAS compatible builds on a local machine.",
   "bugs": "https://github.com/expo/eas-cli/issues",
   "license": "BUSL-1.1",
@@ -26,7 +26,7 @@
     "clean": "rimraf node_modules dist coverage \"*.tsbuildinfo\""
   },
   "dependencies": {
-    "@expo/build-tools": "18.11.0",
+    "@expo/build-tools": "18.9.0",
     "@expo/eas-build-job": "18.8.0",
     "@expo/logger": "18.5.0",
     "@expo/spawn-async": "^1.7.2",

packages/lockfile-utils/jest.config.ts

@@ -0,0 +1,13 @@
+import type { Config } from '@jest/types';
+
+import baseConfig from '../../jest/jest.shared.config';
+
+const config: Config.InitialOptions = {
+  ...baseConfig,
+  rootDir: 'src',
+  testMatch: ['**/__tests__/*.test.ts'],
+  clearMocks: true,
+  setupFilesAfterEnv: ['<rootDir>/../jest/setup-tests.ts'],
+};
+
+export default config;

packages/lockfile-utils/jest/setup-tests.ts

@@ -0,0 +1,5 @@
+if (process.env.NODE_ENV !== 'test') {
+  throw new Error("NODE_ENV environment variable must be set to 'test'.");
+}
+
+// Always mock:

packages/lockfile-utils/package.json

@@ -0,0 +1,39 @@
+{
+  "name": "@expo/lockfile-utils",
+  "version": "18.0.1",
+  "description": "Parse npm, yarn, pnpm, and bun lockfiles and validate them against package.json for version mismatches and peer dependency conflicts",
+  "bugs": "https://github.com/expo/eas-cli/issues",
+  "license": "MIT",
+  "author": "Expo <[email protected]>",
+  "repository": {
+    "type": "git",
+    "url": "https://github.com/expo/eas-cli.git",
+    "directory": "packages/lockfile-utils"
+  },
+  "files": [
+    "dist"
+  ],
+  "main": "dist/index.js",
+  "types": "dist/index.d.ts",
+  "scripts": {
+    "start": "yarn watch",
+    "watch": "tsc --watch --preserveWatchOutput",
+    "build": "tsc",
+    "typecheck": "tsc",
+    "prepack": "rm -rf dist *.tsbuildinfo && tsc -p tsconfig.build.json",
+    "test": "jest --config jest.config.ts",
+    "test:watch": "jest --config jest.config.ts --watch",
+    "clean": "rm -rf node_modules dist coverage *.tsbuildinfo"
+  },
+  "dependencies": {
+    "semver": "^7.6.0"
+  },
+  "devDependencies": {
+    "@types/jest": "^29.5.12",
+    "@types/node": "20.14.2",
+    "@types/semver": "^7.5.8",
+    "jest": "^29.7.0",
+    "ts-jest": "^29.1.4",
+    "typescript": "^5.5.4"
+  }
+}

packages/lockfile-utils/src/__tests__/parsers.test.ts

@@ -0,0 +1,152 @@
+import {
+  parseLockfile,
+  parseNpmLock,
+  parseYarnLock,
+  parsePnpmLock,
+  parseBunLock,
+} from '../parsers';
+
+const NPM_LOCKFILE = JSON.stringify({
+  lockfileVersion: 3,
+  packages: {
+    'node_modules/react': { version: '19.0.4' },
+    'node_modules/react-native': { version: '0.79.4' },
+    'node_modules/react/node_modules/loose-envify': { version: '1.4.0' },
+  },
+});
+
+const NPM_LOCKFILE_WITH_PEERS = JSON.stringify({
+  lockfileVersion: 3,
+  packages: {
+    'node_modules/react': { version: '19.0.0' },
+    'node_modules/react-dom': {
+      version: '19.2.4',
+      peerDependencies: { react: '^19.2.4' },
+    },
+    'node_modules/@0no-co/graphql.web': {
+      version: '1.2.0',
+      peerDependencies: { graphql: '^14.0.0 || ^15.0.0 || ^16.0.0' },
+      peerDependenciesMeta: { graphql: { optional: true } },
+    },
+  },
+});
+
+const YARN_LOCKFILE = `# yarn lockfile v1
+
+react@19.0.4:
+  version "19.0.4"
+  resolved "https://registry.yarnpkg.com/react/-/react-19.0.4.tgz"
+
+react-native@~0.79.0:
+  version "0.79.4"
+  resolved "https://registry.yarnpkg.com/react-native/-/react-native-0.79.4.tgz"
+`;
+
+const BUN_LOCKFILE = `{
+  "lockfileVersion": 1,
+  "workspaces": {
+    "": {
+      "dependencies": {
+        "react": "19.0.4",
+      },
+    },
+  },
+  "packages": {
+    "react": ["[email protected]", "", {}, "sha512-abc"],
+    "react-dom": ["[email protected]", "", { "peerDependencies": { "react": "^19.2.4" } }, "sha512-def"],
+    "@0no-co/graphql.web": ["@0no-co/[email protected]", "", { "peerDependencies": { "graphql": "^16.0.0" }, "optionalPeers": ["graphql"] }, "sha512-ghi"],
+  },
+}`;
+
+const PNPM_LOCKFILE = `lockfileVersion: '9.0'
+
+packages:
+  react@19.0.4:
+    resolution: {integrity: sha512-abc}
+  @types/react@19.0.4:
+    resolution: {integrity: sha512-def}
+`;
+
+describe('parseNpmLock', () => {
+  it('parses top-level packages', () => {
+    const result = parseNpmLock(NPM_LOCKFILE);
+    expect(result).not.toBeNull();
+    expect(result!.packages.get('react')?.version).toBe('19.0.4');
+    expect(result!.packages.get('react-native')?.version).toBe('0.79.4');
+  });
+
+  it('skips nested node_modules (transitive deps)', () => {
+    const result = parseNpmLock(NPM_LOCKFILE);
+    expect(result!.packages.has('loose-envify')).toBe(false);
+  });
+
+  it('parses peer dependencies and optional peers', () => {
+    const result = parseNpmLock(NPM_LOCKFILE_WITH_PEERS);
+    const reactDom = result!.packages.get('react-dom');
+    expect(reactDom?.peerDependencies).toEqual({ react: '^19.2.4' });
+    expect(reactDom?.optionalPeers).toBeUndefined();
+
+    const graphqlWeb = result!.packages.get('@0no-co/graphql.web');
+    expect(graphqlWeb?.optionalPeers?.has('graphql')).toBe(true);
+  });
+
+  it('returns null for invalid JSON', () => {
+    expect(parseNpmLock('not json')).toBeNull();
+  });
+});
+
+describe('parseYarnLock', () => {
+  it('parses package versions', () => {
+    const result = parseYarnLock(YARN_LOCKFILE);
+    expect(result).not.toBeNull();
+    expect(result!.packages.get('react')?.version).toBe('19.0.4');
+    expect(result!.packages.get('react-native')?.version).toBe('0.79.4');
+  });
+});
+
+describe('parsePnpmLock', () => {
+  it('parses package versions including scoped packages', () => {
+    const result = parsePnpmLock(PNPM_LOCKFILE);
+    expect(result).not.toBeNull();
+    expect(result!.packages.get('react')?.version).toBe('19.0.4');
+    expect(result!.packages.get('@types/react')?.version).toBe('19.0.4');
+  });
+});
+
+describe('parseBunLock', () => {
+  it('parses package versions from JSONC format', () => {
+    const result = parseBunLock(BUN_LOCKFILE);
+    expect(result).not.toBeNull();
+    expect(result!.packages.get('react')?.version).toBe('19.0.4');
+  });
+
+  it('parses peer dependencies and optional peers', () => {
+    const result = parseBunLock(BUN_LOCKFILE);
+    const reactDom = result!.packages.get('react-dom');
+    expect(reactDom?.peerDependencies).toEqual({ react: '^19.2.4' });
+
+    const graphqlWeb = result!.packages.get('@0no-co/graphql.web');
+    expect(graphqlWeb?.optionalPeers?.has('graphql')).toBe(true);
+  });
+
+  it('returns null for invalid content', () => {
+    expect(parseBunLock('not json at all {')).toBeNull();
+  });
+});
+
+describe('parseLockfile', () => {
+  it('dispatches to the correct parser by manager', () => {
+    expect(parseLockfile(NPM_LOCKFILE, 'npm', 'package-lock.json')).not.toBeNull();
+    expect(parseLockfile(YARN_LOCKFILE, 'yarn', 'yarn.lock')).not.toBeNull();
+    expect(parseLockfile(PNPM_LOCKFILE, 'pnpm', 'pnpm-lock.yaml')).not.toBeNull();
+    expect(parseLockfile(BUN_LOCKFILE, 'bun', 'bun.lock')).not.toBeNull();
+  });
+
+  it('returns null for binary bun.lockb', () => {
+    expect(parseLockfile('binary', 'bun', 'bun.lockb')).toBeNull();
+  });
+
+  it('returns null for unknown manager', () => {
+    expect(parseLockfile('{}', 'deno', 'deno.lock')).toBeNull();
+  });
+});

packages/lockfile-utils/src/__tests__/validators.test.ts

@@ -0,0 +1,118 @@
+import { findLockfileMismatches, findPeerDependencyConflicts } from '../validators';
+import { LockfileData, PackageInfo } from '../types';
+
+function makeLockfileData(packages: Record<string, PackageInfo>): LockfileData {
+  return { packages: new Map(Object.entries(packages)) };
+}
+
+describe('findLockfileMismatches', () => {
+  it('returns empty when lockfile is in sync', () => {
+    const packageJson = { dependencies: { react: '19.0.4', 'react-native': '~0.79.0' } };
+    const lockfile = makeLockfileData({
+      react: { version: '19.0.4' },
+      'react-native': { version: '0.79.4' },
+    });
+    expect(findLockfileMismatches(packageJson, lockfile)).toEqual([]);
+  });
+
+  it('detects version mismatch', () => {
+    const packageJson = { dependencies: { react: '19.0.4' } };
+    const lockfile = makeLockfileData({ react: { version: '19.0.0' } });
+    const mismatches = findLockfileMismatches(packageJson, lockfile);
+    expect(mismatches).toHaveLength(1);
+    expect(mismatches[0]).toEqual({
+      name: 'react',
+      specifier: '19.0.4',
+      lockedVersion: '19.0.0',
+    });
+  });
+
+  it('checks devDependencies and optionalDependencies', () => {
+    const packageJson = {
+      devDependencies: { typescript: '^5.5.0' },
+      optionalDependencies: { fsevents: '^2.3.0' },
+    };
+    const lockfile = makeLockfileData({
+      typescript: { version: '5.5.4' },
+      fsevents: { version: '2.3.3' },
+    });
+    expect(findLockfileMismatches(packageJson, lockfile)).toEqual([]);
+  });
+
+  it('skips non-registry specifiers', () => {
+    const packageJson = {
+      dependencies: {
+        'my-local': 'file:../local',
+        'my-workspace': 'workspace:*',
+        'my-git': 'git+https://github.com/foo/bar.git',
+        'my-github': 'github:foo/bar',
+        'my-latest': 'latest',
+      },
+    };
+    const lockfile = makeLockfileData({});
+    expect(findLockfileMismatches(packageJson, lockfile)).toEqual([]);
+  });
+
+  it('skips packages not found in lockfile', () => {
+    const packageJson = { dependencies: { 'new-dep': '^1.0.0' } };
+    const lockfile = makeLockfileData({});
+    expect(findLockfileMismatches(packageJson, lockfile)).toEqual([]);
+  });
+});
+
+describe('findPeerDependencyConflicts', () => {
+  it('returns empty when peers are satisfied', () => {
+    const packageJson = { dependencies: { react: '19.2.4', 'react-dom': '19.2.4' } };
+    const lockfile = makeLockfileData({
+      react: { version: '19.2.4' },
+      'react-dom': {
+        version: '19.2.4',
+        peerDependencies: { react: '^19.2.4' },
+      },
+    });
+    expect(findPeerDependencyConflicts(packageJson, lockfile)).toEqual([]);
+  });
+
+  it('detects unsatisfied peer dependency', () => {
+    const packageJson = { dependencies: { react: '19.0.0', 'react-dom': '19.2.4' } };
+    const lockfile = makeLockfileData({
+      react: { version: '19.0.0' },
+      'react-dom': {
+        version: '19.2.4',
+        peerDependencies: { react: '^19.2.4' },
+      },
+    });
+    const conflicts = findPeerDependencyConflicts(packageJson, lockfile);
+    expect(conflicts).toHaveLength(1);
+    expect(conflicts[0]).toEqual({
+      source: 'react-dom',
+      sourceVersion: '19.2.4',
+      peer: 'react',
+      peerRange: '^19.2.4',
+      installedVersion: '19.0.0',
+    });
+  });
+
+  it('skips optional peers', () => {
+    const packageJson = { dependencies: { '@0no-co/graphql.web': '1.2.0' } };
+    const lockfile = makeLockfileData({
+      '@0no-co/graphql.web': {
+        version: '1.2.0',
+        peerDependencies: { graphql: '^14.0.0 || ^15.0.0 || ^16.0.0' },
+        optionalPeers: new Set(['graphql']),
+      },
+    });
+    expect(findPeerDependencyConflicts(packageJson, lockfile)).toEqual([]);
+  });
+
+  it('skips peers not installed in lockfile', () => {
+    const packageJson = { dependencies: { 'react-dom': '19.2.4' } };
+    const lockfile = makeLockfileData({
+      'react-dom': {
+        version: '19.2.4',
+        peerDependencies: { react: '^19.2.4' },
+      },
+    });
+    expect(findPeerDependencyConflicts(packageJson, lockfile)).toEqual([]);
+  });
+});

packages/lockfile-utils/src/index.ts

@@ -0,0 +1,8 @@
+export { parseLockfile, parseNpmLock, parseYarnLock, parsePnpmLock, parseBunLock } from './parsers';
+export { findLockfileMismatches, findPeerDependencyConflicts } from './validators';
+export type {
+  PackageInfo,
+  LockfileData,
+  DependencyMismatch,
+  PeerDependencyConflict,
+} from './types';

packages/lockfile-utils/src/parsers.ts

@@ -0,0 +1,154 @@
+import { LockfileData, PackageInfo } from './types';
+
+export function parseNpmLock(content: string): LockfileData | null {
+  try {
+    const lockfile = JSON.parse(content);
+    const rawPackages: Record<
+      string,
+      {
+        version?: string;
+        peerDependencies?: Record<string, string>;
+        peerDependenciesMeta?: Record<string, { optional?: boolean }>;
+      }
+    > = lockfile.packages ?? {};
+    const packages = new Map<string, PackageInfo>();
+    for (const [key, value] of Object.entries(rawPackages)) {
+      if (!key.startsWith('node_modules/')) {
+        continue;
+      }
+      const rest = key.slice('node_modules/'.length);
+      // Skip nested node_modules (transitive deps)
+      if (rest.includes('node_modules/')) {
+        continue;
+      }
+      if (value.version) {
+        const optionalPeers = new Set<string>();
+        if (value.peerDependenciesMeta) {
+          for (const [peer, meta] of Object.entries(value.peerDependenciesMeta)) {
+            if (meta.optional) {
+              optionalPeers.add(peer);
+            }
+          }
+        }
+        packages.set(rest, {
+          version: value.version,
+          peerDependencies: value.peerDependencies,
+          optionalPeers: optionalPeers.size > 0 ? optionalPeers : undefined,
+        });
+      }
+    }
+    return { packages };
+  } catch {
+    return null;
+  }
+}
+
+export function parseYarnLock(content: string): LockfileData | null {
+  try {
+    const packages = new Map<string, PackageInfo>();
+    const lines = content.split('\n');
+    let currentPackage: string | null = null;
+
+    for (const line of lines) {
+      // Entry header: not indented, not a comment, ends with ':'
+      if (line.length > 0 && !line.startsWith(' ') && !line.startsWith('#') && line.endsWith(':')) {
+        // Examples:
+        //   yarn v1: react@^19.0.0:  or  "react@^19.0.0":
+        //   yarn v2+: "react@npm:^19.0.0":
+        const entry = line.replace(/^"/, '').replace(/:$/, '').replace(/"$/, '');
+        const atIndex = entry.indexOf('@', entry.startsWith('@') ? 1 : 0);
+        if (atIndex > 0) {
+          currentPackage = entry.slice(0, atIndex);
+        }
+      }
+
+      // Version line (indented): `  version "19.0.0"` or `  version: 19.0.0`
+      if (currentPackage) {
+        const versionMatch = line.match(/^\s+version:?\s+"?([^"\s]+)"?/);
+        if (versionMatch) {
+          if (!packages.has(currentPackage)) {
+            packages.set(currentPackage, { version: versionMatch[1] });
+          }
+          currentPackage = null;
+        }
+      }
+    }
+    // yarn.lock doesn't include peer dependency info
+    return { packages };
+  } catch {
+    return null;
+  }
+}
+
+export function parsePnpmLock(content: string): LockfileData | null {
+  try {
+    const packages = new Map<string, PackageInfo>();
+    // Match entries in the packages section like:
+    //   [email protected]:   or   @types/[email protected]:
+    const packageRegex = /^ {2}((?:@[\w.-]+\/)?[\w.-]+)@(\d+[^:\s]*?):/gm;
+    let match;
+    while ((match = packageRegex.exec(content)) !== null) {
+      if (!packages.has(match[1])) {
+        packages.set(match[1], { version: match[2] });
+      }
+    }
+    // pnpm-lock.yaml doesn't readily expose peer deps in a parseable way without YAML
+    return { packages };
+  } catch {
+    return null;
+  }
+}
+
+export function parseBunLock(content: string): LockfileData | null {
+  try {
+    // bun.lock is JSONC (has trailing commas) — strip them for JSON.parse
+    const jsonContent = content.replace(/,(\s*[}\]])/g, '$1');
+    const lockfile = JSON.parse(jsonContent);
+    const rawPackages: Record<string, unknown[]> = lockfile.packages ?? {};
+    const packages = new Map<string, PackageInfo>();
+    for (const [name, value] of Object.entries(rawPackages)) {
+      // Format: "react": ["[email protected]", "", { peerDependencies: {...}, optionalPeers: [...] }, "sha512-..."]
+      if (Array.isArray(value) && typeof value[0] === 'string') {
+        const entry: string = value[0];
+        const atIndex = entry.lastIndexOf('@');
+        if (atIndex > 0) {
+          const meta = (typeof value[2] === 'object' && value[2] !== null ? value[2] : {}) as {
+            peerDependencies?: Record<string, string>;
+            optionalPeers?: string[];
+          };
+          packages.set(name, {
+            version: entry.slice(atIndex + 1),
+            peerDependencies: meta.peerDependencies,
+            optionalPeers: meta.optionalPeers ? new Set(meta.optionalPeers) : undefined,
+          });
+        }
+      }
+    }
+    return { packages };
+  } catch {
+    return null;
+  }
+}
+
+export function parseLockfile(
+  content: string,
+  manager: string,
+  lockfilePath: string
+): LockfileData | null {
+  switch (manager) {
+    case 'npm':
+      return parseNpmLock(content);
+    case 'yarn':
+      return parseYarnLock(content);
+    case 'pnpm':
+      return parsePnpmLock(content);
+    case 'bun':
+      // bun.lockb is binary — can only parse the text variant
+      if (lockfilePath.endsWith('.lockb')) {
+        return null;
+      }
+      return parseBunLock(content);
+    default:
+      return null;
+  }
+}

packages/lockfile-utils/src/types.ts

@@ -0,0 +1,26 @@
+export interface PackageInfo {
+  version: string;
+  peerDependencies?: Record<string, string>;
+  optionalPeers?: Set<string>;
+}
+
+export interface LockfileData {
+  packages: Map<string, PackageInfo>;
+}
+
+export interface DependencyMismatch {
+  name: string;
+  specifier: string;
+  lockedVersion: string;
+}
+
+export interface PeerDependencyConflict {
+  /** Package that declares the peer dependency */
+  source: string;
+  sourceVersion: string;
+  /** The peer dependency that is not satisfied */
+  peer: string;
+  peerRange: string;
+  /** The actual version of the peer in the lockfile */
+  installedVersion: string;
+}

packages/lockfile-utils/src/validators.ts

@@ -0,0 +1,92 @@
+import semver from 'semver';
+
+import { DependencyMismatch, LockfileData, PeerDependencyConflict } from './types';
+
+function isNonRegistrySpecifier(specifier: string): boolean {
+  return (
+    specifier.startsWith('file:') ||
+    specifier.startsWith('link:') ||
+    specifier.startsWith('workspace:') ||
+    specifier.startsWith('git:') ||
+    specifier.startsWith('git+') ||
+    specifier.startsWith('github:') ||
+    specifier.startsWith('http:') ||
+    specifier.startsWith('https:') ||
+    specifier.startsWith('portal:') ||
+    specifier === '*' ||
+    specifier === 'latest' ||
+    specifier === 'next'
+  );
+}
+
+export function findLockfileMismatches(
+  packageJson: Record<string, unknown>,
+  lockfileData: LockfileData
+): DependencyMismatch[] {
+  const allDeps: Record<string, string> = {
+    ...(packageJson.dependencies as Record<string, string> | undefined),
+    ...(packageJson.devDependencies as Record<string, string> | undefined),
+    ...(packageJson.optionalDependencies as Record<string, string> | undefined),
+  };
+
+  const mismatches: DependencyMismatch[] = [];
+  for (const [name, specifier] of Object.entries(allDeps)) {
+    if (isNonRegistrySpecifier(specifier)) {
+      continue;
+    }
+
+    const pkg = lockfileData.packages.get(name);
+    if (!pkg) {
+      continue; // Package not found in lockfile — may be a new dep or hoisted differently
+    }
+
+    if (!semver.satisfies(pkg.version, specifier)) {
+      mismatches.push({ name, specifier, lockedVersion: pkg.version });
+    }
+  }
+
+  return mismatches;
+}
+
+export function findPeerDependencyConflicts(
+  packageJson: Record<string, unknown>,
+  lockfileData: LockfileData
+): PeerDependencyConflict[] {
+  // Check peer deps of direct dependencies only (most common source of build failures)
+  const directDeps: Record<string, string> = {
+    ...(packageJson.dependencies as Record<string, string> | undefined),
+    ...(packageJson.devDependencies as Record<string, string> | undefined),
+  };
+
+  const conflicts: PeerDependencyConflict[] = [];
+  for (const depName of Object.keys(directDeps)) {
+    const pkg = lockfileData.packages.get(depName);
+    if (!pkg?.peerDependencies) {
+      continue;
+    }
+
+    for (const [peer, peerRange] of Object.entries(pkg.peerDependencies)) {
+      // Skip optional peers
+      if (pkg.optionalPeers?.has(peer)) {
+        continue;
+      }
+
+      const peerPkg = lockfileData.packages.get(peer);
+      if (!peerPkg) {
+        continue; // Peer not installed — might be optional or provided by a parent
+      }
+
+      if (!semver.satisfies(peerPkg.version, peerRange)) {
+        conflicts.push({
+          source: depName,
+          sourceVersion: pkg.version,
+          peer,
+          peerRange,
+          installedVersion: peerPkg.version,
+        });
+      }
+    }
+  }
+
+  return conflicts;
+}

packages/lockfile-utils/tsconfig.build.json

@@ -0,0 +1,4 @@
+{
+  "extends": "./tsconfig.json",
+  "exclude": ["src/**/__mocks__/**/*.ts", "src/**/__tests__/**/*.ts"]
+}

packages/lockfile-utils/tsconfig.json

@@ -0,0 +1,16 @@
+{
+  "compilerOptions": {
+    "moduleResolution": "node",
+    "target": "es2022",
+    "module": "commonjs",
+    "strict": true,
+    "esModuleInterop": true,
+    "skipLibCheck": true,
+    "forceConsistentCasingInFileNames": true,
+    "declaration": true,
+    "composite": true,
+    "rootDir": "./src",
+    "outDir": "./dist"
+  },
+  "include": ["src/**/*"]
+}

packages/worker/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@expo/worker",
-  "version": "18.11.0",
+  "version": "18.9.0",
   "private": true,
   "scripts": {
     "start": "yarn watch",
@@ -19,7 +19,7 @@
   },
   "dependencies": {
     "@babel/core": "7.24.7",
-    "@expo/build-tools": "18.11.0",
+    "@expo/build-tools": "18.9.0",
     "@expo/config-plugins": "55.0.7",
     "@expo/config-types": "55.0.5",
     "@expo/downloader": "18.5.0",

packages/worker/src/__integration__/stateSync.test.ts

@@ -65,11 +65,6 @@ jest.mock('@expo/build-tools', () => {
     })),
   };
 });
-jest.mock('@expo/turtle-spawn', () =>
-  jest.fn(async () => {
-    throw new Error('Cannot find module expo/package.json');
-  })
-);
 jest.mock('../service', () => {
   return function () {
     const BuildService = new (jest.requireActual('../service').default)();
@@ -85,9 +80,6 @@ jest.mock('../config', () => {
     wwwApiV2BaseUrl: 'http://api.expo.test/v2/',
   };
 });
-jest.mock('../utils/turtleFetch', () => ({
-  turtleFetch: jest.fn(async () => ({ ok: true })),
-}));
 jest.mock('../upload', () => {
   return {
     ...jest.requireActual('../upload'),

packages/worker/src/__unit__/service.test.ts

@@ -183,7 +183,7 @@ describe(BuildService, () => {
     });
 
     expect(turtleFetch).toHaveBeenCalledWith(
-      'http://api.expo.test/v2/turtle-builds/logs',
+      'http://api.expo.test/v2/turtle-builds/error-logs',
       'POST',
       expect.objectContaining({
         json: expect.objectContaining({
@@ -211,7 +211,7 @@ describe(BuildService, () => {
     });
 
     expect(turtleFetch).toHaveBeenCalledWith(
-      'http://api.expo.test/v2/turtle-builds/logs',
+      'http://api.expo.test/v2/turtle-builds/error-logs',
       'POST',
       expect.objectContaining({
         json: expect.objectContaining({
@@ -242,7 +242,7 @@ describe(BuildService, () => {
 
     expect(spawn).not.toHaveBeenCalled();
     expect(turtleFetch).toHaveBeenCalledWith(
-      'http://api.expo.test/v2/turtle-builds/logs',
+      'http://api.expo.test/v2/turtle-builds/error-logs',
       'POST',
       expect.objectContaining({
         json: expect.objectContaining({

packages/worker/src/service.ts

@@ -354,16 +354,15 @@ export default class BuildService {
 
         try {
           await turtleFetch(
-            new URL('turtle-builds/logs', config.wwwApiV2BaseUrl).toString(),
+            new URL('turtle-builds/error-logs', config.wwwApiV2BaseUrl).toString(),
             'POST',
             {
               json: {
                 buildId: this.buildId,
                 message: rawErrorMessage,
-                level: 'error',
+                buildPhase: err.buildPhase ?? null,
+                errorCode: err.errorCode,
                 tags: {
-                  build_phase: err.buildPhase ?? null,
-                  error_code: err.errorCode,
                   platform: job.platform,
                   workflow: job.type,
                   sdk_version: metadata?.sdkVersion ?? null,

yarn.lock

@@ -2856,7 +2856,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@expo/build-tools@npm:18.11.0, @expo/build-tools@workspace:packages/build-tools":
+"@expo/build-tools@npm:18.9.0, @expo/build-tools@workspace:packages/build-tools":
   version: 0.0.0-use.local
   resolution: "@expo/build-tools@workspace:packages/build-tools"
   dependencies:
@@ -3270,6 +3270,21 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@expo/lockfile-utils@npm:18.0.1, @expo/lockfile-utils@workspace:packages/lockfile-utils":
+  version: 0.0.0-use.local
+  resolution: "@expo/lockfile-utils@workspace:packages/lockfile-utils"
+  dependencies:
+    "@types/jest": "npm:^29.5.12"
+    "@types/node": "npm:20.14.2"
+    "@types/semver": "npm:^7.5.8"
+    jest: "npm:^29.7.0"
+    semver: "npm:^7.6.0"
+    ts-jest: "npm:^29.1.4"
+    typescript: "npm:^5.5.4"
+  languageName: unknown
+  linkType: soft
+
+"@expo/logger@npm:18.0.1, @expo/logger@workspace:packages/logger":
 "@expo/logger@npm:18.5.0, @expo/logger@workspace:packages/logger":
   version: 0.0.0-use.local
   resolution: "@expo/logger@workspace:packages/logger"
@@ -3554,7 +3569,7 @@ __metadata:
   resolution: "@expo/worker@workspace:packages/worker"
   dependencies:
     "@babel/core": "npm:7.24.7"
-    "@expo/build-tools": "npm:18.11.0"
+    "@expo/build-tools": "npm:18.9.0"
     "@expo/config-plugins": "npm:55.0.7"
     "@expo/config-types": "npm:55.0.5"
     "@expo/downloader": "npm:18.5.0"
@@ -10944,7 +10959,7 @@ __metadata:
   version: 0.0.0-use.local
   resolution: "eas-cli-local-build-plugin@workspace:packages/local-build-plugin"
   dependencies:
-    "@expo/build-tools": "npm:18.11.0"
+    "@expo/build-tools": "npm:18.9.0"
     "@expo/eas-build-job": "npm:18.8.0"
     "@expo/logger": "npm:18.5.0"
     "@expo/spawn-async": "npm:^1.7.2"
@@ -11006,6 +11021,7 @@ __metadata:
     "@expo/eas-json": "npm:18.8.0"
     "@expo/env": "npm:^1.0.0"
     "@expo/json-file": "npm:8.3.3"
+    "@expo/lockfile-utils": "npm:18.0.1"
     "@expo/logger": "npm:18.5.0"
     "@expo/multipart-body-parser": "npm:2.0.0"
     "@expo/osascript": "npm:2.1.4"