eoas 3.0.0-alpha.1 → 3.0.0-beta.1

package/README.md

@@ -5,7 +5,7 @@ EOAS ((Expo Open Application Services) is a powerful helper package designed to
 ## Quick Start
 
 To get started with EOAS, check out the official documentation:
-[EOAS Official Documentation](https://axelmarciano.github.io/expo-open-ota/)
+[EOAS Official Documentation](https://mercure-technologies.gitbook.io/expo-open-ota/eoas/overview)
 
 ## Learn More
 For detailed information and to explore the core functionalities of expo-open-ota, visit the main repository:

package/dist/commands/doctor.d.ts

@@ -0,0 +1,12 @@
+import { Command } from '@oclif/core';
+export default class Doctor extends Command {
+    static args: {};
+    static description: string;
+    static examples: string[];
+    static flags: {
+        channel: import("@oclif/core/lib/interfaces").OptionFlag<string, import("@oclif/core/lib/interfaces").CustomOptions>;
+        url: import("@oclif/core/lib/interfaces").OptionFlag<string | undefined, import("@oclif/core/lib/interfaces").CustomOptions>;
+        appId: import("@oclif/core/lib/interfaces").OptionFlag<string | undefined, import("@oclif/core/lib/interfaces").CustomOptions>;
+    };
+    run(): Promise<void>;
+}

package/dist/commands/doctor.js

@@ -0,0 +1,127 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+const tslib_1 = require("tslib");
+const core_1 = require("@oclif/core");
+const expoConfig_1 = require("../lib/expoConfig");
+const fetch_1 = require("../lib/fetch");
+const log_1 = tslib_1.__importDefault(require("../lib/log"));
+const ora_1 = require("../lib/ora");
+const package_1 = require("../lib/package");
+// probeManifest asks the server for a manifest the way a client would, and
+// reports what came back. `appId` is omitted to impersonate a v1 client — the
+// point of this command is that the header may legitimately be absent.
+//
+// A runtime version nothing was ever published against is deliberate: the
+// server answers "no update available" instead of streaming a bundle, which
+// exercises app resolution without downloading anything. Resolution happens
+// before any update lookup, so a 200 proves the app was resolved either way.
+async function probeManifest({ baseUrl, channel, appId, }) {
+    const headers = {
+        'expo-platform': 'ios',
+        'expo-runtime-version': 'eoas-doctor-probe',
+        'expo-protocol-version': '1',
+        'expo-channel-name': channel,
+    };
+    if (appId) {
+        headers['expo-app-id'] = appId;
+    }
+    const response = await (0, fetch_1.fetchWithRetries)(`${baseUrl}/manifest`, { method: 'GET', headers });
+    return {
+        ok: response.ok,
+        status: response.status,
+        body: (await response.text()).trim(),
+    };
+}
+class Doctor extends core_1.Command {
+    static args = {};
+    static description = "Check that this project's clients can reach the update server — including builds shipped before expo-app-id existed";
+    static examples = ['<%= config.bin %> <%= command.id %> --channel=production'];
+    static flags = {
+        channel: core_1.Flags.string({
+            description: 'Channel to probe with (must exist on the server)',
+            required: true,
+        }),
+        url: core_1.Flags.string({
+            description: 'Update server URL. Defaults to updates.url from your Expo config',
+            required: false,
+        }),
+        appId: core_1.Flags.string({
+            description: 'App id to probe with. Defaults to updates.requestHeaders["expo-app-id"] from your Expo config',
+            required: false,
+        }),
+    };
+    async run() {
+        const { flags } = await this.parse(Doctor);
+        const projectDir = process.cwd();
+        if (!(0, package_1.isExpoInstalled)(projectDir)) {
+            log_1.default.error('Expo is not installed in this project. Please install Expo first.');
+            process.exit(1);
+        }
+        const privateConfig = await (0, expoConfig_1.getPrivateExpoConfigAsync)(projectDir, {
+            env: process.env,
+        });
+        const updateUrl = flags.url ?? (0, expoConfig_1.getExpoConfigUpdateUrl)(privateConfig);
+        if (!updateUrl) {
+            log_1.default.error("Update url is not setup in your config. Please run 'eoas init' to setup the update url, or pass --url");
+            process.exit(1);
+        }
+        let baseUrl;
+        try {
+            baseUrl = new URL(updateUrl).origin;
+        }
+        catch (e) {
+            log_1.default.error('Invalid URL', e);
+            process.exit(1);
+        }
+        const appId = flags.appId ?? (0, expoConfig_1.getExpoAppId)(privateConfig);
+        log_1.default.log(`🩺 Probing ${baseUrl} on channel '${flags.channel}'`);
+        log_1.default.newLine();
+        // Probe 1 — the fleet already in users' hands. Its binary predates
+        // expo-app-id and cannot be made to send it without a store release, so
+        // this is the probe that decides whether upgrading the server strands
+        // those installs.
+        const legacySpinner = (0, ora_1.ora)('Probing as a v1 client (no expo-app-id header)...').start();
+        const legacy = await probeManifest({ baseUrl, channel: flags.channel });
+        if (legacy.ok) {
+            legacySpinner.succeed('✅ v1 clients are served — the server falls back to its EXPO_APP_ID');
+        }
+        else {
+            legacySpinner.fail(`❌ v1 clients are rejected — HTTP ${legacy.status}: ${legacy.body}`);
+        }
+        // Probe 2 — what a rebuilt binary sends. Skipped when the project has no
+        // app id configured, which is itself the v1 shape and not an error.
+        let modern;
+        if (appId) {
+            const modernSpinner = (0, ora_1.ora)(`Probing as a v2 client (expo-app-id: ${appId})...`).start();
+            modern = await probeManifest({ baseUrl, channel: flags.channel, appId });
+            if (modern.ok) {
+                modernSpinner.succeed('✅ v2 clients are served');
+            }
+            else {
+                modernSpinner.fail(`❌ v2 clients are rejected — HTTP ${modern.status}: ${modern.body}`);
+            }
+        }
+        else {
+            log_1.default.warn("⚠️  Skipping the v2 probe: no 'expo-app-id' in updates.requestHeaders. That is the v1 config shape — run 'npx eoas init' to add it.");
+        }
+        log_1.default.newLine();
+        if (!legacy.ok && !appId) {
+            log_1.default.error('Your v1 clients are being rejected and this project sends no app id at all.');
+            log_1.default.error('Every install in the wild has lost OTA coverage. On the server, unset SKIP_LEGACY_APP_ID_FALLBACK to restore it immediately.');
+            process.exit(1);
+        }
+        if (!legacy.ok) {
+            log_1.default.warn('Clients built before expo-app-id existed are rejected by this server.');
+            log_1.default.warn('That is correct only if every build your users run already ships the header. If any predate it, they have silently stopped updating — unset SKIP_LEGACY_APP_ID_FALLBACK on the server.');
+        }
+        if (modern && !modern.ok) {
+            log_1.default.error(`The app id '${appId}' is not served by this server.`);
+            log_1.default.error('Check it matches EXPO_APP_ID (single-app) or an app in the dashboard (control plane).');
+            process.exit(1);
+        }
+        if (legacy.ok && modern?.ok) {
+            log_1.default.succeed('Both v1 and v2 clients are served. This server is safe to cut over to.');
+        }
+    }
+}
+exports.default = Doctor;

package/dist/commands/init.js

@@ -30,8 +30,8 @@ class Init extends core_1.Command {
         const detectedAppId = config.extra?.eas
             ?.projectId;
         const { appId } = await (0, prompts_1.promptAsync)({
-            message: 'Enter the Expo project id for this project (sent as the expo-app-id header).\n' +
-                '  See https://axelmarciano.github.io/expo-open-ota/docs/getting-started/prerequisites for details.',
+            message: 'Enter the project id for this project (sent as the expo-app-id header).\n' +
+                '  See https://mercure-technologies.gitbook.io/expo-open-ota/stateless-mode/getting-started for details.',
             name: 'appId',
             type: 'text',
             initial: detectedAppId,

package/dist/commands/publish.d.ts

@@ -12,6 +12,7 @@ export default class Publish extends Command {
         outputDir: import("@oclif/core/lib/interfaces").OptionFlag<string, import("@oclif/core/lib/interfaces").CustomOptions>;
         packageRunner: import("@oclif/core/lib/interfaces").OptionFlag<string | undefined, import("@oclif/core/lib/interfaces").CustomOptions>;
         message: import("@oclif/core/lib/interfaces").OptionFlag<string | undefined, import("@oclif/core/lib/interfaces").CustomOptions>;
+        dumpSourcemap: import("@oclif/core/lib/interfaces").BooleanFlag<boolean>;
     };
     private sanitizeFlags;
     run(): Promise<void>;

package/dist/commands/publish.js

@@ -57,7 +57,7 @@ class Publish extends core_1.Command {
             default: 'dist',
         }),
         packageRunner: core_1.Flags.string({
-            description: 'Package runner to use for spawning Expo CLI commands (e.g. npx, bunx, pnpx). Can also be set via EOAS_PACKAGE_RUNNER env var. Defaults to npx.',
+            description: 'Package runner to use for spawning Expo CLI commands (e.g. npx, bunx, "pnpm exec"). Can also be set via EOAS_PACKAGE_RUNNER env var. Defaults to npx.',
             required: false,
         }),
         message: core_1.Flags.string({
@@ -65,6 +65,10 @@ class Publish extends core_1.Command {
             description: 'A short message describing the update. Defaults to the latest git commit message.',
             required: false,
         }),
+        dumpSourcemap: core_1.Flags.boolean({
+            description: 'Emit Hermes source maps alongside the bundle so the published artifact can be symbolicated by tools like Sentry or PostHog.',
+            default: false,
+        }),
     };
     sanitizeFlags(flags) {
         return {
@@ -76,16 +80,17 @@ class Publish extends core_1.Command {
             packageRunner: (0, packageRunner_1.resolvePackageRunner)(flags.packageRunner, process.cwd()),
             providedDeprecatedChannel: flags.channel,
             message: flags.message,
+            dumpSourcemap: flags.dumpSourcemap,
         };
     }
     async run() {
-        const credentials = (0, auth_1.retrieveExpoCredentials)();
-        if (!credentials.token && !credentials.sessionSecret) {
-            log_1.default.error('You are not logged to eas, please run `eas login`');
+        const credentials = (0, auth_1.retrieveCredentials)();
+        if (!(0, auth_1.validateCredentials)(credentials)) {
+            log_1.default.error('Invalid credentials. Please run `eas login or set EXPO_ACCESS_TOKEN or EOO_TOKEN environment variable`');
             process.exit(1);
         }
         const { flags } = await this.parse(Publish);
-        const { platform, nonInteractive, branch, outputDir, packageRunner, providedDeprecatedChannel, disableRepositoryCheck, message, } = this.sanitizeFlags(flags);
+        const { platform, nonInteractive, branch, outputDir, packageRunner, providedDeprecatedChannel, disableRepositoryCheck, message, dumpSourcemap, } = this.sanitizeFlags(flags);
         if (!branch) {
             log_1.default.error('Branch name is required');
             process.exit(1);
@@ -188,7 +193,17 @@ class Publish extends core_1.Command {
         const exportSpinner = (0, ora_1.ora)('📦 Exporting project files...').start();
         try {
             const specifiedPlatform = platform === expoConfig_1.RequestedPlatform.All ? [] : ['--platform', platform];
-            const { stdout } = await (0, spawn_async_1.default)(packageRunner, ['expo', 'export', '--output-dir', outputDir, ...specifiedPlatform], {
+            const sourcemapArgs = dumpSourcemap ? ['--dump-sourcemap'] : [];
+            const [runnerCommand, runnerArgs] = (0, packageRunner_1.splitPackageRunner)(packageRunner);
+            const { stdout } = await (0, spawn_async_1.default)(runnerCommand, [
+                ...runnerArgs,
+                'expo',
+                'export',
+                '--output-dir',
+                outputDir,
+                ...sourcemapArgs,
+                ...specifiedPlatform,
+            ], {
                 cwd: projectDir,
                 env: {
                     ...process.env,
@@ -260,7 +275,7 @@ class Publish extends core_1.Command {
                         method: 'PUT',
                         headers: {
                             ...formData.getHeaders(),
-                            ...(0, auth_1.getAuthExpoHeaders)(credentials),
+                            ...(0, auth_1.getAuthHeaders)(credentials),
                         },
                         body: formData,
                     });
@@ -311,7 +326,7 @@ class Publish extends core_1.Command {
             const response = await (0, fetch_1.fetchWithRetries)(markAsUploadedUrl.toString(), {
                 method: 'POST',
                 headers: {
-                    ...(0, auth_1.getAuthExpoHeaders)(credentials),
+                    ...(0, auth_1.getAuthHeaders)(credentials),
                     'Content-Type': 'application/json',
                 },
             });

package/dist/commands/republish.js

@@ -21,7 +21,7 @@ class Publish extends core_1.Command {
         }),
         platform: core_1.Flags.string({
             type: 'option',
-            options: ['ios', 'android'],
+            options: ['ios', 'android', 'all'],
             default: 'all',
             required: true,
         }),
@@ -33,9 +33,9 @@ class Publish extends core_1.Command {
         };
     }
     async run() {
-        const credentials = (0, auth_1.retrieveExpoCredentials)();
-        if (!credentials.token && !credentials.sessionSecret) {
-            log_1.default.error('You are not logged to eas, please run `eas login`');
+        const credentials = (0, auth_1.retrieveCredentials)();
+        if (!(0, auth_1.validateCredentials)(credentials)) {
+            log_1.default.error('Invalid credentials. Please run `eas login or set EXPO_ACCESS_TOKEN or EOO_TOKEN environment variable`');
             process.exit(1);
         }
         const { flags } = await this.parse(Publish);
@@ -78,8 +78,8 @@ class Publish extends core_1.Command {
         const runtimeVersionsEndpoint = `${baseUrl}/api/apps/${appId}/branch/${branch}/runtimeVersions`;
         const response = await (0, fetch_1.fetchWithRetries)(runtimeVersionsEndpoint, {
             headers: {
-                ...(0, auth_1.getAuthExpoHeaders)(credentials),
-                'use-expo-auth': 'true',
+                ...(0, auth_1.getAuthHeaders)(credentials),
+                'use-cli-auth': 'true',
             },
         });
         if (!response.ok) {
@@ -106,8 +106,8 @@ class Publish extends core_1.Command {
         const updatesEndpoint = `${baseUrl}/api/apps/${appId}/branch/${branch}/runtimeVersion/${selectedRuntimeVersion.runtimeVersion}/updates`;
         const updatesResponse = await (0, fetch_1.fetchWithRetries)(updatesEndpoint, {
             headers: {
-                ...(0, auth_1.getAuthExpoHeaders)(credentials),
-                'use-expo-auth': 'true',
+                ...(0, auth_1.getAuthHeaders)(credentials),
+                'use-cli-auth': 'true',
             },
         });
         if (!updatesResponse.ok) {
@@ -115,8 +115,12 @@ class Publish extends core_1.Command {
             process.exit(1);
         }
         const updates = (await updatesResponse.json()).filter(u => {
-            return u.updateUUID !== 'Rollback to embedded' && u.platform === platform;
+            return (u.updateUUID !== 'Rollback to embedded' && (platform === 'all' || u.platform === platform));
         });
+        if (updates.length === 0) {
+            log_1.default.error(`No republishable updates found for runtime version ${selectedRuntimeVersion.runtimeVersion} on platform ${platform}.`);
+            process.exit(1);
+        }
         const selectedUpdated = await (0, prompts_1.promptAsync)({
             type: 'select',
             name: 'update',
@@ -129,7 +133,7 @@ class Publish extends core_1.Command {
         });
         log_1.default.log(`Re-publishing update: ${selectedUpdated.update.updateUUID}`);
         const republishUrl = new URL(`${baseUrl}/${appId}/republish/${branch}`);
-        republishUrl.searchParams.set('platform', platform);
+        republishUrl.searchParams.set('platform', selectedUpdated.update.platform);
         republishUrl.searchParams.set('runtimeVersion', selectedRuntimeVersion.runtimeVersion);
         republishUrl.searchParams.set('updateId', selectedUpdated.update.updateId);
         republishUrl.searchParams.set('commitHash', selectedUpdated.update.commitHash);
@@ -137,7 +141,8 @@ class Publish extends core_1.Command {
         const republishResponse = await (0, fetch_1.fetchWithRetries)(republishUrl.toString(), {
             method: 'POST',
             headers: {
-                ...(0, auth_1.getAuthExpoHeaders)(credentials),
+                ...(0, auth_1.getAuthHeaders)(credentials),
+                'use-cli-auth': 'true',
                 'Content-Type': 'application/json',
             },
         });

package/dist/commands/rollback.js

@@ -41,9 +41,9 @@ class Publish extends core_1.Command {
         };
     }
     async run() {
-        const credentials = (0, auth_1.retrieveExpoCredentials)();
-        if (!credentials.token && !credentials.sessionSecret) {
-            log_1.default.error('You are not logged to eas, please run `eas login`');
+        const credentials = (0, auth_1.retrieveCredentials)();
+        if (!(0, auth_1.validateCredentials)(credentials)) {
+            log_1.default.error('Invalid credentials. Please run `eas login or set EXPO_ACCESS_TOKEN or EOO_TOKEN environment variable`');
             process.exit(1);
         }
         const { flags } = await this.parse(Publish);
@@ -141,7 +141,7 @@ class Publish extends core_1.Command {
             const response = await (0, fetch_1.fetchWithRetries)(rollbackUrl.toString(), {
                 method: 'POST',
                 headers: {
-                    ...(0, auth_1.getAuthExpoHeaders)(credentials),
+                    ...(0, auth_1.getAuthHeaders)(credentials),
                 },
             });
             if (!response.ok) {

package/dist/lib/assets.d.ts

@@ -1,5 +1,5 @@
 import Joi from 'joi';
-import { ExpoCredentials } from './auth';
+import { Credentials } from './auth';
 import { RequestedPlatform } from './expoConfig';
 export declare const MetadataJoi: Joi.ObjectSchema<any>;
 interface AssetToUpload {
@@ -18,7 +18,7 @@ export declare function requestUploadUrls({ body, requestUploadUrl, auth, runtim
         fileNames: string[];
     };
     requestUploadUrl: string;
-    auth: ExpoCredentials;
+    auth: Credentials;
     runtimeVersion: string;
     platform: string;
     commitHash?: string;

package/dist/lib/assets.js

@@ -85,7 +85,7 @@ async function requestUploadUrls({ body, requestUploadUrl, auth, runtimeVersion,
     const response = await (0, fetch_1.fetchWithRetries)(uploadUrl.toString(), {
         method: 'POST',
         headers: {
-            ...(0, auth_1.getAuthExpoHeaders)(auth),
+            ...(0, auth_1.getAuthHeaders)(auth),
             'Content-Type': 'application/json',
         },
         body: JSON.stringify(requestBody),

package/dist/lib/auth.d.ts

@@ -1,6 +1,11 @@
-export interface ExpoCredentials {
+type ServerImplementation = 'expo' | 'eoo';
+export interface Credentials {
     token?: string;
     sessionSecret?: string;
 }
-export declare function retrieveExpoCredentials(): ExpoCredentials;
-export declare function getAuthExpoHeaders(credentials: ExpoCredentials): Record<string, string>;
+export declare function detectServerImplementation(): ServerImplementation;
+export declare function retrieveCredentials(): Credentials;
+export declare function validateCredentials(credentials: Credentials): boolean;
+export declare function retrieveExpoCredentials(): Credentials;
+export declare function getAuthHeaders(credentials: Credentials): Record<string, string>;
+export {};

package/dist/lib/auth.js

@@ -1,9 +1,29 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getAuthExpoHeaders = exports.retrieveExpoCredentials = void 0;
+exports.getAuthHeaders = exports.retrieveExpoCredentials = exports.validateCredentials = exports.retrieveCredentials = exports.detectServerImplementation = void 0;
 const tslib_1 = require("tslib");
 const os_1 = require("os");
 const path_1 = tslib_1.__importDefault(require("path"));
+function detectServerImplementation() {
+    return process.env.EOO_TOKEN ? 'eoo' : 'expo';
+}
+exports.detectServerImplementation = detectServerImplementation;
+function retrieveCredentials() {
+    const serverImplementation = detectServerImplementation();
+    if (serverImplementation === 'eoo') {
+        return {
+            token: process.env.EOO_TOKEN,
+        };
+    }
+    return retrieveExpoCredentials();
+}
+exports.retrieveCredentials = retrieveCredentials;
+function validateCredentials(credentials) {
+    if (!credentials)
+        return false;
+    return !!(credentials.token || credentials.sessionSecret);
+}
+exports.validateCredentials = validateCredentials;
 function dotExpoHomeDirectory() {
     const home = (0, os_1.homedir)();
     if (!home) {
@@ -41,17 +61,17 @@ function retrieveExpoCredentials() {
     return { token, sessionSecret };
 }
 exports.retrieveExpoCredentials = retrieveExpoCredentials;
-function getAuthExpoHeaders(credentials) {
+function getAuthHeaders(credentials) {
     if (credentials.token) {
         return {
             Authorization: `Bearer ${credentials.token}`,
         };
     }
-    if (credentials.sessionSecret) {
+    if (credentials?.sessionSecret) {
         return {
-            'expo-session': credentials.sessionSecret,
+            'expo-session': credentials?.sessionSecret,
         };
     }
     return {};
 }
-exports.getAuthExpoHeaders = getAuthExpoHeaders;
+exports.getAuthHeaders = getAuthHeaders;

package/dist/lib/expoConfig.d.ts

@@ -21,6 +21,7 @@ export declare function ensureExpoConfigExists(projectDir: string): void;
 export declare function isUsingStaticExpoConfig(projectDir: string): boolean;
 export declare function getPublicExpoConfigAsync(projectDir: string, opts?: ExpoConfigOptions): Promise<PublicExpoConfig>;
 export declare function getExpoConfigUpdateUrl(config: ExpoConfig): string | undefined;
+export declare function getExpoAppId(config: ExpoConfig): string | undefined;
 export declare function requireExpoAppId(config: ExpoConfig): string;
 export declare function createOrModifyExpoConfigAsync(projectDir: string, exp: Partial<ExpoConfig>): Promise<void>;
 export declare function resolveServerUrl(config: ExpoConfig): Promise<string>;

package/dist/lib/expoConfig.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.resolveServerUrl = exports.createOrModifyExpoConfigAsync = exports.requireExpoAppId = exports.getExpoConfigUpdateUrl = exports.getPublicExpoConfigAsync = exports.isUsingStaticExpoConfig = exports.ensureExpoConfigExists = exports.getPrivateExpoConfigAsync = exports.RequestedPlatform = void 0;
+exports.resolveServerUrl = exports.createOrModifyExpoConfigAsync = exports.requireExpoAppId = exports.getExpoAppId = exports.getExpoConfigUpdateUrl = exports.getPublicExpoConfigAsync = exports.isUsingStaticExpoConfig = exports.ensureExpoConfigExists = exports.getPrivateExpoConfigAsync = exports.RequestedPlatform = void 0;
 const tslib_1 = require("tslib");
 // This file is copied from eas-cli[https://github.com/expo/eas-cli] to ensure consistent user experience across the CLI.
 const config_1 = require("@expo/config");
@@ -29,8 +29,9 @@ async function getExpoConfigInternalAsync(projectDir, opts = {}) {
         let exp;
         if ((0, package_1.isExpoInstalled)(projectDir)) {
             const runner = (0, packageRunner_1.resolvePackageRunner)(opts.packageRunner, projectDir);
+            const [runnerCommand, runnerArgs] = (0, packageRunner_1.splitPackageRunner)(runner);
             try {
-                const { stdout } = await (0, spawn_async_1.default)(runner, ['expo', 'config', '--json', ...(opts.isPublicConfig ? ['--type', 'public'] : [])], {
+                const { stdout } = await (0, spawn_async_1.default)(runnerCommand, [...runnerArgs, 'expo', 'config', '--json', ...(opts.isPublicConfig ? ['--type', 'public'] : [])], {
                     cwd: projectDir,
                     env: {
                         ...process.env,
@@ -111,13 +112,21 @@ function getExpoConfigUpdateUrl(config) {
     return config.updates?.url;
 }
 exports.getExpoConfigUpdateUrl = getExpoConfigUpdateUrl;
-function requireExpoAppId(config) {
-    const appId = config.updates
+// getExpoAppId reads the app id without treating its absence as fatal. A config
+// with no 'expo-app-id' is the shape every v1 project has, so a caller that
+// diagnoses or migrates such a project needs to see the absence rather than be
+// exited on. Commands that cannot proceed without an id use requireExpoAppId.
+function getExpoAppId(config) {
+    return config.updates
         ?.requestHeaders?.['expo-app-id'];
+}
+exports.getExpoAppId = getExpoAppId;
+function requireExpoAppId(config) {
+    const appId = getExpoAppId(config);
     if (!appId) {
         log_1.default.error("Your Expo config is missing the 'expo-app-id' entry in updates.requestHeaders.");
-        log_1.default.error("This usually means you're running eoas v3+ against a v3-style single-app config or your config is missing the 'expo-app-id' entry.");
-        log_1.default.error("Fix: run 'npx eoas init' to migrate, or pin to the previous CLI via 'npx eoas@2 ...'.");
+        log_1.default.error("This usually means you're running eoas v2+ against a v1-style single-app config or your config is missing the 'expo-app-id' entry.");
+        log_1.default.error("Fix: run 'npx eoas init' to migrate, or pin to the previous CLI via 'npx eoas@1 ...'.");
         process.exit(1);
     }
     return appId;

package/dist/lib/packageRunner.d.ts

@@ -7,6 +7,12 @@
  * 3. Inferred from packageManager field in package.json
  * 4. Falls back to 'npx'
  *
- * Supported values: npx, bunx, pnpx, or any other package runner binary.
+ * Supported values: npx, bunx, "pnpm exec", or any other package runner
+ * binary, optionally followed by subcommand words.
  */
 export declare function resolvePackageRunner(explicit?: string, projectDir?: string): string;
+/**
+ * Splits a resolved package runner into a spawnable command and its leading
+ * arguments (e.g. "pnpm exec" -> ['pnpm', ['exec']]).
+ */
+export declare function splitPackageRunner(runner: string): [string, string[]];

package/dist/lib/packageRunner.js

@@ -1,19 +1,21 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.resolvePackageRunner = void 0;
+exports.splitPackageRunner = exports.resolvePackageRunner = void 0;
 const tslib_1 = require("tslib");
 const fs_extra_1 = tslib_1.__importDefault(require("fs-extra"));
 const path_1 = tslib_1.__importDefault(require("path"));
 const DEFAULT_PACKAGE_RUNNER = 'npx';
-const VALID_RUNNER_RE = /^[a-zA-Z0-9._-]+$/;
+const VALID_RUNNER_RE = /^[a-zA-Z0-9._-]+( [a-zA-Z0-9._-]+)*$/;
 function assertValidRunner(value, source) {
     if (!VALID_RUNNER_RE.test(value)) {
-        throw new Error(`Invalid package runner "${value}" (from ${source}). Expected a simple binary name like npx, bunx or pnpx.`);
+        throw new Error(`Invalid package runner "${value}" (from ${source}). Expected a binary name with optional subcommands like npx, bunx or "pnpm exec".`);
     }
 }
 const PACKAGE_MANAGER_RUNNERS = {
     bun: 'bunx',
-    pnpm: 'pnpx',
+    // pnpm removed the `pnpx` binary in v7. `pnpm exec` runs the project-local
+    // Expo CLI with the same local-first semantics as npx and bunx.
+    pnpm: 'pnpm exec',
     yarn: 'npx',
     npm: 'npx',
 };
@@ -26,7 +28,8 @@ const PACKAGE_MANAGER_RUNNERS = {
  * 3. Inferred from packageManager field in package.json
  * 4. Falls back to 'npx'
  *
- * Supported values: npx, bunx, pnpx, or any other package runner binary.
+ * Supported values: npx, bunx, "pnpm exec", or any other package runner
+ * binary, optionally followed by subcommand words.
  */
 function resolvePackageRunner(explicit, projectDir) {
     if (explicit) {
@@ -70,3 +73,12 @@ function detectRunnerFromPackageJson(startDir) {
     }
     return undefined;
 }
+/**
+ * Splits a resolved package runner into a spawnable command and its leading
+ * arguments (e.g. "pnpm exec" -> ['pnpm', ['exec']]).
+ */
+function splitPackageRunner(runner) {
+    const [command, ...args] = runner.split(' ');
+    return [command, args];
+}
+exports.splitPackageRunner = splitPackageRunner;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "eoas",
-  "version": "3.0.0-alpha.1",
+  "version": "3.0.0-beta.1",
   "main": "index.js",
   "scripts": {
     "build": "tsc --project tsconfig.json",