weapp-vite 7.5.0 → 7.6.0

package/dist/i18n.d.mts

@@ -1,4 +1,4 @@
-import { t as WeappI18nConfig } from "./types-CgZn5X6j.mjs";
+import { t as WeappI18nConfig } from "./types-D-kfuyVa.mjs";
 import { I18nGlobal, I18nGlobal as I18nGlobal$1, I18nInstance, I18nInstance as I18nInstance$1, I18nLocaleChangeSubscription } from "@weapp-vite/i18n";
 //#region src/i18n.d.ts
 export declare const behavior: I18nInstance$1["behavior"];

package/dist/{index-C9HjUX5c.d.mts → index-D5rgBzYZ.d.mts}

@@ -1,5 +1,4 @@
-import "./config-V0L-IAJf.mjs";
-import { a as AnalyzeSubpackagesResult } from "./budget-BD7VqLCl.mjs";
+import { a as AnalyzeSubpackagesResult } from "./budget-CTLOHwgI.mjs";
 import { DevframeDefinition } from "devframe";
 import { z } from "zod";
 //#region src/dashboard/artifacts.d.ts

package/dist/index.d.mts

@@ -1,6 +1,6 @@
-import { $ as WeappCompilerHmrRequest, A as PluginOption, B as ViteDevServer, Br as WeappVitePlatform, Ct as WeappViteConfig, D as InlineConfig, E as ConfigEnv, F as RolldownOutput, Fr as isWeappViteHost, Gn as JsonConfig, Gr as WebPlatform, Hr as WeappViteTargetDescriptor, I as RolldownPlugin, Ir as resolveWeappViteHostMeta, Jn as JsonMergeStage, Jr as isWebPlatform, Kn as JsonMergeContext, Kr as getSupportedWeappVitePlatforms, L as RolldownPluginOption, Lr as ResolveWeappViteTargetOptions, M as ResolvedConfig, Mr as WeappViteHostMeta, N as RolldownBuild, Nr as applyWeappViteHostMeta, O as MethodDefinitions, P as RolldownOptions, Pr as createWeappViteHostMeta, Q as WeappCompilerHmrPreparation, R as RolldownWatchOptions, Rr as ResolvedWeappViteTarget, S as CompilerContext, Sn as MultiPlatformProjectConfigs, T as ComputedDefinitions, Ur as WeappViteTargetInput, Vr as WeappViteRuntime, Wr as WeappViteTargetKind, Yn as JsonMergeStrategy, Yr as resolveWeappViteTarget, Z as WeappCompilerHmrAsset, _ as definePageJson, _n as WxmlTransformContext, a as UserConfigFnNoEnvPlain, at as WeappCompilerPluginFactory, bn as WxmlTransformVisitor, c as UserConfigFnPromise, cn as WxmlValidate, ct as WeappCompilerResourceKind, d as Component, dn as WxmlValidationVisitor, dt as WeappCompilerTransformResult, et as WeappCompilerOutputRequest, f as Page, fn as WxmlAttribute, g as defineComponentJson, gn as WxmlTransform, h as defineAppJson, hn as WxmlSourceLocation, i as UserConfigFnNoEnv, it as WeappCompilerPluginController, j as Ref, jr as WEAPP_VITE_HOST_NAME, k as Plugin, l as defineConfig, ln as WxmlValidationContext, lt as WeappCompilerSourceClaim, m as Theme, mn as WxmlElementInfo, n as UserConfigExport, nt as WeappCompilerPluginCapabilities, o as UserConfigFnObject, on as WxmlRemoveAttrRule, ot as WeappCompilerPluginOption, p as Sitemap, pn as WxmlAttributeValue, qn as JsonMergeFunction, qr as getSupportedWeappViteTargetDescriptors, r as UserConfigFn, rt as WeappCompilerPluginContext, s as UserConfigFnObjectPlain, sn as WxmlRemoveOptions, st as WeappCompilerPluginPhase, t as UserConfig, tt as WeappCompilerPlugin, u as App, un as WxmlValidationDiagnostic, ut as WeappCompilerSourceRequest, v as defineSitemapJson, vn as WxmlTransformNode, w as LoadConfigOptions, xn as MultiPlatformProjectConfig, y as defineThemeJson, yn as WxmlTransformResult, z as RolldownWatcher, zr as WEB_PLATFORM_ALIASES } from "./config-V0L-IAJf.mjs";
-import { t as WeappI18nConfig } from "./types-CgZn5X6j.mjs";
-import { a as LayoutHostContext, c as LayoutHostResolver, d as unregisterLayoutHosts, f as waitForLayoutHost, i as LayoutHostBridge, l as registerLayoutHosts, m as createWevuComponent, n as defineProps, o as LayoutHostEntry, p as WevuComponentOptions, r as setPageLayout, s as LayoutHostResolveOptions, t as defineEmits, u as resolveLayoutHost } from "./runtime-Ee2HY6gR.mjs";
+import { $ as WeappCompilerOutputRequest, A as Ref, Ar as WEAPP_VITE_HOST_NAME, Br as WeappViteRuntime, C as LoadConfigOptions, D as MethodDefinitions, E as InlineConfig, F as RolldownPlugin, Fr as resolveWeappViteHostMeta, Gn as JsonMergeContext, Gr as getSupportedWeappVitePlatforms, Hr as WeappViteTargetInput, I as RolldownPluginOption, Ir as ResolveWeappViteTargetOptions, Jn as JsonMergeStrategy, Jr as resolveWeappViteTarget, Kn as JsonMergeFunction, Kr as getSupportedWeappViteTargetDescriptors, L as RolldownWatchOptions, Lr as ResolvedWeappViteTarget, M as RolldownBuild, Mr as applyWeappViteHostMeta, N as RolldownOptions, Nr as createWeappViteHostMeta, O as Plugin, P as RolldownOutput, Pr as isWeappViteHost, Q as WeappCompilerHmrRequest, R as RolldownWatcher, Rr as WEB_PLATFORM_ALIASES, S as CompilerContext, St as WeappViteConfig, T as ConfigEnv, Ur as WeappViteTargetKind, Vr as WeappViteTargetDescriptor, Wn as JsonConfig, Wr as WebPlatform, X as WeappCompilerHmrAsset, Z as WeappCompilerHmrPreparation, _ as definePageJson, _n as WxmlTransformNode, a as UserConfigFnNoEnvPlain, an as WxmlRemoveAttrRule, at as WeappCompilerPluginOption, bn as MultiPlatformProjectConfig, c as UserConfigFnPromise, cn as WxmlValidationContext, ct as WeappCompilerSourceClaim, d as Component, dn as WxmlAttribute, et as WeappCompilerPlugin, f as Page, fn as WxmlAttributeValue, g as defineComponentJson, gn as WxmlTransformContext, h as defineAppJson, hn as WxmlTransform, i as UserConfigFnNoEnv, it as WeappCompilerPluginFactory, j as ResolvedConfig, jr as WeappViteHostMeta, k as PluginOption, l as defineConfig, ln as WxmlValidationDiagnostic, lt as WeappCompilerSourceRequest, m as Theme, mn as WxmlSourceLocation, n as UserConfigExport, nt as WeappCompilerPluginContext, o as UserConfigFnObject, on as WxmlRemoveOptions, ot as WeappCompilerPluginPhase, p as Sitemap, pn as WxmlElementInfo, qn as JsonMergeStage, qr as isWebPlatform, r as UserConfigFn, rt as WeappCompilerPluginController, s as UserConfigFnObjectPlain, sn as WxmlValidate, st as WeappCompilerResourceKind, t as UserConfig, tt as WeappCompilerPluginCapabilities, u as App, un as WxmlValidationVisitor, ut as WeappCompilerTransformResult, v as defineSitemapJson, vn as WxmlTransformResult, w as ComputedDefinitions, xn as MultiPlatformProjectConfigs, y as defineThemeJson, yn as WxmlTransformVisitor, z as ViteDevServer, zr as WeappVitePlatform } from "./config-Bf6DWhyb.mjs";
+import { t as WeappI18nConfig } from "./types-D-kfuyVa.mjs";
+import { a as LayoutHostContext, c as LayoutHostResolver, d as unregisterLayoutHosts, f as waitForLayoutHost, i as LayoutHostBridge, l as registerLayoutHosts, m as createWevuComponent, n as defineProps, o as LayoutHostEntry, p as WevuComponentOptions, r as setPageLayout, s as LayoutHostResolveOptions, t as defineEmits, u as resolveLayoutHost } from "./runtime-DpVf714f.mjs";
 //#region src/runtime/compilerSession/context.d.ts
 interface InitializeCompilerContextOptions extends Partial<LoadConfigOptions> {
   syncSupportFiles?: boolean;

package/dist/index.mjs

@@ -1,7 +1,7 @@
 import { a as resolveWeappViteHostMeta, i as isWeappViteHost, n as applyWeappViteHostMeta, r as createWeappViteHostMeta, t as WEAPP_VITE_HOST_NAME } from "./pluginHost--CaeyWpA.mjs";
 import { a as defineThemeJson, i as defineSitemapJson, n as defineComponentJson, r as definePageJson, t as defineAppJson } from "./json-BL8Dhhk6.mjs";
 import { t as defineConfig } from "./config-DRGcCi3h.mjs";
-import { a as getSupportedWeappViteTargetDescriptors, i as getSupportedWeappVitePlatforms, o as isWebPlatform, r as WEB_PLATFORM_ALIASES, s as resolveWeappViteTarget } from "./createCompilerContextInstance-DJH_P_nZ.mjs";
-import { t as createCompilerContext } from "./createContext-BqYzHhY9.mjs";
+import { a as getSupportedWeappViteTargetDescriptors, i as getSupportedWeappVitePlatforms, o as isWebPlatform, r as WEB_PLATFORM_ALIASES, s as resolveWeappViteTarget } from "./createCompilerContextInstance-aYwi8wQt.mjs";
+import { t as createCompilerContext } from "./createContext-tApLtII-.mjs";
 import { a as resolveLayoutHost, c as createWevuComponent, i as registerLayoutHosts, n as defineProps, o as unregisterLayoutHosts, r as setPageLayout, s as waitForLayoutHost, t as defineEmits } from "./runtime-D6VCNhNY.mjs";
 export { WEAPP_VITE_HOST_NAME, WEB_PLATFORM_ALIASES, applyWeappViteHostMeta, createCompilerContext, createWeappViteHostMeta, createWevuComponent, defineAppJson, defineComponentJson, defineConfig, defineEmits, definePageJson, defineProps, defineSitemapJson, defineThemeJson, getSupportedWeappVitePlatforms, getSupportedWeappViteTargetDescriptors, isWeappViteHost, isWebPlatform, registerLayoutHosts, resolveLayoutHost, resolveWeappViteHostMeta, resolveWeappViteTarget, setPageLayout, unregisterLayoutHosts, waitForLayoutHost };

package/dist/json.d.mts

@@ -1,2 +1,2 @@
-import { _ as definePageJson, d as Component, f as Page, g as defineComponentJson, h as defineAppJson, m as Theme, p as Sitemap, u as App, v as defineSitemapJson, y as defineThemeJson } from "./config-V0L-IAJf.mjs";
+import { _ as definePageJson, d as Component, f as Page, g as defineComponentJson, h as defineAppJson, m as Theme, p as Sitemap, u as App, v as defineSitemapJson, y as defineThemeJson } from "./config-Bf6DWhyb.mjs";
 export { type App, type Component, type Page, type Sitemap, type Theme, defineAppJson, defineComponentJson, definePageJson, defineSitemapJson, defineThemeJson };

package/dist/lib-DjccSI1B.mjs

@@ -0,0 +1,143 @@
+import { o as stripLeadingSlashes, r as normalizeRelativePath } from "./path-CYYIQGS7.mjs";
+import { c as findJsEntry, d as findVueEntry } from "./file-CcIOmqhC.mjs";
+import path from "pathe";
+import { isObject, removeExtensionDeep } from "@weapp-core/shared";
+import { fs } from "@weapp-core/shared/fs";
+//#region src/runtime/compilerSession/tasks.ts
+/** 任一子构建失败后仍等待所有已启动任务，保留最先排列的原始错误。 */
+async function waitForBuildTasks(tasks) {
+	const results = await Promise.allSettled(tasks);
+	const failure = results.find((result) => result.status === "rejected");
+	if (failure?.status === "rejected") throw failure.reason;
+	return results.map((result) => result.value);
+}
+//#endregion
+//#region src/runtime/utils/object.ts
+function hasOwn(source, key) {
+	return Object.prototype.hasOwnProperty.call(source, key);
+}
+//#endregion
+//#region src/runtime/lib.ts
+function hasLibEntry(entry) {
+	if (!entry) return false;
+	if (typeof entry === "string") return entry.trim().length > 0;
+	if (Array.isArray(entry)) return entry.length > 0;
+	if (isObject(entry)) return Object.keys(entry).length > 0;
+	return false;
+}
+function resolveWeappLibConfig(options) {
+	const { cwd, srcRoot, config } = options;
+	if (!config) return;
+	const root = config.root ?? srcRoot ?? "";
+	const resolvedRoot = path.resolve(cwd, root || ".");
+	const userDtsOptions = typeof config.dts === "object" && config.dts ? config.dts : void 0;
+	const resolvedDtsEnabled = typeof config.dts === "boolean" ? config.dts : userDtsOptions?.enabled !== false;
+	const resolvedDtsMode = userDtsOptions?.mode ?? "internal";
+	const resolvedDts = {
+		...userDtsOptions,
+		enabled: resolvedDtsEnabled,
+		mode: resolvedDtsMode
+	};
+	return {
+		enabled: hasLibEntry(config.entry),
+		entry: config.entry,
+		root: resolvedRoot,
+		outDir: config.outDir,
+		preservePath: config.preservePath !== false,
+		fileName: config.fileName,
+		componentJson: config.componentJson ?? "auto",
+		dts: resolvedDts,
+		source: config
+	};
+}
+function normalizeLibName(value) {
+	return stripLeadingSlashes(normalizeRelativePath(value));
+}
+async function resolveEntryFile(root, entry) {
+	const resolved = path.isAbsolute(entry) ? entry : path.resolve(root, entry);
+	if (path.extname(resolved)) {
+		if (await fs.pathExists(resolved)) return resolved;
+	}
+	const jsEntry = await findJsEntry(resolved);
+	if (jsEntry.path) return jsEntry.path;
+	const vueEntry = await findVueEntry(resolved);
+	if (vueEntry) return vueEntry;
+	if (await fs.pathExists(resolved)) return resolved;
+}
+function resolveEntryName(options) {
+	const { explicitName, preservePath, relativeId } = options;
+	if (explicitName) return normalizeLibName(explicitName);
+	const base = removeExtensionDeep(relativeId);
+	if (!preservePath) return normalizeLibName(path.basename(base));
+	return normalizeLibName(base);
+}
+function resolveOutputBase(options) {
+	const { entryName, entryPath, config } = options;
+	const fileName = config.fileName;
+	if (!fileName) return normalizeLibName(entryName);
+	let resolved;
+	if (typeof fileName === "function") {
+		resolved = fileName({
+			name: entryName,
+			input: entryPath
+		});
+		if (typeof resolved !== "string") throw new TypeError("`weapp.lib.fileName` 必须返回字符串。");
+	} else resolved = fileName.includes("[name]") ? fileName.replace(/\[name\]/g, entryName) : fileName;
+	const normalized = normalizeLibName(resolved);
+	if (!normalized) throw new Error("`weapp.lib.fileName` 解析结果为空，请检查配置。");
+	return normalizeLibName(removeExtensionDeep(normalized));
+}
+function createLibEntryFileNameResolver(libConfig) {
+	if (!libConfig.fileName) return;
+	return (chunkInfo) => {
+		return `${resolveOutputBase({
+			entryName: chunkInfo.name,
+			entryPath: chunkInfo.facadeModuleId ?? "",
+			config: libConfig
+		})}.js`;
+	};
+}
+async function resolveWeappLibEntries(configService, libConfig) {
+	const entry = libConfig.entry;
+	const root = libConfig.root || configService.absoluteSrcRoot;
+	const preservePath = libConfig.preservePath;
+	const entries = [];
+	if (typeof entry === "string") entries.push({ path: entry });
+	else if (Array.isArray(entry)) for (const item of entry) entries.push({ path: item });
+	else if (isObject(entry)) for (const [name, value] of Object.entries(entry)) entries.push({
+		name,
+		path: value
+	});
+	if (!entries.length) throw new Error("`weapp.lib.entry` 不能为空，请配置库模式入口。");
+	if (typeof libConfig.fileName === "string" && !libConfig.fileName.includes("[name]") && entries.length > 1) throw new Error("`weapp.lib.fileName` 在多入口模式下必须包含 `[name]` 占位符。");
+	const outputNames = /* @__PURE__ */ new Set();
+	const resolved = [];
+	for (const item of entries) {
+		const entryPath = await resolveEntryFile(root, item.path);
+		if (!entryPath) throw new Error(`未找到 lib 入口文件：${item.path}`);
+		const relativeId = normalizeRelativePath(configService.relativeAbsoluteSrcRoot(entryPath));
+		const entryName = resolveEntryName({
+			explicitName: item.name,
+			preservePath,
+			relativeId
+		});
+		if (!entryName) throw new Error(`lib 入口解析失败：${item.path}`);
+		const outputBase = resolveOutputBase({
+			entryName,
+			entryPath,
+			config: libConfig
+		});
+		if (outputNames.has(outputBase)) throw new Error(`lib 输出路径冲突：${outputBase}`);
+		outputNames.add(outputBase);
+		const relativeBase = normalizeLibName(removeExtensionDeep(relativeId));
+		resolved.push({
+			name: entryName,
+			input: entryPath,
+			relativeBase,
+			outputBase
+		});
+	}
+	return resolved;
+}
+//#endregion
+export { hasOwn as a, resolveWeappLibEntries as i, hasLibEntry as n, waitForBuildTasks as o, resolveWeappLibConfig as r, createLibEntryFileNameResolver as t };

package/dist/{lifecycle-BROTlwSL.mjs → lifecycle-C36WSbQS.mjs}

@@ -1,7 +1,8 @@
 import process from "node:process";
+import { WEAPP_VITE_DEV_SERVER_CLOSE_KEY, WEAPP_VITE_HOST_RESTART_CONFIG_KEY } from "@weapp-core/constants";
 import { AsyncLocalStorage } from "node:async_hooks";
 //#region src/devLifecycle/server.ts
-const serverCloseRecord = Symbol("weapp-vite:dev-server-close");
+const serverCloseRecord = Symbol.for(WEAPP_VITE_DEV_SERVER_CLOSE_KEY);
 const dispatchedRecords = /* @__PURE__ */ new WeakMap();
 const dispatchedCloses = /* @__PURE__ */ new WeakMap();
 function onceClose(close) {
@@ -105,7 +106,7 @@ var DevShutdownScope = class {
 		process.on("SIGTERM", this.onSigterm);
 		process.on("disconnect", this.onDisconnect);
 		process.stdin?.on?.("end", this.onStdinEnd);
-		if (process.connected === false) this.request("disconnect");
+		if (process.connected === false && typeof process.disconnect === "function") this.request("disconnect");
 	}
 	get stopping() {
 		return this.reason !== void 0;
@@ -205,9 +206,26 @@ function createDevShutdownScope(options) {
 //#endregion
 //#region src/vite/lifecycle.ts
 const hostLifecycleKey = Symbol.for("weapp-vite:host-lifecycle");
+function createHostOperations() {
+	const operations = new AsyncLocalStorage();
+	return {
+		isInternal: () => operations.getStore()?.active === true,
+		run: (action) => {
+			const operation = { active: true };
+			return operations.run(operation, async () => {
+				try {
+					return await action();
+				} finally {
+					operation.active = false;
+				}
+			});
+		}
+	};
+}
 const hostData = /* @__PURE__ */ new WeakMap();
 async function settleHostCleanup(tasks) {
-	const errors = (await Promise.allSettled(tasks)).flatMap((result) => result.status === "rejected" ? [result.reason] : []);
+	const results = await Promise.allSettled(tasks);
+	const errors = [...new Set(results.flatMap((result) => result.status === "rejected" ? [result.reason] : []))];
 	if (errors.length) throw errors.length === 1 ? errors[0] : new AggregateError(errors, "Host cleanup failed");
 }
 async function discardRestartData(data, status) {
@@ -215,6 +233,23 @@ async function discardRestartData(data, status) {
 	data?.clear();
 	await settleHostCleanup(entries.map(async (entry) => await entry.dispose?.(status)));
 }
+/** 在配置合并后、编译准备前接管重启链；函数载体不会被 Vite 深拷贝。 */
+function takeHostLifecycle(config) {
+	const inline = config;
+	const carrier = inline[WEAPP_VITE_HOST_RESTART_CONFIG_KEY];
+	const inherited = typeof carrier === "function" ? carrier[hostLifecycleKey] : inline[hostLifecycleKey];
+	if (inherited) {
+		delete inline[WEAPP_VITE_HOST_RESTART_CONFIG_KEY];
+		delete inline[hostLifecycleKey];
+	}
+	return inherited;
+}
+/** 需要参与配置准备的数据在 configureServer 之前读取，且只能接管一次。 */
+function takeHostConfigRestartData(lifecycle, key) {
+	const value = lifecycle?.data.get(key)?.value;
+	lifecycle?.data.delete(key);
+	return value;
+}
 /** 重启附带数据仅属于这一条宿主链，不写入调用方配置或共享的进程缓存。 */
 async function setHostRestartData(server, key, value, dispose) {
 	const data = hostData.get(server);
@@ -234,46 +269,99 @@ function takeHostRestartData(server, key) {
 	return value;
 }
 /** 关闭等待正在替换服务器的重启，避免旧入口返回后新会话继续写出。 */
-function bindHostLifecycle(server, closeSession) {
+function bindHostLifecycle(server, closeSession, preparedLifecycle, isRetired, finalize) {
 	const nativeRestart = server.restart.bind(server);
 	const generation = getDevServerCloseRecord(server);
 	const nativeClose = generation.close;
+	const hostWatcher = server.watcher;
+	const nativeWatcherClose = hostWatcher?.close.bind(hostWatcher);
+	let watcherCloseTask;
+	const closeHostWatcher = () => watcherCloseTask ??= Promise.resolve().then(() => nativeWatcherClose?.()).then(() => {});
+	if (hostWatcher) hostWatcher.close = closeHostWatcher;
 	const scope = getDevShutdownScope();
 	const inlineConfig = server.config.inlineConfig;
-	const inherited = inlineConfig[hostLifecycleKey];
+	const inherited = preparedLifecycle ?? takeHostLifecycle(inlineConfig);
+	const operations = inherited?.operations ?? createHostOperations();
 	const inheritedRestart = inherited?.restartTask;
+	let inheritedRestartSettled = !inheritedRestart;
+	inheritedRestart?.then(() => {
+		inheritedRestartSettled = true;
+	}, () => {
+		inheritedRestartSettled = true;
+	});
 	const data = /* @__PURE__ */ new Map();
 	hostData.set(server, {
 		incoming: inherited?.data,
 		outgoing: data
 	});
-	delete inlineConfig[hostLifecycleKey];
 	const stopping = Promise.withResolvers();
 	let restartTask;
 	let closeTask;
-	const lifecycle = {
-		data,
-		get restartTask() {
-			return restartTask;
-		}
+	let retired = false;
+	for (const environment of Object.values(server.environments ?? {})) {
+		const listen = environment.listen.bind(environment);
+		environment.listen = async (...args) => {
+			if (!retired && !isRetired?.()) await listen(...args);
+		};
+	}
+	const replacements = /* @__PURE__ */ new Set();
+	let restartCleanupFailure;
+	const discardRestartResources = async (status) => {
+		const active = getDevServerCloseRecord(server);
+		const abandoned = [...replacements].filter((replacement) => replacement !== active);
+		replacements.clear();
+		await settleHostCleanup([discardRestartData(data, status), ...abandoned.map((replacement) => Promise.resolve().then(() => replacement.close()))]).catch((error) => {
+			restartCleanupFailure ??= { error };
+			throw error;
+		});
 	};
 	const closeResources = async () => {
+		retired = true;
 		stopping.resolve();
+		const pendingRestart = restartTask;
 		const sessionCleanup = settleHostCleanup([
-			Promise.resolve().then(closeSession),
+			Promise.resolve().then(() => closeSession("close")),
 			discardRestartData(data, "incomplete"),
 			discardRestartData(inherited?.data, "incomplete")
 		]);
-		await settleHostCleanup([sessionCleanup, (async () => {
+		const hostCleanup = (async () => {
 			await sessionCleanup.catch(() => {});
-			await restartTask?.catch(() => {});
+			await pendingRestart?.catch(() => {});
 			const current = getDevServerCloseRecord(server);
-			if (current !== generation) await current.close();
-			else await nativeClose();
-		})()]);
+			await settleHostCleanup([closeHostWatcher(), Promise.resolve().then(() => current !== generation ? current.close() : nativeClose())]);
+		})();
+		const restartCleanup = (async () => {
+			await pendingRestart;
+			if (restartCleanupFailure) throw restartCleanupFailure.error;
+		})();
+		await settleHostCleanup([(async () => {
+			await settleHostCleanup([sessionCleanup, hostCleanup]);
+			if (!restartCleanupFailure && inheritedRestartSettled) await finalize?.();
+		})(), restartCleanup]);
+	};
+	const closeLocal = () => operations.run(closeResources);
+	const close = () => closeTask ??= scope ? scope.run("cleanup", closeLocal) : closeLocal();
+	const lifecycle = {
+		data,
+		operations,
+		close: inherited?.close ?? close,
+		registerReplacement(replacement) {
+			replacements.delete(getDevServerCloseRecord(server));
+			replacements.add(replacement);
+		},
+		get restartTask() {
+			return restartTask;
+		}
 	};
-	const close = () => closeTask ??= scope ? scope.run("cleanup", closeResources) : closeResources();
 	replaceDevServerClose(server, close);
+	if (inherited) {
+		const previousGate = generation.gate;
+		generation.gate = (closeResources) => {
+			const dispatch = () => operations.isInternal() ? closeResources() : inherited.close();
+			return previousGate ? previousGate(dispatch) : dispatch();
+		};
+	}
+	inherited?.registerReplacement(generation);
 	server.restart = (force) => {
 		if (closeTask || scope?.stopping) return close();
 		const restart = async () => {
@@ -282,12 +370,16 @@ function bindHostLifecycle(server, closeSession) {
 				if (closeTask || scope?.stopping) return;
 			}
 			try {
-				await closeSession();
+				retired = true;
+				await closeSession("restart");
+				if (closeTask || scope?.stopping) return;
+				await closeHostWatcher();
 				if (closeTask || scope?.stopping) return;
 				const config = server.config;
+				const carrier = Object.assign(() => {}, { [hostLifecycleKey]: lifecycle });
 				const restartConfig = {
 					...config.inlineConfig,
-					[hostLifecycleKey]: lifecycle
+					[WEAPP_VITE_HOST_RESTART_CONFIG_KEY]: carrier
 				};
 				const restartHostConfig = {
 					...config,
@@ -296,25 +388,26 @@ function bindHostLifecycle(server, closeSession) {
 				server.config = restartHostConfig;
 				try {
 					await nativeRestart(force);
+					if (getDevServerCloseRecord(server) === generation) throw new Error("[weapp-vite] Vite 重启未完成替换宿主交接，请查看原始初始化错误。");
 				} finally {
-					delete restartConfig[hostLifecycleKey];
+					delete restartConfig[WEAPP_VITE_HOST_RESTART_CONFIG_KEY];
 					if (server.config === restartHostConfig) server.config = config;
 				}
 			} catch (error) {
 				try {
-					await discardRestartData(data, "failed");
+					await discardRestartResources("failed");
 				} catch (cleanupError) {
-					throw new AggregateError([error, cleanupError], "Host restart and handoff cleanup failed", { cause: error });
+					throw new AggregateError([error, cleanupError], "Host restart and resource cleanup failed", { cause: error });
 				}
 				throw error;
-			} finally {
-				await discardRestartData(data, "incomplete");
 			}
+			await discardRestartResources("incomplete");
 		};
-		return restartTask ??= (scope ? scope.run("restart", restart) : restart()).finally(() => {
+		const runRestart = () => operations.run(restart);
+		return restartTask ??= (scope ? scope.run("restart", runRestart) : runRestart()).finally(() => {
 			restartTask = void 0;
 		});
 	};
 }
 //#endregion
-export { getDevShutdownScope as a, createDevShutdownScope as i, setHostRestartData as n, getDevServerCloseRecord as o, takeHostRestartData as r, replaceDevServerClose as s, bindHostLifecycle as t };
+export { takeHostRestartData as a, getDevServerCloseRecord as c, takeHostLifecycle as i, replaceDevServerClose as l, setHostRestartData as n, createDevShutdownScope as o, takeHostConfigRestartData as r, getDevShutdownScope as s, bindHostLifecycle as t };

package/dist/{loadConfig-C3BQhz7F.mjs → loadConfig-BWIsDXR4.mjs}

@@ -1,4 +1,4 @@
-import { E as loadViteConfigFile, M as createCjsConfigLoadError, t as resolveWeappConfigFile } from "./utils-CJSCgEj6.mjs";
+import { A as createCjsConfigLoadError, C as loadViteConfigFile, t as resolveWeappConfigFile } from "./utils-Dy51PYAC.mjs";
 import process from "node:process";
 import path from "pathe";
 import { defu } from "@weapp-core/shared";

package/dist/loadConfig-D-BpBgsk.mjs

@@ -0,0 +1 @@
+export { t as loadConfig } from "./loadConfig-BWIsDXR4.mjs";

package/dist/logBuildAppFinish-ChjwATMv.mjs

@@ -0,0 +1,57 @@
+import { s as getProjectConfigFileName } from "./utils-Dy51PYAC.mjs";
+import { r as logger_default, t as colors } from "./logger-DGn5iEVN.mjs";
+import process from "node:process";
+import { resolveCommand } from "package-manager-detector/commands";
+//#region src/cli/commands/build/completion.ts
+function shouldScheduleCompletedProductionBuildExit(options, analyzeHandle) {
+	return process.env.VITEST !== "true" && process.env.NODE_ENV !== "test" && process.env.WEAPP_VITE_DISABLE_COMPLETED_BUILD_EXIT !== "1" && options.watch !== true && options.open !== true && analyzeHandle === void 0;
+}
+function scheduleCompletedProductionBuildExit(options, analyzeHandle) {
+	if (!shouldScheduleCompletedProductionBuildExit(options, analyzeHandle)) return;
+	setTimeout(() => {
+		if (process.exitCode === void 0 || process.exitCode === 0) process.exit(0);
+	}, 0).unref?.();
+}
+//#endregion
+//#region src/cli/formatDuration.ts
+/**
+* 将毫秒耗时格式化为适合 CLI 展示的文本。
+*/
+function formatDuration(durationMs) {
+	return `${durationMs}ms`;
+}
+//#endregion
+//#region src/cli/logBuildAppFinish.ts
+let logBuildAppFinishOnlyShowOnce = false;
+function collectServerUrls(webServer) {
+	const urls = webServer?.resolvedUrls;
+	if (!urls) return [];
+	return [...urls.local ?? [], ...urls.network ?? []];
+}
+function logBuildAppFinish(configService, webServer, options = {}) {
+	if (logBuildAppFinishOnlyShowOnce) return;
+	const { skipMini = false, skipWeb = false, uiUrls = [] } = options;
+	const webUrls = skipWeb ? [] : collectServerUrls(webServer);
+	if (skipMini) {
+		logger_default.success("开发服务已就绪：");
+		if (webUrls.length > 0) logger_default.info(`Web：${colors.cyan(webUrls[0])}`);
+		else logger_default.info("Web：已启动");
+		logBuildAppFinishOnlyShowOnce = true;
+		return;
+	}
+	const { command, args } = resolveCommand(configService.packageManager.agent, "run", ["open"]) ?? {
+		command: "npm",
+		args: ["run", "open"]
+	};
+	const devCommand = `${command} ${args.join(" ")}`;
+	logger_default.success("开发服务已就绪：");
+	logger_default.info(`小程序：执行 ${colors.bold(colors.green(devCommand))}，或手动导入 ${colors.green(getProjectConfigFileName(configService.platform))}`);
+	if (uiUrls.length > 0) logger_default.info(`UI：${colors.cyan(uiUrls[0])}`);
+	else if (!skipMini) logger_default.info("UI：未启用");
+	if (webUrls.length > 0) logger_default.info(`Web：${colors.cyan(webUrls[0])}`);
+	const projectConfigFileName = getProjectConfigFileName(configService.platform);
+	if (!uiUrls.length && !webUrls.length) logger_default.info(`提示：手动打开对应平台开发者工具，导入根目录（${colors.green(projectConfigFileName)} 文件所在目录）`);
+	logBuildAppFinishOnlyShowOnce = true;
+}
+//#endregion
+export { formatDuration as n, scheduleCompletedProductionBuildExit as r, logBuildAppFinish as t };

package/dist/mcp-CYgX9HpO.mjs

@@ -0,0 +1,86 @@
+import process from "node:process";
+import path from "node:path";
+import { writeFile } from "node:fs/promises";
+//#region src/cli/commands/accept.ts
+function registerAcceptCommand(cli) {
+	cli.command("accept [root]", "run deterministic mini-program acceptance without a model").option("--init", "create acceptance configuration without overwriting").option("--inspect", "inspect acceptance prerequisites without executing project code").option("--report <jobId>", "read a saved report and check source freshness").option("--acceptance-config <file>", "select an acceptance JSON configuration").option("--trust", "authorize the reviewed configuration for this invocation").option("--json", "write protocol data only to stdout").action(async (root = ".", options) => {
+		try {
+			const directory = path.resolve(root);
+			const { defaultVerification, detectProject, safePath } = await import("@weapp-vite/acceptance");
+			if (options.init) {
+				const target = await safePath(directory, options.acceptanceConfig ?? "weapp-acceptance.config.json");
+				const config = {
+					version: 1,
+					verification: defaultVerification(await detectProject(directory)),
+					acceptance: {
+						requiredChecks: ["build", "devtools"],
+						scenarios: [],
+						timeoutMs: 6e5
+					}
+				};
+				await writeFile(target, `${JSON.stringify(config, null, 2)}\n`, { flag: "wx" });
+				process.stdout.write(`${JSON.stringify({
+					created: target,
+					modelRequired: false
+				})}\n`);
+				return;
+			}
+			const { createRuntimeAcceptanceService } = await import("@weapp-vite/mcp");
+			const { connectMiniProgram, prepareAcceptanceProject, resolveAutomatorSessionOptions } = await import("weapp-ide-cli");
+			const service = await createRuntimeAcceptanceService(directory, {
+				trust: Boolean(options.trust && !options.inspect && !options.report),
+				configFile: options.acceptanceConfig
+			}, {
+				connectMiniProgram,
+				resolveSessionOptions: resolveAutomatorSessionOptions,
+				prepareProject: prepareAcceptanceProject
+			});
+			let jobId;
+			let cancelRequested = false;
+			const cancel = () => {
+				cancelRequested = true;
+				if (jobId) service.cancel(jobId);
+			};
+			process.once("SIGINT", cancel);
+			try {
+				let result;
+				if (options.inspect) result = await service.inspect();
+				else if (options.report) result = await service.report(options.report);
+				else {
+					let report = await service.start();
+					jobId = report.jobId;
+					if (cancelRequested) await service.cancel(jobId);
+					while (report.status === "running") {
+						await new Promise((resolve) => setTimeout(resolve, 100));
+						report = await service.report(jobId);
+					}
+					result = report;
+				}
+				process.stdout.write(`${JSON.stringify(result, null, options.json ? void 0 : 2)}\n`);
+				if ("passed" in result && (!result.passed || result.snapshot.stale)) process.exitCode = 1;
+			} finally {
+				process.off("SIGINT", cancel);
+				await service.close();
+			}
+		} catch (error) {
+			const message = error instanceof Error ? error.message : String(error);
+			if (options.json) process.stdout.write(`${JSON.stringify({
+				status: "failed",
+				passed: false,
+				reason: message
+			})}\n`);
+			else process.stderr.write(`${message}\n`);
+			process.exitCode = 1;
+		}
+	});
+}
+//#endregion
+//#region src/cli/commands/mcp/index.ts
+function registerMcpCommand(cli) {
+	cli.command("mcp [...args]", "start weapp-vite MCP server or manage MCP client onboarding").option("--transport <type>", "[string] stdio | streamable-http | command | http", { default: "stdio" }).option("--host <host>", "[string] streamable-http host").option("--port <port>", "[number] streamable-http port").option("--endpoint <path>", "[string] streamable-http endpoint path").option("--rest-endpoint <path>", "[string] streamable-http REST runtime endpoint path").option("--no-rest", "[boolean] disable streamable-http REST runtime endpoints").option("--unref", "[boolean] unref HTTP server to not block process exit").option("--url <url>", "[string] explicit HTTP MCP url").option("--workspace-root <path>", "[string] workspace root path, defaults to cwd").option("-y, --yes", "[boolean] write config without prompt").action(async (args, options) => {
+		const { runMcpCommand } = await import("./action-BELcDNNv.mjs");
+		return runMcpCommand(args, options);
+	});
+}
+//#endregion
+export { registerAcceptCommand as n, registerMcpCommand as t };

package/dist/mcp.d.mts

@@ -1,4 +1,4 @@
-import { Wt as WeappMcpConfig } from "./config-V0L-IAJf.mjs";
+import { Ut as WeappMcpConfig } from "./config-Bf6DWhyb.mjs";
 import { DEFAULT_MCP_ENDPOINT, DEFAULT_MCP_HOST, DEFAULT_MCP_PORT, DEFAULT_RUNTIME_REST_ENDPOINT } from "@weapp-core/constants";
 import { CreateServerOptions, McpServerHandle, StartMcpServerOptions, createWeappViteMcpServer as createWeappViteMcpServer$1 } from "@weapp-vite/mcp";
 //#region src/mcp.d.ts