From 3677daf46eb8e929e286785c43ae13ade542f422 Mon Sep 17 00:00:00 2001
From: Gabe Debes <pacheco@expo.dev>
Date: Tue, 13 Oct 2026 15:54:42 -0700
Subject: [PATCH 1/5] [eas-cli] default simulator previews to authenticated
 links

Co-authored-by: Codex <codex@openai.com>
---
 packages/eas-cli/README.md                    |  57 +++--
 .../src/build/utils/__tests__/url.test.ts     |  15 +-
 packages/eas-cli/src/build/utils/url.ts       |   8 +
 .../commands/simulator/__tests__/get.test.ts  |  68 +++++-
 .../simulator/__tests__/index.test.ts         |  70 +++++-
 .../eas-cli/src/commands/simulator/get.ts     |  21 +-
 .../eas-cli/src/commands/simulator/index.ts   |  22 +-
 .../src/simulator/__tests__/utils.test.ts     | 205 ++++++++++++++----
 packages/eas-cli/src/simulator/utils.ts       | 109 ++++++++--
 9 files changed, 483 insertions(+), 92 deletions(-)

diff --git a/packages/eas-cli/README.md b/packages/eas-cli/README.md
index b739d8b3da..cf0a8c5162 100644
--- a/packages/eas-cli/README.md
+++ b/packages/eas-cli/README.md
@@ -2836,19 +2836,22 @@ ALIASES
 
 ## `eas sim:get`
 
-[EXPERIMENTAL] get info about a remote simulator session on EAS by its simulator session ID
+[EXPERIMENTAL] get info about a remote simulator session on EAS by its simulator session ID. The default browser preview link requires sign-in.
 
 ```
 USAGE
-  $ eas sim:get [--id <value>] [--json] [--non-interactive]
+  $ eas sim:get [--id <value>] [--public-link] [--json] [--non-interactive]
 
 FLAGS
   --id=<value>       Simulator session ID. Defaults to .env.eas-simulator.
   --json             Enable JSON output, non-JSON messages will be printed to stderr. Implies --non-interactive.
   --non-interactive  Run the command in non-interactive mode.
+  --public-link      Print a shareable preview link containing an access token. Anyone with the link can control the
+                     simulator. With --json, previewApiUrl also includes the token for API clients when available.
 
 DESCRIPTION
-  [EXPERIMENTAL] get info about a remote simulator session on EAS by its simulator session ID
+  [EXPERIMENTAL] get info about a remote simulator session on EAS by its simulator session ID. The default browser
+  preview link requires sign-in.
 
 ALIASES
   $ eas sim:get
@@ -2889,7 +2892,7 @@ ALIASES
 
 ## `eas sim:start`
 
-[EXPERIMENTAL] start a remote simulator session on EAS and get instructions to connect to it
+[EXPERIMENTAL] start a remote simulator session on EAS and get instructions to connect to it. The default browser preview link requires sign-in.
 
 ```
 USAGE
@@ -2897,8 +2900,8 @@ USAGE
     --build-fingerprint <value> | --application-archive-url <value> | --expo-go] [--sdk-version <value>] [--launch-arg
     <value>...] [--open-url <value>] [--type agent-device|appium|argent|web-preview-only] [--package-version <value>]
     [--network-capture-field <value>... --network-capture] [--max-duration-minutes <value>] [--max-idle-time-minutes
-    <value>] [--egress-allow <value>... --egress local] [--force] [--out-config-type env|dotenv] [--json]
-    [--non-interactive]
+    <value>] [--egress-allow <value>... --egress local] [--force] [--out-config-type env|dotenv] [--public-link]
+    [--json] [--non-interactive]
 
 FLAGS
   -p, --platform=<option>
@@ -2981,6 +2984,10 @@ FLAGS
   --package-version=<value>
       Version of the package backing the simulator session (e.g. "0.1.3-alpha.3"). Defaults to "latest" when omitted.
 
+  --public-link
+      Print a shareable preview link containing an access token. Anyone with the link can control the simulator. With
+      --json, previewApiUrl also includes the token for API clients when available.
+
   --sdk-version=<value>
       Expo SDK version used to select Expo Go when --expo-go is passed. Defaults to the current project SDK.
 
@@ -2994,7 +3001,8 @@ FLAGS
       <options: agent-device|appium|argent|web-preview-only>
 
 DESCRIPTION
-  [EXPERIMENTAL] start a remote simulator session on EAS and get instructions to connect to it
+  [EXPERIMENTAL] start a remote simulator session on EAS and get instructions to connect to it. The default browser
+  preview link requires sign-in.
 
 ALIASES
   $ eas simulator:start
@@ -3023,7 +3031,7 @@ ALIASES
 
 ## `eas simulator`
 
-[EXPERIMENTAL] start a remote simulator session on EAS and get instructions to connect to it
+[EXPERIMENTAL] start a remote simulator session on EAS and get instructions to connect to it. The default browser preview link requires sign-in.
 
 ```
 USAGE
@@ -3031,8 +3039,8 @@ USAGE
     --build-fingerprint <value> | --application-archive-url <value> | --expo-go] [--sdk-version <value>] [--launch-arg
     <value>...] [--open-url <value>] [--type agent-device|appium|argent|web-preview-only] [--package-version <value>]
     [--network-capture-field <value>... --network-capture] [--max-duration-minutes <value>] [--max-idle-time-minutes
-    <value>] [--egress-allow <value>... --egress local] [--force] [--out-config-type env|dotenv] [--json]
-    [--non-interactive]
+    <value>] [--egress-allow <value>... --egress local] [--force] [--out-config-type env|dotenv] [--public-link]
+    [--json] [--non-interactive]
 
 FLAGS
   -p, --platform=<option>
@@ -3115,6 +3123,10 @@ FLAGS
   --package-version=<value>
       Version of the package backing the simulator session (e.g. "0.1.3-alpha.3"). Defaults to "latest" when omitted.
 
+  --public-link
+      Print a shareable preview link containing an access token. Anyone with the link can control the simulator. With
+      --json, previewApiUrl also includes the token for API clients when available.
+
   --sdk-version=<value>
       Expo SDK version used to select Expo Go when --expo-go is passed. Defaults to the current project SDK.
 
@@ -3128,7 +3140,8 @@ FLAGS
       <options: agent-device|appium|argent|web-preview-only>
 
 DESCRIPTION
-  [EXPERIMENTAL] start a remote simulator session on EAS and get instructions to connect to it
+  [EXPERIMENTAL] start a remote simulator session on EAS and get instructions to connect to it. The default browser
+  preview link requires sign-in.
 
 ALIASES
   $ eas simulator:start
@@ -3223,19 +3236,22 @@ _See code: [packages/eas-cli/src/commands/simulator/exec.ts](https://github.com/
 
 ## `eas simulator:get`
 
-[EXPERIMENTAL] get info about a remote simulator session on EAS by its simulator session ID
+[EXPERIMENTAL] get info about a remote simulator session on EAS by its simulator session ID. The default browser preview link requires sign-in.
 
 ```
 USAGE
-  $ eas simulator:get [--id <value>] [--json] [--non-interactive]
+  $ eas simulator:get [--id <value>] [--public-link] [--json] [--non-interactive]
 
 FLAGS
   --id=<value>       Simulator session ID. Defaults to .env.eas-simulator.
   --json             Enable JSON output, non-JSON messages will be printed to stderr. Implies --non-interactive.
   --non-interactive  Run the command in non-interactive mode.
+  --public-link      Print a shareable preview link containing an access token. Anyone with the link can control the
+                     simulator. With --json, previewApiUrl also includes the token for API clients when available.
 
 DESCRIPTION
-  [EXPERIMENTAL] get info about a remote simulator session on EAS by its simulator session ID
+  [EXPERIMENTAL] get info about a remote simulator session on EAS by its simulator session ID. The default browser
+  preview link requires sign-in.
 
 ALIASES
   $ eas sim:get
