Skip to content

armgit / cindy

Public Imported from GitHub
0

Consider it done. The open-source AI agent that works out of the box · 想到,就能做到。开源、开箱即用的 AI Agent。

fix(mobile): 修复 E2E 登录前置断链 (#4401)

Yecheng Fud89539550142
diff --git a/apps/mobile/app/files/preview/[sessionId].tsx b/apps/mobile/app/files/preview/[sessionId].tsx
index c6fed9b54f..4f969ea948 100644
--- a/apps/mobile/app/files/preview/[sessionId].tsx
+++ b/apps/mobile/app/files/preview/[sessionId].tsx
@@ -1173,6 +1173,7 @@ function TextPreviewPage({
}, 220);
}}
ref={codeListRef}
+ testID={visible ? 'filePreview.sourceReady' : undefined}
renderItem={({ item: line, index }) => (
<View style={[styles.codeLine, index === targetIndex && styles.codeLineHit]}>
<Text style={styles.codeLineNum}>{String(index + 1).padStart(lineNumWidth, ' ')}</Text>
diff --git a/apps/mobile/e2e/maestro/file_browser.yaml b/apps/mobile/e2e/maestro/file_browser.yaml
index 6a6d9a9a5d..ed4b250127 100644
--- a/apps/mobile/e2e/maestro/file_browser.yaml
+++ b/apps/mobile/e2e/maestro/file_browser.yaml
@@ -9,63 +9,32 @@ appId: ${APP_ID}
id: "files.screen"
timeout: 10000
- assertVisible:
- id: "files.pathInput"
+ id: "files.navRow"
- assertVisible:
- id: "files.locationBar"
+ id: "files.title"
- assertVisible:
- id: "files.currentPath"
-- assertVisible:
- id: "files.directoryCount"
+ id: "files.summary"
+- tapOn:
+ id: "files.titleMenuButton"
+- tapOn:
+ id: "files.menu.view.list"
- extendedWaitUntil:
visible:
- id: "files.dirEntry.fixtures"
+ id: "files.row.about.txt"
timeout: 10000
-- assertVisible:
- id: "files.directoryActions"
-- assertVisible:
- id: "files.workdirButton"
- tapOn:
- id: "files.copyCurrentPathButton"
-- assertVisible:
- id: "files.currentPathCopyStatus"
-- scrollUntilVisible:
- element:
- id: "files.fileEntry.about.txt"
- direction: DOWN
- timeout: 10000
-- tapOn:
- id: "files.fileEntry.about.txt"
-- scrollUntilVisible:
- element:
- id: "files.previewBlock"
- direction: DOWN
+ id: "files.row.about.txt"
+- extendedWaitUntil:
+ visible:
+ id: "filePreview.screen"
timeout: 10000
- assertVisible:
- id: "files.previewBlock"
-- assertVisible:
- id: "files.selectedPath"
-- assertVisible:
- id: "files.previewActions"
-- assertVisible:
- id: "files.copyPathButton"
-- tapOn:
- id: "files.copyPathButton"
-- assertVisible:
- id: "files.copyPathStatus"
-- scrollUntilVisible:
- element:
- id: "files.loadPreviewButton"
- direction: DOWN
- timeout: 10000
+ id: "filePreview.title"
- extendedWaitUntil:
visible:
- id: "files.loadPreviewButton"
+ id: "filePreview.sourceReady"
timeout: 10000
- tapOn:
- id: "files.loadPreviewButton"
-- extendedWaitUntil:
- notVisible:
- id: "files.loadPreviewButton"
- timeout: 10000
+ id: "filePreview.copyPath"
- assertVisible:
- id: "files.previewText"
+ id: "filePreview.notice"
diff --git a/apps/mobile/e2e/maestro/login_mock_no_clear.yaml b/apps/mobile/e2e/maestro/login_mock_no_clear.yaml
index cf7bfae2fb..ba995252c0 100644
--- a/apps/mobile/e2e/maestro/login_mock_no_clear.yaml
+++ b/apps/mobile/e2e/maestro/login_mock_no_clear.yaml
@@ -1,5 +1,10 @@
appId: ${APP_ID}
---
+# 登录前置:驱动真实登录 UI(identifier → 验证码),不依赖任何 dev-only 入口。
+# 离线确定性来自仓内既有的登录 scenario harness:Metro 以
+# EXPO_PUBLIC_LOGIN_SCENARIO=providers:email-only 启动后,__DEV__ 下真实
+# CindyAuthClient 被注入 scenario fetch(packages/auth-client/fixtures/loginScenarios.ts),
+# providers/discovery/request-code/verify-code 全部本地应答,验证码任意 6 位即通过。
- waitForAnimationToEnd:
timeout: 30000
- tapOn:
@@ -36,23 +41,36 @@ appId: ${APP_ID}
visible:
id: "login.screen"
timeout: 30000
+ - extendedWaitUntil:
+ visible:
+ id: "login.identifierInput"
+ timeout: 15000
+ - tapOn:
+ id: "login.identifierInput"
+ - inputText: "[email protected]"
- tapOn:
- id: "login.debugButton"
+ id: "login.continueButton"
retryTapIfNoChange: true
- - runFlow:
- when:
- notVisible:
- id: "login.devLoginButton"
- commands:
- - tapOn:
- text: "打开开发调试"
- retryTapIfNoChange: true
+ # Email discovery is gated by the consent dialog and completes asynchronously.
- extendedWaitUntil:
visible:
- id: "login.devLoginButton"
- timeout: 5000
+ id: "login.consentDialog"
+ timeout: 15000
- tapOn:
- id: "login.devLoginButton"
+ id: "login.consentAgree"
+ retryTapIfNoChange: true
+ # email-only has a single method, so the real login controller auto-requests
+ # the code after consent and renders the code input directly.
+ - extendedWaitUntil:
+ visible:
+ id: "login.codeInput"
+ timeout: 15000
+ - tapOn:
+ id: "login.codeInput"
+ - inputText: "123456"
+ - tapOn:
+ id: "login.verifyButton"
+ retryTapIfNoChange: true
- extendedWaitUntil:
visible:
id: "devices.screen"
diff --git a/apps/mobile/e2e/maestro/visual_files.yaml b/apps/mobile/e2e/maestro/visual_files.yaml
index b81764a0ec..96175b9434 100644
--- a/apps/mobile/e2e/maestro/visual_files.yaml
+++ b/apps/mobile/e2e/maestro/visual_files.yaml
@@ -20,42 +20,26 @@ appId: ${APP_ID}
id: "files.screen"
timeout: 10000
- assertVisible:
- id: "files.locationBar"
-- assertVisible:
- id: "files.directoryActions"
-- assertVisible:
- id: "files.dirEntry.fixtures"
+ id: "files.navRow"
+- tapOn:
+ id: "files.titleMenuButton"
+- tapOn:
+ id: "files.menu.view.list"
+- extendedWaitUntil:
+ visible:
+ id: "files.row.about.txt"
+ timeout: 10000
- takeScreenshot:
path: visual-files
-- scrollUntilVisible:
- element:
- id: "files.fileEntry.about.txt"
- direction: DOWN
- timeout: 10000
- tapOn:
- id: "files.fileEntry.about.txt"
-- scrollUntilVisible:
- element:
- id: "files.previewBlock"
- direction: DOWN
- timeout: 10000
-- assertVisible:
- id: "files.previewBlock"
-- assertVisible:
- id: "files.selectedPath"
-- assertVisible:
- id: "files.previewActions"
+ id: "files.row.about.txt"
- extendedWaitUntil:
visible:
- id: "files.loadPreviewButton"
+ id: "filePreview.screen"
timeout: 10000
-- tapOn:
- id: "files.loadPreviewButton"
- extendedWaitUntil:
visible:
- id: "files.previewText"
+ id: "filePreview.sourceReady"
timeout: 10000
-- assertVisible:
- id: "files.previewText"
- takeScreenshot:
path: visual-files-preview
diff --git a/apps/mobile/e2e/maestro/visual_session_controls_usage.yaml b/apps/mobile/e2e/maestro/visual_session_controls_usage.yaml
index 80b3d7e9a2..e1500e9757 100644
--- a/apps/mobile/e2e/maestro/visual_session_controls_usage.yaml
+++ b/apps/mobile/e2e/maestro/visual_session_controls_usage.yaml
@@ -20,7 +20,7 @@ appId: ${APP_ID}
id: "session.menuSheet"
timeout: 10000
- tapOn:
- id: "session.infoButton"
+ id: "session.menuUsageRow"
- extendedWaitUntil:
visible:
id: "session.infoSheet"
diff --git a/apps/mobile/scripts/local-device-link-smoke.mjs b/apps/mobile/scripts/local-device-link-smoke.mjs
index 80956143c8..77043bbcb2 100644
--- a/apps/mobile/scripts/local-device-link-smoke.mjs
+++ b/apps/mobile/scripts/local-device-link-smoke.mjs
@@ -5,6 +5,14 @@ import { existsSync, readFileSync } from 'node:fs';
import { resolve } from 'node:path';
import { fileURLToPath } from 'node:url';
import { resolveMobileE2eProfile } from './mobile-e2e-profile.mjs';
+import {
+ clearMetroOwner,
+ gitSourceIdentity,
+ metroEnvironmentFingerprint,
+ probeMetroOwnership,
+ terminateMetro,
+ writeMetroOwner,
+} from './sim-metro.mjs';
const scriptDir = resolve(fileURLToPath(import.meta.url), '..');
const mobileRoot = resolve(scriptDir, '..');
@@ -18,6 +26,11 @@ const defaultAppId = 'com.xd.cindy';
const defaultApiBase = 'http://localhost:3333';
const defaultFlow = 'remote_session_smoke.yaml';
const defaultVoiceProxyPort = 3345;
+// 登录前置(login_mock.yaml)驱动真实登录 UI,离线确定性来自登录 scenario
+// harness(__DEV__ + EXPO_PUBLIC_LOGIN_SCENARIO;值域见 packages/auth-client/
+// fixtures/loginScenarios.ts)。email-only 让 cn / global 两种构建都落到邮箱
+// identifier,flow 无需按区域分叉。
+const defaultLoginScenario = 'providers:email-only';
const cleanupDeviceId = 'mobile-e2e-cleaner';
const e2eDeviceIdPrefixes = ['mobile-e2e-', 'visual-'];
@@ -36,12 +49,20 @@ const deviceLinkApiBase = normalizeBaseUrl(
?? process.env.EXPO_PUBLIC_XDT_DEVICE_LINK_API_BASE_URL
?? deriveDeviceLinkApiBase(apiBase),
);
+const requestedLoginScenario = process.env.EXPO_PUBLIC_LOGIN_SCENARIO?.trim();
+if (requestedLoginScenario && requestedLoginScenario !== defaultLoginScenario) {
+ throw new Error([
+ `local-device-link-smoke login flow requires ${defaultLoginScenario}, but EXPO_PUBLIC_LOGIN_SCENARIO=${requestedLoginScenario}.`,
+ 'Use a flow-specific runner for other login scenarios instead of the fixed email-code precondition.',
+ ].join('\n'));
+}
+const loginScenario = defaultLoginScenario;
if (options.startExpo) {
process.env.EXPO_PUBLIC_XDT_API_BASE_URL = apiBase;
process.env.XDT_MOBILE_E2E_API_BASE_URL = apiBase;
process.env.EXPO_PUBLIC_XDT_DEVICE_LINK_API_BASE_URL = deviceLinkApiBase;
process.env.XDT_MOBILE_E2E_DEVICE_LINK_API_BASE_URL = deviceLinkApiBase;
- process.env.EXPO_PUBLIC_XDT_DEV_LOGIN_ENABLED = '1';
+ process.env.EXPO_PUBLIC_LOGIN_SCENARIO = loginScenario;
}
const appConfiguredApiBase = process.env.EXPO_PUBLIC_XDT_API_BASE_URL
? normalizeBaseUrl(process.env.EXPO_PUBLIC_XDT_API_BASE_URL)
@@ -133,6 +154,7 @@ if (options.dryRun) {
const expoServer = resolveExpoServer(expoUrl);
console.log(`- expo command: pnpm start -- --host ${expoServer.startHost} --port ${expoServer.port}`);
console.log(`- expo status: ${expoServer.statusUrl}`);
+ console.log(`- expo login scenario: ${loginScenario}`);
if (voiceProxySelected) console.log(`- expo mock audio: ${useMockAudio ? 'yes' : 'no'}`);
}
if (options.mockHost) {
@@ -549,10 +571,24 @@ async function startExpoProcess(url) {
timeoutMs: 1000,
});
if (isExpoReadyText(existingStatus)) {
- console.log(`local-device-link-smoke reusing Expo server at ${expoServer.statusUrl}`);
- return null;
+ const ownership = probeMetroOwnership(expoServer.port);
+ const runningWorktree = ownership?.cwd ? resolve(ownership.cwd, '..', '..') : null;
+ if (!ownership?.pid || !ownership?.source || runningWorktree !== repoRoot) {
+ throw new Error([
+ `Expo Metro is already running at ${expoServer.statusUrl}, but this runner cannot verify`,
+ `that its bundle contains EXPO_PUBLIC_LOGIN_SCENARIO=${loginScenario}.`,
+ 'Stop the existing Metro and rerun with --start-expo so the login scenario is injected',
+ 'before the bundle is created.',
+ ].join('\n'));
+ }
+ const stopped = await terminateMetro(ownership.pid, { worktreeRoot: repoRoot });
+ if (!stopped) {
+ throw new Error(`Unable to restart the existing Metro for ${repoRoot}; stop it manually and retry.`);
+ }
+ console.log(`local-device-link-smoke restarted the existing Metro at ${expoServer.statusUrl} to inject the login scenario`);
}
+ const sourceIdentity = gitSourceIdentity(repoRoot);
const child = spawn(pnpmBin(), ['start', '--', '--host', expoServer.startHost, '--port', expoServer.port], {
cwd: mobileRoot,
env: {
@@ -561,7 +597,8 @@ async function startExpoProcess(url) {
EXPO_NO_TELEMETRY: '1',
EXPO_PUBLIC_XDT_API_BASE_URL: apiBase,
EXPO_PUBLIC_XDT_DEVICE_LINK_API_BASE_URL: deviceLinkApiBase,
- EXPO_PUBLIC_XDT_DEV_LOGIN_ENABLED: '1',
+ EXPO_PUBLIC_LOGIN_SCENARIO: loginScenario,
+ EXPO_PUBLIC_XDT_GIT_SOURCE: sourceIdentity,
...(voiceProxyBaseUrl ? {
EXPO_PUBLIC_XDT_MOBILE_VOICE_LITELLM_BASE_URL: voiceProxyBaseUrl,
EXPO_PUBLIC_CINDY_VOICE_API_BASE_URL: voiceProxyBaseUrl,
@@ -572,8 +609,21 @@ async function startExpoProcess(url) {
detached: process.platform !== 'win32',
stdio: ['ignore', 'pipe', 'pipe'],
});
+ writeMetroOwner(expoServer.port, {
+ pid: child.pid,
+ launcherPid: child.pid,
+ source: sourceIdentity,
+ loginScenario,
+ envFingerprint: metroEnvironmentFingerprint({
+ env: { EXPO_PUBLIC_LOGIN_SCENARIO: loginScenario },
+ }),
+ worktreeRoot: repoRoot,
+ });
pipeChildOutput(child, 'expo');
- const cleanupTask = () => stopChild(child);
+ const cleanupTask = () => {
+ clearMetroOwner(expoServer.port, child.pid);
+ stopChild(child);
+ };
cleanupTasks.push(cleanupTask);
console.log(`local-device-link-smoke started Expo fixture on ${expoServer.statusUrl}`);
return cleanupTask;
@@ -588,7 +638,7 @@ async function assertExpoReady(url, { waitForReadyMs = 0 } = {}) {
hint: [
'Expo Go native E2E needs Metro before Maestro opens the app.',
'Pass --start-expo, or start Expo manually with:',
- ` EXPO_PUBLIC_XDT_API_BASE_URL=${apiBase} EXPO_PUBLIC_XDT_DEVICE_LINK_API_BASE_URL=${deviceLinkApiBase} pnpm --filter mobile start -- --host ${expoServer.startHost} --port ${expoServer.port}`,
+ ` EXPO_PUBLIC_XDT_API_BASE_URL=${apiBase} EXPO_PUBLIC_XDT_DEVICE_LINK_API_BASE_URL=${deviceLinkApiBase} EXPO_PUBLIC_LOGIN_SCENARIO=${loginScenario} pnpm --filter mobile start -- --host ${expoServer.startHost} --port ${expoServer.port}`,
].join('\n'),
});
console.log(`local-device-link-smoke Expo preflight passed: ${expoServer.statusUrl}`);
diff --git a/apps/mobile/scripts/maestro-e2e.mjs b/apps/mobile/scripts/maestro-e2e.mjs
index 5763705ad8..d25edca281 100644
--- a/apps/mobile/scripts/maestro-e2e.mjs
+++ b/apps/mobile/scripts/maestro-e2e.mjs
@@ -1,17 +1,19 @@
#!/usr/bin/env node
-import { existsSync } from 'node:fs';
+import { existsSync, readFileSync } from 'node:fs';
import { resolve } from 'node:path';
import { spawnSync } from 'node:child_process';
import { fileURLToPath } from 'node:url';
import { resolveJavaRuntimeEnv } from './java-runtime-env.mjs';
import { resolveMobileE2eProfile } from './mobile-e2e-profile.mjs';
+import { probeMetroOwnership } from './sim-metro.mjs';
const scriptDir = resolve(fileURLToPath(import.meta.url), '..');
const mobileRoot = resolve(scriptDir, '..');
const flowRoot = resolve(mobileRoot, 'e2e', 'maestro');
const doctorScript = resolve(scriptDir, 'native-e2e-doctor.mjs');
const defaultAppId = 'com.xd.cindy';
+const loginScenario = 'providers:email-only';
const options = parseArgs(process.argv.slice(2));
const profile = resolveMobileE2eProfile(options.profile ?? process.env.XDT_MOBILE_E2E_PROFILE);
@@ -59,6 +61,8 @@ for (const flow of resolvedFlows) {
}
}
+const includesLogin = resolvedFlows.some((flow) => flowIncludesLogin(flow));
+
if (options.dryRun) {
console.log(`maestro dry run: APP_ID=${appId}`);
console.log(`- profile: ${profile?.name ?? '<none>'}`);
@@ -74,6 +78,17 @@ if (options.dryRun) {
process.exit(0);
}
+if (includesLogin) {
+ const metroPort = expoUrl ? new URL(expoUrl).port || '8081' : '8081';
+ const ownership = probeMetroOwnership(Number(metroPort));
+ if (ownership?.loginScenario !== loginScenario) {
+ throw new Error([
+ `Active Metro on port ${metroPort} is not verified with EXPO_PUBLIC_LOGIN_SCENARIO=${loginScenario}.`,
+ 'Start Metro through pnpm mobile:sim:start with that variable, or use local-device-link-smoke --start-expo.',
+ ].join('\n'));
+ }
+}
+
if (!options.skipDoctor) {
runNodeScript(doctorScript, [
'--require-maestro',
@@ -211,6 +226,18 @@ function sanitizeTestIdSegment(value) {
return String(value).replace(/[^A-Za-z0-9_-]/g, '_');
}
+function flowIncludesLogin(flow, seen = new Set()) {
+ if (seen.has(flow)) return false;
+ seen.add(flow);
+ const source = readFileSync(flow, 'utf8');
+ if (/(^|[\\/])login_mock(?:_no_clear)?\.yaml$/.test(flow)) return true;
+ if (/runFlow:\s*login_mock(?:_no_clear)?\.yaml/.test(source)) return true;
+ return [...source.matchAll(/runFlow:\s*([^\s#]+\.yaml)/g)].some(([, child]) => {
+ const childPath = resolve(flowRoot, child);
+ return existsSync(childPath) && flowIncludesLogin(childPath, seen);
+ });
+}
+
function expoUrlWithRoute(url, route) {
const marker = '--/';
const routeValue = String(route).replace(/^\/+/, '');
diff --git a/apps/mobile/scripts/maestro-flow-smoke.mjs b/apps/mobile/scripts/maestro-flow-smoke.mjs
index f5e71d1caa..1871e9fee5 100644
--- a/apps/mobile/scripts/maestro-flow-smoke.mjs
+++ b/apps/mobile/scripts/maestro-flow-smoke.mjs
@@ -54,8 +54,13 @@ const requiredFlows = [
const requiredFlowMarkers = [
'appId: ${APP_ID}',
- 'login.debugButton',
- 'login.devLoginButton',
+ // 登录前置走真实登录 UI + 登录 scenario harness(dev-only 调试登录入口已随
+ // auth-server 迁移删除),锚点即真实登录链路上的 testID。
+ 'login.identifierInput',
+ 'login.continueButton',
+ 'login.consentAgree',
+ 'login.codeInput',
+ 'login.verifyButton',
'devices.screen',
'devices.list',
'devices.settingsButton',
@@ -117,19 +122,15 @@ const requiredFlowMarkers = [
'message.diffFilePreviewReady',
'session.filesButton',
'files.screen',
- 'files.locationBar',
- 'files.currentPath',
- 'files.directoryCount',
- 'files.pathInput',
- 'files.directoryActions',
- 'files.workdirButton',
- 'files.dirEntry',
- 'files.fileEntry',
- 'files.copyCurrentPathButton',
- 'files.currentPathCopyStatus',
- 'files.previewActions',
- 'files.loadPreviewButton',
- 'files.previewText',
+ 'files.navRow',
+ 'files.title',
+ 'files.summary',
+ 'files.row.',
+ 'filePreview.screen',
+ 'filePreview.title',
+ 'filePreview.sourceReady',
+ 'filePreview.copyPath',
+ 'filePreview.notice',
'message.imageLightbox',
'XDT_MOBILE_E2E_HOST_AUTOMATIONS_URL',
'automations.screen',
@@ -182,8 +183,13 @@ const requiredFlowMarkers = [
const requiredSourceAnchors = [
'login.screen',
- 'login.debugButton',
- 'login.devLoginButton',
+ 'login.identifierInput',
+ 'login.continueButton',
+ 'login.consentDialog',
+ 'login.consentAgree',
+ 'login.emailCodeButton',
+ 'login.codeInput',
+ 'login.verifyButton',
'devices.screen',
'devices.list',
'devices.settingsButton',
@@ -270,7 +276,6 @@ const requiredSourceAnchors = [
'message.markdownTable',
'message.mermaidPreviewButton',
'message.mermaidDiagram',
- 'message.mermaidSourceButton',
'message.payloadMermaidDiagram',
'message.systemCard.',
'message.actionBar',
@@ -404,7 +409,6 @@ const requiredSourceAnchors = [
'session.menuMetaLine',
'session.menuUsageRow',
'session.settingsBackdrop',
- 'session.infoButton',
'session.infoSheet',
'session.infoSheetBody',
'session.summary',
@@ -500,28 +504,17 @@ const requiredSourceAnchors = [
'session.menuReadOnlyNotice',
'session.collaborationReadOnlyComposer',
'files.screen',
- 'files.locationBar',
- 'files.currentPath',
- 'files.currentPathCopyStatus',
- 'files.locationActions',
- 'files.copyCurrentPathButton',
- 'files.pathInput',
- 'files.pathInputActions',
- 'files.openPathButton',
- 'files.directoryActions',
- 'files.refreshButton',
- 'files.workdirButton',
- 'files.pathCrumb',
- 'files.directoryCount',
- 'files.dirEntry',
- 'files.fileEntry',
- 'files.previewBlock',
- 'files.previewActions',
- 'files.selectedPath',
- 'files.loadPreviewButton',
- 'files.previewText',
- 'files.copyPathButton',
- 'files.copyPathStatus',
+ 'files.navRow',
+ 'files.title',
+ 'files.summary',
+ 'files.titleMenuButton',
+ 'files.menu.',
+ 'files.row.',
+ 'filePreview.screen',
+ 'filePreview.title',
+ 'filePreview.sourceReady',
+ 'filePreview.copyPath',
+ 'filePreview.notice',
];
for (const flow of requiredFlows) {
diff --git a/apps/mobile/scripts/sim-metro.mjs b/apps/mobile/scripts/sim-metro.mjs
index 3fa94b56f6..e1104dcb44 100644
--- a/apps/mobile/scripts/sim-metro.mjs
+++ b/apps/mobile/scripts/sim-metro.mjs
@@ -154,6 +154,8 @@ function windowsOwnerOwnsListener(owner, listener, processes) {
}
/** Probe a Metro listener with a worktree/source identity on every host OS. */
+/** @typedef {{ pid: string|number, launcherPid?: string|number, cwd: string|null, source: string|null, region?: string|null, loginScenario?: string, envFingerprint?: string|null }} MetroOwnership */
+/** @returns {MetroOwnership|null} */
export function probeMetroOwnership(port, options = {}) {
const pid = (options.listenerPid ?? listenerPid)(port);
if (!pid) return null;
@@ -167,6 +169,10 @@ export function probeMetroOwnership(port, options = {}) {
pid,
cwd,
source,
+ ...(ownerRoot && ownerRoot === worktreeRoot && owner?.source === source
+ && owner && Object.hasOwn(owner, 'loginScenario')
+ ? { loginScenario: owner.loginScenario }
+ : {}),
envFingerprint: ownerRoot && ownerRoot === worktreeRoot && owner?.source === source
? owner.envFingerprint ?? null
: null,
@@ -183,6 +189,7 @@ export function probeMetroOwnership(port, options = {}) {
cwd: owner.worktreeRoot ? join(owner.worktreeRoot, 'apps/mobile') : null,
source: owner.source ?? null,
region: owner.region ?? null,
+ ...(Object.hasOwn(owner, 'loginScenario') ? { loginScenario: owner.loginScenario } : {}),
envFingerprint: owner.envFingerprint ?? null,
};
}
diff --git a/apps/mobile/scripts/sim-start.mjs b/apps/mobile/scripts/sim-start.mjs
index c2636ef6b9..1c97074303 100644
--- a/apps/mobile/scripts/sim-start.mjs
+++ b/apps/mobile/scripts/sim-start.mjs
@@ -27,6 +27,7 @@
import { execFileSync, spawn } from 'node:child_process';
import { existsSync, readFileSync } from 'node:fs';
+import { parseProjectEnv } from '@expo/env';
import { dirname, resolve } from 'node:path';
import { fileURLToPath } from 'node:url';
import { mobileClientBundleEnv } from '../../../scripts/shared/client-endpoint-build-env.mjs';
@@ -85,8 +86,19 @@ const buildEnv = withLocalMobileRegionConfig(
const envResult = ensureMobileEnv({ mobileDir, authRegion: region, endpointEnv: buildEnv });
console.log(formatMobileEnvStatus(envResult, worktreeRoot));
const envChanged = envResult.created || envResult.addedKeys.length > 0;
+const projectEnv = parseProjectEnv(mobileDir, {
+ mode: process.env.NODE_ENV ?? 'development',
+ silent: true,
+ systemEnv: { ...process.env },
+});
+const loginScenario = process.env.EXPO_PUBLIC_LOGIN_SCENARIO?.trim()
+ ?? projectEnv.env.EXPO_PUBLIC_LOGIN_SCENARIO?.trim()
+ ?? '';
const envFingerprint = metroEnvironmentFingerprint({
- env: buildEnv,
+ env: {
+ ...buildEnv,
+ EXPO_PUBLIC_LOGIN_SCENARIO: loginScenario,
+ },
files: {
'.env': readFileSync(envResult.envPath, 'utf8'),
'scripts/self-host-regions.json': readFileSync(localConfigResult.configPath, 'utf8'),
@@ -168,6 +180,10 @@ if (portArgs.port === DEFAULT_PORT) {
console.log(`✓ 已接管其他 Cindy worktree 的 Metro(pid=${pid}, cwd=${cwd})。`);
}
}
+} else if (await portInUse(portArgs.port)) {
+ // Do not let a failed second launcher overwrite (then clear) the live owner.
+ console.error(`✗ Metro port ${portArgs.port} is already in use; stop its owner or choose another --port.`);
+ process.exit(1);
}
await ensureAndroidTarget();
// 统一规范化成 Expo 明确支持的 `--port <n>`,避免 `--port=<n>` 被本工具识别、
@@ -199,16 +215,17 @@ const child = spawn(invocation.command, invocation.args, {
windowsVerbatimArguments: invocation.windowsVerbatimArguments,
});
-if (portArgs.port === DEFAULT_PORT && Number.isInteger(child.pid)) {
- writeMetroOwner(DEFAULT_PORT, {
+if (Number.isInteger(child.pid)) {
+ writeMetroOwner(portArgs.port, {
pid: child.pid,
launcherPid: child.pid,
source: sourceIdentity,
region,
+ loginScenario,
envFingerprint,
worktreeRoot,
});
- child.once('exit', () => clearMetroOwner(DEFAULT_PORT, child.pid));
+ child.once('exit', () => clearMetroOwner(portArgs.port, child.pid));
}
child.once('error', (error) => {
diff --git a/apps/mobile/src/__tests__/filePreviewPagerWiring.test.ts b/apps/mobile/src/__tests__/filePreviewPagerWiring.test.ts
index 375c692096..67b0c392eb 100644
--- a/apps/mobile/src/__tests__/filePreviewPagerWiring.test.ts
+++ b/apps/mobile/src/__tests__/filePreviewPagerWiring.test.ts
@@ -22,6 +22,15 @@ function readSource(rel: string): string {
const source = readSource('app/files/preview/[sessionId].tsx');
describe('remote file preview pager wiring', () => {
+ it('exposes source readiness only on the visible loaded text page', () => {
+ const textPage = source.slice(source.indexOf('function TextPreviewPage('), source.indexOf('function ImagePreviewPage('));
+ const sourceList = textPage.match(/<FlatList\s[\s\S]*?data=\{state.lines\}[\s\S]*?testID=\{visible \? 'filePreview.sourceReady' : undefined\}/);
+ expect(sourceList).not.toBeNull();
+ // Loading/error pages and prefetched neighbours must not satisfy the wait.
+ expect(textPage.indexOf(sourceList![0])).toBeGreaterThan(textPage.indexOf("if (state.status === 'loading')"));
+ expect(textPage.indexOf(sourceList![0])).toBeGreaterThan(textPage.indexOf("if (state.status === 'unavailable')"));
+ });
+
it('reserves horizontal gestures for the PDF WebView', () => {
expect(source).toContain("current.previewKind !== 'pdf'");
});
diff --git a/apps/mobile/src/__tests__/mobileEnvBootstrap.test.ts b/apps/mobile/src/__tests__/mobileEnvBootstrap.test.ts
index b583e4b05b..07ac85cd65 100644
--- a/apps/mobile/src/__tests__/mobileEnvBootstrap.test.ts
+++ b/apps/mobile/src/__tests__/mobileEnvBootstrap.test.ts
@@ -33,7 +33,7 @@ describe('mobile simulator env bootstrap', () => {
expect(result.created).toBe(true);
expect(result.addedKeys).toEqual(REQUIRED_MOBILE_ENV_KEYS);
expect(env).toMatchObject(productionEnv);
- expect(env).not.toHaveProperty('EXPO_PUBLIC_XDT_DEV_LOGIN_ENABLED');
+ expect(env).not.toHaveProperty('EXPO_PUBLIC_LOGIN_SCENARIO');
});
it('preserves existing user values and only fills missing or empty required keys', () => {
@@ -47,7 +47,7 @@ describe('mobile simulator env bootstrap', () => {
'EXPO_PUBLIC_CINDY_AUTH_REGION=global',
'EXPO_PUBLIC_ENDPOINT_MANIFEST_BASE_URL=',
'EXPO_PUBLIC_ENDPOINT_MANIFEST_PEER_BASE_URL=',
- 'EXPO_PUBLIC_XDT_DEV_LOGIN_ENABLED=1',
+ 'EXPO_PUBLIC_LOGIN_SCENARIO=providers:email-only',
'',
].join('\n'),
);
@@ -67,7 +67,7 @@ describe('mobile simulator env bootstrap', () => {
expect(env.EXPO_PUBLIC_ENDPOINT_MANIFEST_PEER_BASE_URL).toBe(
productionEnv.EXPO_PUBLIC_ENDPOINT_MANIFEST_PEER_BASE_URL,
);
- expect(env.EXPO_PUBLIC_XDT_DEV_LOGIN_ENABLED).toBe('1');
+ expect(env.EXPO_PUBLIC_LOGIN_SCENARIO).toBe('providers:email-only');
});
it('replaces copied example placeholders and quoted empty values', () => {
diff --git a/apps/mobile/src/__tests__/nativeE2eEnvironment.test.ts b/apps/mobile/src/__tests__/nativeE2eEnvironment.test.ts
index 1ff3ffb85a..cb4748a3d6 100644
--- a/apps/mobile/src/__tests__/nativeE2eEnvironment.test.ts
+++ b/apps/mobile/src/__tests__/nativeE2eEnvironment.test.ts
@@ -1,9 +1,100 @@
import { spawnSync } from 'node:child_process';
import { readFileSync } from 'node:fs';
import { resolve } from 'node:path';
-import { describe, expect, it } from 'vitest';
+import { runInNewContext } from 'node:vm';
+import { describe, expect, it, vi } from 'vitest';
describe('native e2e environment', () => {
+ it.each([
+ [undefined, 'providers:email-only', 'providers:email-only'],
+ ['', 'providers:email-only', ''],
+ [' ', 'providers:email-only', ''],
+ ['providers:email-only', 'another-scenario', 'providers:email-only'],
+ [undefined, undefined, ''],
+ ])('records shell scenario %j over dotenv scenario %j as %j', (shell, dotenv, expected) => {
+ const source = readFileSync(resolve(process.cwd(), 'scripts/sim-start.mjs'), 'utf8');
+ const declaration = source.match(/const loginScenario = [\s\S]*?;/)?.[0];
+ expect(declaration).toBeDefined();
+ const env = shell === undefined ? {} : { EXPO_PUBLIC_LOGIN_SCENARIO: shell };
+ expect(runInNewContext(`${declaration}\nloginScenario`, {
+ process: { env }, projectEnv: { env: { EXPO_PUBLIC_LOGIN_SCENARIO: dotenv } },
+ })).toBe(expected);
+ });
+
+ it.each([false, true])('preserves custom-port ownership when occupied=%s', async (occupied) => {
+ const source = readFileSync(resolve(process.cwd(), 'scripts/sim-start.mjs'), 'utf8');
+ const start = source.indexOf("const args = ['exec', 'expo', 'start'");
+ expect(start).toBeGreaterThan(0);
+ const exitCallbacks: Array<() => void> = [];
+ const child = {
+ pid: 4242,
+ once: (event: string, callback: () => void) => { if (event === 'exit') exitCallbacks.push(callback); },
+ on: vi.fn(),
+ };
+ const spawn = vi.fn(() => child);
+ const writeMetroOwner = vi.fn();
+ const clearMetroOwner = vi.fn();
+ const portInUse = vi.fn(async () => occupied);
+ const error = vi.fn();
+ const execution = runInNewContext(`(async () => { ${source.slice(start)} })()`, {
+ DEFAULT_PORT: 8081, portArgs: { port: 8082, passthrough: [] }, portInUse,
+ ensureAndroidTarget: vi.fn(), spawn, writeMetroOwner, clearMetroOwner,
+ console: { log: vi.fn(), error },
+ process: { env: {}, exit: (code: number) => { throw new Error(`exit:${code}`); } },
+ resolvePnpmInvocation: () => ({ command: 'pnpm', args: [] }),
+ usablePnpmExecPath: () => undefined, existsSync: () => false,
+ mobileDir: '/repo/apps/mobile', worktreeRoot: '/repo', buildEnv: {}, region: 'global',
+ branch: 'test', commit: 'test', sourceIdentity: 'test@123',
+ loginScenario: 'providers:email-only', envFingerprint: 'fixture',
+ });
+ if (occupied) {
+ await expect(execution).rejects.toThrow('exit:1');
+ expect(error).toHaveBeenCalledWith(expect.stringContaining('8082 is already in use'));
+ expect(spawn).not.toHaveBeenCalled();
+ expect(writeMetroOwner).not.toHaveBeenCalled();
+ expect(clearMetroOwner).not.toHaveBeenCalled();
+ } else {
+ await execution;
+ expect(spawn).toHaveBeenCalledOnce();
+ expect(writeMetroOwner).toHaveBeenCalledWith(8082, expect.objectContaining({ pid: 4242 }));
+ for (const callback of exitCallbacks) callback();
+ expect(clearMetroOwner).toHaveBeenCalledWith(8082, 4242);
+ }
+ expect(portInUse).toHaveBeenCalledWith(8082);
+ });
+
+ it('waits for the plain-text preview in both file-browser flows', () => {
+ for (const name of ['file_browser.yaml', 'visual_files.yaml']) {
+ const flow = readFileSync(resolve(process.cwd(), 'e2e/maestro', name), 'utf8').replace(/\r\n/g, '\n');
+ expect(flow).toContain('id: "files.row.about.txt"');
+ expect(flow).toMatch(/- extendedWaitUntil:\s+visible:\s+id: "filePreview.sourceReady"\s+timeout: 10000/);
+ expect(flow).not.toContain('filePreview.markdownRendered');
+ // The app defaults to a grid; select list view before looking for rows.
+ const listView = flow.indexOf('id: "files.menu.view.list"');
+ expect(listView).toBeGreaterThan(flow.indexOf('id: "files.titleMenuButton"'));
+ expect(listView).toBeLessThan(flow.indexOf('id: "files.row.about.txt"'));
+ }
+ });
+
+ it('captures file screenshots only after listing and preview readiness', () => {
+ const flow = readFileSync(resolve(process.cwd(), 'e2e/maestro/visual_files.yaml'), 'utf8').replace(/\r\n/g, '\n');
+ const listReady = flow.search(/- extendedWaitUntil:\s+visible:\s+id: "files.row.about.txt"/);
+ const previewReady = flow.search(/- extendedWaitUntil:\s+visible:\s+id: "filePreview.sourceReady"/);
+ expect(listReady).toBeGreaterThanOrEqual(0);
+ expect(listReady).toBeLessThan(flow.indexOf('path: visual-files\n'));
+ expect(previewReady).toBeGreaterThanOrEqual(0);
+ expect(previewReady).toBeLessThan(flow.indexOf('path: visual-files-preview'));
+ });
+
+ it('opens usage details from inside the visible menu modal', () => {
+ const flow = readFileSync(resolve(process.cwd(), 'e2e/maestro/visual_session_controls_usage.yaml'), 'utf8');
+ expect(flow).toContain('id: "session.menuUsageRow"');
+ expect(flow.indexOf('id: "session.menuUsageRow"')).toBeGreaterThan(flow.indexOf('id: "session.menuSheet"'));
+ expect(flow).not.toContain('id: "session.usageButton"');
+ const menu = readFileSync(resolve(process.cwd(), 'src/session/SessionMenuSheet.tsx'), 'utf8');
+ expect(menu).toMatch(/<SessionUsageSummary[^>]+onPress=\{openInfo\}/);
+ });
+
it('uses a Java 17 runtime for Maestro without requiring global shell changes', () => {
const helper = readFileSync(resolve(process.cwd(), 'scripts/java-runtime-env.mjs'), 'utf8');
const doctor = readFileSync(resolve(process.cwd(), 'scripts/native-e2e-doctor.mjs'), 'utf8');
@@ -22,6 +113,15 @@ describe('native e2e environment', () => {
expect(runner).toContain("import { resolveJavaRuntimeEnv } from './java-runtime-env.mjs';");
expect(runner).toContain('const toolEnv = resolveJavaRuntimeEnv(process.env);');
expect(runner).toContain('...toolEnv');
+ const simStart = readFileSync(resolve(process.cwd(), 'scripts/sim-start.mjs'), 'utf8');
+ expect(simStart).toContain("import { parseProjectEnv } from '@expo/env';");
+ expect(simStart).toContain('projectEnv.env.EXPO_PUBLIC_LOGIN_SCENARIO');
+ expect(simStart).toContain('const loginScenario = process.env.EXPO_PUBLIC_LOGIN_SCENARIO?.trim()');
+ expect(simStart).toContain('writeMetroOwner(portArgs.port, {');
+ expect(simStart).toContain("child.once('exit', () => clearMetroOwner(portArgs.port, child.pid));");
+ expect(simStart).not.toContain('writeMetroOwner(DEFAULT_PORT,');
+ expect(simStart).not.toContain('clearMetroOwner(DEFAULT_PORT,');
+ expect(runner).toContain("/(^|[\\\\/])login_mock(?:_no_clear)?\\.yaml$/");
expect(runner).toContain("process.env.XDT_MOBILE_E2E_EXPO_LAUNCH_DELAY_MS ?? '20000'");
expect(runner).toContain("process.env.XDT_MOBILE_E2E_EXPO_TERMINATE_BEFORE_OPEN ?? 'true'");
expect(runner).toContain("process.env.XDT_MOBILE_E2E_EXPO_OPEN_BEFORE_TEST ?? 'true'");
@@ -194,6 +294,17 @@ describe('native e2e environment', () => {
expect(missingCredentials.stderr).toContain('isolated test environment');
});
+ it('keeps Maestro dry runs independent of Metro ownership', () => {
+ const script = resolve(process.cwd(), 'scripts/maestro-e2e.mjs');
+ const result = spawnSync(process.execPath, [script, '--dry-run', '--flow', 'login_mock_no_clear.yaml'], {
+ cwd: process.cwd(), encoding: 'utf8', timeout: 10_000,
+ env: { ...process.env, EXPO_PUBLIC_LOGIN_SCENARIO: '' },
+ });
+ expect(result.status).toBe(0);
+ expect(result.stdout).toContain('maestro dry run: APP_ID=');
+ expect(result.stderr).not.toContain('Active Metro');
+ });
+
it('keeps cloud voice preflight opt-in and secret-redacted with the credential relay removed', () => {
const packageJson = readFileSync(resolve(process.cwd(), 'package.json'), 'utf8');
const preflight = readFileSync(resolve(process.cwd(), 'scripts/mobile-voice-cloud-preflight.mjs'), 'utf8');
diff --git a/apps/mobile/src/config/env.ts b/apps/mobile/src/config/env.ts
index c47e26e80e..2d65c1837f 100644
--- a/apps/mobile/src/config/env.ts
+++ b/apps/mobile/src/config/env.ts
@@ -140,10 +140,6 @@ export function resolveEnvFlag(value: string | undefined): boolean {
return normalized === '1' || normalized === 'true' || normalized === 'yes';
}
-export const DEV_LOGIN_ENABLED = resolveEnvFlag(
- process.env.EXPO_PUBLIC_XDT_DEV_LOGIN_ENABLED,
-);
-
export const MOBILE_VISUAL_MOCK_ENABLED =
__DEV__ && resolveEnvFlag(process.env.EXPO_PUBLIC_CINDY_MOBILE_VISUAL_MOCK);
diff --git a/docs/e2e-evidence/pr-4401/devices-loaded.png b/docs/e2e-evidence/pr-4401/devices-loaded.png
new file mode 100644
index 0000000000..ec86120062
Binary files /dev/null and b/docs/e2e-evidence/pr-4401/devices-loaded.png differ
diff --git a/docs/e2e-evidence/pr-4401/login-code-entry.png b/docs/e2e-evidence/pr-4401/login-code-entry.png
new file mode 100644
index 0000000000..f56c8b15db
Binary files /dev/null and b/docs/e2e-evidence/pr-4401/login-code-entry.png differ