weapp-vite 6.22.0 → 6.23.0

package/dist/auto-routes.mjs

@@ -1,4 +1,4 @@
-import { n as getCompilerContext, v as getRouteRuntimeGlobalKeys } from "./createContext-PBWMhrli.mjs";
+import { n as getCompilerContext, y as getRouteRuntimeGlobalKeys } from "./createContext-RnHhe84f.mjs";
 //#region src/auto-routes.ts
 const ROUTE_RUNTIME_OVERRIDE_KEY = Symbol.for("weapp-vite.route-runtime");
 function createGetter(resolver) {

package/dist/cli.mjs

@@ -1,6 +1,6 @@
-import { A as shouldPassPlatformArgToIdeOpen, C as findPreloadRuleKey, D as parseCommentJson, E as loadViteConfigFile, O as createCjsConfigLoadError, S as collectPreloadPages, T as suggestPreloadRules, _ as resolveHmrProfileJsonPath, a as formatBytes, b as checkRuntime, d as getBackendForCapability, f as resolveBackendExecution, g as SHARED_CHUNK_VIRTUAL_PREFIX, h as createSharedBuildConfig, j as isPathInside, k as getDefaultIdeProjectRoot, m as syncManagedTsconfigBootstrapFiles, p as syncProjectSupportFiles, t as createCompilerContext, w as resolvePreloadPackageIdentifier, x as getProjectConfigFileName, y as resolveWeappConfigFile } from "./createContext-PBWMhrli.mjs";
+import { A as getDefaultIdeProjectRoot, C as collectPreloadPages, D as loadViteConfigFile, E as suggestPreloadRules, M as isPathInside, O as parseCommentJson, S as getProjectConfigFileName, T as resolvePreloadPackageIdentifier, _ as SHARED_CHUNK_VIRTUAL_PREFIX, a as createGlassEaselAnalyzeResult, b as resolveWeappConfigFile, f as getBackendForCapability, g as createSharedBuildConfig, h as syncManagedTsconfigBootstrapFiles, j as shouldPassPlatformArgToIdeOpen, k as createCjsConfigLoadError, m as syncProjectSupportFiles, o as formatBytes, p as resolveBackendExecution, t as createCompilerContext, v as resolveHmrProfileJsonPath, w as findPreloadRuleKey, x as checkRuntime } from "./createContext-RnHhe84f.mjs";
 import { r as logger_default, t as colors } from "./logger-mt4mSTqV.mjs";
-import { h as VERSION, i as findJsEntry, o as findTemplateEntry, s as findVueEntry } from "./file-D0n-Q1ra.mjs";
+import { h as VERSION, i as findJsEntry, o as findTemplateEntry, s as findVueEntry } from "./file-Cr034LIZ.mjs";
 import { c as startWeappViteMcpServer, l as detectAiDevelopmentEnvironment, s as resolveWeappMcpConfig } from "./mcp-BG6TliEg.mjs";
 import { createRequire } from "node:module";
 import fs from "node:fs";
@@ -16,7 +16,7 @@ import os from "node:os";
 import { execFile, spawn } from "node:child_process";
 import { Buffer } from "node:buffer";
 import { cac } from "cac";
-import { RETRY_CANCEL_KEYS, RETRY_CONFIRM_KEYS, bootstrapWechatDevtoolsSettings, buildWechatIdeNpm, clearWechatIdeCache, clearWechatIdeCacheByAutomator, closeSharedMiniProgram, closeWechatIdeProject, compileWechatIdeByAutomator, connectOpenedAutomator, createSharedInputSession, createWechatIdeLoginRequiredExitError, defaultCustomConfigFilePath, detectWechatDevtoolsServicePort, dispatchWechatCliCommand, formatAutomatorLoginError, getConfig, getWechatIdeTestAccounts, getWechatIdeTicket, getWechatIdeToolInfo, isAutomatorLoginError, isWeappIdeTopLevelCommand, isWechatIdeEngineBuildEndpointMissingError, isWechatIdeLoggedIn, isWechatIdeLoginRequiredError, isWechatIdeLoginRequiredExitError, launchAutomator, parse as parse$1, promptRetryKeypress, promptWechatIdeLoginRetry, quitWechatIde, refreshWechatIdeTicket, resetWechatIdeFileUtilsByHttp, resolveCliPath, resolveProjectAutomatorPort, runRetryableCommand, runWechatIdeEngineBuild, runWithSuspendedSharedInput, setWechatIdeTicket, startForwardConsole, takeScreenshot } from "weapp-ide-cli";
+import { RETRY_CANCEL_KEYS, RETRY_CONFIRM_KEYS, bootstrapWechatDevtoolsSettings, buildWechatIdeNpm, clearWechatIdeCache, clearWechatIdeCacheByAutomator, closeSharedMiniProgram, closeWechatIdeProject, compileWechatIdeByAutomator, connectOpenedAutomator, createSharedInputSession, createWechatIdeLoginRequiredExitError, defaultCustomConfigFilePath, detectWechatDevtoolsServicePort, dispatchWechatCliCommand, formatAutomatorLoginError, getConfig, getWechatIdeTestAccounts, getWechatIdeTicket, getWechatIdeToolInfo, isAutomatorLoginError, isRetryableAutomatorLaunchError, isWeappIdeTopLevelCommand, isWechatIdeEngineBuildEndpointMissingError, isWechatIdeLoggedIn, isWechatIdeLoginRequiredError, isWechatIdeLoginRequiredExitError, launchAutomator, parse as parse$1, promptRetryKeypress, promptWechatIdeLoginRetry, quitWechatIde, refreshWechatIdeTicket, resetWechatIdeFileUtilsByHttp, resolveCliPath, resolveProjectAutomatorPort, runRetryableCommand, runWechatIdeEngineBuild, runWithSuspendedSharedInput, setWechatIdeTicket, startForwardConsole, takeScreenshot } from "weapp-ide-cli";
 import { promisify } from "node:util";
 import { brotliCompressSync, gzipSync } from "node:zlib";
 import { resolveCommand } from "package-manager-detector/commands";
@@ -387,11 +387,12 @@ async function tryReuseOpenedWechatIde(projectPath, closeIde, options = {}) {
 */
 async function reopenOpenedWechatIde(projectPath, closeIde, options = {}) {
 	const connection = await connectOpenedProject(projectPath);
-	if (connection.status !== "connected") return false;
-	const { miniProgram } = connection;
-	disconnectMiniProgram(miniProgram);
-	logger_default.info("目标项目已在微信开发者工具中打开，当前命令将主动重开以刷新最新构建产物。");
-	if (!await closeIde()) logger_default.warn("关闭当前微信开发者工具失败，仍继续尝试重新打开目标项目。");
+	if (connection.status === "connected") {
+		disconnectMiniProgram(connection.miniProgram);
+		logger_default.info("目标项目已在微信开发者工具中打开，当前命令将主动重开以刷新最新构建产物。");
+	} else if (connection.status === "unhealthy") logger_default.info("目标项目的 automator 会话未通过健康检查，当前命令将关闭窗口并重新拉起。");
+	else logger_default.info("未检测到可复用的 automator 会话，当前命令将关闭现有窗口并重新拉起目标项目。");
+	if (!await (connection.status === "connected" ? closeIde : options.restartIde ?? closeIde)()) logger_default.warn("关闭当前微信开发者工具失败，仍继续尝试重新打开目标项目。");
 	await openWechatIdeByAutomator(projectPath, options);
 	return true;
 }
@@ -402,7 +403,11 @@ function shouldLogAutomatorFallbackError() {
 	return flag === "1" || flag === "true";
 }
 const PREPARE_AUTOMATOR_SESSION_TIMEOUT = 8e3;
+const AUTOMATOR_RECOVERY_QUIT_SETTLE_MS = 5e3;
 const RESET_FILEUTILS_ENV = "WEAPP_VITE_RESET_IDE_FILEUTILS";
+function sleep$1(ms) {
+	return new Promise((resolve) => setTimeout(resolve, ms));
+}
 function readProjectConfigObject(projectPath) {
 	try {
 		const raw = fs.readFileSync(path.join(projectPath, "project.config.json"), "utf8");
@@ -456,11 +461,21 @@ function resolveIdeProjectRoot(mpDistRoot, cwd) {
 async function closeIde() {
 	return await closeIde$1();
 }
+async function restartWechatIdeForAutomatorRecovery() {
+	try {
+		await quitWechatIde();
+		await sleep$1(AUTOMATOR_RECOVERY_QUIT_SETTLE_MS);
+		return true;
+	} catch {
+		return await closeIde();
+	}
+}
 async function tryOpenWechatIdeByAutomator(projectPath, options) {
 	const preserveProjectRoot = !shouldUseAutomatorProjectWrapper(projectPath);
 	if (options.reuseOpenedProject === false) {
 		if (await reopenOpenedWechatIde(projectPath, closeIde, {
 			preserveProjectRoot,
+			restartIde: restartWechatIdeForAutomatorRecovery,
 			trustProject: options.trustProject
 		})) return "reopened";
 	}
@@ -1293,6 +1308,10 @@ function readUsingComponents(config) {
 	if (!isRecord(config) || !isRecord(config.usingComponents)) return [];
 	return Object.entries(config.usingComponents).filter((entry) => typeof entry[1] === "string" && entry[1].trim() !== "");
 }
+function readComponentGenericDefaults(config) {
+	if (!isRecord(config) || !isRecord(config.componentGenerics)) return [];
+	return Object.entries(config.componentGenerics).map(([name, value]) => isRecord(value) && typeof value.default === "string" && value.default.trim() !== "" ? [name, value.default] : void 0).filter((entry) => Boolean(entry));
+}
 function readComponentPlaceholder(config) {
 	if (!isRecord(config) || !isRecord(config.componentPlaceholder)) return /* @__PURE__ */ new Set();
 	return new Set(Object.keys(config.componentPlaceholder));
@@ -1367,14 +1386,14 @@ function analyzeComponentUsage(options) {
 	for (const route of configs.keys()) packageMap.set(route, resolvePackageId(route, options.subPackages));
 	for (const [owner, config] of configs) {
 		const placeholders = readComponentPlaceholder(config);
-		const edges = readUsingComponents(config).map(([name, request]) => {
+		const edges = [...readUsingComponents(config), ...readComponentGenericDefaults(config)].map(([name, request]) => {
 			const component = resolveComponentRoute(owner, request);
 			return component && configs.has(component) ? {
 				owner,
 				component,
 				placeholderCovered: placeholders.has(name)
 			} : void 0;
-		}).filter((edge) => Boolean(edge));
+		}).filter((edge) => Boolean(edge)).filter((edge, index, all) => all.findIndex((item) => item.component === edge.component) === index);
 		if (edges.length > 0) graph.set(owner, edges);
 	}
 	const usageMap = /* @__PURE__ */ new Map();
@@ -1784,7 +1803,8 @@ async function analyzeSubpackages(ctx) {
 		components: analyzeComponentUsage({
 			jsonConfigs: componentJsonConfigs,
 			subPackages
-		})
+		}),
+		glassEasel: createGlassEaselAnalyzeResult(ctx)
 	};
 }
 //#endregion
@@ -2759,6 +2779,25 @@ function printBudgetCheckSummary(result) {
 	for (const item of exceededItems) logger_default.error(`- ${item.label}：${formatAnalyzeBytes(item.currentBytes)} / ${formatAnalyzeBytes(item.limitBytes)} (${(item.ratio * 100).toFixed(1)}%)`);
 	return true;
 }
+function printGlassEaselCheckSummary(result) {
+	const { glassEasel } = result;
+	if (!glassEasel.detected) {
+		logger_default.info("未检测到 glass-easel 配置。");
+		return false;
+	}
+	if (glassEasel.diagnostics.length === 0) {
+		logger_default.success("glass-easel 迁移检查通过");
+		return false;
+	}
+	logger_default.info(`glass-easel 迁移检查：${glassEasel.summary.errors} 个错误，${glassEasel.summary.warnings} 个警告`);
+	for (const diagnostic of glassEasel.diagnostics) {
+		const location = diagnostic.line ? `:${diagnostic.line}:${diagnostic.column}` : "";
+		const message = `[${diagnostic.code}] ${diagnostic.file}${location} ${diagnostic.message}`;
+		if (diagnostic.severity === "error") logger_default.error(message);
+		else logger_default.warn(message);
+	}
+	return glassEasel.summary.errors > 0;
+}
 function printWebAnalysisSummary(result) {
 	logger_default.success("Web 静态分析完成");
 	logger_default.info(`- 配置状态：${result.web.enabled ? "已启用 weapp.web" : "未启用 weapp.web"}`);
@@ -2913,7 +2952,7 @@ function printHmrProfileAnalysisSummary(result, configService) {
 	}
 }
 function registerAnalyzeCommand(cli) {
-	cli.command("analyze [root]", "analyze 两端包体与源码映射").option("--hmr-profile [file]", `[string | boolean] 分析 HMR JSONL profile，省略值时优先读取配置，否则回退到默认路径`).option("--json", `[boolean] 输出 JSON 结果`).option("--markdown", `[boolean] 输出 Markdown 报告`).option("--report <type>", `[string] 输出指定报告类型（pr）`).option("--budget-check", `[boolean] 检查 analyze 预算，超过预算时返回非 0 退出码`).option("--preload", `[boolean] 分析静态页面跳转、实际分包体积和 preloadRule 额度`).option("--output <file>", `[string] 将分析结果写入指定文件（JSON 或 Markdown）`).option("-p, --platform <platform>", `[string] target platform (weapp | web)`).option("--project-config <path>", `[string] project config path (miniprogram only)`).action(async (root, options) => {
+	cli.command("analyze [root]", "analyze 两端包体与源码映射").option("--hmr-profile [file]", `[string | boolean] 分析 HMR JSONL profile，省略值时优先读取配置，否则回退到默认路径`).option("--json", `[boolean] 输出 JSON 结果`).option("--markdown", `[boolean] 输出 Markdown 报告`).option("--report <type>", `[string] 输出指定报告类型（pr）`).option("--budget-check", `[boolean] 检查 analyze 预算，超过预算时返回非 0 退出码`).option("--glass-easel-check", `[boolean] 检查 glass-easel 配置、模板和 SelectorQuery 迁移兼容性`).option("--preload", `[boolean] 分析静态页面跳转、实际分包体积和 preloadRule 额度`).option("--output <file>", `[string] 将分析结果写入指定文件（JSON 或 Markdown）`).option("-p, --platform <platform>", `[string] target platform (weapp | web)`).option("--project-config <path>", `[string] project config path (miniprogram only)`).action(async (root, options) => {
 		filterDuplicateOptions(options);
 		const configFile = resolveConfigFile(options);
 		const outputJson = coerceBooleanOption(options.json);
@@ -2922,6 +2961,7 @@ function registerAnalyzeCommand(cli) {
 		const outputPrReport = reportType === "pr";
 		if (reportType && !outputPrReport) throw new Error(`不支持的 analyze report 类型：${reportType}`);
 		const budgetCheck = coerceBooleanOption(options.budgetCheck);
+		const glassEaselCheck = coerceBooleanOption(options.glassEaselCheck);
 		const targets = resolveRuntimeTargets(options);
 		const inlineConfig = createInlineConfig(targets);
 		let ctx;
@@ -2976,6 +3016,7 @@ function registerAnalyzeCommand(cli) {
 				return;
 			}
 			const previousResult = await readLatestAnalyzeHistorySnapshot(ctx.configService);
+			ctx.runtimeState.glassEasel.silent = Boolean(outputJson || outputMarkdown || outputPrReport || glassEaselCheck);
 			const result = await analyzeSubpackages(ctx);
 			await writeAnalyzeHistorySnapshot(result, ctx.configService);
 			const writtenPath = await writeAnalyzeResult(result, outputOption, ctx.configService, outputPrReport ? "pr" : outputMarkdown ? "markdown" : "json", previousResult);
@@ -2986,8 +3027,10 @@ function registerAnalyzeCommand(cli) {
 			} else if (outputJson) {
 				if (!writtenPath) process.stdout.write(`${JSON.stringify(result, null, 2)}\n`);
 			}
-			if (budgetCheck ? printBudgetCheckSummary(result) : false) process.exitCode = 1;
-			if (budgetCheck) return;
+			const budgetFailed = budgetCheck ? printBudgetCheckSummary(result) : false;
+			const glassEaselFailed = glassEaselCheck && !outputJson ? printGlassEaselCheckSummary(result) : glassEaselCheck && result.glassEasel.summary.errors > 0;
+			if (budgetFailed || glassEaselFailed) process.exitCode = 1;
+			if (budgetCheck || glassEaselCheck) return;
 			if (!outputPrReport && !outputMarkdown && !outputJson) {
 				printAnalysisSummary(result);
 				await startAnalyzeDashboard(result, {
@@ -3448,8 +3491,12 @@ const DEFAULT_FORWARD_CONSOLE_LEVELS = [
 ];
 let activeForwardConsoleSession;
 let activeForwardConsoleBridgeOptions;
+let activeForwardConsoleStart;
+let forwardConsoleLifecycle = 0;
 const FORWARD_CONSOLE_RETRY_DELAY_MS = 1e3;
 const FORWARD_CONSOLE_RETRY_TIMES = 5;
+const FORWARD_CONSOLE_RETRY_WINDOW_MS = 1e4;
+const FORWARD_CONSOLE_RECOVERABLE_START_TIMEOUT_MS = 6e4;
 const FORWARD_CONSOLE_START_TIMEOUT_MS = 12e4;
 async function detectAgent() {
 	try {
@@ -3487,16 +3534,23 @@ function writeForwardConsoleLine(line) {
 function isDevtoolsPortNotReadyError(error) {
 	return error instanceof Error && (error.message === "DEVTOOLS_HTTP_PORT_ERROR" || error.message === "DEVTOOLS_WS_CONNECT_ERROR" || error.message === "DEVTOOLS_EXTENSION_CONTEXT_INVALIDATED");
 }
+function isDevtoolsProtocolTimeoutError(error) {
+	return error instanceof Error && (error.message === "DEVTOOLS_PROTOCOL_TIMEOUT" || /DevTools did not respond to protocol method \S+ within \d+ms/i.test(error.message));
+}
+function isRecoverableAutomatorStartError(error) {
+	return isDevtoolsPortNotReadyError(error) || isDevtoolsProtocolTimeoutError(error) || isRetryableAutomatorLaunchError(error);
+}
 function sleep(ms) {
 	return new Promise((resolve) => setTimeout(resolve, ms));
 }
 async function withForwardConsoleRetry(runner) {
 	let lastError;
+	const startedAt = Date.now();
 	for (let attempt = 0; attempt <= FORWARD_CONSOLE_RETRY_TIMES; attempt++) try {
 		return await runner();
 	} catch (error) {
 		lastError = error;
-		if (!isDevtoolsPortNotReadyError(error) || attempt === FORWARD_CONSOLE_RETRY_TIMES) break;
+		if (!isDevtoolsPortNotReadyError(error) || attempt === FORWARD_CONSOLE_RETRY_TIMES || Date.now() - startedAt >= FORWARD_CONSOLE_RETRY_WINDOW_MS) break;
 		await sleep(FORWARD_CONSOLE_RETRY_DELAY_MS);
 	}
 	throw lastError instanceof Error ? lastError : new Error(String(lastError));
@@ -3550,6 +3604,8 @@ async function startForwardConsoleBridge(options) {
 			projectPath: options.projectPath,
 			logLevels: options.logLevels,
 			openedOnly: options.openedOnly,
+			preferOpenedSession: options.preferOpenedSession,
+			preserveProjectRoot: options.preserveProjectRoot,
 			port: options.port,
 			timeout: options.timeout,
 			unhandledErrors: options.unhandledErrors,
@@ -3589,57 +3645,100 @@ async function pauseActiveForwardConsole() {
 	};
 }
 /**
+* @description 关闭当前 DevTools 日志桥并释放共享 automator 会话。
+*/
+async function closeActiveForwardConsole() {
+	forwardConsoleLifecycle += 1;
+	const session = activeForwardConsoleSession;
+	const pendingStart = activeForwardConsoleStart;
+	activeForwardConsoleSession = void 0;
+	activeForwardConsoleBridgeOptions = void 0;
+	await session?.close();
+	await pendingStart?.catch(() => {});
+}
+/**
 * @description 在 weapp 开发态按需启动控制台转发。
 */
 async function maybeStartForwardConsole(options) {
 	if (options.platform !== "weapp") return false;
 	const projectPath = resolveIdeProjectPath(options.mpDistRoot) ?? options.cwd;
 	if (!projectPath) return false;
-	const resolved = await resolveForwardConsoleOptions(options.weappViteConfig);
-	if (!resolved.enabled) return false;
 	if (activeForwardConsoleSession) return true;
-	const bridgeOptions = {
-		agentName: resolved.agentName,
-		color: !resolved.agentName,
-		projectPath,
-		port: resolveProjectAutomatorPort(projectPath),
-		timeout: FORWARD_CONSOLE_START_TIMEOUT_MS,
-		logLevels: resolved.logLevels,
-		openedOnly: options.openedOnly,
-		unhandledErrors: resolved.unhandledErrors,
-		onReadyMessage: "[forwardConsole] 已连接微信开发者工具日志"
-	};
-	try {
-		activeForwardConsoleSession = await startForwardConsoleBridge(bridgeOptions);
-		activeForwardConsoleBridgeOptions = bridgeOptions;
-		return true;
-	} catch (error) {
-		if (!isDevtoolsPortNotReadyError(error)) {
-			activeForwardConsoleSession = void 0;
-			activeForwardConsoleBridgeOptions = void 0;
-			const message = error instanceof Error ? error.message : String(error);
-			logger_default.warn(`[forwardConsole] 启动失败，回退到普通 IDE 打开流程：${message}`);
-			return false;
-		}
+	if (activeForwardConsoleStart) return await activeForwardConsoleStart;
+	const lifecycle = forwardConsoleLifecycle;
+	const startTask = (async () => {
+		const resolved = await resolveForwardConsoleOptions(options.weappViteConfig);
+		if (!resolved.enabled || lifecycle !== forwardConsoleLifecycle) return false;
+		const bridgeOptions = {
+			agentName: resolved.agentName,
+			color: !resolved.agentName,
+			projectPath,
+			port: resolveProjectAutomatorPort(projectPath),
+			timeout: options.recoverAutomatorSession ? FORWARD_CONSOLE_RECOVERABLE_START_TIMEOUT_MS : FORWARD_CONSOLE_START_TIMEOUT_MS,
+			logLevels: resolved.logLevels,
+			openedOnly: options.openedOnly,
+			preferOpenedSession: options.preferOpenedSession,
+			preserveProjectRoot: options.preserveProjectRoot ?? !shouldUseAutomatorProjectWrapper(projectPath),
+			unhandledErrors: resolved.unhandledErrors,
+			onReadyMessage: "[forwardConsole] 已连接微信开发者工具日志"
+		};
+		const activateSession = async (session, activeOptions) => {
+			if (lifecycle !== forwardConsoleLifecycle) {
+				await session.close();
+				return false;
+			}
+			activeForwardConsoleSession = session;
+			activeForwardConsoleBridgeOptions = activeOptions;
+			return true;
+		};
+		const recoverAutomatorSession = async () => {
+			try {
+				await options.recoverAutomatorSession?.();
+				if (lifecycle !== forwardConsoleLifecycle) return false;
+				const recoveredOptions = {
+					...bridgeOptions,
+					openedOnly: true,
+					preferOpenedSession: true
+				};
+				return await activateSession(await startForwardConsoleBridge(recoveredOptions), recoveredOptions);
+			} catch (recoveryError) {
+				if (lifecycle !== forwardConsoleLifecycle) return false;
+				const message = recoveryError instanceof Error ? recoveryError.message : String(recoveryError);
+				logger_default.warn(`[forwardConsole] automator 会话恢复失败，回退到普通 IDE 打开流程：${message}`);
+				return false;
+			}
+		};
 		try {
-			activeForwardConsoleSession = await startForwardConsoleBridge({
-				...bridgeOptions,
-				openedOnly: true,
-				port: void 0
-			});
-			activeForwardConsoleBridgeOptions = {
+			return await activateSession(await startForwardConsoleBridge(bridgeOptions), bridgeOptions);
+		} catch (error) {
+			if (lifecycle !== forwardConsoleLifecycle) return false;
+			if (options.recoverAutomatorSession && isRecoverableAutomatorStartError(error)) return await recoverAutomatorSession();
+			if (!isDevtoolsPortNotReadyError(error)) {
+				const message = error instanceof Error ? error.message : String(error);
+				logger_default.warn(`[forwardConsole] 启动失败，回退到普通 IDE 打开流程：${message}`);
+				return false;
+			}
+			const fallbackOptions = {
 				...bridgeOptions,
 				openedOnly: true,
-				port: void 0
+				port: void 0,
+				preferOpenedSession: true
 			};
-			return true;
-		} catch (fallbackError) {
-			activeForwardConsoleSession = void 0;
-			activeForwardConsoleBridgeOptions = void 0;
-			const message = fallbackError instanceof Error ? fallbackError.message : String(fallbackError);
-			logger_default.warn(`[forwardConsole] 启动失败，回退到普通 IDE 打开流程：${message}`);
-			return false;
+			try {
+				return await activateSession(await startForwardConsoleBridge(fallbackOptions), fallbackOptions);
+			} catch (fallbackError) {
+				if (lifecycle !== forwardConsoleLifecycle) return false;
+				const message = fallbackError instanceof Error ? fallbackError.message : String(fallbackError);
+				logger_default.warn(`[forwardConsole] 启动失败，回退到普通 IDE 打开流程：${message}`);
+				return false;
+			}
 		}
+	})();
+	activeForwardConsoleStart = startTask;
+	try {
+		return await startTask;
+	} finally {
+		if (activeForwardConsoleStart === startTask) activeForwardConsoleStart = void 0;
 	}
 }
 //#endregion
@@ -4945,7 +5044,7 @@ function resolveRunnableHotkeyDefinition(input) {
 }
 //#endregion
 //#region package.json
-var version = "6.22.0";
+var version = "6.23.0";
 //#endregion
 //#region src/cli/devHotkeys/format.ts
 const FULLWIDTH_ASCII_START = 65281;
@@ -5408,7 +5507,8 @@ async function analyzeUiFallback(ctx) {
 			root: meta.subPackage.root ?? "",
 			independent: Boolean(meta.subPackage.independent),
 			name: meta.subPackage.name
-		})).filter((item) => item.root).sort((a, b) => a.root.localeCompare(b.root))
+		})).filter((item) => item.root).sort((a, b) => a.root.localeCompare(b.root)),
+		glassEasel: createGlassEaselAnalyzeResult(ctx)
 	};
 }
 function createAnalyzeController(options) {
@@ -5567,11 +5667,17 @@ function createAnalyzeController(options) {
 }
 //#endregion
 //#region src/cli/commands/serve/shared.ts
-function startBackgroundForwardConsoleReuse(tryReuseForwardConsole) {
-	if (!tryReuseForwardConsole) return;
+function startBackgroundForwardConsole(startForwardConsole) {
+	if (!startForwardConsole) return;
 	try {
-		tryReuseForwardConsole().catch(() => {});
-	} catch {}
+		startForwardConsole().catch((error) => {
+			const message = error instanceof Error ? error.message : String(error);
+			logger_default.warn(`[forwardConsole] 后台启动失败：${message}`);
+		});
+	} catch (error) {
+		const message = error instanceof Error ? error.message : String(error);
+		logger_default.warn(`[forwardConsole] 后台启动失败：${message}`);
+	}
 }
 function resolveWebHost(host) {
 	if (host === void 0) return;
@@ -5589,7 +5695,7 @@ function createServeMiniProgramDevActions(options) {
 		openIde: async (openOptions = {}) => {
 			if (!openOptions.forceOpen && await options.tryReuseForwardConsole?.()) return "已通过控制台转发复用当前开发者工具会话";
 			await options.openIde(projectPath, openOptions);
-			startBackgroundForwardConsoleReuse(options.tryReuseForwardConsole);
+			startBackgroundForwardConsole(options.startForwardConsole);
 			return openOptions.forceReopen ? "已重新打开微信开发者工具项目" : "已打开或复用微信开发者工具项目";
 		},
 		rebuild: async () => {
@@ -5658,7 +5764,7 @@ function registerServeCommand(cli) {
 					loginRetryTimeout: options.loginRetryTimeout,
 					nonInteractive: options.nonInteractive,
 					openRecovery: false,
-					prepareAutomatorSession: useAutomatorOpen ? true : "connect-opened",
+					prepareAutomatorSession: useAutomatorOpen,
 					reuseOpenedProject: !forceReopen,
 					skipAutomatorCompile: !forceReopen,
 					skipPostOpenHealthCheck: true,
@@ -5669,8 +5775,34 @@ function registerServeCommand(cli) {
 				writePostOpenSeparator();
 			},
 			projectPath: resolveIdeProjectRoot(configService.mpDistRoot, configService.cwd),
+			startForwardConsole: async () => {
+				return await maybeStartForwardConsole({
+					platform: configService.platform,
+					mpDistRoot: configService.mpDistRoot,
+					cwd: configService.cwd,
+					preferOpenedSession: false,
+					recoverAutomatorSession: async () => {
+						const projectPath = resolveIdeProjectRoot(configService.mpDistRoot, configService.cwd);
+						await openIde(configService.platform, projectPath, {
+							loginRetry: options.loginRetry,
+							loginRetryTimeout: options.loginRetryTimeout,
+							nonInteractive: options.nonInteractive,
+							openRecovery: false,
+							openStrategy: "automator",
+							prepareAutomatorSession: true,
+							reuseOpenedProject: false,
+							skipAutomatorCompile: false,
+							skipPostOpenHealthCheck: true,
+							trustProject: options.trustProject,
+							useAutomatorOpen: true
+						});
+					},
+					weappViteConfig: configService.weappViteConfig
+				});
+			},
 			tryReuseForwardConsole: async () => {
 				return await maybeStartForwardConsole({
+					openedOnly: true,
 					platform: configService.platform,
 					mpDistRoot: configService.mpDistRoot,
 					cwd: configService.cwd,
@@ -5786,6 +5918,7 @@ function registerServeCommand(cli) {
 			else if (targets.has("dev")) await waitForServeShutdownSignal();
 		} finally {
 			devHotkeysSession?.close();
+			await closeActiveForwardConsole();
 			for (const backend of [...targets.select("dev")].reverse()) await backend.driver.close(ctx);
 		}
 	});

package/dist/{config-6l-p3o-C.d.mts → config-qh0O73A5.d.mts}

@@ -317,6 +317,12 @@ interface NpmMainPackageConfig {
 interface NpmPluginPackageConfig {
   dependencies?: false | NpmDependencyPattern[];
 }
+interface NpmPackageFilesConfig {
+  /** 包内需要复制的文件 glob，默认包含全部文件 */
+  include?: string[];
+  /** 包内需要排除的文件 glob */
+  exclude?: string[];
+}
 type JsFormat = 'cjs' | 'esm';
 type SharedChunkStrategy = 'hoist' | 'duplicate';
 type SharedChunkMode = 'common' | 'path' | 'inline';
@@ -563,6 +569,8 @@ interface WeappNpmConfig {
   mainPackage?: NpmMainPackageConfig;
   pluginPackage?: NpmPluginPackageConfig;
   subPackages?: Record<string, NpmSubPackageConfig>;
+  /** 按包名限制原生小程序 npm 包复制到产物中的文件 */
+  packageFiles?: Record<string, NpmPackageFilesConfig>;
   buildOptions?: (options: NpmBuildOptions, pkgMeta: BuildNpmPackageMeta) => NpmBuildOptions | undefined;
   alipayNpmMode?: AlipayNpmMode;
 }
@@ -1562,6 +1570,26 @@ interface NpmService {
   build: (options?: NpmBuildOptions) => Promise<void>;
 }
 //#endregion
+//#region src/analyze/glassEasel/types.d.ts
+type GlassEaselDiagnosticCode = 'GE001' | 'GE002' | 'GE003' | 'GE004' | 'GE005' | 'GE006';
+type GlassEaselDiagnosticSeverity = 'error' | 'warning';
+interface GlassEaselDiagnostic {
+  code: GlassEaselDiagnosticCode;
+  severity: GlassEaselDiagnosticSeverity;
+  message: string;
+  file: string;
+  line?: number;
+  column?: number;
+  normalized?: boolean;
+}
+interface GlassEaselTemplateFinding {
+  code: Extract<GlassEaselDiagnosticCode, 'GE002' | 'GE003' | 'GE004'>;
+  severity: GlassEaselDiagnosticSeverity;
+  message: string;
+  start: number;
+  normalized?: boolean;
+}
+//#endregion
 //#region src/wxml/shared.d.ts
 interface Token {
   start: number;
@@ -1603,6 +1631,7 @@ interface WxmlToken {
   eventTokens: Token[];
   directiveTokens?: Token[];
   tagNameTokens?: Token[];
+  glassEaselFindings?: GlassEaselTemplateFinding[];
   code: string;
 }
 //#endregion
@@ -1640,6 +1669,12 @@ interface LibEntryState {
   relativeBase: string;
 }
 interface RuntimeState {
+  glassEasel: {
+    detected: boolean;
+    diagnostics: Map<string, GlassEaselDiagnostic>;
+    warnedDiagnostics: Set<string>;
+    silent: boolean;
+  };
   autoRoutes: {
     routes: AutoRoutes;
     serialized: string;
@@ -2070,4 +2105,4 @@ declare module 'vite' {
  */
 declare function defineConfig<T extends UserConfigExport>(config: T): T;
 //#endregion
-export { WeappAnalyzeBudgetConfig as $, isWeappViteHost as $n, GenerateFilenamesOptions as $t, Ref as A, StyleScope as An, WeappReactCompilerConfig as At, BindingErrorLike as B, WeappLibFileName as Bn, WeappWevuConfig as Bt, LoadConfigOptions as C, SharedChunkDynamicImports as Cn, WeappInjectWeapiConfig as Ct, MethodDefinitions$1 as D, StyleConfigEntry as Dn, WeappNpmConfig as Dt, InlineConfig$1 as E, SharedChunkStrategy as En, WeappMcpConfig as Et, RolldownPlugin as F, SubPackageStyleScope as Fn, WeappSubPackageConfig as Ft, EntryJsonFragment as G, WeappManagedServerTsconfigConfig as Gn, BuildNpmPackageMeta as Gt, BaseEntry as H, WeappLibVueTscOptions as Hn, Alias as Ht, RolldownPluginOption as I, WeappLibComponentJson as In, WeappUniAppConfig as It, ScanComponentItem as J, WeappWebConfig as Jn, CopyOptions as Jt, PageEntry as K, WeappManagedSharedTsconfigConfig as Kn, ChunksConfig as Kt, RolldownWatchOptions as L, WeappLibConfig as Ln, WeappVueConfig as Lt, RolldownBuild as M, SubPackageStyleConfigEntry as Mn, WeappRequestRuntimeConfig as Mt, RolldownOptions as N, SubPackageStyleConfigObject as Nn, WeappRouteRule as Nt, Plugin$1 as O, StyleConfigObject as On, WeappPreloadNetwork as Ot, RolldownOutput$1 as P, SubPackageStyleEntry as Pn, WeappRouteRules as Pt, UserConfig$2 as Q, createWeappViteHostMeta as Qn, GenerateFileType as Qt, RolldownWatcher$1 as R, WeappLibDtsOptions as Rn, WeappVueTemplateConfig as Rt, CompilerContext as S, ResolvedAlias as Sn, WeappInjectRequestGlobalsTarget as St, ConfigEnv$1 as T, SharedChunkOverride as Tn, WeappInjectWebRuntimeGlobalsTarget as Tt, ComponentEntry as U, WeappManagedAppTsconfigConfig as Un, AliasOptions as Ut, AppEntry as V, WeappLibInternalDtsOptions as Vn, WeappWorkerConfig as Vt, Entry as W, WeappManagedNodeTsconfigConfig as Wn, AlipayNpmMode as Wt, ProjectConfig as X, WeappViteHostMeta as Xn, GenerateDirsOptions as Xt, WxmlDep as Y, WEAPP_VITE_HOST_NAME as Yn, DeprecatedInlineDynamicImports as Yt, SubPackageMetaValue as Z, applyWeappViteHostMeta as Zn, GenerateExtensionsOptions as Zt, definePageJson as _, NpmDependencyPattern as _n, WeappAutoRoutesIncludePattern as _t, UserConfigFnNoEnvPlain as a, GenerateTemplateFileSource as an, WeappViteRuntime as ar, WeappViteConfig as at, ChangeEvent as b, NpmStrategy as bn, WeappHmrConfig as bt, UserConfigFnPromise as c, GenerateTemplatesConfig as cn, WeappViteTargetKind as cr, EnhanceOptions as ct, Component$1 as d, JsonMergeContext as dn, getSupportedWeappViteTargetDescriptors as dr, MultiPlatformConfig as dt, GenerateOptions as en, resolveWeappViteHostMeta as er, WeappAnalyzeConfig as et, Page$1 as f, JsonMergeFunction as fn, isWebPlatform as fr, ScanWxmlOptions as ft, defineComponentJson as g, NpmBuildOptions as gn, WeappAutoRoutesInclude as gt, defineAppJson as h, MpPlatform$1 as hn, WeappAutoRoutesConfig as ht, UserConfigFnNoEnv as i, GenerateTemplateFactory as in, WeappVitePlatform as ir, WeappForwardConsoleLogLevel as it, ResolvedConfig as j, SubPackage as jn, WeappReactConfig as jt, PluginOption as k, StyleEntry as kn, WeappPreloadRule as kt, defineConfig as l, JsFormat as ln, WebPlatform as lr, EnhanceWxmlOptions as lt, Theme$1 as m, JsonMergeStrategy as mn, WeappAppPreludeMode as mt, UserConfigExport as n, GenerateTemplateContext as nn, ResolvedWeappViteTarget as nr, WeappDebugConfig as nt, UserConfigFnObject as o, GenerateTemplateInlineSource as on, WeappViteTargetDescriptor as or, AutoImportComponents as ot, Sitemap$1 as p, JsonMergeStage as pn, resolveWeappViteTarget as pr, WeappAppPreludeConfig as pt, ComponentsMap as q, WeappManagedTypeScriptConfig as qn, CopyGlobs as qt, UserConfigFn as r, GenerateTemplateEntry as rn, WEB_PLATFORM_ALIASES as rr, WeappForwardConsoleConfig as rt, UserConfigFnObjectPlain as s, GenerateTemplateScope as sn, WeappViteTargetInput as sr, AutoImportComponentsOption as st, UserConfig$1 as t, GenerateTemplate as tn, ResolveWeappViteTargetOptions as tr, WeappAnalyzeHistoryConfig as tt, App$1 as u, JsonConfig as un, getSupportedWeappVitePlatforms as ur, HandleWxmlOptions as ut, defineSitemapJson as v, NpmMainPackageConfig as vn, WeappBuildScopeConfig as vt, ComputedDefinitions$1 as w, SharedChunkMode as wn, WeappInjectWebRuntimeGlobalsConfig as wt, WeappVitePluginApi as x, NpmSubPackageConfig as xn, WeappInjectRequestGlobalsConfig as xt, defineThemeJson as y, NpmPluginPackageConfig as yn, WeappBuildScopeObjectConfig as yt, ViteDevServer$1 as z, WeappLibEntryContext as zn, WeappWebRuntimeConfig as zt };
+export { WeappAnalyzeBudgetConfig as $, createWeappViteHostMeta as $n, GenerateFilenamesOptions as $t, Ref as A, StyleEntry as An, WeappReactCompilerConfig as At, BindingErrorLike as B, WeappLibEntryContext as Bn, WeappWevuConfig as Bt, LoadConfigOptions as C, ResolvedAlias as Cn, WeappInjectWeapiConfig as Ct, MethodDefinitions$1 as D, SharedChunkStrategy as Dn, WeappNpmConfig as Dt, InlineConfig$1 as E, SharedChunkOverride as En, WeappMcpConfig as Et, RolldownPlugin as F, SubPackageStyleEntry as Fn, WeappSubPackageConfig as Ft, EntryJsonFragment as G, WeappManagedNodeTsconfigConfig as Gn, BuildNpmPackageMeta as Gt, BaseEntry as H, WeappLibInternalDtsOptions as Hn, Alias as Ht, RolldownPluginOption as I, SubPackageStyleScope as In, WeappUniAppConfig as It, ScanComponentItem as J, WeappManagedTypeScriptConfig as Jn, CopyOptions as Jt, PageEntry as K, WeappManagedServerTsconfigConfig as Kn, ChunksConfig as Kt, RolldownWatchOptions as L, WeappLibComponentJson as Ln, WeappVueConfig as Lt, RolldownBuild as M, SubPackage as Mn, WeappRequestRuntimeConfig as Mt, RolldownOptions as N, SubPackageStyleConfigEntry as Nn, WeappRouteRule as Nt, Plugin$1 as O, StyleConfigEntry as On, WeappPreloadNetwork as Ot, RolldownOutput$1 as P, SubPackageStyleConfigObject as Pn, WeappRouteRules as Pt, UserConfig$2 as Q, applyWeappViteHostMeta as Qn, GenerateFileType as Qt, RolldownWatcher$1 as R, WeappLibConfig as Rn, WeappVueTemplateConfig as Rt, CompilerContext as S, NpmSubPackageConfig as Sn, WeappInjectRequestGlobalsTarget as St, ConfigEnv$1 as T, SharedChunkMode as Tn, WeappInjectWebRuntimeGlobalsTarget as Tt, ComponentEntry as U, WeappLibVueTscOptions as Un, AliasOptions as Ut, AppEntry as V, WeappLibFileName as Vn, WeappWorkerConfig as Vt, Entry as W, WeappManagedAppTsconfigConfig as Wn, AlipayNpmMode as Wt, ProjectConfig as X, WEAPP_VITE_HOST_NAME as Xn, GenerateDirsOptions as Xt, WxmlDep as Y, WeappWebConfig as Yn, DeprecatedInlineDynamicImports as Yt, SubPackageMetaValue as Z, WeappViteHostMeta as Zn, GenerateExtensionsOptions as Zt, definePageJson as _, NpmDependencyPattern as _n, WeappAutoRoutesIncludePattern as _t, UserConfigFnNoEnvPlain as a, GenerateTemplateFileSource as an, WeappVitePlatform as ar, WeappViteConfig as at, ChangeEvent as b, NpmPluginPackageConfig as bn, WeappHmrConfig as bt, UserConfigFnPromise as c, GenerateTemplatesConfig as cn, WeappViteTargetInput as cr, EnhanceOptions as ct, Component$1 as d, JsonMergeContext as dn, getSupportedWeappVitePlatforms as dr, MultiPlatformConfig as dt, GenerateOptions as en, isWeappViteHost as er, WeappAnalyzeConfig as et, Page$1 as f, JsonMergeFunction as fn, getSupportedWeappViteTargetDescriptors as fr, ScanWxmlOptions as ft, defineComponentJson as g, NpmBuildOptions as gn, WeappAutoRoutesInclude as gt, defineAppJson as h, MpPlatform$1 as hn, WeappAutoRoutesConfig as ht, UserConfigFnNoEnv as i, GenerateTemplateFactory as in, WEB_PLATFORM_ALIASES as ir, WeappForwardConsoleLogLevel as it, ResolvedConfig as j, StyleScope as jn, WeappReactConfig as jt, PluginOption as k, StyleConfigObject as kn, WeappPreloadRule as kt, defineConfig as l, JsFormat as ln, WeappViteTargetKind as lr, EnhanceWxmlOptions as lt, Theme$1 as m, JsonMergeStrategy as mn, resolveWeappViteTarget as mr, WeappAppPreludeMode as mt, UserConfigExport as n, GenerateTemplateContext as nn, ResolveWeappViteTargetOptions as nr, WeappDebugConfig as nt, UserConfigFnObject as o, GenerateTemplateInlineSource as on, WeappViteRuntime as or, AutoImportComponents as ot, Sitemap$1 as p, JsonMergeStage as pn, isWebPlatform as pr, WeappAppPreludeConfig as pt, ComponentsMap as q, WeappManagedSharedTsconfigConfig as qn, CopyGlobs as qt, UserConfigFn as r, GenerateTemplateEntry as rn, ResolvedWeappViteTarget as rr, WeappForwardConsoleConfig as rt, UserConfigFnObjectPlain as s, GenerateTemplateScope as sn, WeappViteTargetDescriptor as sr, AutoImportComponentsOption as st, UserConfig$1 as t, GenerateTemplate as tn, resolveWeappViteHostMeta as tr, WeappAnalyzeHistoryConfig as tt, App$1 as u, JsonConfig as un, WebPlatform as ur, HandleWxmlOptions as ut, defineSitemapJson as v, NpmMainPackageConfig as vn, WeappBuildScopeConfig as vt, ComputedDefinitions$1 as w, SharedChunkDynamicImports as wn, WeappInjectWebRuntimeGlobalsConfig as wt, WeappVitePluginApi as x, NpmStrategy as xn, WeappInjectRequestGlobalsConfig as xt, defineThemeJson as y, NpmPackageFilesConfig as yn, WeappBuildScopeObjectConfig as yt, ViteDevServer$1 as z, WeappLibDtsOptions as zn, WeappWebRuntimeConfig as zt };

package/dist/config.d.mts

@@ -1,3 +1,3 @@
-import { $n as isWeappViteHost, Qn as createWeappViteHostMeta, Xn as WeappViteHostMeta, Yn as WEAPP_VITE_HOST_NAME, Zn as applyWeappViteHostMeta, _ as definePageJson, a as UserConfigFnNoEnvPlain, ar as WeappViteRuntime, at as WeappViteConfig, c as UserConfigFnPromise, d as Component, er as resolveWeappViteHostMeta, f as Page, g as defineComponentJson, h as defineAppJson, i as UserConfigFnNoEnv, l as defineConfig, m as Theme, n as UserConfigExport, o as UserConfigFnObject, p as Sitemap, r as UserConfigFn, s as UserConfigFnObjectPlain, t as UserConfig, u as App, v as defineSitemapJson, y as defineThemeJson } from "./config-6l-p3o-C.mjs";
+import { $n as createWeappViteHostMeta, Qn as applyWeappViteHostMeta, Xn as WEAPP_VITE_HOST_NAME, Zn as WeappViteHostMeta, _ as definePageJson, a as UserConfigFnNoEnvPlain, at as WeappViteConfig, c as UserConfigFnPromise, d as Component, er as isWeappViteHost, f as Page, g as defineComponentJson, h as defineAppJson, i as UserConfigFnNoEnv, l as defineConfig, m as Theme, n as UserConfigExport, o as UserConfigFnObject, or as WeappViteRuntime, p as Sitemap, r as UserConfigFn, s as UserConfigFnObjectPlain, t as UserConfig, tr as resolveWeappViteHostMeta, u as App, v as defineSitemapJson, y as defineThemeJson } from "./config-qh0O73A5.mjs";
 import { t as WeappI18nConfig } from "./types-CgZn5X6j.mjs";
 export { type App, type Component, type Page, type Sitemap, type Theme, UserConfig, UserConfigExport, UserConfigFn, UserConfigFnNoEnv, UserConfigFnNoEnvPlain, UserConfigFnObject, UserConfigFnObjectPlain, UserConfigFnPromise, WEAPP_VITE_HOST_NAME, type WeappI18nConfig, type WeappViteConfig, WeappViteHostMeta, type WeappViteRuntime, applyWeappViteHostMeta, createWeappViteHostMeta, defineAppJson, defineComponentJson, defineConfig, definePageJson, defineSitemapJson, defineThemeJson, isWeappViteHost, resolveWeappViteHostMeta };