@@ -3280,7 +3296,7 @@ _See code: [packages/eas-cli/src/commands/simulator/list.ts](https://github.com/
 
 ## `eas simulator:start`
 
-[EXPERIMENTAL] start a remote simulator session on EAS and get instructions to connect to it
+[EXPERIMENTAL] start a remote simulator session on EAS and get instructions to connect to it. The default browser preview link requires sign-in.
 
 ```
 USAGE
@@ -3288,8 +3304,8 @@ USAGE
     --build-fingerprint <value> | --application-archive-url <value> | --expo-go] [--sdk-version <value>] [--launch-arg
     <value>...] [--open-url <value>] [--type agent-device|appium|argent|web-preview-only] [--package-version <value>]
     [--network-capture-field <value>... --network-capture] [--max-duration-minutes <value>] [--max-idle-time-minutes
-    <value>] [--egress-allow <value>... --egress local] [--force] [--out-config-type env|dotenv] [--json]
-    [--non-interactive]
+    <value>] [--egress-allow <value>... --egress local] [--force] [--out-config-type env|dotenv] [--public-link]
+    [--json] [--non-interactive]
 
 FLAGS
   -p, --platform=<option>
@@ -3372,6 +3388,10 @@ FLAGS
   --package-version=<value>
       Version of the package backing the simulator session (e.g. "0.1.3-alpha.3"). Defaults to "latest" when omitted.
 
+  --public-link
+      Print a shareable preview link containing an access token. Anyone with the link can control the simulator. With
+      --json, previewApiUrl also includes the token for API clients when available.
+
   --sdk-version=<value>
       Expo SDK version used to select Expo Go when --expo-go is passed. Defaults to the current project SDK.
 
@@ -3385,7 +3405,8 @@ FLAGS
       <options: agent-device|appium|argent|web-preview-only>
 
 DESCRIPTION
-  [EXPERIMENTAL] start a remote simulator session on EAS and get instructions to connect to it
+  [EXPERIMENTAL] start a remote simulator session on EAS and get instructions to connect to it. The default browser
+  preview link requires sign-in.
 
 ALIASES
   $ eas simulator:start
diff --git a/packages/eas-cli/src/build/utils/__tests__/url.test.ts b/packages/eas-cli/src/build/utils/__tests__/url.test.ts
index 35c75cd80b..22f8874a96 100644
--- a/packages/eas-cli/src/build/utils/__tests__/url.test.ts
+++ b/packages/eas-cli/src/build/utils/__tests__/url.test.ts
@@ -1,4 +1,9 @@
-import { getProjectDashboardUrl, getProjectPageUrl, getSubmissionUrl } from '../url';
+import {
+  getDeviceRunSessionPreviewUrl,
+  getProjectDashboardUrl,
+  getProjectPageUrl,
+  getSubmissionUrl,
+} from '../url';
 
 describe(getProjectPageUrl, () => {
   it('builds the project dashboard URL when no page is provided', () => {
@@ -41,3 +46,11 @@ describe(getSubmissionUrl, () => {
     );
   });
 });
+
+describe(getDeviceRunSessionPreviewUrl, () => {
+  it('builds the authenticated preview route with encoded path segments', () => {
+    expect(getDeviceRunSessionPreviewUrl('my org', 'my app', 'session/id')).toBe(
+      'https://expo.dev/accounts/my%20org/projects/my%20app/simulator-sessions/session%2Fid/preview'
+    );
+  });
+});
diff --git a/packages/eas-cli/src/build/utils/url.ts b/packages/eas-cli/src/build/utils/url.ts
index f49fef662d..2fe406329d 100644
--- a/packages/eas-cli/src/build/utils/url.ts
+++ b/packages/eas-cli/src/build/utils/url.ts
@@ -95,6 +95,14 @@ export function getDeviceRunSessionUrl(
   ).toString();
 }
 
+export function getDeviceRunSessionPreviewUrl(
+  accountName: string,
+  projectName: string,
+  deviceRunSessionId: string
+): string {
+  return `${getDeviceRunSessionUrl(accountName, projectName, deviceRunSessionId)}/preview`;
+}
+
 /**
  * @deprecated Links to the raw job-run page; prefer a higher-level URL (e.g. the workflow run
  * or the feature-specific dashboard) that gives users more context. Use this only for internal
diff --git a/packages/eas-cli/src/commands/simulator/__tests__/get.test.ts b/packages/eas-cli/src/commands/simulator/__tests__/get.test.ts
index ac64e5912e..cb071c6aa0 100644
--- a/packages/eas-cli/src/commands/simulator/__tests__/get.test.ts
+++ b/packages/eas-cli/src/commands/simulator/__tests__/get.test.ts
@@ -154,11 +154,77 @@ describe(SimulatorGet, () => {
       updatedAt: '2025-01-01T00:01:00.000Z',
       deviceRunSessionUrl:
         'https://expo.dev/accounts/testuser/projects/testapp/simulator-sessions/session-123',
-      remoteConfig: session.remoteConfig,
+      remoteConfig: {
+        __typename: 'ServeSimRunSessionRemoteConfig',
+        previewUrl:
+          'https://expo.dev/accounts/testuser/projects/testapp/simulator-sessions/session-123/preview',
+        previewApiUrl: undefined,
+      },
       artifacts: session.artifacts,
     });
   });
 
+  it.each([false, true])(
+    'uses the %s public-link choice for JSON and human previews',
+    async publicLink => {
+      const publicUrl = 'https://expo.dev/simulator-preview/preview-123';
+      const privateUrl =
+        'https://expo.dev/accounts/testuser/projects/testapp/simulator-sessions/session-123/preview';
+      mockByIdAsync.mockResolvedValue(
+        makeDeviceRunSession({
+          type: DeviceRunSessionType.WebPreviewOnly,
+          remoteConfig: {
+            __typename: 'WebPreviewOnlyRunSessionRemoteConfig',
+            previewUrl: publicUrl,
+            previewToken: 'preview-secret',
+            previewApiUrl: 'https://preview-api.example.test',
+          },
+        })
+      );
+      const choice = publicLink ? ['--public-link'] : [];
+      const expectedUrl = publicLink ? `${publicUrl}#token=preview-secret` : privateUrl;
+      const expectedApiUrl = publicLink
+        ? 'https://preview-api.example.test/?token=preview-secret'
+        : 'https://preview-api.example.test';
+
+      const { command: jsonCommand } = createCommand(['--id', 'session-123', '--json', ...choice]);
+      await jsonCommand.runAsync();
+      expect(mockPrintJsonOnlyOutput).toHaveBeenCalledWith(
+        expect.objectContaining({
+          remoteConfig: expect.objectContaining({
+            previewUrl: expectedUrl,
+            previewApiUrl: expectedApiUrl,
+          }),
+        })
+      );
+      if (!publicLink) {
+        expect(JSON.stringify(mockPrintJsonOnlyOutput.mock.calls[0]?.[0])).not.toContain(
+          'preview-secret'
+        );
+      }
+
+      jest.clearAllMocks();
+      mockLoadSimulatorEnvironmentVariablesAsync.mockResolvedValue();
+      mockByIdAsync.mockResolvedValue(
+        makeDeviceRunSession({
+          type: DeviceRunSessionType.WebPreviewOnly,
+          remoteConfig: {
+            __typename: 'WebPreviewOnlyRunSessionRemoteConfig',
+            previewUrl: publicUrl,
+            previewToken: 'preview-secret',
+            previewApiUrl: 'https://preview-api.example.test',
+          },
+        })
+      );
+      const { command: humanCommand } = createCommand(['--id', 'session-123', ...choice]);
+      await humanCommand.runAsync();
+      expect(Log.log).toHaveBeenCalledWith(expect.stringContaining(expectedUrl));
+      if (!publicLink) {
+        expect(JSON.stringify(jest.mocked(Log.log).mock.calls)).not.toContain('preview-secret');
+      }
+    }
+  );
+
   it('includes the session name in JSON and human output when the session is named', async () => {
     mockByIdAsync.mockResolvedValue(makeDeviceRunSession({ name: 'Checkout regression' }));
 
diff --git a/packages/eas-cli/src/commands/simulator/__tests__/index.test.ts b/packages/eas-cli/src/commands/simulator/__tests__/index.test.ts
index c040c034a9..40d18b0160 100644
--- a/packages/eas-cli/src/commands/simulator/__tests__/index.test.ts
+++ b/packages/eas-cli/src/commands/simulator/__tests__/index.test.ts
@@ -95,6 +95,7 @@ const projectDir = '/test/project';
 const simulatorDotenvPath = `${projectDir}/.env.eas-simulator`;
 const deviceRunSessionUrl =
   'https://expo.dev/accounts/testuser/projects/testapp/simulator-sessions/session-123';
+const deviceRunSessionPreviewUrl = `${deviceRunSessionUrl}/preview`;
 
 const mockCreateDeviceRunSessionAsync = jest.mocked(
   DeviceRunSessionMutation.createDeviceRunSessionAsync
@@ -694,7 +695,7 @@ describe(Simulator, () => {
         '',
         '🌐 Open the following URL in your browser to preview the simulator:',
         '',
-        'https://preview.example.com',
+        deviceRunSessionPreviewUrl,
       ].join('\n')
     );
   });
@@ -768,7 +769,7 @@ describe(Simulator, () => {
       graphqlClient,
       expect.objectContaining({ type: DeviceRunSessionType.WebPreviewOnly })
     );
-    expect(Log.log).toHaveBeenCalledWith(expect.stringContaining('https://preview.example.test'));
+    expect(Log.log).toHaveBeenCalledWith(expect.stringContaining(deviceRunSessionPreviewUrl));
   });
 
   it('overwrites .env.eas-simulator when outputting dotenv and the file exists', async () => {
@@ -1945,6 +1946,71 @@ describe(Simulator, () => {
     );
   });
 
+  it.each([false, true])(
+    'uses the %s public-link choice in start JSON and human output',
+    async publicLink => {
+      const publicUrl = 'https://expo.dev/simulator-preview/preview-123';
+      const remoteConfig = {
+        __typename: 'WebPreviewOnlyRunSessionRemoteConfig' as const,
+        previewUrl: publicUrl,
+        previewToken: 'preview-secret',
+        previewApiUrl: 'https://preview-api.example.test',
+      };
+      mockByIdAsync.mockResolvedValue(
+        makeDeviceRunSession({
+          type: DeviceRunSessionType.WebPreviewOnly,
+          remoteConfig,
+        })
+      );
+      const choice = publicLink ? ['--public-link'] : [];
+      const expectedUrl = publicLink
+        ? `${publicUrl}#token=preview-secret`
+        : deviceRunSessionPreviewUrl;
+
+      const { command: jsonCommand } = createCommand([
+        '--platform',
+        'ios',
+        '--type',
+        'web-preview-only',
+        '--non-interactive',
+        '--json',
+        ...choice,
+      ]);
+      await jsonCommand.runAsync();
+      expect(mockPrintJsonOnlyOutput).toHaveBeenCalledWith(
+        expect.objectContaining({
+          remoteConfig: expect.objectContaining({ previewUrl: expectedUrl }),
+        })
+      );
+      if (!publicLink) {
+        expect(JSON.stringify(mockPrintJsonOnlyOutput.mock.calls[0]?.[0])).not.toContain(
+          'preview-secret'
+        );
+      }
+
+      jest.clearAllMocks();
+      mockByIdAsync.mockResolvedValue(
+        makeDeviceRunSession({
+          type: DeviceRunSessionType.WebPreviewOnly,
+          remoteConfig,
+        })
+      );
+      const { command: humanCommand } = createCommand([
+        '--platform',
+        'ios',
+        '--type',
+        'web-preview-only',
+        '--non-interactive',
+        ...choice,
+      ]);
+      await humanCommand.runAsync();
+      expect(Log.log).toHaveBeenCalledWith(expect.stringContaining(expectedUrl));
+      if (!publicLink) {
+        expect(JSON.stringify(jest.mocked(Log.log).mock.calls)).not.toContain('preview-secret');
+      }
+    }
+  );
+
   it('warns but continues when the dotenv file cannot be written', async () => {
     jest.mocked(fs.writeFile).mockRejectedValue(new Error('disk full') as never);
 
diff --git a/packages/eas-cli/src/commands/simulator/get.ts b/packages/eas-cli/src/commands/simulator/get.ts
index b528983a87..b4d7d527a5 100644
--- a/packages/eas-cli/src/commands/simulator/get.ts
+++ b/packages/eas-cli/src/commands/simulator/get.ts
@@ -1,6 +1,6 @@
 import { Flags } from '@oclif/core';
 
-import { getDeviceRunSessionUrl } from '../../build/utils/url';
+import { getDeviceRunSessionPreviewUrl, getDeviceRunSessionUrl } from '../../build/utils/url';
 import EasCommand from '../../commandUtils/EasCommand';
 import {
   EasNonInteractiveAndJsonFlags,
@@ -30,12 +30,16 @@ type DeviceRunSessionArtifact = DeviceRunSessionById['artifacts'][number];
 export default class SimulatorGet extends EasCommand {
   static override aliases = ['sim:get'];
   static override description =
-    '[EXPERIMENTAL] get info about a remote simulator session on EAS by its simulator session ID';
+    '[EXPERIMENTAL] get info about a remote simulator session on EAS by its simulator session ID. The default browser preview link requires sign-in.';
 
   static override flags = {
     id: Flags.string({
       description: `Simulator session ID. Defaults to ${SIMULATOR_DOTENV_FILE_NAME}.`,
     }),
+    'public-link': Flags.boolean({
+      description:
+        'Print a shareable preview link containing an access token. Anyone with the link can control the simulator. With --json, previewApiUrl also includes the token for API clients when available.',
+    }),
     ...EasNonInteractiveAndJsonFlags,
   };
 
@@ -82,6 +86,11 @@ export default class SimulatorGet extends EasCommand {
       session.app.slug,
       session.id
     );
+    const deviceRunSessionPreviewUrl = getDeviceRunSessionPreviewUrl(
+      session.app.ownerAccount.name,
+      session.app.slug,
+      session.id
+    );
 
     if (jsonFlag) {
       printJsonOnlyOutput({
@@ -97,7 +106,11 @@ export default class SimulatorGet extends EasCommand {
         updatedAt: session.updatedAt,
         deviceRunSessionUrl,
         remoteConfig: session.remoteConfig
-          ? sanitizeRemoteConfigForJson(session.remoteConfig)
+          ? sanitizeRemoteConfigForJson(
+              session.remoteConfig,
+              deviceRunSessionPreviewUrl,
+              flags['public-link']
+            )
           : session.remoteConfig,
         artifacts: session.artifacts,
       });
@@ -113,6 +126,8 @@ export default class SimulatorGet extends EasCommand {
         Log.log(
           formatRemoteSessionInstructions(session.remoteConfig, 'env', {
             sessionUrl: deviceRunSessionUrl,
+            privatePreviewUrl: deviceRunSessionPreviewUrl,
+            publicLink: flags['public-link'],
             platform: session.platform,
           })
         );
diff --git a/packages/eas-cli/src/commands/simulator/index.ts b/packages/eas-cli/src/commands/simulator/index.ts
index 110fa68baf..13ac4319fa 100644
--- a/packages/eas-cli/src/commands/simulator/index.ts
+++ b/packages/eas-cli/src/commands/simulator/index.ts
@@ -8,7 +8,7 @@ import {
   isAnalyticsOptedOutAsync,
 } from '../../analytics/AnalyticsManager';
 import { getAgentTelemetryContext } from '../../analytics/agent';
-import { getDeviceRunSessionUrl } from '../../build/utils/url';
+import { getDeviceRunSessionPreviewUrl, getDeviceRunSessionUrl } from '../../build/utils/url';
 import EasCommand from '../../commandUtils/EasCommand';
 import { ExpoGraphqlClient } from '../../commandUtils/context/contextUtils/createGraphqlClient';
 import { EasCommandError } from '../../commandUtils/errors';
@@ -78,7 +78,7 @@ export default class Simulator extends EasCommand {
   static override aliases = ['simulator:start', 'sim:start'];
   static override hiddenAliases = ['sim'];
   static override description =
-    '[EXPERIMENTAL] start a remote simulator session on EAS and get instructions to connect to it';
+    '[EXPERIMENTAL] start a remote simulator session on EAS and get instructions to connect to it. The default browser preview link requires sign-in.';
 
   static override flags = {
     platform: Flags.option({
@@ -188,6 +188,10 @@ export default class Simulator extends EasCommand {
       options: Object.values(OUT_CONFIG_TYPE_VALUES),
       default: OUT_CONFIG_TYPE_VALUES.Dotenv,
     })(),
+    'public-link': Flags.boolean({
+      description:
+        'Print a shareable preview link containing an access token. Anyone with the link can control the simulator. With --json, previewApiUrl also includes the token for API clients when available.',
+    }),
     ...EasNonInteractiveAndJsonFlags,
   };
 
@@ -310,6 +314,7 @@ export default class Simulator extends EasCommand {
     const createSpinner = ora('🚀 Creating simulator session').start();
     let deviceRunSessionId: string;
     let deviceRunSessionUrl: string;
+    let deviceRunSessionPreviewUrl: string;
     let sessionInterrupt: SessionInterrupt | undefined;
     try {
       const agentIdentity = await agentIdentityInputAsync();
@@ -367,6 +372,11 @@ export default class Simulator extends EasCommand {
         session.app.slug,
         deviceRunSessionId
       );
+      deviceRunSessionPreviewUrl = getDeviceRunSessionPreviewUrl(
+        session.app.ownerAccount.name,
+        session.app.slug,
+        deviceRunSessionId
+      );
       sessionInterrupt = registerSessionInterrupt(deviceRunSessionId);
       const simulatorEnvWritten =
         !jsonFlag && flags['out-config-type'] === OUT_CONFIG_TYPE_VALUES.Dotenv
@@ -496,7 +506,11 @@ export default class Simulator extends EasCommand {
         name,
         type: flags.type,
         deviceRunSessionUrl,
-        remoteConfig: sanitizeRemoteConfigForJson(remoteConfig),
+        remoteConfig: sanitizeRemoteConfigForJson(
+          remoteConfig,
+          deviceRunSessionPreviewUrl,
+          flags['public-link']
+        ),
       });
       return;
     }
@@ -507,6 +521,8 @@ export default class Simulator extends EasCommand {
         egressAllow,
         egressClientRunsInline: !nonInteractive,
         sessionUrl: deviceRunSessionUrl,
+        privatePreviewUrl: deviceRunSessionPreviewUrl,
+        publicLink: flags['public-link'],
         platform,
       })
     );
diff --git a/packages/eas-cli/src/simulator/__tests__/utils.test.ts b/packages/eas-cli/src/simulator/__tests__/utils.test.ts
index d819a67f87..a6638e0485 100644
--- a/packages/eas-cli/src/simulator/__tests__/utils.test.ts
+++ b/packages/eas-cli/src/simulator/__tests__/utils.test.ts
@@ -305,111 +305,216 @@ describe(formatPreviewUrl, () => {
 
 describe(sanitizeRemoteConfigForJson, () => {
   const PREVIEW_URL = 'https://preview.example.test';
-
   const PAGE_URL = 'https://expo.dev/simulator-preview/abc';
+  const PRIVATE_URL =
+    'https://expo.dev/accounts/testuser/projects/testapp/simulator-sessions/session-123/preview';
 
-  it('moves the token into the preview url and drops the standalone field', () => {
-    const sanitized = sanitizeRemoteConfigForJson({
-      __typename: 'ServeSimRunSessionRemoteConfig' as const,
-      previewUrl: PREVIEW_URL,
-      previewToken: 'tok-1',
-    });
+  it('uses the authenticated preview URL by default and drops the standalone token', () => {
+    const sanitized = sanitizeRemoteConfigForJson(
+      {
+        __typename: 'ServeSimRunSessionRemoteConfig' as const,
+        previewUrl: PREVIEW_URL,
+        previewToken: 'tok-1',
+      },
+      PRIVATE_URL
+    );
 
     expect(sanitized).toEqual({
       __typename: 'ServeSimRunSessionRemoteConfig',
-      previewUrl: `${PREVIEW_URL}/?token=tok-1`,
+      previewUrl: PRIVATE_URL,
     });
-    expect(JSON.stringify(sanitized)).not.toContain('previewToken');
+    expect(JSON.stringify(sanitized)).not.toContain('tok-1');
   });
 
-  it('puts the token on the api url query, for a caller that cannot send a header', () => {
-    const sanitized = sanitizeRemoteConfigForJson({
-      __typename: 'WebPreviewOnlyRunSessionRemoteConfig' as const,
-      previewUrl: PAGE_URL,
-      previewToken: 'tok-1',
-      previewApiUrl: PREVIEW_URL,
-    });
+  it('leaves the API URL free of the preview token by default', () => {
+    const sanitized = sanitizeRemoteConfigForJson(
+      {
+        __typename: 'WebPreviewOnlyRunSessionRemoteConfig' as const,
+        previewUrl: PAGE_URL,
+        previewToken: 'tok-1',
+        previewApiUrl: `${PREVIEW_URL}/?token=tok-1&mode=stream`,
+      },
+      PRIVATE_URL
+    );
 
     expect(sanitized).toEqual({
       __typename: 'WebPreviewOnlyRunSessionRemoteConfig',
-      previewUrl: `${PAGE_URL}#token=tok-1`,
-      previewApiUrl: `${PREVIEW_URL}/?token=tok-1`,
+      previewUrl: PRIVATE_URL,
+      previewApiUrl: `${PREVIEW_URL}/?mode=stream`,
     });
-    expect(JSON.stringify(sanitized)).not.toContain('previewToken');
+    expect(JSON.stringify(sanitized)).not.toContain('tok-1');
   });
 
-  it('does the same for a controller session', () => {
-    const sanitized = sanitizeRemoteConfigForJson({
-      __typename: 'ArgentRunSessionRemoteConfig' as const,
-      toolsUrl: 'https://argent.example.test',
-      toolsAuthToken: 'argent-token',
-      webPreviewUrl: PREVIEW_URL,
-      webPreviewToken: 'tok-1',
+  it('removes preexisting query and fragment tokens but preserves other URL parameters', () => {
+    const pretokenizedUrl = `${PREVIEW_URL}/?mode=stream&token=tok-1#token=tok-1&view=logs`;
+    const tokenlessUrl = `${PREVIEW_URL}/?mode=stream#view=logs`;
+    const remoteConfig = {
+      __typename: 'WebPreviewOnlyRunSessionRemoteConfig' as const,
+      previewUrl: pretokenizedUrl,
+      previewApiUrl: pretokenizedUrl,
+      previewToken: 'tok-1',
+    };
+
+    expect(sanitizeRemoteConfigForJson(remoteConfig, PRIVATE_URL)).toMatchObject({
+      previewUrl: PRIVATE_URL,
+      previewApiUrl: tokenlessUrl,
     });
+    const fallbackInstructions = formatRemoteSessionInstructions(remoteConfig, 'env');
+    expect(fallbackInstructions).toContain(tokenlessUrl);
+    expect(fallbackInstructions).not.toContain('tok-1');
+  });
+
+  it('keeps controller credentials separate from the preview token', () => {
+    const sanitized = sanitizeRemoteConfigForJson(
+      {
+        __typename: 'ArgentRunSessionRemoteConfig' as const,
+        toolsUrl: 'https://argent.example.test',
+        toolsAuthToken: 'argent-token',
+        webPreviewUrl: PREVIEW_URL,
+        webPreviewToken: 'tok-1',
+      },
+      PRIVATE_URL
+    );
 
-    expect(sanitized).toMatchObject({ webPreviewUrl: `${PREVIEW_URL}/?token=tok-1` });
-    expect(JSON.stringify(sanitized)).not.toContain('webPreviewToken');
-    // The controller credential is a different secret and stays: it is what simulator:exec needs.
-    expect(sanitized).toMatchObject({ toolsAuthToken: 'argent-token' });
+    expect(sanitized).toMatchObject({
+      webPreviewUrl: PRIVATE_URL,
+      toolsAuthToken: 'argent-token',
+    });
+    expect(JSON.stringify(sanitized)).not.toContain('tok-1');
   });
 
-  it('leaves an ungated session untouched', () => {
+  it('uses the authenticated preview URL even when the public preview is ungated', () => {
     const remoteConfig = {
       __typename: 'ServeSimRunSessionRemoteConfig' as const,
       previewUrl: PREVIEW_URL,
       previewToken: null,
     };
 
-    expect(sanitizeRemoteConfigForJson(remoteConfig)).toEqual({
+    expect(sanitizeRemoteConfigForJson(remoteConfig, PRIVATE_URL)).toEqual({
       __typename: 'ServeSimRunSessionRemoteConfig',
-      previewUrl: PREVIEW_URL,
+      previewUrl: PRIVATE_URL,
     });
   });
 
   it('leaves a controller session with no web preview alone', () => {
-    const sanitized = sanitizeRemoteConfigForJson({
-      __typename: 'AppiumRunSessionRemoteConfig' as const,
-      appiumUrl: 'https://appium.example.test',
-      capabilities: {},
-      webPreviewUrl: null,
-      webPreviewToken: null,
-    });
+    const sanitized = sanitizeRemoteConfigForJson(
+      {
+        __typename: 'AppiumRunSessionRemoteConfig' as const,
+        appiumUrl: 'https://appium.example.test',
+        capabilities: {},
+        webPreviewUrl: null,
+        webPreviewToken: null,
+      },
+      PRIVATE_URL
+    );
 
     expect(sanitized).toMatchObject({ webPreviewUrl: null });
   });
+
+  it('returns a fragment-bearing website link with --public-link', () => {
+    const sanitized = sanitizeRemoteConfigForJson(
+      {
+        __typename: 'WebPreviewOnlyRunSessionRemoteConfig' as const,
+        previewUrl: PAGE_URL,
+        previewToken: 'tok-1',
+        previewApiUrl: PREVIEW_URL,
+      },
+      PRIVATE_URL,
+      true
+    );
+
+    expect(sanitized).toEqual({
+      __typename: 'WebPreviewOnlyRunSessionRemoteConfig',
+      previewUrl: `${PAGE_URL}#token=tok-1`,
+      previewApiUrl: `${PREVIEW_URL}/?token=tok-1`,
+    });
+  });
+
+  it('returns the legacy direct-preview link with --public-link', () => {
+    const sanitized = sanitizeRemoteConfigForJson(
+      {
+        __typename: 'ServeSimRunSessionRemoteConfig' as const,
+        previewUrl: PREVIEW_URL,
+        previewToken: 'tok-1',
+      },
+      PRIVATE_URL,
+      true
+    );
+
+    expect(sanitized).toMatchObject({ previewUrl: `${PREVIEW_URL}/?token=tok-1` });
+  });
 });
 
 describe('gated preview links', () => {
   const PREVIEW = 'https://preview.example.test';
   const GATED = `${PREVIEW}/?token=tok-1`;
+  const PRIVATE =
+    'https://expo.dev/accounts/testuser/projects/testapp/simulator-sessions/session-123/preview';
+
+  it('prints the private preview by default while retaining controller credentials', () => {
+    const instructions = formatRemoteSessionInstructions(
+      {
+        __typename: 'AgentDeviceRunSessionRemoteConfig' as const,
+        agentDeviceRemoteSessionUrl: 'https://daemon.example.test',
+        agentDeviceRemoteSessionToken: 'daemon-token',
+        webPreviewUrl: PREVIEW,
+        webPreviewToken: 'tok-1',
+      },
+      'env',
+      { privatePreviewUrl: PRIVATE }
+    );
+
+    expect(instructions).toContain(PRIVATE);
+    expect(instructions).not.toContain(PREVIEW);
+    expect(instructions).not.toContain('tok-1');
+    expect(instructions).toContain("export AGENT_DEVICE_DAEMON_AUTH_TOKEN='daemon-token'");
+  });
+
+  it('prints the shareable link when explicitly requested', () => {
+    const instructions = formatRemoteSessionInstructions(
+      {
+        __typename: 'WebPreviewOnlyRunSessionRemoteConfig' as const,
+        previewUrl: 'https://expo.dev/simulator-preview/abc',
+        previewToken: 'tok-1',
+        previewApiUrl: PREVIEW,
+      },
+      'env',
+      { privatePreviewUrl: PRIVATE, publicLink: true }
+    );
 
-  it('prints the tokenized preview for a serve-sim session', () => {
+    expect(instructions).toContain('https://expo.dev/simulator-preview/abc#token=tok-1');
+    expect(instructions).not.toContain(PRIVATE);
+  });
+
+  it('prints the tokenized preview for a serve-sim session with --public-link', () => {
     const instructions = formatRemoteSessionInstructions(
       {
         __typename: 'ServeSimRunSessionRemoteConfig' as const,
         previewUrl: PREVIEW,
         previewToken: 'tok-1',
       },
-      'env'
+      'env',
+      { publicLink: true }
     );
 
     expect(instructions).toContain(GATED);
   });
 
-  it('prints the tokenized preview for a web-preview-only session', () => {
+  it('prints the tokenized preview for a web-preview-only session with --public-link', () => {
     const instructions = formatRemoteSessionInstructions(
       {
         __typename: 'WebPreviewOnlyRunSessionRemoteConfig' as const,
         previewUrl: PREVIEW,
         previewToken: 'tok-1',
       },
-      'env'
+      'env',
+      { publicLink: true }
     );
 
     expect(instructions).toContain(GATED);
   });
 
-  it('prints the tokenized preview for every controller session type', () => {
+  it('prints the tokenized preview for every controller session type with --public-link', () => {
     const controllers = [
       {
         __typename: 'AgentDeviceRunSessionRemoteConfig' as const,
@@ -429,11 +534,13 @@ describe('gated preview links', () => {
     ];
 
     for (const remoteConfig of controllers) {
-      expect(formatRemoteSessionInstructions(remoteConfig, 'env')).toContain(GATED);
+      expect(formatRemoteSessionInstructions(remoteConfig, 'env', { publicLink: true })).toContain(
+        GATED
+      );
     }
   });
 
-  it('prints the fragment link for every session the worker gave a preview api url', () => {
+  it('prints the fragment link for every session the worker gave a preview api url with --public-link', () => {
     const PAGE = 'https://expo.dev/simulator-preview/abc';
     const API = 'https://web-preview-abc.eas-simulator.ngrok.dev';
     const sessions = [
@@ -469,7 +576,9 @@ describe('gated preview links', () => {
     ];
 
     for (const remoteConfig of sessions) {
-      const instructions = formatRemoteSessionInstructions(remoteConfig, 'env');
+      const instructions = formatRemoteSessionInstructions(remoteConfig, 'env', {
+        publicLink: true,
+      });
       expect(instructions).toContain(`${PAGE}#token=tok-1`);
       expect(instructions).not.toContain('?token=');
     }
diff --git a/packages/eas-cli/src/simulator/utils.ts b/packages/eas-cli/src/simulator/utils.ts
index 281dbd20bc..4b8940631a 100644
--- a/packages/eas-cli/src/simulator/utils.ts
+++ b/packages/eas-cli/src/simulator/utils.ts
@@ -256,6 +256,11 @@ function getControllerEnvironmentVariables(
 
 type RemoteSessionInstructionsConfigType = 'env' | 'dotenv';
 
+type PreviewLinkOptions = {
+  privatePreviewUrl?: string;
+  publicLink?: boolean;
+};
+
 function previewUrlIsWebsitePage(remoteConfig: DeviceRunSessionRemoteConfig): boolean {
   return remoteConfig.previewApiUrl != null;
 }
@@ -287,13 +292,39 @@ function formatPreviewApiUrl(url: string, token: string | null | undefined): str
   return withToken.toString();
 }
 
+function withoutPreviewToken(url: string): string {
+  const parsed = new URL(url);
+  const hashParams = new URLSearchParams(parsed.hash.slice(1));
+  if (!parsed.searchParams.has('token') && !hashParams.has('token')) {
+    return url;
+  }
+  parsed.searchParams.delete('token');
+  if (hashParams.has('token')) {
+    hashParams.delete('token');
+    parsed.hash = hashParams.toString();
+  }
+  return parsed.toString();
+}
+
+function formatBrowserPreviewUrl(
+  remoteConfig: DeviceRunSessionRemoteConfig,
+  url: string,
+  token: string | null | undefined,
+  { privatePreviewUrl, publicLink }: PreviewLinkOptions
+): string {
+  return publicLink
+    ? formatPreviewUrl(remoteConfig, url, token)
+    : (privatePreviewUrl ?? withoutPreviewToken(url));
+}
+
 /**
- * Remote config for `--json`. Both URLs carry the token and the standalone token field is dropped,
- * so a consumer gets URLs that work rather than bare URLs that 401 next to a secret it has to know
- * to combine.
+ * Remote config for `--json`. Preview tokens are omitted by default; `--public-link` puts them
+ * into the preview URLs for callers that explicitly need a shareable bearer link.
  */
 export function sanitizeRemoteConfigForJson(
-  remoteConfig: DeviceRunSessionRemoteConfig
+  remoteConfig: DeviceRunSessionRemoteConfig,
+  privatePreviewUrl: string,
+  publicLink = false
 ): DeviceRunSessionRemoteConfig {
   switch (remoteConfig.__typename) {
     case 'ServeSimRunSessionRemoteConfig':
@@ -301,9 +332,14 @@ export function sanitizeRemoteConfigForJson(
       const { previewToken, ...rest } = remoteConfig;
       return {
         ...rest,
-        previewUrl: formatPreviewUrl(remoteConfig, remoteConfig.previewUrl, previewToken),
+        previewUrl: formatBrowserPreviewUrl(remoteConfig, remoteConfig.previewUrl, previewToken, {
+          privatePreviewUrl,
+          publicLink,
+        }),
         previewApiUrl: remoteConfig.previewApiUrl
-          ? formatPreviewApiUrl(remoteConfig.previewApiUrl, previewToken)
+          ? publicLink
+            ? formatPreviewApiUrl(remoteConfig.previewApiUrl, previewToken)
+            : withoutPreviewToken(remoteConfig.previewApiUrl)
           : remoteConfig.previewApiUrl,
       };
     }
@@ -314,10 +350,15 @@ export function sanitizeRemoteConfigForJson(
       return {
         ...rest,
         webPreviewUrl: remoteConfig.webPreviewUrl
-          ? formatPreviewUrl(remoteConfig, remoteConfig.webPreviewUrl, webPreviewToken)
+          ? formatBrowserPreviewUrl(remoteConfig, remoteConfig.webPreviewUrl, webPreviewToken, {
+              privatePreviewUrl,
+              publicLink,
+            })
           : remoteConfig.webPreviewUrl,
         previewApiUrl: remoteConfig.previewApiUrl
-          ? formatPreviewApiUrl(remoteConfig.previewApiUrl, webPreviewToken)
+          ? publicLink
+            ? formatPreviewApiUrl(remoteConfig.previewApiUrl, webPreviewToken)
+            : withoutPreviewToken(remoteConfig.previewApiUrl)
           : remoteConfig.previewApiUrl,
       };
     }
@@ -327,9 +368,19 @@ export function sanitizeRemoteConfigForJson(
 export function formatRemoteSessionInstructions(
   remoteConfig: DeviceRunSessionRemoteConfig,
   configType: RemoteSessionInstructionsConfigType,
-  { egressAllow, egressClientRunsInline = false, sessionUrl, platform }: LocalEgressOptions = {}
+  {
+    egressAllow,
+    egressClientRunsInline = false,
+    sessionUrl,
+    platform,
+    privatePreviewUrl,
+    publicLink,
+  }: LocalEgressOptions & PreviewLinkOptions = {}
 ): string {
-  const instructions = formatControllerInstructions(remoteConfig, configType);
+  const instructions = formatControllerInstructions(remoteConfig, configType, {
+    privatePreviewUrl,
+    publicLink,
+  });
   const egress = getLocalEgressConfig(remoteConfig, egressAllow, platform);
   if (!egress) {
     return instructions;
@@ -374,7 +425,8 @@ export function formatRemoteSessionInstructions(
 
 function formatControllerInstructions(
   remoteConfig: DeviceRunSessionRemoteConfig,
-  configType: RemoteSessionInstructionsConfigType
+  configType: RemoteSessionInstructionsConfigType,
+  previewLinkOptions: PreviewLinkOptions
 ): string {
   switch (remoteConfig.__typename) {
     case 'AgentDeviceRunSessionRemoteConfig': {
@@ -398,7 +450,12 @@ function formatControllerInstructions(
           '',
           '🌐 Open the following URL in your browser to preview the simulator:',
           '',
-          formatPreviewUrl(remoteConfig, remoteConfig.webPreviewUrl, remoteConfig.webPreviewToken)
+          formatBrowserPreviewUrl(
+            remoteConfig,
+            remoteConfig.webPreviewUrl,
+            remoteConfig.webPreviewToken,
+            previewLinkOptions
+          )
         );
       }
       return lines.join('\n');
@@ -436,7 +493,12 @@ function formatControllerInstructions(
           '',
           '🌐 Open the following URL in your browser to preview the simulator:',
           '',
-          formatPreviewUrl(remoteConfig, remoteConfig.webPreviewUrl, remoteConfig.webPreviewToken)
+          formatBrowserPreviewUrl(
+            remoteConfig,
+            remoteConfig.webPreviewUrl,
+            remoteConfig.webPreviewToken,
+            previewLinkOptions
+          )
         );
       }
       return lines.join('\n');
@@ -464,7 +526,12 @@ function formatControllerInstructions(
           '',
           'Open the simulator preview:',
           '',
-          formatPreviewUrl(remoteConfig, remoteConfig.webPreviewUrl, remoteConfig.webPreviewToken)
+          formatBrowserPreviewUrl(
+            remoteConfig,
+            remoteConfig.webPreviewUrl,
+            remoteConfig.webPreviewToken,
+            previewLinkOptions
+          )
         );
       }
       return lines.join('\n');
@@ -473,13 +540,23 @@ function formatControllerInstructions(
       return [
         '🌐 Open the following URL in your browser to access the simulator:',
         '',
-        formatPreviewUrl(remoteConfig, remoteConfig.previewUrl, remoteConfig.previewToken),
+        formatBrowserPreviewUrl(
+          remoteConfig,
+          remoteConfig.previewUrl,
+          remoteConfig.previewToken,
+          previewLinkOptions
+        ),
       ].join('\n');
     case 'WebPreviewOnlyRunSessionRemoteConfig':
       return [
         '🌐 Open the following URL in your browser to access the simulator:',
         '',
-        formatPreviewUrl(remoteConfig, remoteConfig.previewUrl, remoteConfig.previewToken),
+        formatBrowserPreviewUrl(
+          remoteConfig,
+          remoteConfig.previewUrl,
+          remoteConfig.previewToken,
+          previewLinkOptions
+        ),
       ].join('\n');
   }
 }

From 40532f061c9da5b5095bde21acf3a750ef5423ef Mon Sep 17 00:00:00 2001
From: Gabe Debes <pacheco@expo.dev>
Date: Tue, 13 Oct 2026 19:51:17 -0700
Subject: [PATCH 2/5] [eas-cli] Persist simulator preview sharing preference

---
 packages/eas-cli/README.md                    |  12 +-
 packages/eas-cli/graphql.schema.json          |  28 +++++
 .../simulator/__tests__/index.test.ts         | 108 +++++++++++-------
 .../eas-cli/src/commands/simulator/index.ts   |   3 +-
 packages/eas-cli/src/graphql/generated.ts     |  10 ++
 5 files changed, 112 insertions(+), 49 deletions(-)

diff --git a/packages/eas-cli/README.md b/packages/eas-cli/README.md
index cf0a8c5162..072c7804ed 100644
--- a/packages/eas-cli/README.md
+++ b/packages/eas-cli/README.md
@@ -2985,8 +2985,8 @@ FLAGS
       Version of the package backing the simulator session (e.g. "0.1.3-alpha.3"). Defaults to "latest" when omitted.
 
   --public-link
-      Print a shareable preview link containing an access token. Anyone with the link can control the simulator. With
-      --json, previewApiUrl also includes the token for API clients when available.
+      Enable the simulator preview Share button and print a shareable link containing an access token. Anyone with the
+      link can control the simulator. With --json, previewApiUrl also includes the token for API clients when available.
 
   --sdk-version=<value>
       Expo SDK version used to select Expo Go when --expo-go is passed. Defaults to the current project SDK.
@@ -3124,8 +3124,8 @@ FLAGS
       Version of the package backing the simulator session (e.g. "0.1.3-alpha.3"). Defaults to "latest" when omitted.
 
   --public-link
-      Print a shareable preview link containing an access token. Anyone with the link can control the simulator. With
-      --json, previewApiUrl also includes the token for API clients when available.
+      Enable the simulator preview Share button and print a shareable link containing an access token. Anyone with the
+      link can control the simulator. With --json, previewApiUrl also includes the token for API clients when available.
 
   --sdk-version=<value>
       Expo SDK version used to select Expo Go when --expo-go is passed. Defaults to the current project SDK.
@@ -3389,8 +3389,8 @@ FLAGS
       Version of the package backing the simulator session (e.g. "0.1.3-alpha.3"). Defaults to "latest" when omitted.
 
   --public-link
-      Print a shareable preview link containing an access token. Anyone with the link can control the simulator. With
-      --json, previewApiUrl also includes the token for API clients when available.
+      Enable the simulator preview Share button and print a shareable link containing an access token. Anyone with the
+      link can control the simulator. With --json, previewApiUrl also includes the token for API clients when available.
 
   --sdk-version=<value>
       Expo SDK version used to select Expo Go when --expo-go is passed. Defaults to the current project SDK.
diff --git a/packages/eas-cli/graphql.schema.json b/packages/eas-cli/graphql.schema.json
index ffca99b189..9733e9a8db 100644
--- a/packages/eas-cli/graphql.schema.json
+++ b/packages/eas-cli/graphql.schema.json
@@ -46098,6 +46098,18 @@
             "isDeprecated": false,
             "deprecationReason": null
           },
+          {
+            "name": "publicPreview",
+            "description": "Prefer public preview links and show the preview host's Share button. Defaults to false.\nThis is a presentation preference and does not change access to bearer links.",
+            "type": {
+              "kind": "SCALAR",
+              "name": "Boolean",
+              "ofType": null
+            },
+            "defaultValue": null,
+            "isDeprecated": false,
+            "deprecationReason": null
+          },
           {
             "name": "requestOrigin",
             "description": "The client sending this request, recorded for analytics only. Omit it when the\nclient is not one of the listed values; the session is then reported as unknown.",
@@ -51206,6 +51218,22 @@
             "isDeprecated": false,
             "deprecationReason": null
           },
+          {
+            "name": "publicPreview",
+            "description": "Whether this session prefers public preview links and the preview host's Share button.\nThis preference does not change access to bearer links.",
+            "args": [],
+            "type": {
+              "kind": "NON_NULL",
+              "name": null,
+              "ofType": {
+                "kind": "SCALAR",
+                "name": "Boolean",
+                "ofType": null
+              }
+            },
+            "isDeprecated": false,
+            "deprecationReason": null
+          },
           {
             "name": "remoteConfig",
             "description": null,
diff --git a/packages/eas-cli/src/commands/simulator/__tests__/index.test.ts b/packages/eas-cli/src/commands/simulator/__tests__/index.test.ts
index 40d18b0160..be68b683c2 100644
--- a/packages/eas-cli/src/commands/simulator/__tests__/index.test.ts
+++ b/packages/eas-cli/src/commands/simulator/__tests__/index.test.ts
@@ -645,14 +645,18 @@ describe(Simulator, () => {
     expect(getContextAsync).toHaveBeenCalledWith(Simulator, {
       nonInteractive: true,
     });
-    expect(mockCreateDeviceRunSessionAsync).toHaveBeenCalledWith(graphqlClient, {
-      appId: 'project-123',
-      name: undefined,
-      packageVersion: undefined,
-      platform: AppPlatform.Ios,
-      type: DeviceRunSessionType.AgentDevice,
-      requestOrigin: DeviceRunSessionRequestOrigin.EasCli,
-    });
+    expect(mockCreateDeviceRunSessionAsync).toHaveBeenCalledWith(
+      graphqlClient,
+      expect.objectContaining({
+        appId: 'project-123',
+        name: undefined,
+        packageVersion: undefined,
+        platform: AppPlatform.Ios,
+        type: DeviceRunSessionType.AgentDevice,
+        publicPreview: false,
+        requestOrigin: DeviceRunSessionRequestOrigin.EasCli,
+      })
+    );
     expect(fs.writeFile).not.toHaveBeenCalled();
     expect(mockOra.mock.results[0]?.value.succeed).toHaveBeenCalledWith(
       `Simulator session created (id: session-123) ${deviceRunSessionUrl}`
@@ -808,14 +812,18 @@ describe(Simulator, () => {
         'The previous remote session will continue running until stopped. ' +
         'To stop it, run: eas simulator:stop --id existing-session'
     );
-    expect(mockCreateDeviceRunSessionAsync).toHaveBeenCalledWith(graphqlClient, {
-      appId: 'project-123',
-      name: undefined,
-      packageVersion: undefined,
-      platform: AppPlatform.Ios,
-      type: DeviceRunSessionType.AgentDevice,
-      requestOrigin: DeviceRunSessionRequestOrigin.EasCli,
-    });
+    expect(mockCreateDeviceRunSessionAsync).toHaveBeenCalledWith(
+      graphqlClient,
+      expect.objectContaining({
+        appId: 'project-123',
+        name: undefined,
+        packageVersion: undefined,
+        platform: AppPlatform.Ios,
+        type: DeviceRunSessionType.AgentDevice,
+        publicPreview: false,
+        requestOrigin: DeviceRunSessionRequestOrigin.EasCli,
+      })
+    );
   });
 
   it(`creates a new session when ${EAS_SIMULATOR_SESSION_ID} is present with --force`, async () => {
@@ -829,14 +837,18 @@ describe(Simulator, () => {
         'The previous remote session will continue running until stopped. ' +
         'To stop it, run: eas simulator:stop --id existing-session'
     );
-    expect(mockCreateDeviceRunSessionAsync).toHaveBeenCalledWith(graphqlClient, {
-      appId: 'project-123',
-      name: undefined,
-      packageVersion: undefined,
-      platform: AppPlatform.Ios,
-      type: DeviceRunSessionType.AgentDevice,
-      requestOrigin: DeviceRunSessionRequestOrigin.EasCli,
-    });
+    expect(mockCreateDeviceRunSessionAsync).toHaveBeenCalledWith(
+      graphqlClient,
+      expect.objectContaining({
+        appId: 'project-123',
+        name: undefined,
+        packageVersion: undefined,
+        platform: AppPlatform.Ios,
+        type: DeviceRunSessionType.AgentDevice,
+        publicPreview: false,
+        requestOrigin: DeviceRunSessionRequestOrigin.EasCli,
+      })
+    );
   });
 
   it('passes --max-idle-time-minutes to the createDeviceRunSession mutation', async () => {
@@ -849,15 +861,19 @@ describe(Simulator, () => {
     ]);
     await command.runAsync();
 
-    expect(mockCreateDeviceRunSessionAsync).toHaveBeenCalledWith(graphqlClient, {
-      appId: 'project-123',
-      name: undefined,
-      packageVersion: undefined,
-      platform: AppPlatform.Ios,
-      type: DeviceRunSessionType.AgentDevice,
-      maxIdleTimeMinutes: 30,
-      requestOrigin: DeviceRunSessionRequestOrigin.EasCli,
-    });
+    expect(mockCreateDeviceRunSessionAsync).toHaveBeenCalledWith(
+      graphqlClient,
+      expect.objectContaining({
+        appId: 'project-123',
+        name: undefined,
+        packageVersion: undefined,
+        platform: AppPlatform.Ios,
+        type: DeviceRunSessionType.AgentDevice,
+        maxIdleTimeMinutes: 30,
+        publicPreview: false,
+        requestOrigin: DeviceRunSessionRequestOrigin.EasCli,
+      })
+    );
   });
 
   it('passes --network-capture to the createDeviceRunSession mutation', async () => {
@@ -869,15 +885,19 @@ describe(Simulator, () => {
     ]);
     await command.runAsync();
 
-    expect(mockCreateDeviceRunSessionAsync).toHaveBeenCalledWith(graphqlClient, {
-      appId: 'project-123',
-      name: undefined,
-      networkCapture: true,
-      packageVersion: undefined,
-      platform: AppPlatform.Ios,
-      type: DeviceRunSessionType.AgentDevice,
-      requestOrigin: DeviceRunSessionRequestOrigin.EasCli,
-    });
+    expect(mockCreateDeviceRunSessionAsync).toHaveBeenCalledWith(
+      graphqlClient,
+      expect.objectContaining({
+        appId: 'project-123',
+        name: undefined,
+        networkCapture: true,
+        packageVersion: undefined,
+        platform: AppPlatform.Ios,
+        type: DeviceRunSessionType.AgentDevice,
+        publicPreview: false,
+        requestOrigin: DeviceRunSessionRequestOrigin.EasCli,
+      })
+    );
   });
 
   it('passes the requested capture fields, splitting a comma-separated value', async () => {
@@ -1977,6 +1997,10 @@ describe(Simulator, () => {
         ...choice,
       ]);
       await jsonCommand.runAsync();
+      expect(mockCreateDeviceRunSessionAsync).toHaveBeenCalledWith(
+        graphqlClient,
+        expect.objectContaining({ publicPreview: publicLink })
+      );
       expect(mockPrintJsonOnlyOutput).toHaveBeenCalledWith(
         expect.objectContaining({
           remoteConfig: expect.objectContaining({ previewUrl: expectedUrl }),
diff --git a/packages/eas-cli/src/commands/simulator/index.ts b/packages/eas-cli/src/commands/simulator/index.ts
index 13ac4319fa..392af9a998 100644
--- a/packages/eas-cli/src/commands/simulator/index.ts
+++ b/packages/eas-cli/src/commands/simulator/index.ts
@@ -190,7 +190,7 @@ export default class Simulator extends EasCommand {
     })(),
     'public-link': Flags.boolean({
       description:
-        'Print a shareable preview link containing an access token. Anyone with the link can control the simulator. With --json, previewApiUrl also includes the token for API clients when available.',
+        'Enable the simulator preview Share button and print a shareable link containing an access token. Anyone with the link can control the simulator. With --json, previewApiUrl also includes the token for API clients when available.',
     }),
     ...EasNonInteractiveAndJsonFlags,
   };
@@ -339,6 +339,7 @@ export default class Simulator extends EasCommand {
             ...(tags?.length ? { tags } : {}),
             platform,
             type: DEVICE_RUN_SESSION_TYPE_BY_FLAG_VALUE[flags.type],
+            publicPreview: flags['public-link'] ?? false,
             packageVersion: flags['package-version'],
             networkCapture: flags['network-capture'],
             ...(networkCaptureFields.length ? { networkCaptureFields } : {}),
diff --git a/packages/eas-cli/src/graphql/generated.ts b/packages/eas-cli/src/graphql/generated.ts
index 17a540a36a..5de4249629 100644
--- a/packages/eas-cli/src/graphql/generated.ts
+++ b/packages/eas-cli/src/graphql/generated.ts
@@ -6542,6 +6542,11 @@ export type CreateDeviceRunSessionInput = {
    */
   packageVersion?: InputMaybe<Scalars['String']['input']>;
   platform: AppPlatform;
+  /**
+   * Prefer public preview links and show the preview host's Share button. Defaults to false.
+   * This is a presentation preference and does not change access to bearer links.
+   */
+  publicPreview?: InputMaybe<Scalars['Boolean']['input']>;
   /**
    * The client sending this request, recorded for analytics only. Omit it when the
    * client is not one of the listed values; the session is then reported as unknown.
@@ -7234,6 +7239,11 @@ export type DeviceRunSession = {
    */
   packageVersion?: Maybe<Scalars['String']['output']>;
   platform: AppPlatform;
+  /**
+   * Whether this session prefers public preview links and the preview host's Share button.
+   * This preference does not change access to bearer links.
+   */
+  publicPreview: Scalars['Boolean']['output'];
   remoteConfig?: Maybe<DeviceRunSessionRemoteConfig>;
   startedAt?: Maybe<Scalars['DateTime']['output']>;
   status: DeviceRunSessionStatus;

From e361286c9c2d964bd0d7ec45e5fb72646bdecf72 Mon Sep 17 00:00:00 2001
From: Gabe Debes <pacheco@expo.dev>
Date: Tue, 13 Oct 2026 21:23:51 -0700
Subject: [PATCH 3/5] [eas-cli] omit direct preview API addresses from private
 JSON

---
 packages/eas-cli/README.md                    | 10 +--
 .../commands/simulator/__tests__/get.test.ts  |  4 +-
 .../simulator/__tests__/index.test.ts         |  7 +-
 .../eas-cli/src/commands/simulator/get.ts     |  2 +-
 .../eas-cli/src/commands/simulator/index.ts   |  2 +-
 .../src/simulator/__tests__/utils.test.ts     | 70 ++++++++++++++++++-
 packages/eas-cli/src/simulator/utils.ts       | 22 +++---
 7 files changed, 92 insertions(+), 25 deletions(-)

diff --git a/packages/eas-cli/README.md b/packages/eas-cli/README.md
index 072c7804ed..1ff6b955ea 100644
--- a/packages/eas-cli/README.md
+++ b/packages/eas-cli/README.md
@@ -2847,7 +2847,7 @@ FLAGS
   --json             Enable JSON output, non-JSON messages will be printed to stderr. Implies --non-interactive.
   --non-interactive  Run the command in non-interactive mode.
   --public-link      Print a shareable preview link containing an access token. Anyone with the link can control the
-                     simulator. With --json, previewApiUrl also includes the token for API clients when available.
+                     simulator. With --json, include previewApiUrl and its token for API clients when available.
 
 DESCRIPTION
   [EXPERIMENTAL] get info about a remote simulator session on EAS by its simulator session ID. The default browser
@@ -2986,7 +2986,7 @@ FLAGS
 
   --public-link
       Enable the simulator preview Share button and print a shareable link containing an access token. Anyone with the
-      link can control the simulator. With --json, previewApiUrl also includes the token for API clients when available.
+      link can control the simulator. With --json, include previewApiUrl and its token for API clients when available.
 
   --sdk-version=<value>
       Expo SDK version used to select Expo Go when --expo-go is passed. Defaults to the current project SDK.
@@ -3125,7 +3125,7 @@ FLAGS
 
   --public-link
       Enable the simulator preview Share button and print a shareable link containing an access token. Anyone with the
-      link can control the simulator. With --json, previewApiUrl also includes the token for API clients when available.
+      link can control the simulator. With --json, include previewApiUrl and its token for API clients when available.
 
   --sdk-version=<value>
       Expo SDK version used to select Expo Go when --expo-go is passed. Defaults to the current project SDK.
@@ -3247,7 +3247,7 @@ FLAGS
   --json             Enable JSON output, non-JSON messages will be printed to stderr. Implies --non-interactive.
   --non-interactive  Run the command in non-interactive mode.
   --public-link      Print a shareable preview link containing an access token. Anyone with the link can control the
-                     simulator. With --json, previewApiUrl also includes the token for API clients when available.
+                     simulator. With --json, include previewApiUrl and its token for API clients when available.
 
 DESCRIPTION
   [EXPERIMENTAL] get info about a remote simulator session on EAS by its simulator session ID. The default browser
@@ -3390,7 +3390,7 @@ FLAGS
 
   --public-link
       Enable the simulator preview Share button and print a shareable link containing an access token. Anyone with the
-      link can control the simulator. With --json, previewApiUrl also includes the token for API clients when available.
+      link can control the simulator. With --json, include previewApiUrl and its token for API clients when available.
 
   --sdk-version=<value>
       Expo SDK version used to select Expo Go when --expo-go is passed. Defaults to the current project SDK.
diff --git a/packages/eas-cli/src/commands/simulator/__tests__/get.test.ts b/packages/eas-cli/src/commands/simulator/__tests__/get.test.ts
index cb071c6aa0..91ff7c3736 100644
--- a/packages/eas-cli/src/commands/simulator/__tests__/get.test.ts
+++ b/packages/eas-cli/src/commands/simulator/__tests__/get.test.ts
@@ -158,7 +158,7 @@ describe(SimulatorGet, () => {
         __typename: 'ServeSimRunSessionRemoteConfig',
         previewUrl:
           'https://expo.dev/accounts/testuser/projects/testapp/simulator-sessions/session-123/preview',
-        previewApiUrl: undefined,
+        previewApiUrl: null,
       },
       artifacts: session.artifacts,
     });
@@ -185,7 +185,7 @@ describe(SimulatorGet, () => {
       const expectedUrl = publicLink ? `${publicUrl}#token=preview-secret` : privateUrl;
       const expectedApiUrl = publicLink
         ? 'https://preview-api.example.test/?token=preview-secret'
-        : 'https://preview-api.example.test';
+        : null;
 
       const { command: jsonCommand } = createCommand(['--id', 'session-123', '--json', ...choice]);
       await jsonCommand.runAsync();
diff --git a/packages/eas-cli/src/commands/simulator/__tests__/index.test.ts b/packages/eas-cli/src/commands/simulator/__tests__/index.test.ts
index be68b683c2..a05c627b95 100644
--- a/packages/eas-cli/src/commands/simulator/__tests__/index.test.ts
+++ b/packages/eas-cli/src/commands/simulator/__tests__/index.test.ts
@@ -2003,7 +2003,12 @@ describe(Simulator, () => {
       );
       expect(mockPrintJsonOnlyOutput).toHaveBeenCalledWith(
         expect.objectContaining({
-          remoteConfig: expect.objectContaining({ previewUrl: expectedUrl }),
+          remoteConfig: expect.objectContaining({
+            previewUrl: expectedUrl,
+            previewApiUrl: publicLink
+              ? 'https://preview-api.example.test/?token=preview-secret'
+              : null,
+          }),
         })
       );
       if (!publicLink) {
diff --git a/packages/eas-cli/src/commands/simulator/get.ts b/packages/eas-cli/src/commands/simulator/get.ts
index b4d7d527a5..dcadc23b0d 100644
--- a/packages/eas-cli/src/commands/simulator/get.ts
+++ b/packages/eas-cli/src/commands/simulator/get.ts
@@ -38,7 +38,7 @@ export default class SimulatorGet extends EasCommand {
     }),
     'public-link': Flags.boolean({
       description:
-        'Print a shareable preview link containing an access token. Anyone with the link can control the simulator. With --json, previewApiUrl also includes the token for API clients when available.',
+        'Print a shareable preview link containing an access token. Anyone with the link can control the simulator. With --json, include previewApiUrl and its token for API clients when available.',
     }),
     ...EasNonInteractiveAndJsonFlags,
   };
diff --git a/packages/eas-cli/src/commands/simulator/index.ts b/packages/eas-cli/src/commands/simulator/index.ts
index 392af9a998..59bb0a8d86 100644
--- a/packages/eas-cli/src/commands/simulator/index.ts
+++ b/packages/eas-cli/src/commands/simulator/index.ts
@@ -190,7 +190,7 @@ export default class Simulator extends EasCommand {
     })(),
     'public-link': Flags.boolean({
       description:
-        'Enable the simulator preview Share button and print a shareable link containing an access token. Anyone with the link can control the simulator. With --json, previewApiUrl also includes the token for API clients when available.',
+        'Enable the simulator preview Share button and print a shareable link containing an access token. Anyone with the link can control the simulator. With --json, include previewApiUrl and its token for API clients when available.',
     }),
     ...EasNonInteractiveAndJsonFlags,
   };
diff --git a/packages/eas-cli/src/simulator/__tests__/utils.test.ts b/packages/eas-cli/src/simulator/__tests__/utils.test.ts
index a6638e0485..9dbbfd605d 100644
--- a/packages/eas-cli/src/simulator/__tests__/utils.test.ts
+++ b/packages/eas-cli/src/simulator/__tests__/utils.test.ts
@@ -322,11 +322,12 @@ describe(sanitizeRemoteConfigForJson, () => {
     expect(sanitized).toEqual({
       __typename: 'ServeSimRunSessionRemoteConfig',
       previewUrl: PRIVATE_URL,
+      previewApiUrl: null,
     });
     expect(JSON.stringify(sanitized)).not.toContain('tok-1');
   });
 
-  it('leaves the API URL free of the preview token by default', () => {
+  it('omits the direct preview API address by default', () => {
     const sanitized = sanitizeRemoteConfigForJson(
       {
         __typename: 'WebPreviewOnlyRunSessionRemoteConfig' as const,
@@ -340,7 +341,7 @@ describe(sanitizeRemoteConfigForJson, () => {
     expect(sanitized).toEqual({
       __typename: 'WebPreviewOnlyRunSessionRemoteConfig',
       previewUrl: PRIVATE_URL,
-      previewApiUrl: `${PREVIEW_URL}/?mode=stream`,
+      previewApiUrl: null,
     });
     expect(JSON.stringify(sanitized)).not.toContain('tok-1');
   });
@@ -357,13 +358,75 @@ describe(sanitizeRemoteConfigForJson, () => {
 
     expect(sanitizeRemoteConfigForJson(remoteConfig, PRIVATE_URL)).toMatchObject({
       previewUrl: PRIVATE_URL,
-      previewApiUrl: tokenlessUrl,
+      previewApiUrl: null,
     });
     const fallbackInstructions = formatRemoteSessionInstructions(remoteConfig, 'env');
     expect(fallbackInstructions).toContain(tokenlessUrl);
     expect(fallbackInstructions).not.toContain('tok-1');
   });
 
+  it.each([
+    {
+      name: 'legacy serve-sim',
+      config: {
+        __typename: 'ServeSimRunSessionRemoteConfig' as const,
+        previewUrl: PREVIEW_URL,
+        previewToken: 'preview-secret',
+      },
+    },
+    {
+      name: 'web-preview-only',
+      config: {
+        __typename: 'WebPreviewOnlyRunSessionRemoteConfig' as const,
+        previewUrl: PAGE_URL,
+        previewToken: 'preview-secret',
+      },
+    },
+    {
+      name: 'agent-device on Android',
+      config: {
+        ...agentDeviceConfig,
+        webPreviewUrl: null,
+        webPreviewToken: null,
+      },
+    },
+    {
+      name: 'Argent',
+      config: {
+        __typename: 'ArgentRunSessionRemoteConfig' as const,
+        toolsUrl: 'https://argent.example.test',
+        toolsAuthToken: 'argent-secret',
+        webPreviewUrl: PREVIEW_URL,
+        webPreviewToken: 'preview-secret',
+      },
+    },
+    {
+      name: 'Appium',
+      config: {
+        __typename: 'AppiumRunSessionRemoteConfig' as const,
+        appiumUrl: 'https://appium.example.test',
+        capabilities: {},
+        webPreviewUrl: PREVIEW_URL,
+        webPreviewToken: 'preview-secret',
+      },
+    },
+  ])('hides the direct API address for $name unless opted in', ({ config }) => {
+    const remoteConfig: DeviceRunSessionRemoteConfig = {
+      ...config,
+      previewApiUrl: PREVIEW_URL,
+    };
+    const token =
+      'previewToken' in config
+        ? config.previewToken
+        : 'webPreviewToken' in config
+          ? config.webPreviewToken
+          : null;
+    expect(sanitizeRemoteConfigForJson(remoteConfig, PRIVATE_URL).previewApiUrl).toBeNull();
+    expect(sanitizeRemoteConfigForJson(remoteConfig, PRIVATE_URL, true).previewApiUrl).toBe(
+      token ? `${PREVIEW_URL}/?token=${token}` : PREVIEW_URL
+    );
+  });
+
   it('keeps controller credentials separate from the preview token', () => {
     const sanitized = sanitizeRemoteConfigForJson(
       {
@@ -393,6 +456,7 @@ describe(sanitizeRemoteConfigForJson, () => {
     expect(sanitizeRemoteConfigForJson(remoteConfig, PRIVATE_URL)).toEqual({
       __typename: 'ServeSimRunSessionRemoteConfig',
       previewUrl: PRIVATE_URL,
+      previewApiUrl: null,
     });
   });
 
diff --git a/packages/eas-cli/src/simulator/utils.ts b/packages/eas-cli/src/simulator/utils.ts
index 4b8940631a..b003da950c 100644
--- a/packages/eas-cli/src/simulator/utils.ts
+++ b/packages/eas-cli/src/simulator/utils.ts
@@ -318,8 +318,8 @@ function formatBrowserPreviewUrl(
 }
 
 /**
- * Remote config for `--json`. Preview tokens are omitted by default; `--public-link` puts them
- * into the preview URLs for callers that explicitly need a shareable bearer link.
+ * Remote config for `--json`. The direct preview API address and preview tokens are omitted by
+ * default; `--public-link` includes them for callers that explicitly need bearer access.
  */
 export function sanitizeRemoteConfigForJson(
   remoteConfig: DeviceRunSessionRemoteConfig,
@@ -336,11 +336,10 @@ export function sanitizeRemoteConfigForJson(
           privatePreviewUrl,
           publicLink,
         }),
-        previewApiUrl: remoteConfig.previewApiUrl
-          ? publicLink
-            ? formatPreviewApiUrl(remoteConfig.previewApiUrl, previewToken)
-            : withoutPreviewToken(remoteConfig.previewApiUrl)
-          : remoteConfig.previewApiUrl,
+        previewApiUrl: publicLink
+          ? remoteConfig.previewApiUrl &&
+            formatPreviewApiUrl(remoteConfig.previewApiUrl, previewToken)
+          : null,
       };
     }
     case 'AgentDeviceRunSessionRemoteConfig':
@@ -355,11 +354,10 @@ export function sanitizeRemoteConfigForJson(
               publicLink,
             })
           : remoteConfig.webPreviewUrl,
-        previewApiUrl: remoteConfig.previewApiUrl
-          ? publicLink
-            ? formatPreviewApiUrl(remoteConfig.previewApiUrl, webPreviewToken)
-            : withoutPreviewToken(remoteConfig.previewApiUrl)
-          : remoteConfig.previewApiUrl,
+        previewApiUrl: publicLink
+          ? remoteConfig.previewApiUrl &&
+            formatPreviewApiUrl(remoteConfig.previewApiUrl, webPreviewToken)
+          : null,
       };
     }
   }

From ab0071e0a5834de487b6319bd5176782bd4bbb99 Mon Sep 17 00:00:00 2001
From: Gabe Debes <pacheco@expo.dev>
Date: Wed, 14 Oct 2026 00:10:37 -0700
Subject: [PATCH 4/5] [eas-cli] use saved simulator sharing preference in get

Co-authored-by: Codex <codex@openai.com>
---
 packages/eas-cli/README.md                    | 20 +++----
 .../commands/simulator/__tests__/get.test.ts  | 59 ++++++++++++++++---
 .../simulator/__tests__/index.test.ts         |  1 +
 .../eas-cli/src/commands/simulator/get.ts     | 10 +---
 packages/eas-cli/src/graphql/generated.ts     |  2 +-
 .../graphql/queries/DeviceRunSessionQuery.ts  |  1 +
 packages/eas-cli/src/simulator/utils.ts       |  4 +-
 7 files changed, 66 insertions(+), 31 deletions(-)

diff --git a/packages/eas-cli/README.md b/packages/eas-cli/README.md
index 1ff6b955ea..bb34397736 100644
--- a/packages/eas-cli/README.md
+++ b/packages/eas-cli/README.md
@@ -2836,22 +2836,20 @@ ALIASES
 
 ## `eas sim:get`
 
-[EXPERIMENTAL] get info about a remote simulator session on EAS by its simulator session ID. The default browser preview link requires sign-in.
+[EXPERIMENTAL] get info about a remote simulator session on EAS by its simulator session ID. Preview links follow the session's saved sharing preference.
 
 ```
 USAGE
-  $ eas sim:get [--id <value>] [--public-link] [--json] [--non-interactive]
+  $ eas sim:get [--id <value>] [--json] [--non-interactive]
 
 FLAGS
   --id=<value>       Simulator session ID. Defaults to .env.eas-simulator.
   --json             Enable JSON output, non-JSON messages will be printed to stderr. Implies --non-interactive.
   --non-interactive  Run the command in non-interactive mode.
-  --public-link      Print a shareable preview link containing an access token. Anyone with the link can control the
-                     simulator. With --json, include previewApiUrl and its token for API clients when available.
 
 DESCRIPTION
-  [EXPERIMENTAL] get info about a remote simulator session on EAS by its simulator session ID. The default browser
-  preview link requires sign-in.
+  [EXPERIMENTAL] get info about a remote simulator session on EAS by its simulator session ID. Preview links follow the
+  session's saved sharing preference.
 
 ALIASES
   $ eas sim:get
@@ -3236,22 +3234,20 @@ _See code: [packages/eas-cli/src/commands/simulator/exec.ts](https://github.com/
 
 ## `eas simulator:get`
 
-[EXPERIMENTAL] get info about a remote simulator session on EAS by its simulator session ID. The default browser preview link requires sign-in.
+[EXPERIMENTAL] get info about a remote simulator session on EAS by its simulator session ID. Preview links follow the session's saved sharing preference.
 
 ```
 USAGE
-  $ eas simulator:get [--id <value>] [--public-link] [--json] [--non-interactive]
+  $ eas simulator:get [--id <value>] [--json] [--non-interactive]
 
 FLAGS
   --id=<value>       Simulator session ID. Defaults to .env.eas-simulator.
   --json             Enable JSON output, non-JSON messages will be printed to stderr. Implies --non-interactive.
   --non-interactive  Run the command in non-interactive mode.
-  --public-link      Print a shareable preview link containing an access token. Anyone with the link can control the
-                     simulator. With --json, include previewApiUrl and its token for API clients when available.
 
 DESCRIPTION
-  [EXPERIMENTAL] get info about a remote simulator session on EAS by its simulator session ID. The default browser
-  preview link requires sign-in.
+  [EXPERIMENTAL] get info about a remote simulator session on EAS by its simulator session ID. Preview links follow the
+  session's saved sharing preference.
 
 ALIASES
   $ eas sim:get
diff --git a/packages/eas-cli/src/commands/simulator/__tests__/get.test.ts b/packages/eas-cli/src/commands/simulator/__tests__/get.test.ts
index 91ff7c3736..d8dca493f7 100644
--- a/packages/eas-cli/src/commands/simulator/__tests__/get.test.ts
+++ b/packages/eas-cli/src/commands/simulator/__tests__/get.test.ts
@@ -49,6 +49,7 @@ function makeDeviceRunSession(overrides: Partial<DeviceRunSessionById> = {}): De
     id: 'session-123',
     name: null,
     tags: [],
+    publicPreview: false,
     status: DeviceRunSessionStatus.InProgress,
     type: DeviceRunSessionType.AgentDevice,
     platform: AppPlatform.Ios,
@@ -165,13 +166,14 @@ describe(SimulatorGet, () => {
   });
 
   it.each([false, true])(
-    'uses the %s public-link choice for JSON and human previews',
-    async publicLink => {
+    'uses the saved publicPreview=%s preference for JSON and human previews',
+    async publicPreview => {
       const publicUrl = 'https://expo.dev/simulator-preview/preview-123';
       const privateUrl =
         'https://expo.dev/accounts/testuser/projects/testapp/simulator-sessions/session-123/preview';
       mockByIdAsync.mockResolvedValue(
         makeDeviceRunSession({
+          publicPreview,
           type: DeviceRunSessionType.WebPreviewOnly,
           remoteConfig: {
             __typename: 'WebPreviewOnlyRunSessionRemoteConfig',
@@ -181,13 +183,12 @@ describe(SimulatorGet, () => {
           },
         })
       );
-      const choice = publicLink ? ['--public-link'] : [];
-      const expectedUrl = publicLink ? `${publicUrl}#token=preview-secret` : privateUrl;
-      const expectedApiUrl = publicLink
+      const expectedUrl = publicPreview ? `${publicUrl}#token=preview-secret` : privateUrl;
+      const expectedApiUrl = publicPreview
         ? 'https://preview-api.example.test/?token=preview-secret'
         : null;
 
-      const { command: jsonCommand } = createCommand(['--id', 'session-123', '--json', ...choice]);
+      const { command: jsonCommand } = createCommand(['--id', 'session-123', '--json']);
       await jsonCommand.runAsync();
       expect(mockPrintJsonOnlyOutput).toHaveBeenCalledWith(
         expect.objectContaining({
@@ -197,7 +198,7 @@ describe(SimulatorGet, () => {
           }),
         })
       );
-      if (!publicLink) {
+      if (!publicPreview) {
         expect(JSON.stringify(mockPrintJsonOnlyOutput.mock.calls[0]?.[0])).not.toContain(
           'preview-secret'
         );
@@ -207,6 +208,7 @@ describe(SimulatorGet, () => {
       mockLoadSimulatorEnvironmentVariablesAsync.mockResolvedValue();
       mockByIdAsync.mockResolvedValue(
         makeDeviceRunSession({
+          publicPreview,
           type: DeviceRunSessionType.WebPreviewOnly,
           remoteConfig: {
             __typename: 'WebPreviewOnlyRunSessionRemoteConfig',
@@ -216,10 +218,10 @@ describe(SimulatorGet, () => {
           },
         })
       );
-      const { command: humanCommand } = createCommand(['--id', 'session-123', ...choice]);
+      const { command: humanCommand } = createCommand(['--id', 'session-123']);
       await humanCommand.runAsync();
       expect(Log.log).toHaveBeenCalledWith(expect.stringContaining(expectedUrl));
-      if (!publicLink) {
+      if (!publicPreview) {
         expect(JSON.stringify(jest.mocked(Log.log).mock.calls)).not.toContain('preview-secret');
       }
     }
@@ -245,6 +247,45 @@ describe(SimulatorGet, () => {
     expect(Log.log).toHaveBeenCalledWith(expect.stringContaining('Checkout regression'));
   });
 
+  it.each([false, true])(
+    'uses saved publicPreview=%s for Android while preserving controller access',
+    async publicPreview => {
+      mockByIdAsync.mockResolvedValue(
+        makeDeviceRunSession({
+          platform: AppPlatform.Android,
+          publicPreview,
+          remoteConfig: {
+            __typename: 'AgentDeviceRunSessionRemoteConfig',
+            agentDeviceRemoteSessionUrl: 'https://agent.example.test',
+            agentDeviceRemoteSessionToken: 'controller-secret',
+            webPreviewUrl: 'https://expo.dev/simulator-preview/android-123',
+            webPreviewToken: 'preview-secret',
+            previewApiUrl: 'https://preview-api.example.test',
+          },
+        })
+      );
+
+      const { command } = createCommand(['--id', 'session-123', '--json']);
+      await command.runAsync();
+
+      expect(mockPrintJsonOnlyOutput).toHaveBeenCalledWith(
+        expect.objectContaining({
+          remoteConfig: {
+            __typename: 'AgentDeviceRunSessionRemoteConfig',
+            agentDeviceRemoteSessionUrl: 'https://agent.example.test',
+            agentDeviceRemoteSessionToken: 'controller-secret',
+            webPreviewUrl: publicPreview
+              ? 'https://expo.dev/simulator-preview/android-123#token=preview-secret'
+              : 'https://expo.dev/accounts/testuser/projects/testapp/simulator-sessions/session-123/preview',
+            previewApiUrl: publicPreview
+              ? 'https://preview-api.example.test/?token=preview-secret'
+              : null,
+          },
+        })
+      );
+    }
+  );
+
   it(`uses ${EAS_SIMULATOR_SESSION_ID} from simulator env when --id is not passed`, async () => {
     const previousDeviceRunSessionId = process.env[EAS_SIMULATOR_SESSION_ID];
     const session = makeDeviceRunSession({ id: 'session-from-env' });
diff --git a/packages/eas-cli/src/commands/simulator/__tests__/index.test.ts b/packages/eas-cli/src/commands/simulator/__tests__/index.test.ts
index a05c627b95..4ac3803b4e 100644
--- a/packages/eas-cli/src/commands/simulator/__tests__/index.test.ts
+++ b/packages/eas-cli/src/commands/simulator/__tests__/index.test.ts
@@ -143,6 +143,7 @@ function makeDeviceRunSession(overrides: Partial<DeviceRunSessionById> = {}): De
     id: 'session-123',
     name: null,
     tags: [],
+    publicPreview: false,
     status: DeviceRunSessionStatus.InProgress,
     type: DeviceRunSessionType.AgentDevice,
     platform: AppPlatform.Ios,
diff --git a/packages/eas-cli/src/commands/simulator/get.ts b/packages/eas-cli/src/commands/simulator/get.ts
index dcadc23b0d..8eb4117653 100644
--- a/packages/eas-cli/src/commands/simulator/get.ts
+++ b/packages/eas-cli/src/commands/simulator/get.ts
@@ -30,16 +30,12 @@ type DeviceRunSessionArtifact = DeviceRunSessionById['artifacts'][number];
 export default class SimulatorGet extends EasCommand {
   static override aliases = ['sim:get'];
   static override description =
-    '[EXPERIMENTAL] get info about a remote simulator session on EAS by its simulator session ID. The default browser preview link requires sign-in.';
+    "[EXPERIMENTAL] get info about a remote simulator session on EAS by its simulator session ID. Preview links follow the session's saved sharing preference.";
 
   static override flags = {
     id: Flags.string({
       description: `Simulator session ID. Defaults to ${SIMULATOR_DOTENV_FILE_NAME}.`,
     }),
-    'public-link': Flags.boolean({
-      description:
-        'Print a shareable preview link containing an access token. Anyone with the link can control the simulator. With --json, include previewApiUrl and its token for API clients when available.',
-    }),
     ...EasNonInteractiveAndJsonFlags,
   };
 
@@ -109,7 +105,7 @@ export default class SimulatorGet extends EasCommand {
           ? sanitizeRemoteConfigForJson(
               session.remoteConfig,
               deviceRunSessionPreviewUrl,
-              flags['public-link']
+              session.publicPreview
             )
           : session.remoteConfig,
         artifacts: session.artifacts,
@@ -127,7 +123,7 @@ export default class SimulatorGet extends EasCommand {
           formatRemoteSessionInstructions(session.remoteConfig, 'env', {
             sessionUrl: deviceRunSessionUrl,
             privatePreviewUrl: deviceRunSessionPreviewUrl,
-            publicLink: flags['public-link'],
+            publicLink: session.publicPreview,
             platform: session.platform,
           })
         );
diff --git a/packages/eas-cli/src/graphql/generated.ts b/packages/eas-cli/src/graphql/generated.ts
index 5de4249629..26f5dbc440 100644
--- a/packages/eas-cli/src/graphql/generated.ts
+++ b/packages/eas-cli/src/graphql/generated.ts
@@ -16911,7 +16911,7 @@ export type DeviceRunSessionByIdQueryVariables = Exact<{
 }>;
 
 
-export type DeviceRunSessionByIdQuery = { __typename?: 'RootQuery', deviceRunSessions: { __typename?: 'DeviceRunSessionQuery', byId: { __typename?: 'DeviceRunSession', id: string, name?: string | null, tags: Array<string>, status: DeviceRunSessionStatus, type: DeviceRunSessionType, platform: AppPlatform, createdAt: any, startedAt?: any | null, finishedAt?: any | null, updatedAt: any, app: { __typename?: 'App', id: string, slug: string, ownerAccount: { __typename?: 'Account', id: string, name: string } }, artifacts: Array<{ __typename?: 'DeviceRunSessionArtifact', id: string, name: string, filename: string, downloadUrl: string, fileSizeBytes?: number | null, metadata?: any | null, createdAt: any, updatedAt: any }>, remoteConfig?:
+export type DeviceRunSessionByIdQuery = { __typename?: 'RootQuery', deviceRunSessions: { __typename?: 'DeviceRunSessionQuery', byId: { __typename?: 'DeviceRunSession', id: string, name?: string | null, tags: Array<string>, publicPreview: boolean, status: DeviceRunSessionStatus, type: DeviceRunSessionType, platform: AppPlatform, createdAt: any, startedAt?: any | null, finishedAt?: any | null, updatedAt: any, app: { __typename?: 'App', id: string, slug: string, ownerAccount: { __typename?: 'Account', id: string, name: string } }, artifacts: Array<{ __typename?: 'DeviceRunSessionArtifact', id: string, name: string, filename: string, downloadUrl: string, fileSizeBytes?: number | null, metadata?: any | null, createdAt: any, updatedAt: any }>, remoteConfig?:
         | { __typename: 'AgentDeviceRunSessionRemoteConfig', agentDeviceRemoteSessionUrl: string, agentDeviceRemoteSessionToken: string, webPreviewUrl?: string | null, webPreviewToken?: string | null, previewApiUrl?: string | null, egressUrl?: string | null, egressToken?: string | null, egressFingerprint?: string | null, egressPort?: number | null }
         | { __typename: 'AppiumRunSessionRemoteConfig', egressUrl?: string | null, egressToken?: string | null, egressFingerprint?: string | null, egressPort?: number | null, appiumUrl: string, capabilities: any, webPreviewUrl?: string | null, webPreviewToken?: string | null, previewApiUrl?: string | null }
         | { __typename: 'ArgentRunSessionRemoteConfig', egressUrl?: string | null, egressToken?: string | null, egressFingerprint?: string | null, egressPort?: number | null, toolsUrl: string, toolsAuthToken?: string | null, webPreviewUrl?: string | null, webPreviewToken?: string | null, previewApiUrl?: string | null }
diff --git a/packages/eas-cli/src/graphql/queries/DeviceRunSessionQuery.ts b/packages/eas-cli/src/graphql/queries/DeviceRunSessionQuery.ts
index 4c08a1756a..b89b385a67 100644
--- a/packages/eas-cli/src/graphql/queries/DeviceRunSessionQuery.ts
+++ b/packages/eas-cli/src/graphql/queries/DeviceRunSessionQuery.ts
@@ -56,6 +56,7 @@ export const DeviceRunSessionQuery = {
                   id
                   name
                   tags
+                  publicPreview
                   status
                   type
                   platform
diff --git a/packages/eas-cli/src/simulator/utils.ts b/packages/eas-cli/src/simulator/utils.ts
index b003da950c..178aa54753 100644
--- a/packages/eas-cli/src/simulator/utils.ts
+++ b/packages/eas-cli/src/simulator/utils.ts
@@ -318,8 +318,8 @@ function formatBrowserPreviewUrl(
 }
 
 /**
- * Remote config for `--json`. The direct preview API address and preview tokens are omitted by
- * default; `--public-link` includes them for callers that explicitly need bearer access.
+ * Remote config for `--json`. Private sessions omit the direct preview API address and preview
+ * tokens. Public sessions include bearer preview links while preserving controller credentials.
  */
 export function sanitizeRemoteConfigForJson(
   remoteConfig: DeviceRunSessionRemoteConfig,

From 0c443ae54050e73a4d982697e160eabbd401aa61 Mon Sep 17 00:00:00 2001
From: Gabe Debes <pacheco@expo.dev>
Date: Wed, 14 Oct 2026 11:19:40 -0700
Subject: [PATCH 5/5] [eas-cli] warn before printing public simulator links

Edited-by: Codex
---
 .changeset/private-simulator-preview-links.md |  5 ++++
 .../src/simulator/__tests__/utils.test.ts     |  6 +++++
 packages/eas-cli/src/simulator/utils.ts       | 24 +++++++++++++++----
 3 files changed, 30 insertions(+), 5 deletions(-)
 create mode 100644 .changeset/private-simulator-preview-links.md

diff --git a/.changeset/private-simulator-preview-links.md b/.changeset/private-simulator-preview-links.md
new file mode 100644
index 0000000000..5b0c1cd517
--- /dev/null
+++ b/.changeset/private-simulator-preview-links.md
@@ -0,0 +1,5 @@
+---
+'eas-cli': major
+---
+
+Default new simulator sessions to authenticated preview links and omit preview credentials from private output; use `simulator:start --public-link` for public sharing, while `simulator:get` follows the saved preference.
diff --git a/packages/eas-cli/src/simulator/__tests__/utils.test.ts b/packages/eas-cli/src/simulator/__tests__/utils.test.ts
index 9dbbfd605d..58f9b26e1c 100644
--- a/packages/eas-cli/src/simulator/__tests__/utils.test.ts
+++ b/packages/eas-cli/src/simulator/__tests__/utils.test.ts
@@ -643,6 +643,12 @@ describe('gated preview links', () => {
       const instructions = formatRemoteSessionInstructions(remoteConfig, 'env', {
         publicLink: true,
       });
+      expect(instructions).toContain(
+        'Warning: Anyone with this link can view and control the simulator, including your app and logs that may contain sensitive data. Share this link only with trusted recipients.'
+      );
+      expect(instructions.indexOf('Warning:')).toBeLessThan(
+        instructions.indexOf(`${PAGE}#token=tok-1`)
+      );
       expect(instructions).toContain(`${PAGE}#token=tok-1`);
       expect(instructions).not.toContain('?token=');
     }
diff --git a/packages/eas-cli/src/simulator/utils.ts b/packages/eas-cli/src/simulator/utils.ts
index 178aa54753..539f3e17d1 100644
--- a/packages/eas-cli/src/simulator/utils.ts
+++ b/packages/eas-cli/src/simulator/utils.ts
@@ -1,3 +1,5 @@
+import chalk from 'chalk';
+
 import {
   AppPlatform,
   DeviceRunSessionByIdQuery,
@@ -317,6 +319,18 @@ function formatBrowserPreviewUrl(
     : (privatePreviewUrl ?? withoutPreviewToken(url));
 }
 
+function formatBrowserPreviewInstructions(
+  remoteConfig: DeviceRunSessionRemoteConfig,
+  url: string,
+  token: string | null | undefined,
+  options: PreviewLinkOptions
+): string {
+  const previewUrl = formatBrowserPreviewUrl(remoteConfig, url, token, options);
+  return options.publicLink
+    ? `${chalk.yellow('Warning: Anyone with this link can view and control the simulator, including your app and logs that may contain sensitive data. Share this link only with trusted recipients.')}\n${previewUrl}`
+    : previewUrl;
+}
+
 /**
  * Remote config for `--json`. Private sessions omit the direct preview API address and preview
  * tokens. Public sessions include bearer preview links while preserving controller credentials.
@@ -448,7 +462,7 @@ function formatControllerInstructions(
           '',
           '🌐 Open the following URL in your browser to preview the simulator:',
           '',
-          formatBrowserPreviewUrl(
+          formatBrowserPreviewInstructions(
             remoteConfig,
             remoteConfig.webPreviewUrl,
             remoteConfig.webPreviewToken,
@@ -491,7 +505,7 @@ function formatControllerInstructions(
           '',
           '🌐 Open the following URL in your browser to preview the simulator:',
           '',
-          formatBrowserPreviewUrl(
+          formatBrowserPreviewInstructions(
             remoteConfig,
             remoteConfig.webPreviewUrl,
             remoteConfig.webPreviewToken,
@@ -524,7 +538,7 @@ function formatControllerInstructions(
           '',
           'Open the simulator preview:',
           '',
-          formatBrowserPreviewUrl(
+          formatBrowserPreviewInstructions(
             remoteConfig,
             remoteConfig.webPreviewUrl,
             remoteConfig.webPreviewToken,
@@ -538,7 +552,7 @@ function formatControllerInstructions(
       return [
         '🌐 Open the following URL in your browser to access the simulator:',
         '',
-        formatBrowserPreviewUrl(
+        formatBrowserPreviewInstructions(
           remoteConfig,
           remoteConfig.previewUrl,
           remoteConfig.previewToken,
@@ -549,7 +563,7 @@ function formatControllerInstructions(
       return [
         '🌐 Open the following URL in your browser to access the simulator:',
         '',
-        formatBrowserPreviewUrl(
+        formatBrowserPreviewInstructions(
           remoteConfig,
           remoteConfig.previewUrl,
           remoteConfig.previewToken,