@rstest/browser 0.10.5 → 0.11.0

package/dist/index.js

@@ -9,11 +9,11 @@ import sirv from "sirv";
 import { WebSocketServer } from "ws";
 import convert_source_map from "convert-source-map";
 import { __webpack_require__ } from "./rslib-runtime.js";
-import { DISPATCH_RPC_BRIDGE_NAME, DISPATCH_NAMESPACE_SNAPSHOT, DISPATCH_MESSAGE_TYPE, DISPATCH_NAMESPACE_BROWSER } from "./626.js";
+import { DISPATCH_RPC_BRIDGE_NAME, DISPATCH_NAMESPACE_SNAPSHOT, DISPATCH_MESSAGE_TYPE, DISPATCH_NAMESPACE_BROWSER } from "./33.js";
 __webpack_require__.add({
-    "../../node_modules/.pnpm/picomatch@4.0.4/node_modules/picomatch/index.js" (module, __unused_rspack_exports, __webpack_require__) {
-        const pico = __webpack_require__("../../node_modules/.pnpm/picomatch@4.0.4/node_modules/picomatch/lib/picomatch.js");
-        const utils = __webpack_require__("../../node_modules/.pnpm/picomatch@4.0.4/node_modules/picomatch/lib/utils.js");
+    "../../node_modules/.pnpm/picomatch@4.0.5/node_modules/picomatch/index.js" (module, __unused_rspack_exports, __webpack_require__) {
+        const pico = __webpack_require__("../../node_modules/.pnpm/picomatch@4.0.5/node_modules/picomatch/lib/picomatch.js");
+        const utils = __webpack_require__("../../node_modules/.pnpm/picomatch@4.0.5/node_modules/picomatch/lib/utils.js");
         function picomatch(glob, options, returnState = false) {
             if (options && (null === options.windows || void 0 === options.windows)) options = {
                 ...options,
@@ -24,7 +24,7 @@ __webpack_require__.add({
         Object.assign(picomatch, pico);
         module.exports = picomatch;
     },
-    "../../node_modules/.pnpm/picomatch@4.0.4/node_modules/picomatch/lib/constants.js" (module) {
+    "../../node_modules/.pnpm/picomatch@4.0.5/node_modules/picomatch/lib/constants.js" (module) {
         const WIN_SLASH = '\\\\/';
         const WIN_NO_SLASH = `[^${WIN_SLASH}]`;
         const DEFAULT_MAX_EXTGLOB_RECURSION = 0;
@@ -187,9 +187,9 @@ __webpack_require__.add({
             }
         };
     },
-    "../../node_modules/.pnpm/picomatch@4.0.4/node_modules/picomatch/lib/parse.js" (module, __unused_rspack_exports, __webpack_require__) {
-        const constants = __webpack_require__("../../node_modules/.pnpm/picomatch@4.0.4/node_modules/picomatch/lib/constants.js");
-        const utils = __webpack_require__("../../node_modules/.pnpm/picomatch@4.0.4/node_modules/picomatch/lib/utils.js");
+    "../../node_modules/.pnpm/picomatch@4.0.5/node_modules/picomatch/lib/parse.js" (module, __unused_rspack_exports, __webpack_require__) {
+        const constants = __webpack_require__("../../node_modules/.pnpm/picomatch@4.0.5/node_modules/picomatch/lib/constants.js");
+        const utils = __webpack_require__("../../node_modules/.pnpm/picomatch@4.0.5/node_modules/picomatch/lib/utils.js");
         const { MAX_LENGTH, POSIX_REGEX_SOURCE, REGEX_NON_SPECIAL_CHARS, REGEX_SPECIAL_CHARS_BACKREF, REPLACEMENTS } = constants;
         const expandRange = (args, options)=>{
             if ('function' == typeof options.expandRange) return options.expandRange(...args, options);
@@ -333,7 +333,11 @@ __webpack_require__.add({
                 }
             }
         };
-        const getStarExtglobSequenceOutput = (pattern)=>{
+        const buildCharClassStar = (chars)=>{
+            const source = 1 === chars.length ? utils.escapeRegex(chars[0]) : `[${chars.map((ch)=>utils.escapeRegex(ch)).join('')}]`;
+            return `${source}*`;
+        };
+        const getStarExtglobSequenceChars = (pattern)=>{
             let index = 0;
             const chars = [];
             while(index < pattern.length){
@@ -347,8 +351,7 @@ __webpack_require__.add({
                 index += match.end + 1;
             }
             if (chars.length < 1) return;
-            const source = 1 === chars.length ? utils.escapeRegex(chars[0]) : `[${chars.map((ch)=>utils.escapeRegex(ch)).join('')}]`;
-            return `${source}*`;
+            return chars;
         };
         const repeatedExtglobRecursion = (pattern)=>{
             let depth = 0;
@@ -372,16 +375,34 @@ __webpack_require__.add({
                     risky: true
                 };
             }
+            const safeChars = [];
+            let sawStarSequence = false;
+            let combinable = true;
             for (const branch of branches){
-                const safeOutput = getStarExtglobSequenceOutput(branch);
-                if (safeOutput) return {
-                    risky: true,
-                    safeOutput
-                };
+                const chars = getStarExtglobSequenceChars(branch);
+                if (chars) {
+                    sawStarSequence = true;
+                    safeChars.push(...chars);
+                    continue;
+                }
+                const literal = normalizeSimpleBranch(branch);
+                if (literal && 1 === literal.length) {
+                    safeChars.push(literal);
+                    continue;
+                }
+                combinable = false;
                 if (repeatedExtglobRecursion(branch) > max) return {
                     risky: true
                 };
             }
+            if (sawStarSequence) return combinable ? {
+                risky: true,
+                safeOutput: buildCharClassStar([
+                    ...new Set(safeChars)
+                ])
+            } : {
+                risky: true
+            };
             return {
                 risky: false
             };
@@ -1185,11 +1206,11 @@ __webpack_require__.add({
         };
         module.exports = parse;
     },
-    "../../node_modules/.pnpm/picomatch@4.0.4/node_modules/picomatch/lib/picomatch.js" (module, __unused_rspack_exports, __webpack_require__) {
-        const scan = __webpack_require__("../../node_modules/.pnpm/picomatch@4.0.4/node_modules/picomatch/lib/scan.js");
-        const parse = __webpack_require__("../../node_modules/.pnpm/picomatch@4.0.4/node_modules/picomatch/lib/parse.js");
-        const utils = __webpack_require__("../../node_modules/.pnpm/picomatch@4.0.4/node_modules/picomatch/lib/utils.js");
-        const constants = __webpack_require__("../../node_modules/.pnpm/picomatch@4.0.4/node_modules/picomatch/lib/constants.js");
+    "../../node_modules/.pnpm/picomatch@4.0.5/node_modules/picomatch/lib/picomatch.js" (module, __unused_rspack_exports, __webpack_require__) {
+        const scan = __webpack_require__("../../node_modules/.pnpm/picomatch@4.0.5/node_modules/picomatch/lib/scan.js");
+        const parse = __webpack_require__("../../node_modules/.pnpm/picomatch@4.0.5/node_modules/picomatch/lib/parse.js");
+        const utils = __webpack_require__("../../node_modules/.pnpm/picomatch@4.0.5/node_modules/picomatch/lib/utils.js");
+        const constants = __webpack_require__("../../node_modules/.pnpm/picomatch@4.0.5/node_modules/picomatch/lib/constants.js");
         const isObject = (val)=>val && 'object' == typeof val && !Array.isArray(val);
         const picomatch = (glob, options, returnState = false)=>{
             if (Array.isArray(glob)) {
@@ -1272,9 +1293,11 @@ __webpack_require__.add({
                 output
             };
         };
-        picomatch.matchBase = (input, glob, options)=>{
+        picomatch.matchBase = (input, glob, options, posix = options && options.windows)=>{
             const regex = glob instanceof RegExp ? glob : picomatch.makeRe(glob, options);
-            return regex.test(utils.basename(input));
+            return regex.test(utils.basename(input, {
+                windows: posix
+            }));
         };
         picomatch.isMatch = (str, patterns, options)=>picomatch(patterns, options)(str);
         picomatch.parse = (pattern, options)=>{
@@ -1318,9 +1341,9 @@ __webpack_require__.add({
         picomatch.constants = constants;
         module.exports = picomatch;
     },
-    "../../node_modules/.pnpm/picomatch@4.0.4/node_modules/picomatch/lib/scan.js" (module, __unused_rspack_exports, __webpack_require__) {
-        const utils = __webpack_require__("../../node_modules/.pnpm/picomatch@4.0.4/node_modules/picomatch/lib/utils.js");
-        const { CHAR_ASTERISK, CHAR_AT, CHAR_BACKWARD_SLASH, CHAR_COMMA, CHAR_DOT, CHAR_EXCLAMATION_MARK, CHAR_FORWARD_SLASH, CHAR_LEFT_CURLY_BRACE, CHAR_LEFT_PARENTHESES, CHAR_LEFT_SQUARE_BRACKET, CHAR_PLUS, CHAR_QUESTION_MARK, CHAR_RIGHT_CURLY_BRACE, CHAR_RIGHT_PARENTHESES, CHAR_RIGHT_SQUARE_BRACKET } = __webpack_require__("../../node_modules/.pnpm/picomatch@4.0.4/node_modules/picomatch/lib/constants.js");
+    "../../node_modules/.pnpm/picomatch@4.0.5/node_modules/picomatch/lib/scan.js" (module, __unused_rspack_exports, __webpack_require__) {
+        const utils = __webpack_require__("../../node_modules/.pnpm/picomatch@4.0.5/node_modules/picomatch/lib/utils.js");
+        const { CHAR_ASTERISK, CHAR_AT, CHAR_BACKWARD_SLASH, CHAR_COMMA, CHAR_DOT, CHAR_EXCLAMATION_MARK, CHAR_FORWARD_SLASH, CHAR_LEFT_CURLY_BRACE, CHAR_LEFT_PARENTHESES, CHAR_LEFT_SQUARE_BRACKET, CHAR_PLUS, CHAR_QUESTION_MARK, CHAR_RIGHT_CURLY_BRACE, CHAR_RIGHT_PARENTHESES, CHAR_RIGHT_SQUARE_BRACKET } = __webpack_require__("../../node_modules/.pnpm/picomatch@4.0.5/node_modules/picomatch/lib/constants.js");
         const isPathSeparator = (code)=>code === CHAR_FORWARD_SLASH || code === CHAR_BACKWARD_SLASH;
         const depth = (token)=>{
             if (true !== token.isPrefix) token.depth = token.isGlobstar ? 1 / 0 : 1;
@@ -1586,8 +1609,8 @@ __webpack_require__.add({
         };
         module.exports = scan;
     },
-    "../../node_modules/.pnpm/picomatch@4.0.4/node_modules/picomatch/lib/utils.js" (__unused_rspack_module, exports, __webpack_require__) {
-        const { REGEX_BACKSLASH, REGEX_REMOVE_BACKSLASH, REGEX_SPECIAL_CHARS, REGEX_SPECIAL_CHARS_GLOBAL } = __webpack_require__("../../node_modules/.pnpm/picomatch@4.0.4/node_modules/picomatch/lib/constants.js");
+    "../../node_modules/.pnpm/picomatch@4.0.5/node_modules/picomatch/lib/utils.js" (__unused_rspack_module, exports, __webpack_require__) {
+        const { REGEX_BACKSLASH, REGEX_REMOVE_BACKSLASH, REGEX_SPECIAL_CHARS, REGEX_SPECIAL_CHARS_GLOBAL } = __webpack_require__("../../node_modules/.pnpm/picomatch@4.0.5/node_modules/picomatch/lib/constants.js");
         exports.isObject = (val)=>null !== val && 'object' == typeof val && !Array.isArray(val);
         exports.hasRegexChars = (str)=>REGEX_SPECIAL_CHARS.test(str);
         exports.isRegexChar = (str)=>1 === str.length && exports.hasRegexChars(str);
@@ -2522,6 +2545,7 @@ const wrapPage = (page)=>{
         if ('popup' === event) return void originalOn(event, (popup)=>{
             listener(wrapPage(popup));
         });
+        if ('crash' === event || 'close' === event) return void originalOn(event, listener);
         originalOn(event, listener);
     };
     return withAsyncDispose(page);
@@ -2810,12 +2834,11 @@ const planWatchRerun = ({ projectEntries, previousTestFiles, affectedTestFiles }
         affectedTestFiles: matchedAffectedFiles
     };
 };
-const picomatch = __webpack_require__("../../node_modules/.pnpm/picomatch@4.0.4/node_modules/picomatch/index.js");
+const picomatch = __webpack_require__("../../node_modules/.pnpm/picomatch@4.0.5/node_modules/picomatch/index.js");
 var picomatch_default = /*#__PURE__*/ __webpack_require__.n(picomatch);
 const { createRsbuild: createRsbuild, rspack: rspack } = rsbuild;
 const hostController_dirname = dirname(fileURLToPath(import.meta.url));
 const OPTIONS_PLACEHOLDER = '__RSTEST_OPTIONS_PLACEHOLDER__';
-const PER_FILE_TIMEOUT_BUFFER_MS = 30000;
 let nextBrowserFilePid = 1000000000;
 const serializeForInlineScript = (value)=>JSON.stringify(value).replace(/</g, '\\u003c').replace(/\u2028/g, '\\u2028').replace(/\u2029/g, '\\u2029');
 const getBrowserProviderOptions = (project)=>{
@@ -2991,9 +3014,10 @@ const createBrowserLazyCompilationConfig = (setupFiles)=>{
         }
     };
 };
-const createBrowserRsbuildDevConfig = (_isWatchMode)=>({
+const shouldEnableBrowserHmr = (isWatchMode, isHeadless)=>isWatchMode && !isHeadless;
+const createBrowserRsbuildDevConfig = (enableHmr)=>({
         writeToDisk: isDebug(),
-        hmr: true,
+        hmr: enableHmr,
         client: {
             logLevel: 'error'
         }
@@ -3002,7 +3026,8 @@ const globToRegexp = (glob)=>{
     const regex = picomatch_default().makeRe(glob, {
         fastpaths: false,
         noglobstar: false,
-        bash: false
+        bash: false,
+        dot: true
     });
     if (!regex) throw new Error(`Invalid glob pattern: ${glob}`);
     if (!glob.startsWith('./')) return regex;
@@ -3022,20 +3047,76 @@ const globPatternsToRegExp = (patterns)=>{
     });
     return new RegExp(`(?:${regexParts.join('|')})$`);
 };
-const excludePatternsToRegExp = (patterns)=>{
-    const keywords = [];
-    for (const pattern of patterns){
-        const match = pattern.match(/\*\*\/\.?\{?([^/*{}]+(?:,[^/*{}]+)*)\}?\/?\*?\*?/);
-        if (match) {
-            const parts = match[1].split(',');
-            for (const part of parts){
-                const cleaned = part.replace(/^\./, '');
-                if (cleaned && !keywords.includes(cleaned)) keywords.push(cleaned);
-            }
+const REGEXP_SPECIAL_CHARACTERS = /[|\\{}()[\]^$+*?.]/g;
+const PATH_SEPARATOR_SOURCE = String.raw`[\\/]`;
+const WINDOWS_ABSOLUTE_PATH_SOURCE = String.raw`[A-Za-z]:[\\/]`;
+const escapeRegExp = (value)=>value.replace(REGEXP_SPECIAL_CHARACTERS, '\\$&');
+const normalizePathForRegExp = (value)=>normalize(value).replaceAll('\\', '/');
+const normalizeExcludePatternForRegExp = (value)=>value.startsWith('./') ? `./${normalizePathForRegExp(value.substring(2))}` : normalizePathForRegExp(value);
+const isAbsolutePatternForRegExp = (value)=>value.startsWith('/') || /^[A-Za-z]:\//.test(value);
+const isEscapedRegExpCharacter = (source, index)=>{
+    let backslashCount = 0;
+    for(let current = index - 1; current >= 0 && '\\' === source[current]; current--)backslashCount++;
+    return backslashCount % 2 === 1;
+};
+const replacePathSeparatorsInRegExpSource = (source)=>{
+    let result = '';
+    let inCharacterClass = false;
+    for(let index = 0; index < source.length; index++){
+        const character = source[index];
+        const isEscaped = isEscapedRegExpCharacter(source, index);
+        if ('[' === character && !isEscaped) inCharacterClass = true;
+        if (!inCharacterClass && '\\' === character && '/' === source[index + 1]) {
+            result += PATH_SEPARATOR_SOURCE;
+            index++;
+            continue;
         }
+        result += character;
+        if (']' === character && !isEscaped) inCharacterClass = false;
+    }
+    return result;
+};
+const createRelativeContextExcludeSource = (source, normalizedPattern)=>{
+    if (normalizedPattern.startsWith('./')) return source;
+    return normalizedPattern.startsWith('**/') ? `(?:(?:${source})|\\.(?:${source}))` : `(?:(?:${source})|\\.${PATH_SEPARATOR_SOURCE}(?:${source}))`;
+};
+const createProjectAbsoluteExcludeSource = (source, normalizedPattern)=>normalizedPattern.startsWith('./') || normalizedPattern.startsWith('**/') ? source : `${PATH_SEPARATOR_SOURCE}(?:${source})`;
+const excludePatternsToRegExpSources = (patterns)=>{
+    const sources = patterns.map((pattern)=>{
+        const normalizedPattern = normalizeExcludePatternForRegExp(pattern);
+        const regex = globToRegexp(normalizedPattern);
+        let source = regex.source;
+        if (source.startsWith('^')) source = source.substring(1);
+        if (source.endsWith('$')) source = source.substring(0, source.length - 1);
+        source = replacePathSeparatorsInRegExpSource(source);
+        const isAbsolute = isAbsolutePatternForRegExp(normalizedPattern);
+        const absolute = normalizedPattern.startsWith('./') ? source.substring(2) : source;
+        return {
+            relative: isAbsolute ? source : createRelativeContextExcludeSource(source, normalizedPattern),
+            absolute: isAbsolute ? absolute : createProjectAbsoluteExcludeSource(absolute, normalizedPattern),
+            isAbsolute
+        };
+    });
+    if (0 === sources.length) return null;
+    return sources;
+};
+const createBrowserContextExcludeRegExp = (patterns, projectRoot)=>{
+    const excludeSources = excludePatternsToRegExpSources(patterns);
+    if (!excludeSources) return null;
+    const normalizedProjectRoot = normalizePathForRegExp(projectRoot).replace(/[\\/]$/, '');
+    const projectRootSource = normalizedProjectRoot.split('/').map(escapeRegExp).join(PATH_SEPARATOR_SOURCE);
+    const relativeExcludeSources = excludeSources.filter((source)=>!source.isAbsolute);
+    const absoluteExcludeSources = excludeSources.filter((source)=>source.isAbsolute);
+    const sourceBranches = [];
+    if (relativeExcludeSources.length > 0) {
+        const relativePatternSource = `(?:${relativeExcludeSources.map((source)=>source.relative).join('|')})`;
+        const absolutePatternSource = `(?:${relativeExcludeSources.map((source)=>source.absolute).join('|')})`;
+        const relativeSource = `(?:${relativePatternSource})`;
+        const absoluteSource = normalizedProjectRoot ? `${projectRootSource}(?=${PATH_SEPARATOR_SOURCE})(?:${absolutePatternSource})` : `(?:${absolutePatternSource})`;
+        sourceBranches.push(`(?!${WINDOWS_ABSOLUTE_PATH_SOURCE}|${PATH_SEPARATOR_SOURCE})${relativeSource}`, absoluteSource);
     }
-    if (0 === keywords.length) return null;
-    return new RegExp(`[\\\\/](${keywords.join('|')})[\\\\/]`);
+    if (absoluteExcludeSources.length > 0) sourceBranches.push(`(?:${absoluteExcludeSources.map((source)=>source.relative).join('|')})`);
+    return new RegExp(`^(?:${sourceBranches.join('|')})$`);
 };
 const findTestFileInModules = (modules, entryTestFiles)=>{
     if (!modules) return null;
@@ -3126,7 +3207,7 @@ const ensureConsistentBrowserLaunchOptions = (projects)=>{
     const firstOptions = getBrowserLaunchOptions(firstProject);
     for (const project of projects.slice(1)){
         const options = getBrowserLaunchOptions(project);
-        if (options.provider !== firstOptions.provider || options.browser !== firstOptions.browser || options.headless !== firstOptions.headless || options.port !== firstOptions.port || options.strictPort !== firstOptions.strictPort || !isDeepStrictEqual(options.providerOptions, firstOptions.providerOptions)) throw new Error(`Browser launch config mismatch between projects "${firstProject.name}" and "${project.name}". All browser-enabled projects in one run must share provider/browser/headless/port/strictPort/providerOptions.`);
+        if (options.provider !== firstOptions.provider || options.browser !== firstOptions.browser || options.headless !== firstOptions.headless || !isDeepStrictEqual(options.providerOptions, firstOptions.providerOptions)) throw new Error(`Browser launch config mismatch between projects "${firstProject.name}" and "${project.name}". All browser-enabled projects in one run must share provider/browser/headless/providerOptions.`);
     }
     return firstOptions;
 };
@@ -3173,7 +3254,14 @@ const resolveContainerDist = ()=>{
     throw new Error(`Browser container build not found at ${distPath}. Please run "pnpm --filter @rstest/browser build".`);
 };
 const toSafeVarName = (name)=>name.replace(/[^a-zA-Z0-9_]/g, '_');
-const generateManifestModule = ({ manifestPath, entries })=>{
+const toContextKey = (filePath, projectRootPosix)=>{
+    const posixPath = normalize(filePath);
+    const withinRoot = posixPath === projectRootPosix || posixPath.startsWith(`${projectRootPosix}/`);
+    if (!withinRoot) return posixPath;
+    const rel = posixPath.slice(projectRootPosix.length);
+    return rel.startsWith('/') ? `.${rel}` : `./${rel}`;
+};
+const generateManifestModule = ({ manifestPath, entries, isWatchMode })=>{
     const manifestDirPosix = normalize(dirname(manifestPath));
     const toRelativeImport = (filePath)=>{
         const posixPath = normalize(filePath);
@@ -3206,18 +3294,30 @@ const generateManifestModule = ({ manifestPath, entries })=>{
     lines.push('};');
     lines.push('');
     lines.push('// Test context for each project');
-    for (const { project } of entries){
+    for (const { project, testFiles } of entries){
         const varName = `context_${toSafeVarName(project.environmentName)}`;
         const projectRootPosix = normalize(project.rootPath);
-        const includeRegExp = globPatternsToRegExp(project.normalizedConfig.include);
-        const excludePatterns = project.normalizedConfig.exclude.patterns;
-        const excludeRegExp = excludePatternsToRegExp(excludePatterns);
-        lines.push(`const ${varName} = import.meta.webpackContext(${JSON.stringify(projectRootPosix)}, {`);
-        lines.push('  recursive: true,');
-        lines.push(`  regExp: ${includeRegExp.toString()},`);
-        if (excludeRegExp) lines.push(`  exclude: ${excludeRegExp.toString()},`);
-        lines.push("  mode: 'lazy',");
-        lines.push('});');
+        if (isWatchMode) {
+            const includeRegExp = globPatternsToRegExp(project.normalizedConfig.include);
+            const excludeRegExp = createBrowserContextExcludeRegExp(project.normalizedConfig.exclude.patterns, projectRootPosix);
+            lines.push(`const ${varName} = import.meta.webpackContext(${JSON.stringify(projectRootPosix)}, {`);
+            lines.push('  recursive: true,');
+            lines.push(`  regExp: ${includeRegExp.toString()},`);
+            if (excludeRegExp) lines.push(`  exclude: ${excludeRegExp.toString()},`);
+            lines.push("  mode: 'lazy',");
+            lines.push('});');
+        } else {
+            lines.push(`const ${varName}_modules = {`);
+            for (const filePath of testFiles){
+                const key = toContextKey(filePath, projectRootPosix);
+                const importPath = toRelativeImport(filePath);
+                lines.push(`  ${JSON.stringify(key)}: () => import(${JSON.stringify(importPath)}),`);
+            }
+            lines.push('};');
+            lines.push(`const ${varName} = Object.assign((key) => ${varName}_modules[key](), {`);
+            lines.push(`  keys: () => Object.keys(${varName}_modules),`);
+            lines.push('});');
+        }
         lines.push('');
     }
     lines.push('export const projectTestContexts = {');
@@ -3251,13 +3351,21 @@ const htmlTemplate = `<!DOCTYPE html>
 </html>
 `;
 const VIRTUAL_MANIFEST_FILENAME = 'virtual-manifest.ts';
+const closeAllProjectServers = (servers)=>Promise.allSettled([
+        ...servers
+    ].map((server)=>server.devServer.close()));
+const copyProxyResponseHeaders = (response, res)=>{
+    res.statusCode = response.status;
+    response.headers.forEach((value, key)=>{
+        if ('content-length' === key.toLowerCase()) return;
+        res.setHeader(key, value);
+    });
+};
 const destroyBrowserRuntime = async (runtime)=>{
     try {
         await runtime.browser?.close?.();
     } catch  {}
-    try {
-        await runtime.devServer?.close?.();
-    } catch  {}
+    await closeAllProjectServers(runtime.projectServers.values());
     try {
         runtime.wss?.close();
     } catch  {}
@@ -3291,10 +3399,7 @@ const registerWatchCleanup = ()=>{
     });
     watchContext.cleanupRegistered = true;
 };
-const createBrowserRuntime = async ({ context, manifestPath, manifestSource, tempDir, isWatchMode, onTriggerRerun, containerDistPath, containerDevServer, forceHeadless })=>{
-    const virtualManifestPlugin = new rspack.experiments.VirtualModulesPlugin({
-        [manifestPath]: manifestSource
-    });
+const createBrowserRuntime = async ({ context, projectEntries, tempDir, isWatchMode, onTriggerRerun, containerDistPath, containerDevServer, forceHeadless })=>{
     const containerHtmlTemplate = containerDistPath ? await promises.readFile(join(containerDistPath, 'index.html'), 'utf-8') : null;
     let injectedContainerHtml = null;
     let serializedOptions = 'null';
@@ -3304,156 +3409,14 @@ const createBrowserRuntime = async ({ context, manifestPath, manifestSource, tem
         if (containerHtmlTemplate) injectedContainerHtml = containerHtmlTemplate.replace(OPTIONS_PLACEHOLDER, serializedOptions);
     };
     const browserProjects = getBrowserProjects(context);
-    const projectByEnvironmentName = new Map(browserProjects.map((project)=>[
-            project.environmentName,
-            project
-        ]));
-    const userPlugins = browserProjects.flatMap((project)=>project.normalizedConfig.plugins || []);
     const browserLaunchOptions = ensureConsistentBrowserLaunchOptions(browserProjects);
     const browserRuntimePath = fileURLToPath(import.meta.resolve('@rstest/core/internal/browser-runtime'));
-    const rstestInternalAliases = {
-        '@rstest/browser-manifest': manifestPath,
+    const staticRstestAliases = {
         '@rstest/core': resolveBrowserFile('client/public.ts'),
         '@rstest/browser': resolveBrowserFile('browser.ts'),
-        '@rstest/core/internal/browser-runtime': browserRuntimePath,
-        '@sinonjs/fake-timers': resolveBrowserFile('client/fakeTimersStub.ts')
+        '@rstest/core/internal/browser-runtime': browserRuntimePath
     };
-    const rsbuildInstance = await createRsbuild({
-        callerName: 'rstest-browser',
-        rsbuildConfig: {
-            root: context.rootPath,
-            mode: 'development',
-            plugins: userPlugins,
-            server: {
-                printUrls: false,
-                port: browserLaunchOptions.port ?? 4000,
-                strictPort: browserLaunchOptions.strictPort
-            },
-            dev: createBrowserRsbuildDevConfig(isWatchMode),
-            environments: {
-                ...Object.fromEntries(browserProjects.map((project)=>[
-                        project.environmentName,
-                        {}
-                    ]))
-            }
-        }
-    });
-    rsbuildInstance.addPlugins([
-        {
-            name: 'rstest:browser-user-config',
-            setup (api) {
-                api.expose?.('rstest:browser', {
-                    registerDispatchHandler: (namespace, handler)=>{
-                        dispatchHandlers.set(namespace, handler);
-                    }
-                });
-                api.modifyEnvironmentConfig({
-                    handler: (config, { mergeEnvironmentConfig, name })=>{
-                        const project = projectByEnvironmentName.get(name);
-                        if (!project) return config;
-                        const userRsbuildConfig = project.normalizedConfig;
-                        const buildCache = resolveProjectBuildCache({
-                            context,
-                            project
-                        });
-                        const setupFiles = Object.values(getSetupFiles(project.normalizedConfig.setupFiles, project.rootPath));
-                        const rstestEnvDefine = `globalThis[Symbol.for(${JSON.stringify(RSTEST_ENV_SYMBOL_KEY)})]`;
-                        const merged = mergeEnvironmentConfig(config, {
-                            ...userRsbuildConfig,
-                            performance: buildCache ? {
-                                ...userRsbuildConfig.performance,
-                                buildCache
-                            } : userRsbuildConfig.performance
-                        }, {
-                            resolve: {
-                                alias: rstestInternalAliases
-                            },
-                            source: {
-                                define: {
-                                    'process.env': rstestEnvDefine,
-                                    'import.meta.env': rstestEnvDefine
-                                }
-                            },
-                            output: {
-                                target: 'web',
-                                sourceMap: {
-                                    js: 'source-map'
-                                }
-                            },
-                            tools: {
-                                rspack: (rspackConfig)=>{
-                                    rspackConfig.mode = 'development';
-                                    rspackConfig.lazyCompilation = createBrowserLazyCompilationConfig(setupFiles);
-                                    rspackConfig.plugins = rspackConfig.plugins || [];
-                                    rspackConfig.plugins.push(virtualManifestPlugin);
-                                    applyDefaultWatchOptions(rspackConfig, isWatchMode);
-                                    const browserRuntimeDir = dirname(browserRuntimePath);
-                                    rspackConfig.module = rspackConfig.module || {};
-                                    rspackConfig.module.rules = rspackConfig.module.rules || [];
-                                    rspackConfig.module.rules.unshift({
-                                        test: /\.js$/,
-                                        include: browserRuntimeDir,
-                                        extractSourceMap: true
-                                    });
-                                    if (isDebug()) logger.log(`[rstest:browser] extractSourceMap rule added for: ${browserRuntimeDir}`);
-                                }
-                            }
-                        });
-                        merged.source = merged.source || {};
-                        merged.source.entry = {
-                            runner: resolveBrowserFile('client/entry.ts')
-                        };
-                        return merged;
-                    },
-                    order: 'post'
-                });
-            }
-        }
-    ]);
-    if (isWatchMode && onTriggerRerun) rsbuildInstance.addPlugins([
-        {
-            name: 'rstest:browser-watch',
-            setup (api) {
-                api.onBeforeDevCompile(()=>{
-                    if (!watchContext.hooksEnabled) return;
-                    logger.log(color.cyan('\nFile changed, re-running tests...\n'));
-                });
-                api.onAfterDevCompile(async ({ stats })=>{
-                    if (stats) {
-                        const projectEntries = await collectProjectEntries(context);
-                        const entryTestFiles = new Set(collectWatchTestFiles(projectEntries).map((file)=>file.testPath));
-                        const statsJson = stats.toJson({
-                            all: true
-                        });
-                        const affected = getAffectedTestFiles(statsJson.chunks, entryTestFiles);
-                        watchContext.affectedTestFiles = affected;
-                        if (affected.length > 0) logger.debug(`[Watch] Affected test files: ${affected.join(', ')}`);
-                    }
-                    if (!watchContext.hooksEnabled) return;
-                    await onTriggerRerun();
-                });
-            }
-        }
-    ]);
-    const coverage = browserProjects.find((project)=>project.normalizedConfig.coverage?.enabled)?.normalizedConfig.coverage;
-    if (coverage?.enabled && 'list' !== context.command) {
-        const { pluginCoverage } = await loadCoverageProvider(coverage, context.rootPath);
-        rsbuildInstance.addPlugins([
-            pluginCoverage(coverage)
-        ]);
-    }
-    const devServer = await rsbuildInstance.createDevServer({
-        getPortSilently: true
-    });
-    if (isDebug()) await rsbuildInstance.inspectConfig({
-        writeToDisk: true,
-        extraConfigs: {
-            rstest: {
-                ...context.normalizedConfig,
-                projects: browserProjects.map((p)=>p.normalizedConfig)
-            }
-        }
-    });
+    const rstestEnvDefine = `globalThis[Symbol.for(${JSON.stringify(RSTEST_ENV_SYMBOL_KEY)})]`;
     const serveContainer = containerDistPath ? sirv(containerDistPath, {
         dev: false,
         single: 'index.html'
@@ -3467,11 +3430,7 @@ const createBrowserRuntime = async ({ context, manifestPath, manifestSource, tem
             if (!response.ok) return false;
             let html = await response.text();
             html = html.replace(OPTIONS_PLACEHOLDER, serializedOptions);
-            res.statusCode = response.status;
-            response.headers.forEach((value, key)=>{
-                if ('content-length' === key.toLowerCase()) return;
-                res.setHeader(key, value);
-            });
+            copyProxyResponseHeaders(response, res);
             res.setHeader('Content-Type', 'text/html');
             res.end(html);
             return true;
@@ -3487,11 +3446,7 @@ const createBrowserRuntime = async ({ context, manifestPath, manifestSource, tem
             const response = await fetch(target);
             if (!response.ok) return false;
             const buffer = Buffer.from(await response.arrayBuffer());
-            res.statusCode = response.status;
-            response.headers.forEach((value, key)=>{
-                if ('content-length' === key.toLowerCase()) return;
-                res.setHeader(key, value);
-            });
+            copyProxyResponseHeaders(response, res);
             res.end(buffer);
             return true;
         } catch (error) {
@@ -3499,59 +3454,241 @@ const createBrowserRuntime = async ({ context, manifestPath, manifestSource, tem
             return false;
         }
     };
-    devServer.middlewares.use(async (req, res, next)=>{
-        if (!req.url) return void next();
-        const url = new URL(req.url, 'http://localhost');
-        if ('/__open-in-editor' === url.pathname) {
-            const file = url.searchParams.get('file');
-            if (!file) {
-                res.statusCode = 400;
-                res.end('Missing file');
+    const entryByEnvironmentName = new Map(projectEntries.map((entry)=>[
+            entry.project.environmentName,
+            entry
+        ]));
+    const buildProjectServer = async (project, isContainerServer)=>{
+        const manifestPath = join(tempDir, toSafeVarName(project.environmentName), VIRTUAL_MANIFEST_FILENAME);
+        const entry = entryByEnvironmentName.get(project.environmentName);
+        const manifestSource = generateManifestModule({
+            manifestPath,
+            entries: [
+                {
+                    project,
+                    testFiles: entry?.testFiles ?? [],
+                    setupFiles: entry?.setupFiles ?? []
+                }
+            ],
+            isWatchMode
+        });
+        const virtualManifestPlugin = new rspack.experiments.VirtualModulesPlugin({
+            [manifestPath]: manifestSource
+        });
+        const rstestInternalAliases = {
+            '@rstest/browser-manifest': manifestPath,
+            ...staticRstestAliases
+        };
+        const isHeadless = forceHeadless || project.normalizedConfig.browser.headless;
+        const enableHmr = shouldEnableBrowserHmr(isWatchMode, isHeadless);
+        const rsbuildInstance = await createRsbuild({
+            callerName: 'rstest-browser',
+            rsbuildConfig: {
+                root: context.rootPath,
+                mode: 'development',
+                plugins: project.normalizedConfig.plugins || [],
+                server: {
+                    printUrls: false,
+                    port: project.normalizedConfig.browser.port ?? (isContainerServer ? 4000 : 0),
+                    strictPort: project.normalizedConfig.browser.strictPort
+                },
+                dev: createBrowserRsbuildDevConfig(enableHmr),
+                environments: {
+                    [project.environmentName]: {}
+                }
+            }
+        });
+        rsbuildInstance.addPlugins([
+            {
+                name: 'rstest:browser-user-config',
+                setup (api) {
+                    api.expose?.('rstest:browser', {
+                        registerDispatchHandler: (namespace, handler)=>{
+                            dispatchHandlers.set(namespace, handler);
+                        }
+                    });
+                    api.modifyEnvironmentConfig({
+                        handler: (config, { mergeEnvironmentConfig, name })=>{
+                            if (name !== project.environmentName) return config;
+                            const userRsbuildConfig = project.normalizedConfig;
+                            const buildCache = resolveProjectBuildCache({
+                                context,
+                                project
+                            });
+                            const setupFiles = Object.values(getSetupFiles(project.normalizedConfig.setupFiles, project.rootPath));
+                            const merged = mergeEnvironmentConfig(config, {
+                                ...userRsbuildConfig,
+                                performance: buildCache ? {
+                                    ...userRsbuildConfig.performance,
+                                    buildCache
+                                } : userRsbuildConfig.performance
+                            }, {
+                                resolve: {
+                                    alias: rstestInternalAliases
+                                },
+                                source: {
+                                    define: {
+                                        'process.env': rstestEnvDefine,
+                                        'import.meta.env': rstestEnvDefine
+                                    }
+                                },
+                                output: {
+                                    target: 'web',
+                                    sourceMap: {
+                                        js: 'source-map'
+                                    }
+                                },
+                                tools: {
+                                    rspack: (rspackConfig)=>{
+                                        rspackConfig.mode = 'development';
+                                        rspackConfig.lazyCompilation = enableHmr ? createBrowserLazyCompilationConfig(setupFiles) : false;
+                                        rspackConfig.plugins = rspackConfig.plugins || [];
+                                        rspackConfig.plugins.push(virtualManifestPlugin);
+                                        applyDefaultWatchOptions(rspackConfig, isWatchMode);
+                                        const browserRuntimeDir = dirname(browserRuntimePath);
+                                        rspackConfig.module = rspackConfig.module || {};
+                                        rspackConfig.module.rules = rspackConfig.module.rules || [];
+                                        rspackConfig.module.rules.unshift({
+                                            test: /\.js$/,
+                                            include: browserRuntimeDir,
+                                            extractSourceMap: true
+                                        });
+                                        if (isDebug()) logger.log(`[rstest:browser] extractSourceMap rule added for: ${browserRuntimeDir}`);
+                                    }
+                                }
+                            });
+                            merged.source = merged.source || {};
+                            merged.source.entry = {
+                                runner: resolveBrowserFile('client/entry.ts')
+                            };
+                            return merged;
+                        },
+                        order: 'post'
+                    });
+                }
+            }
+        ]);
+        if (isWatchMode && onTriggerRerun) rsbuildInstance.addPlugins([
+            {
+                name: 'rstest:browser-watch',
+                setup (api) {
+                    api.onBeforeDevCompile(()=>{
+                        if (!watchContext.hooksEnabled) return;
+                        logger.log(color.cyan('\nFile changed, re-running tests...\n'));
+                    });
+                    api.onAfterDevCompile(async ({ stats })=>{
+                        if (stats) {
+                            const allProjectEntries = await collectProjectEntries(context);
+                            const entryTestFiles = new Set(collectWatchTestFiles(allProjectEntries).map((file)=>file.testPath));
+                            const statsJson = stats.toJson({
+                                all: true
+                            });
+                            const affected = getAffectedTestFiles(statsJson.chunks, entryTestFiles);
+                            watchContext.affectedTestFiles = affected;
+                            if (affected.length > 0) logger.debug(`[Watch] Affected test files: ${affected.join(', ')}`);
+                        }
+                        if (!watchContext.hooksEnabled) return;
+                        await onTriggerRerun();
+                    });
+                }
+            }
+        ]);
+        const coverage = project.normalizedConfig.coverage;
+        if (coverage?.enabled && 'list' !== context.command) {
+            const { pluginCoverage } = await loadCoverageProvider(coverage, context.rootPath);
+            rsbuildInstance.addPlugins([
+                pluginCoverage(coverage)
+            ]);
+        }
+        const devServer = await rsbuildInstance.createDevServer({
+            getPortSilently: true
+        });
+        if (isDebug()) await rsbuildInstance.inspectConfig({
+            writeToDisk: true,
+            extraConfigs: {
+                rstest: {
+                    ...context.normalizedConfig,
+                    projects: [
+                        project.normalizedConfig
+                    ]
+                }
+            }
+        });
+        devServer.middlewares.use(async (req, res, next)=>{
+            if (!req.url) return void next();
+            const url = new URL(req.url, 'http://localhost');
+            if ('/__open-in-editor' === url.pathname) {
+                const file = url.searchParams.get('file');
+                if (!file) {
+                    res.statusCode = 400;
+                    res.end('Missing file');
+                    return;
+                }
+                try {
+                    await open_editor([
+                        {
+                            file
+                        }
+                    ]);
+                    res.statusCode = 204;
+                    res.end();
+                } catch (error) {
+                    logger.debug(`[Browser UI] Failed to open editor: ${String(error)}`);
+                    res.statusCode = 500;
+                    res.end('Failed to open editor');
+                }
                 return;
             }
-            try {
-                await open_editor([
-                    {
-                        file
+            if (isContainerServer) {
+                if ('/' === url.pathname) {
+                    if (await respondWithDevServerHtml(url, res)) return;
+                    const html = injectedContainerHtml || containerHtmlTemplate?.replace(OPTIONS_PLACEHOLDER, 'null');
+                    if (html) {
+                        res.setHeader('Content-Type', 'text/html');
+                        res.end(html);
+                        return;
                     }
-                ]);
-                res.statusCode = 204;
-                res.end();
-            } catch (error) {
-                logger.debug(`[Browser UI] Failed to open editor: ${String(error)}`);
-                res.statusCode = 500;
-                res.end('Failed to open editor');
+                    res.statusCode = 502;
+                    res.end('Container UI is not available.');
+                    return;
+                }
+                if (url.pathname.startsWith('/container-static/')) {
+                    if (await proxyDevServerAsset(req, res)) return;
+                    if (serveContainer) return void serveContainer(req, res, next);
+                    res.statusCode = 502;
+                    res.end('Container assets are not available.');
+                    return;
+                }
             }
-            return;
-        }
-        if ('/' === url.pathname) {
-            if (await respondWithDevServerHtml(url, res)) return;
-            const html = injectedContainerHtml || containerHtmlTemplate?.replace(OPTIONS_PLACEHOLDER, 'null');
-            if (html) {
+            if ('/runner.html' === url.pathname) {
                 res.setHeader('Content-Type', 'text/html');
-                res.end(html);
+                res.end(htmlTemplate);
                 return;
             }
-            res.statusCode = 502;
-            res.end('Container UI is not available.');
-            return;
-        }
-        if (url.pathname.startsWith('/container-static/')) {
-            if (await proxyDevServerAsset(req, res)) return;
-            if (serveContainer) return void serveContainer(req, res, next);
-            res.statusCode = 502;
-            res.end('Container assets are not available.');
-            return;
-        }
-        if ('/runner.html' === url.pathname) {
-            res.setHeader('Content-Type', 'text/html');
-            res.end(htmlTemplate);
-            return;
+            next();
+        });
+        const { port: listenPort } = await devServer.listen();
+        const port = resolveListenPort(listenPort, devServer.httpServer);
+        return {
+            projectName: project.name,
+            environmentName: project.environmentName,
+            rsbuildInstance,
+            devServer,
+            port,
+            manifestPath
+        };
+    };
+    const projectServers = new Map();
+    try {
+        for (const [index, project] of browserProjects.entries()){
+            const server = await buildProjectServer(project, 0 === index);
+            projectServers.set(server.projectName, server);
         }
-        next();
-    });
-    const { port: listenPort } = await devServer.listen();
-    const port = resolveListenPort(listenPort, devServer.httpServer);
+    } catch (error) {
+        await closeAllProjectServers(projectServers.values());
+        throw error;
+    }
+    const containerServer = projectServers.get(browserProjects[0].name);
     const wss = new WebSocketServer({
         port: 0
     });
@@ -3570,22 +3707,19 @@ const createBrowserRuntime = async ({ context, manifestPath, manifestSource, tem
             providerOptions: browserLaunchOptions.providerOptions
         });
         return {
-            rsbuildInstance,
-            devServer,
+            projectServers,
+            containerServer,
             browser: runtime.browser,
             browserLaunchOptions,
-            port,
             wsPort,
-            manifestPath,
             tempDir,
-            manifestPlugin: virtualManifestPlugin,
             setContainerOptions,
             dispatchHandlers,
             wss
         };
     } catch (error) {
         wss.close();
-        await devServer.close();
+        await closeAllProjectServers(projectServers.values());
         throw error;
     }
 };
@@ -3756,11 +3890,6 @@ const runBrowserController = async (context, options)=>{
     const enableCliShortcuts = isWatchMode && isBrowserWatchCliShortcutsEnabled();
     const browserTempOutputRoot = context.normalizedConfig.output.distPath.root;
     const tempDir = isWatchMode && watchContext.runtime ? watchContext.runtime.tempDir : isWatchMode ? join(context.rootPath, browserTempOutputRoot, 'browser', 'watch') : join(context.rootPath, browserTempOutputRoot, 'browser', Date.now().toString());
-    const manifestPath = join(tempDir, VIRTUAL_MANIFEST_FILENAME);
-    const manifestSource = generateManifestModule({
-        manifestPath,
-        entries: projectEntries
-    });
     if (isWatchMode) watchContext.lastTestFiles = collectWatchTestFiles(projectEntries);
     let runtime = isWatchMode ? watchContext.runtime : null;
     let triggerRerun;
@@ -3768,8 +3897,7 @@ const runBrowserController = async (context, options)=>{
         try {
             runtime = await createBrowserRuntime({
                 context,
-                manifestPath,
-                manifestSource,
+                projectEntries,
                 tempDir,
                 isWatchMode,
                 onTriggerRerun: isWatchMode ? async ()=>{
@@ -3794,7 +3922,7 @@ const runBrowserController = async (context, options)=>{
             });
         }
     }
-    const { browser, browserLaunchOptions, port, wsPort, wss } = runtime;
+    const { browser, browserLaunchOptions, wsPort, wss } = runtime;
     const buildTime = Date.now() - buildStart;
     const allTestFiles = projectEntries.flatMap((entry)=>entry.testFiles.map((testPath)=>({
                 testPath: normalize(testPath),
@@ -3808,13 +3936,20 @@ const runBrowserController = async (context, options)=>{
             viewport: project.normalizedConfig.browser.viewport
         }));
     const maxTestTimeoutForRpc = Math.max(...browserProjects.map((p)=>p.normalizedConfig.testTimeout ?? DEFAULT_TEST_TIMEOUT));
+    const projectRunnerUrls = Object.fromEntries([
+        ...runtime.projectServers
+    ].map(([name, server])=>[
+            name,
+            `http://localhost:${server.port}`
+        ]));
     const hostOptions = {
         rootPath: normalize(context.rootPath),
         projects: projectRuntimeConfigs,
         snapshot: {
             updateSnapshot: context.snapshotManager.options.updateSnapshot
         },
-        runnerUrl: `http://localhost:${port}`,
+        runnerUrl: `http://localhost:${runtime.containerServer.port}`,
+        projectRunnerUrls,
         wsPort,
         debug: isDebug(),
         rpcTimeout: maxTestTimeoutForRpc
@@ -4133,11 +4268,16 @@ const runBrowserController = async (context, options)=>{
             const donePromise = new Promise((resolve)=>{
                 resolveDone = resolve;
             });
-            const projectRuntime = projectRuntimeConfigs.find((project)=>project.name === file.projectName);
-            const perFileTimeoutMs = (projectRuntime?.runtimeConfig.testTimeout ?? maxTestTimeoutForRpc) + PER_FILE_TIMEOUT_BUFFER_MS;
-            let timeoutId;
+            const crashDeferred = createDeferredPromise();
+            const onPageDead = (reason)=>{
+                if (settled || run.cancelled || !runLifecycle.isTokenActive(run.token)) return;
+                settled = true;
+                crashDeferred.resolve(reason);
+            };
             try {
                 page = await browserContext.newPage();
+                page.on('crash', ()=>onPageDead(`Browser page crashed while running ${file.testPath}.`));
+                page.on('close', ()=>onPageDead(`Browser page closed unexpectedly while running ${file.testPath}.`));
                 const session = sessionRegistry.register({
                     testFile: file.testPath,
                     projectName: file.projectName,
@@ -4184,21 +4324,27 @@ const runBrowserController = async (context, options)=>{
                 };
                 const serializedOptions = serializeForInlineScript(inlineOptions);
                 await page.addInitScript(`window.__RSTEST_BROWSER_OPTIONS__ = ${serializedOptions};`);
-                await page.goto(`http://localhost:${port}/runner.html`, {
+                const projectServer = runtime.projectServers.get(file.projectName);
+                if (!projectServer) throw new Error(`No browser dev server for project "${file.projectName}" (test file: ${file.testPath}).`);
+                await page.goto(`http://localhost:${projectServer.port}/runner.html`, {
                     waitUntil: 'load'
                 });
-                const timeoutPromise = new Promise((resolve)=>{
-                    timeoutId = setTimeout(()=>resolve('timeout'), perFileTimeoutMs);
-                });
                 const state = await Promise.race([
-                    donePromise.then(()=>'done'),
-                    timeoutPromise,
-                    run.cancelSignal.then(()=>'cancelled')
+                    donePromise.then(()=>({
+                            type: 'done'
+                        })),
+                    crashDeferred.promise.then((reason)=>({
+                            type: 'crash',
+                            reason
+                        })),
+                    run.cancelSignal.then(()=>({
+                            type: 'cancelled'
+                        }))
                 ]);
-                if ('cancelled' === state) return;
-                if ('timeout' === state && runLifecycle.isTokenActive(run.token) && !run.cancelled) {
+                if ('cancelled' === state.type) return;
+                if ('crash' === state.type && runLifecycle.isTokenActive(run.token) && !run.cancelled) {
                     await handleFatal({
-                        message: `Test execution timeout after ${perFileTimeoutMs / 1000}s for ${file.testPath}.`
+                        message: state.reason
                     });
                     await cancelRun(run, false);
                 }
@@ -4212,7 +4358,6 @@ const runBrowserController = async (context, options)=>{
                     await cancelRun(run, false);
                 }
             } finally{
-                if (timeoutId) clearTimeout(timeoutId);
                 if (page) try {
                     await page.close();
                 } catch  {}
@@ -4455,10 +4600,6 @@ const runBrowserController = async (context, options)=>{
         if (!fileInfo) throw new Error(`Unknown browser test file: ${JSON.stringify(testFile)}`);
         return fileInfo;
     };
-    const getHeadedPerFileTimeoutMs = (file)=>{
-        const projectRuntime = projectRuntimeConfigs.find((project)=>project.name === file.projectName);
-        return (projectRuntime?.runtimeConfig.testTimeout ?? maxTestTimeoutForRpc) + PER_FILE_TIMEOUT_BUFFER_MS;
-    };
     let containerContext;
     let containerPage;
     let isNewPage = false;
@@ -4528,26 +4669,14 @@ const runBrowserController = async (context, options)=>{
         pendingHeadedReloads.delete(testPath);
         pending.deferred.resolve();
     };
-    const reloadTestFileWithTimeout = async (file, testNamePattern)=>{
-        const timeoutMs = getHeadedPerFileTimeoutMs(file);
-        let timeoutId;
+    const reloadTestFileAndWait = async (file, testNamePattern)=>{
         let reloadAck;
         try {
             reloadAck = await rpcManager.reloadTestFile(file.testPath, testNamePattern);
-            const completionPromise = registerPendingHeadedReload(file.testPath, reloadAck.runId);
-            await Promise.race([
-                completionPromise,
-                new Promise((_, reject)=>{
-                    timeoutId = setTimeout(()=>{
-                        reject(new Error(`Headed test execution timeout after ${timeoutMs / 1000}s for ${file.testPath}.`));
-                    }, timeoutMs);
-                })
-            ]);
+            await registerPendingHeadedReload(file.testPath, reloadAck.runId);
         } catch (error) {
             if (reloadAck?.runId) rejectPendingHeadedReload(file.testPath, toError(error), reloadAck.runId);
             throw error;
-        } finally{
-            if (timeoutId) clearTimeout(timeoutId);
         }
     };
     const createRpcMethods = ()=>({
@@ -4604,14 +4733,15 @@ const runBrowserController = async (context, options)=>{
     }
     if (isNewPage) {
         const pagePath = '/';
-        await containerPage.goto(`http://localhost:${port}${pagePath}`, {
+        const containerPort = runtime.containerServer.port;
+        await containerPage.goto(`http://localhost:${containerPort}${pagePath}`, {
             waitUntil: 'load'
         });
-        logger.log(color.cyan(`\nBrowser mode opened at http://localhost:${port}${pagePath}\n`));
+        logger.log(color.cyan(`\nBrowser mode opened at http://localhost:${containerPort}${pagePath}\n`));
     }
     enqueueHeadedReload = async (file, testNamePattern)=>headedReloadQueue.enqueue(async ()=>{
             if (fatalError) return;
-            await reloadTestFileWithTimeout(file, testNamePattern);
+            await reloadTestFileAndWait(file, testNamePattern);
         });
     let testTime = 0;
     if (currentTestFiles.length > 0) {
@@ -4732,18 +4862,12 @@ const listBrowserTests = async (context, options)=>{
         close: async ()=>{}
     };
     const tempDir = join(context.rootPath, context.normalizedConfig.output.distPath.root, 'browser', `list-${Date.now()}`);
-    const manifestPath = join(tempDir, VIRTUAL_MANIFEST_FILENAME);
-    const manifestSource = generateManifestModule({
-        manifestPath,
-        entries: projectEntries
-    });
     const browserProjects = getBrowserProjects(context);
     let runtime;
     try {
         runtime = await createBrowserRuntime({
             context,
-            manifestPath,
-            manifestSource,
+            projectEntries,
             tempDir,
             isWatchMode: false,
             containerDistPath: void 0,
@@ -4757,7 +4881,7 @@ const listBrowserTests = async (context, options)=>{
         logger.error(color.red(`Failed to initialize browser provider runtime (${providers.join(', ')}).`), error);
         throw error;
     }
-    const { browser, browserLaunchOptions, port } = runtime;
+    const { browser, browserLaunchOptions } = runtime;
     const projectRuntimeConfigs = browserProjects.map((project)=>({
             name: project.name,
             environmentName: project.environmentName,
@@ -4777,70 +4901,81 @@ const listBrowserTests = async (context, options)=>{
         rpcTimeout: maxTestTimeoutForRpc
     };
     runtime.setContainerOptions(hostOptions);
-    const collectResults = [];
-    let fatalError = null;
-    let collectCompleted = false;
-    let resolveCollect;
-    const collectPromise = new Promise((resolve)=>{
-        resolveCollect = resolve;
-    });
     const browserContext = await browser.newContext({
         providerOptions: browserLaunchOptions.providerOptions,
         viewport: null
     });
-    const page = await browserContext.newPage();
-    await page.exposeFunction(DISPATCH_MESSAGE_TYPE, (message)=>{
-        switch(message.type){
-            case 'collect-result':
-                {
-                    const payload = message.payload;
-                    collectResults.push({
-                        testPath: payload.testPath,
-                        project: payload.project,
-                        tests: payload.tests
-                    });
-                    break;
-                }
-            case 'collect-complete':
-                collectCompleted = true;
-                resolveCollect?.();
-                break;
-            case 'fatal':
-                {
-                    const payload = message.payload;
-                    fatalError = new Error(payload.message);
-                    fatalError.stack = payload.stack;
+    const serializedOptions = serializeForInlineScript(hostOptions);
+    const collectFromServer = async (server)=>{
+        const results = [];
+        let error = null;
+        let collectCompleted = false;
+        let resolveCollect;
+        const collectPromise = new Promise((resolve)=>{
+            resolveCollect = resolve;
+        });
+        const page = await browserContext.newPage();
+        await page.exposeFunction(DISPATCH_MESSAGE_TYPE, (message)=>{
+            switch(message.type){
+                case 'collect-result':
+                    {
+                        const payload = message.payload;
+                        results.push({
+                            testPath: payload.testPath,
+                            project: payload.project,
+                            tests: payload.tests
+                        });
+                        break;
+                    }
+                case 'collect-complete':
+                    collectCompleted = true;
                     resolveCollect?.();
                     break;
-                }
-            case 'ready':
-            case 'log':
-                break;
-            default:
-                logger.debug(`[List] Unexpected message: ${message.type}`);
-        }
-    });
-    const serializedOptions = serializeForInlineScript(hostOptions);
-    await page.addInitScript(`window.__RSTEST_BROWSER_OPTIONS__ = ${serializedOptions};`);
-    await page.goto(`http://localhost:${port}/runner.html`, {
-        waitUntil: 'load'
-    });
-    const timeoutMs = 30000;
-    let timeoutId;
-    const timeoutPromise = new Promise((resolve)=>{
-        timeoutId = setTimeout(()=>{
-            if (!collectCompleted) logger.warn(color.yellow(`[List] Browser test collection timed out after ${timeoutMs}ms`));
-            resolve();
-        }, timeoutMs);
-    });
-    await Promise.race([
-        collectPromise,
-        timeoutPromise
-    ]);
-    if (timeoutId) clearTimeout(timeoutId);
+                case 'fatal':
+                    {
+                        const payload = message.payload;
+                        error = new Error(payload.message);
+                        error.stack = payload.stack;
+                        resolveCollect?.();
+                        break;
+                    }
+                case 'ready':
+                case 'log':
+                    break;
+                default:
+                    logger.debug(`[List] Unexpected message: ${message.type}`);
+            }
+        });
+        await page.addInitScript(`window.__RSTEST_BROWSER_OPTIONS__ = ${serializedOptions};`);
+        await page.goto(`http://localhost:${server.port}/runner.html`, {
+            waitUntil: 'load'
+        });
+        const timeoutMs = 30000;
+        let timeoutId;
+        const timeoutPromise = new Promise((resolve)=>{
+            timeoutId = setTimeout(()=>{
+                if (!collectCompleted) logger.warn(color.yellow(`[List] Browser test collection timed out after ${timeoutMs}ms`));
+                resolve();
+            }, timeoutMs);
+        });
+        await Promise.race([
+            collectPromise,
+            timeoutPromise
+        ]);
+        if (timeoutId) clearTimeout(timeoutId);
+        await page.close().catch(()=>{});
+        return {
+            results,
+            error
+        };
+    };
+    const collected = await Promise.all([
+        ...runtime.projectServers.values()
+    ].map((server)=>collectFromServer(server)));
+    const collectResults = collected.flatMap((entry)=>entry.results);
+    const fatalError = collected.find((entry)=>entry.error)?.error ?? null;
     const cleanup = async ()=>{
         try {
-            await page.close();
             await browserContext.close();
         } catch  {}
         await destroyBrowserRuntime(runtime);