weapp-vite 6.15.13 → 6.15.14

package/dist/cli.mjs

@@ -1,6 +1,6 @@
-import { S as isPathInside, _ as DEFAULT_MP_PLATFORM, b as resolveMiniPlatform, c as createSharedBuildConfig, d as resolveWeappConfigFile, f as checkRuntime, g as createCjsConfigLoadError, h as parseCommentJson, l as SHARED_CHUNK_VIRTUAL_PREFIX, m as loadViteConfigFile, n as syncProjectSupportFiles, p as getProjectConfigFileName, r as syncManagedTsconfigBootstrapFiles, s as formatBytes, t as createCompilerContext, v as getDefaultIdeProjectRoot, x as shouldPassPlatformArgToIdeOpen, y as normalizeMiniPlatform } from "./createContext-CBnOZ_FN.mjs";
+import { S as isPathInside, _ as DEFAULT_MP_PLATFORM, b as resolveMiniPlatform, c as createSharedBuildConfig, d as resolveWeappConfigFile, f as checkRuntime, g as createCjsConfigLoadError, h as parseCommentJson, l as SHARED_CHUNK_VIRTUAL_PREFIX, m as loadViteConfigFile, n as syncProjectSupportFiles, p as getProjectConfigFileName, r as syncManagedTsconfigBootstrapFiles, s as formatBytes, t as createCompilerContext, v as getDefaultIdeProjectRoot, x as shouldPassPlatformArgToIdeOpen, y as normalizeMiniPlatform } from "./createContext-BcX4FNt9.mjs";
 import { r as logger_default, t as colors } from "./logger-CgxdNjvb.mjs";
-import { h as VERSION } from "./file-CycxGM0E.mjs";
+import { h as VERSION } from "./file-BR4Z0ErL.mjs";
 import { a as resolveWeappMcpConfig, o as startWeappViteMcpServer } from "./mcp-DRlj32v4.mjs";
 import { createRequire } from "node:module";
 import path, { posix } from "pathe";
@@ -15,14 +15,13 @@ import { execFile } from "node:child_process";
 import { Buffer } from "node:buffer";
 import { cac } from "cac";
 import { resolveCommand } from "package-manager-detector/commands";
+import { RETRY_CANCEL_KEYS, RETRY_CONFIRM_KEYS, bootstrapWechatDevtoolsSettings, buildWechatIdeNpm, clearWechatIdeCache, clearWechatIdeCacheByAutomator, closeSharedMiniProgram, closeWechatIdeProject, compileWechatIdeByAutomator, connectOpenedAutomator, createSharedInputSession, dispatchWechatCliCommand, formatAutomatorLoginError, getConfig, getWechatIdeTestAccounts, getWechatIdeTicket, getWechatIdeToolInfo, isAutomatorLoginError, isWeappIdeTopLevelCommand, isWechatIdeLoginRequiredError, launchAutomator, openWechatIdeProjectByHttp, parse, promptRetryKeypress, promptWechatIdeLoginRetry, quitWechatIde, refreshWechatIdeTicket, resetWechatIdeFileUtilsByHttp, runRetryableCommand, runWechatIdeEngineBuild, runWithSuspendedSharedInput, setWechatIdeTicket, startForwardConsole, takeScreenshot } from "weapp-ide-cli";
 import { promisify } from "node:util";
-import { bootstrapWechatDevtoolsSettings, closeSharedMiniProgram, connectOpenedAutomator, formatAutomatorLoginError, formatRetryHotkeyPrompt, formatWechatIdeLoginRequiredError, getConfig, isAutomatorLoginError, isWeappIdeTopLevelCommand, isWechatIdeLoginRequiredError, launchAutomator, parse, startForwardConsole, takeScreenshot, waitForRetryKeypress } from "weapp-ide-cli";
 import { generateJs, generateJson, generateWxml, generateWxss } from "@weapp-core/schematics";
 import { determineAgent } from "@vercel/detect-agent";
 import { initConfig } from "@weapp-core/init";
 import { createInterface } from "node:readline/promises";
 import { clearTimeout, setTimeout as setTimeout$1 } from "node:timers";
-import { emitKeypressEvents } from "node:readline";
 //#region src/analyze/subpackages/classifier.ts
 const VIRTUAL_MODULE_INDICATOR = "\0";
 const VIRTUAL_PREFIX = `${SHARED_CHUNK_VIRTUAL_PREFIX}/`;
@@ -952,42 +951,133 @@ function logBuildPackageSizeReport(options) {
 	}
 }
 //#endregion
-//#region src/cli/openIde.ts
-const execFileAsync = promisify(execFile);
-function shouldLogAutomatorFallbackError() {
-	const flag = process.env.WEAPP_VITE_DEBUG_AUTOMATOR_OPEN;
-	return flag === "1" || flag === "true";
+//#region src/cli/openIde/execute.ts
+function readArgOption(argv, ...names) {
+	for (let index = 0; index < argv.length; index += 1) {
+		const current = argv[index];
+		if (!names.includes(current)) continue;
+		const next = argv[index + 1];
+		if (typeof next === "string" && !next.startsWith("-")) return next;
+	}
 }
-async function openWechatIdeByAutomator(projectPath) {
-	(await launchAutomator({
-		projectPath,
-		trustProject: true
-	})).disconnect();
+async function tryExecuteWechatIdeCliCommandByAutomator(argv, projectPath) {
+	if (!projectPath) return false;
+	const command = argv[0];
+	if (!command) return false;
+	if (command === "compile") {
+		await compileWechatIdeByAutomator({ projectPath });
+		return true;
+	}
+	if (command === "cache") {
+		const cleanType = readArgOption(argv, "--clean", "-c");
+		if (cleanType !== "compile" && cleanType !== "all") return false;
+		await clearWechatIdeCacheByAutomator({
+			clean: cleanType,
+			projectPath
+		});
+		return true;
+	}
+	return false;
+}
+async function tryExecuteWechatIdeCliCommandByHttp(argv, projectPath) {
+	const command = argv[0];
+	if (!command) return false;
+	if (command === "compile") {
+		if (!projectPath) return false;
+		await openWechatIdeProjectByHttp(projectPath);
+		return true;
+	}
+	if (command === "reset-fileutils") {
+		if (!projectPath) return false;
+		await resetWechatIdeFileUtilsByHttp(projectPath);
+		return true;
+	}
+	if (command === "engine" && argv[1] === "build") {
+		const engineProjectPath = argv[2] || projectPath;
+		if (!engineProjectPath) return false;
+		await runWechatIdeEngineBuild(engineProjectPath, { logPath: readArgOption(argv, "--logPath", "-l") });
+		return true;
+	}
+	return false;
+}
+async function tryExecuteWechatIdeCliCommandByHelper(argv) {
+	const command = argv[0];
+	if (!command) return false;
+	if (command === "close") {
+		await closeWechatIdeProject();
+		return true;
+	}
+	if (command === "quit") {
+		await quitWechatIde();
+		return true;
+	}
+	if (command === "cache") {
+		const cleanType = readArgOption(argv, "--clean", "-c");
+		if (!cleanType) return false;
+		await clearWechatIdeCache({ clean: cleanType });
+		return true;
+	}
+	return false;
 }
 /**
-* @description 执行 IDE 打开流程，并在登录失效时允许按键重试。
+* @description 统一执行 weapp-ide-cli 命令，并在登录失效时复用同一套重试交互。
 */
-async function runWechatIdeOpenWithRetry(argv) {
-	let retrying = true;
-	while (retrying) try {
-		await parse(argv);
-		return;
-	} catch (error) {
-		if (!isWechatIdeLoginRequiredError(error)) {
-			logger_default.error(error);
-			return;
+async function executeWechatIdeCliCommand(argv, options = {}) {
+	const { automatorMode = "prefer", cancelLevel = "warn", httpMode = "prefer", onNonLoginError, onRetry, projectPath } = options;
+	await runWithSuspendedSharedInput(async () => {
+		try {
+			if (await tryExecuteWechatIdeCliCommandByHttp(argv, projectPath)) return;
+		} catch (error) {
+			if (httpMode === "require") throw error;
 		}
-		logger_default.error("检测到微信开发者工具登录状态失效，请先登录后重试。");
-		logger_default.warn(formatWechatIdeLoginRequiredError(error));
-		logger_default.info(formatRetryHotkeyPrompt());
-		if (await waitForRetryKeypress() !== "retry") {
-			logger_default.warn("已取消重试。完成登录后请重新执行当前命令。");
-			retrying = false;
-			continue;
+		try {
+			if (await tryExecuteWechatIdeCliCommandByAutomator(argv, projectPath)) return;
+		} catch (error) {
+			if (automatorMode === "require") throw error;
 		}
-		logger_default.info(colors.bold(colors.green("正在重试连接微信开发者工具...")));
-	}
+		try {
+			if (await tryExecuteWechatIdeCliCommandByHelper(argv)) return;
+		} catch (error) {
+			if (onNonLoginError) {
+				onNonLoginError(error);
+				return;
+			}
+			throw error;
+		}
+		await runRetryableCommand({
+			createCancelError: () => /* @__PURE__ */ new Error("cancelled"),
+			execute: async () => {
+				try {
+					await parse(argv);
+					return null;
+				} catch (error) {
+					if (!isWechatIdeLoginRequiredError(error)) {
+						if (onNonLoginError) {
+							onNonLoginError(error);
+							return null;
+						}
+						throw error;
+					}
+					return error;
+				}
+			},
+			isRetryableResult: (result) => result !== null,
+			onCancel: () => {},
+			onRetry: () => {
+				onRetry?.();
+			},
+			promptRetry: async (error) => await promptWechatIdeLoginRetry({
+				cancelLevel,
+				error,
+				logger: logger_default
+			}),
+			shouldRetry: (action) => action === "retry"
+		});
+	});
 }
+//#endregion
+//#region src/cli/openIde/close.ts
+const execFileAsync = promisify(execFile);
 async function closeIdeByAppleScript() {
 	if (process.platform !== "darwin") return false;
 	const appName = process.env.WEAPP_DEVTOOLS_APP_NAME || "wechatwebdevtools";
@@ -1009,29 +1099,21 @@ async function closeIdeByProcessKill(cliPath) {
 	}
 }
 /**
-* @description 根据 mpDistRoot 推导 IDE 项目目录（目录内应包含 project/mini 配置）
-*/
-function resolveIdeProjectPath(mpDistRoot) {
-	if (!mpDistRoot || !mpDistRoot.trim()) return;
-	const parent = path.dirname(mpDistRoot);
-	if (!parent || parent === "." || parent === "/") return;
-	return parent;
-}
-/**
-* @description 结合 mpDistRoot 与配置根目录解析最终 IDE 项目目录。
+* @description 关闭微信开发者工具，并在 CLI 不可用时回退到系统级关闭。
 */
-function resolveIdeProjectRoot(mpDistRoot, cwd) {
-	return resolveIdeProjectPath(mpDistRoot) ?? cwd;
-}
-async function closeIde() {
+async function closeIde$1() {
 	const config = await getConfig();
 	const cliPath = config.cliPath?.trim() ? config.cliPath : null;
 	try {
-		await parse(["close"]);
+		await closeWechatIdeProject();
 		return true;
 	} catch (error) {
 		if (isWechatIdeLoginRequiredError(error)) try {
-			await runWechatIdeOpenWithRetry(["close"]);
+			await executeWechatIdeCliCommand(["close"], {
+				cancelLevel: "warn",
+				onNonLoginError: (retryError) => logger_default.error(retryError),
+				onRetry: () => logger_default.info("正在重试连接微信开发者工具...")
+			});
 			return true;
 		} catch (retryError) {
 			logger_default.error(retryError);
@@ -1051,25 +1133,36 @@ async function closeIde() {
 		return false;
 	}
 }
+//#endregion
+//#region src/cli/openIde/reuse.ts
 function formatReuseOpenedWechatIdePrompt() {
 	return `目标项目已在微信开发者工具中打开，已跳过重复打开。按 ${colors.bold(colors.green("r"))} 关闭当前窗口后重新打开。`;
 }
-/**
-* @description 若当前项目已在微信开发者工具中打开且自动化可连通，则直接复用现有会话，避免重复拉起 IDE。
-*/
-async function tryReuseOpenedWechatIde(projectPath) {
-	let miniProgram;
+async function openWechatIdeByAutomator(projectPath) {
+	(await launchAutomator({
+		projectPath,
+		trustProject: true
+	})).disconnect();
+}
+async function connectOpenedProject(projectPath) {
 	try {
-		miniProgram = await connectOpenedAutomator({
+		return await connectOpenedAutomator({
 			projectPath,
 			timeout: 3e3
 		});
 	} catch {
 		return null;
 	}
+}
+/**
+* @description 若当前项目已在微信开发者工具中打开且自动化可连通，则直接复用现有会话，避免重复拉起 IDE。
+*/
+async function tryReuseOpenedWechatIde(projectPath, closeIde) {
+	const miniProgram = await connectOpenedProject(projectPath);
+	if (!miniProgram) return null;
 	miniProgram.disconnect();
 	logger_default.info(formatReuseOpenedWechatIdePrompt());
-	if (await waitForRetryKeypress() !== "retry") return {
+	if (await promptRetryKeypress({ logger: logger_default }) !== "retry") return {
 		reopened: false,
 		reused: true
 	};
@@ -1081,22 +1174,70 @@ async function tryReuseOpenedWechatIde(projectPath) {
 		reused: false
 	};
 }
-async function reopenOpenedWechatIde(projectPath) {
-	let miniProgram;
-	try {
-		miniProgram = await connectOpenedAutomator({
-			projectPath,
-			timeout: 3e3
-		});
-	} catch {
-		return false;
-	}
+/**
+* @description 对已打开的目标项目执行强制重开，以刷新最新构建产物。
+*/
+async function reopenOpenedWechatIde(projectPath, closeIde) {
+	const miniProgram = await connectOpenedProject(projectPath);
+	if (!miniProgram) return false;
 	miniProgram.disconnect();
 	logger_default.info("目标项目已在微信开发者工具中打开，当前命令将主动重开以刷新最新构建产物。");
 	if (!await closeIde()) logger_default.warn("关闭当前微信开发者工具失败，仍继续尝试重新打开目标项目。");
 	await openWechatIdeByAutomator(projectPath);
 	return true;
 }
+//#endregion
+//#region src/cli/openIde/index.ts
+function shouldLogAutomatorFallbackError() {
+	const flag = process.env.WEAPP_VITE_DEBUG_AUTOMATOR_OPEN;
+	return flag === "1" || flag === "true";
+}
+/**
+* @description 执行 IDE 打开流程，并在登录失效时允许按键重试。
+*/
+async function runWechatIdeOpenWithRetry(argv) {
+	await executeWechatIdeCliCommand(argv, {
+		cancelLevel: "warn",
+		onNonLoginError: (error) => logger_default.error(error),
+		onRetry: () => {
+			logger_default.info(colors.bold(colors.green("正在重试连接微信开发者工具...")));
+		}
+	});
+}
+/**
+* @description 根据 mpDistRoot 推导 IDE 项目目录（目录内应包含 project/mini 配置）
+*/
+function resolveIdeProjectPath(mpDistRoot) {
+	if (!mpDistRoot || !mpDistRoot.trim()) return;
+	const parent = path.dirname(mpDistRoot);
+	if (!parent || parent === "." || parent === "/") return;
+	return parent;
+}
+/**
+* @description 结合 mpDistRoot 与配置根目录解析最终 IDE 项目目录。
+*/
+function resolveIdeProjectRoot(mpDistRoot, cwd) {
+	return resolveIdeProjectPath(mpDistRoot) ?? cwd;
+}
+async function closeIde() {
+	return await closeIde$1();
+}
+async function tryOpenWechatIdeByAutomator(projectPath, options) {
+	if (options.reuseOpenedProject === false) {
+		if (await reopenOpenedWechatIde(projectPath, closeIde)) return true;
+	}
+	const reuseResult = await tryReuseOpenedWechatIde(projectPath, closeIde);
+	if (reuseResult?.reused || reuseResult?.reopened) return true;
+	await openWechatIdeByAutomator(projectPath);
+	return true;
+}
+function createIdeOpenArgv(platform, projectPath, options = {}) {
+	const argv = ["open", "-p"];
+	if (projectPath) argv.push(projectPath);
+	if (platform === "weapp" && options.trustProject !== false) argv.push("--trust-project");
+	if (platform && shouldPassPlatformArgToIdeOpen(platform)) argv.push("--platform", platform);
+	return argv;
+}
 async function openIde(platform, projectPath, options = {}) {
 	let bootstrapResult;
 	if (platform === "weapp" && projectPath) try {
@@ -1110,13 +1251,7 @@ async function openIde(platform, projectPath, options = {}) {
 	}
 	if (platform === "weapp" && projectPath && bootstrapResult?.servicePortEnabled === false) logger_default.warn("检测到微信开发者工具服务端口当前处于关闭状态，已保留用户设置并回退到普通 open 流程。");
 	if (platform === "weapp" && projectPath && options.trustProject !== false && bootstrapResult?.servicePortEnabled !== false) try {
-		if (options.reuseOpenedProject === false) {
-			if (await reopenOpenedWechatIde(projectPath)) return;
-		}
-		const reuseResult = await tryReuseOpenedWechatIde(projectPath);
-		if (reuseResult?.reused || reuseResult?.reopened) return;
-		await openWechatIdeByAutomator(projectPath);
-		return;
+		if (await tryOpenWechatIdeByAutomator(projectPath, options)) return;
 	} catch (error) {
 		if (isAutomatorLoginError(error)) {
 			logger_default.error("检测到微信开发者工具登录状态失效，请先登录后重试。");
@@ -1125,11 +1260,7 @@ async function openIde(platform, projectPath, options = {}) {
 		logger_default.warn("通过 automator 启动微信开发者工具并自动信任项目失败，回退到普通 open 流程。");
 		if (shouldLogAutomatorFallbackError()) logger_default.error(error);
 	}
-	const argv = ["open", "-p"];
-	if (projectPath) argv.push(projectPath);
-	if (platform === "weapp" && options.trustProject !== false) argv.push("--trust-project");
-	if (platform && shouldPassPlatformArgToIdeOpen(platform)) argv.push("--platform", platform);
-	await runWechatIdeOpenWithRetry(argv);
+	await runWechatIdeOpenWithRetry(createIdeOpenArgv(platform, projectPath, options));
 }
 /**
 * @description 解析 IDE 相关命令所需的平台、项目目录与配置上下文。
@@ -1608,11 +1739,15 @@ async function waitForTermination(cleanup) {
 		}
 	});
 }
+function formatIdeOutput(data, options) {
+	if (options.json) return JSON.stringify(data, null, 2);
+	return JSON.stringify(data, null, 2);
+}
 /**
 * @description 执行 ide 子命令。
 */
 async function runIdeCommand(action, root, options) {
-	if (action !== "logs" && action !== "setup") throw new Error(`未知 ide 子命令: ${action ?? "(empty)"}`);
+	if (action !== "logs" && action !== "setup" && action !== "info" && action !== "test-accounts" && action !== "ticket" && action !== "ticket:set" && action !== "ticket:refresh") throw new Error(`未知 ide 子命令: ${action ?? "(empty)"}`);
 	filterDuplicateOptions(options);
 	const configFile = resolveConfigFile(options);
 	const targets = resolveRuntimeTargets(options);
@@ -1634,6 +1769,35 @@ async function runIdeCommand(action, root, options) {
 		return;
 	}
 	if (options.open) await openIde(resolved.platform, resolved.projectPath, { trustProject: options.trustProject });
+	if (action === "info") {
+		const result = await getWechatIdeToolInfo({ projectPath: resolved.projectPath });
+		logger_default.info(formatIdeOutput(result, options));
+		return;
+	}
+	if (action === "test-accounts") {
+		const result = await getWechatIdeTestAccounts({ projectPath: resolved.projectPath });
+		logger_default.info(formatIdeOutput(result, options));
+		return;
+	}
+	if (action === "ticket") {
+		const result = await getWechatIdeTicket({ projectPath: resolved.projectPath });
+		logger_default.info(formatIdeOutput(result, options));
+		return;
+	}
+	if (action === "ticket:set") {
+		if (!options.ticket) throw new Error("`weapp-vite ide ticket:set` 需要提供 --ticket。");
+		await setWechatIdeTicket({
+			projectPath: resolved.projectPath,
+			ticket: options.ticket
+		});
+		logger_default.info(`已设置微信开发者工具 ticket：${options.ticket}`);
+		return;
+	}
+	if (action === "ticket:refresh") {
+		await refreshWechatIdeTicket({ projectPath: resolved.projectPath });
+		logger_default.info("已刷新微信开发者工具 ticket。");
+		return;
+	}
 	const forwardConsoleOptions = await resolveForwardConsoleOptions({
 		...resolved.weappViteConfig,
 		forwardConsole: resolved.weappViteConfig?.forwardConsole === false ? { enabled: true } : {
@@ -1657,7 +1821,7 @@ async function runIdeCommand(action, root, options) {
 * @description 注册 IDE 相关子命令。
 */
 function registerIdeCommand(cli) {
-	cli.command("ide [action] [root]", "forward Wechat DevTools console logs to terminal").option("-o, --open", "[boolean] open ide before attaching log bridge").option("-p, --platform <platform>", "[string] target platform (weapp | h5)").option("--project-config <path>", "[string] project config path (miniprogram only)").option("--trust-project", "[boolean] auto trust Wechat DevTools project on open", { default: true }).action(async (action, root, options) => {
+	cli.command("ide [action] [root]", "run Wechat DevTools utility actions and log bridge commands").option("-o, --open", "[boolean] open ide before attaching log bridge").option("-p, --platform <platform>", "[string] target platform (weapp | h5)").option("--project-config <path>", "[string] project config path (miniprogram only)").option("--ticket <value>", "[string] ticket used by `ide ticket:set`").option("--trust-project", "[boolean] auto trust Wechat DevTools project on open", { default: true }).action(async (action, root, options) => {
 		await runIdeCommand(action, root, options);
 	});
 }
@@ -1979,16 +2143,18 @@ async function resolveHttpUrl(options) {
 }
 async function confirmWrite() {
 	if (!process.stdin.isTTY || !process.stdout.isTTY) return false;
-	const rl = createInterface({
-		input: process.stdin,
-		output: process.stdout
+	return await runWithSuspendedSharedInput(async () => {
+		const rl = createInterface({
+			input: process.stdin,
+			output: process.stdout
+		});
+		try {
+			const normalized = (await rl.question("是否写入配置文件？(Y/n) ")).trim().toLowerCase();
+			return normalized === "" || normalized === "y" || normalized === "yes";
+		} finally {
+			rl.close();
+		}
 	});
-	try {
-		const normalized = (await rl.question("是否写入配置文件？(Y/n) ")).trim().toLowerCase();
-		return normalized === "" || normalized === "y" || normalized === "yes";
-	} finally {
-		rl.close();
-	}
 }
 function resolveClientTransport(transport) {
 	return transport === "http" ? "http" : "command";
@@ -2072,7 +2238,7 @@ function registerMcpCommand(cli) {
 function registerNpmCommand(cli) {
 	cli.command("npm").alias("build:npm").alias("build-npm").action(async () => {
 		try {
-			await parse(["build-npm", "-p"]);
+			await buildWechatIdeNpm({ projectPath: process.cwd() });
 		} catch (error) {
 			logger_default.error(error);
 		}
@@ -2114,6 +2280,7 @@ function registerPrepareCommand(cli) {
 				isDev: false,
 				mode: typeof options.mode === "string" ? options.mode : "development",
 				configFile: resolveConfigFile(options),
+				configLoader: "native",
 				syncSupportFiles: false,
 				preloadAppEntry: false
 			}));
@@ -2124,8 +2291,208 @@ function registerPrepareCommand(cli) {
 	});
 }
 //#endregion
+//#region src/cli/devHotkeys/devtools.ts
+/**
+* @description 重置当前 DevTools automator 共享会话。
+*/
+async function runResetDevtoolsSessionAction(options) {
+	logger_default.info("[dev action] 正在重置当前 DevTools 会话...");
+	await closeSharedMiniProgram(options.projectPath);
+	logger_default.success("[dev action] 当前 DevTools 会话已重置。");
+	return "已重置当前 DevTools 会话";
+}
+/**
+* @description 重置共享会话并重开当前项目，以恢复 DevTools 状态。
+*/
+async function runResetAndReopenDevtoolsAction(options) {
+	if (!options.openIde) {
+		logger_default.warn("[dev action] 当前 dev 会话未提供重新打开微信开发者工具的能力。");
+		return "重置并重开微信开发者工具不可用";
+	}
+	logger_default.info("[dev action] 正在重置当前 DevTools 会话并重开项目...");
+	await closeSharedMiniProgram(options.projectPath);
+	const summary = await options.openIde();
+	logger_default.success("[dev action] 当前 DevTools 会话已重置，并已重新打开项目。");
+	return summary ?? "已重置当前 DevTools 会话并重新打开项目";
+}
+/**
+* @description 手动触发一次当前小程序 dev 重新构建。
+*/
+async function runDevRebuildAction(options) {
+	if (!options.rebuild) {
+		logger_default.warn("[dev action] 当前 dev 会话未提供手动重新构建能力。");
+		return "手动重新构建不可用";
+	}
+	logger_default.info("[dev action] 正在手动重新构建当前小程序产物...");
+	const summary = await options.rebuild();
+	logger_default.success("[dev action] 当前小程序产物已手动重新构建。");
+	return summary ?? "已手动重新构建当前小程序产物";
+}
+/**
+* @description 重新打开当前微信开发者工具项目，并主动清理共享 automator 会话。
+*/
+async function runOpenIdeAction(options) {
+	if (!options.openIde) {
+		logger_default.warn("[dev action] 当前 dev 会话未提供重新打开微信开发者工具的能力。");
+		return "重新打开微信开发者工具不可用";
+	}
+	logger_default.info(`[dev action] 正在重新打开微信开发者工具项目：${colors.cyan(options.projectPath)}`);
+	await closeSharedMiniProgram(options.projectPath);
+	const summary = await options.openIde();
+	logger_default.success("[dev action] 微信开发者工具项目已重新打开。");
+	return summary ?? "已重新打开微信开发者工具项目";
+}
+//#endregion
+//#region src/cli/devHotkeys/screenshot.ts
+const DEV_SCREENSHOT_DIR = ".weapp-vite/dev-screenshots";
+const DEFAULT_SCREENSHOT_TIMEOUT = 3e4;
+/**
+* @description 生成开发态截图输出路径。
+*/
+function resolveDevScreenshotOutputPath(cwd, now = /* @__PURE__ */ new Date()) {
+	const stamp = now.toISOString().replace(/[:.]/g, "-");
+	return path.join(cwd, DEV_SCREENSHOT_DIR, `screenshot-${stamp}.png`);
+}
+function formatLogPath(cwd, targetPath) {
+	const relativePath = path.relative(cwd, targetPath);
+	if (!relativePath || relativePath.startsWith("..")) return targetPath;
+	return relativePath;
+}
+function formatResolvedScreenshotPath(cwd, fallbackPath, result) {
+	return formatLogPath(cwd, result.path ?? fallbackPath);
+}
+/**
+* @description 执行当前页面截图并输出结果日志。
+*/
+async function runScreenshotAction(options) {
+	const outputPath = resolveDevScreenshotOutputPath(options.cwd);
+	await fs$2.mkdir(path.dirname(outputPath), { recursive: true });
+	logger_default.info(`[dev action] 正在截图当前页面，输出到 ${colors.cyan(formatLogPath(options.cwd, outputPath))}`);
+	const result = await takeScreenshot({
+		fullPage: true,
+		projectPath: options.projectPath,
+		sharedSession: true,
+		outputPath,
+		timeout: DEFAULT_SCREENSHOT_TIMEOUT
+	});
+	const resolvedPath = formatResolvedScreenshotPath(options.cwd, outputPath, result);
+	logger_default.success(`[dev action] 当前页面截图完成：${colors.cyan(resolvedPath)}`);
+	return resolvedPath;
+}
+//#endregion
+//#region src/cli/devHotkeys/actions.ts
+const DEV_HOTKEY_GROUPS = [
+	{
+		key: "development",
+		title: "开发动作"
+	},
+	{
+		key: "devtools",
+		title: "会话动作"
+	},
+	{
+		key: "process",
+		title: "进程控制"
+	},
+	{
+		key: "help",
+		title: "帮助"
+	}
+];
+const DEV_HOTKEY_DEFINITIONS = [
+	{
+		description: "截图当前页面并保存到本地",
+		group: "development",
+		key: "s",
+		label: "截图",
+		pendingLabel: "正在截图当前页面",
+		run: async ({ options }) => {
+			return `截图已保存到 ${await runScreenshotAction(options)}`;
+		}
+	},
+	{
+		description: "手动重新构建当前小程序产物",
+		group: "development",
+		key: "r",
+		label: "手动重新构建产物",
+		pendingLabel: "正在手动重新构建当前小程序产物",
+		run: async ({ options }) => {
+			return await runDevRebuildAction(options);
+		}
+	},
+	{
+		description: "重置当前 DevTools automator 会话",
+		group: "devtools",
+		key: "c",
+		label: "重置 DevTools 会话",
+		pendingLabel: "正在重置当前 DevTools 会话",
+		run: async ({ options }) => {
+			return await runResetDevtoolsSessionAction(options);
+		}
+	},
+	{
+		description: "重置会话并重开当前微信开发者工具项目",
+		group: "devtools",
+		key: "C",
+		label: "重置并重开项目",
+		pendingLabel: "正在重置当前 DevTools 会话并重开项目",
+		run: async ({ options }) => {
+			return await runResetAndReopenDevtoolsAction(options);
+		}
+	},
+	{
+		description: "重新打开当前微信开发者工具项目",
+		group: "devtools",
+		key: "o",
+		label: "重新打开微信开发者工具",
+		pendingLabel: "正在重新打开微信开发者工具项目",
+		run: async ({ options }) => {
+			return await runOpenIdeAction(options);
+		}
+	},
+	{
+		description: "开关 MCP 服务",
+		group: "devtools",
+		key: "m",
+		label: "MCP 切换",
+		run: async ({ toggleMcp }) => {
+			return await toggleMcp();
+		}
+	},
+	{
+		description: "退出当前 dev",
+		group: "process",
+		key: "q"
+	},
+	{
+		description: "强制中断当前 dev",
+		group: "process",
+		key: "Ctrl+C"
+	},
+	{
+		description: "暂时挂起当前 dev，恢复终端控制",
+		group: "process",
+		key: "Ctrl+Z"
+	},
+	{
+		description: "重新显示这份帮助",
+		group: "help",
+		key: "h"
+	}
+];
+function resolveDevHotkeyRowsByGroup() {
+	return DEV_HOTKEY_GROUPS.map((group) => ({
+		key: group.key,
+		rows: DEV_HOTKEY_DEFINITIONS.filter((action) => action.group === group.key),
+		title: group.title
+	}));
+}
+function resolveRunnableHotkeyDefinition(input) {
+	return DEV_HOTKEY_DEFINITIONS.find((action) => action.run && action.key === input);
+}
+//#endregion
 //#region package.json
-var version = "6.15.13";
+var version = "6.15.14";
 //#endregion
 //#region src/cli/devHotkeys/format.ts
 const FULLWIDTH_ASCII_START = 65281;
@@ -2143,55 +2510,45 @@ function formatFooterLine(state) {
 	if (state.currentAction) return `执行中    ${state.currentAction}`;
 	return "就绪      等待操作...";
 }
+function formatHotkeyRows(rows) {
+	const key = (value) => colors.bold(colors.green(value));
+	const formattedRows = rows.map((row) => ({
+		description: row.description,
+		key: key(row.key)
+	}));
+	const keyColumnWidth = Math.max(...formattedRows.map((row) => row.key.length));
+	return formattedRows.map(({ key, description }) => `按 ${key.padEnd(keyColumnWidth)}  ${description}`);
+}
+function formatExtraHotkeyRows(rows) {
+	const key = (value) => colors.bold(colors.green(value));
+	const formattedRows = rows.map(([hotkey, description]) => ({
+		description,
+		key: key(hotkey)
+	}));
+	const keyColumnWidth = Math.max(...formattedRows.map((row) => row.key.length));
+	return formattedRows.map(({ key, description }) => `按 ${key.padEnd(keyColumnWidth)}  ${description}`);
+}
 /**
 * @description 生成带状态的开发态快捷键帮助文本。
 */
 function formatDevHotkeyHelpWithState(state) {
-	const key = (value) => colors.bold(colors.green(value));
-	const actionRows = [{
-		key: key("s"),
-		description: "截图当前页面并保存到本地"
-	}, {
-		key: key("m"),
-		description: "开关 MCP 服务"
-	}];
-	const processRows = [
-		{
-			key: key("q"),
-			description: "退出当前 dev"
-		},
-		{
-			key: key("Ctrl+C"),
-			description: "强制中断当前 dev"
-		},
-		{
-			key: key("Ctrl+Z"),
-			description: "暂时挂起当前 dev，恢复终端控制"
-		}
+	const sections = resolveDevHotkeyRowsByGroup().filter((section) => section.rows.length > 0).flatMap((section) => [
+		"",
+		section.title,
+		...formatHotkeyRows(section.rows)
+	]);
+	const retrySections = [
+		"",
+		"登录重试",
+		...formatExtraHotkeyRows([[RETRY_CONFIRM_KEYS.join(" / "), "微信开发者工具登录失效后确认重试当前命令"], [RETRY_CANCEL_KEYS.join(" / "), "取消当前登录重试提示"]])
 	];
-	const helpRows = [{
-		key: key("h"),
-		description: "重新显示这份帮助"
-	}];
-	const keyColumnWidth = Math.max(...[
-		...actionRows,
-		...processRows,
-		...helpRows
-	].map((row) => row.key.length));
-	const formatRows = (rows) => rows.map(({ key, description }) => `按 ${key.padEnd(keyColumnWidth)}  ${description}`);
 	return [
 		`${colors.bold(colors.green("DEV"))}  weapp-vite v${version}  ${state.projectLabel ?? "weapp"}`,
+		...sections,
+		...retrySections,
 		"",
-		"快捷命令",
-		...formatRows(actionRows),
-		"",
-		"进程控制",
-		...formatRows(processRows),
-		"",
-		"帮助",
-		...formatRows(helpRows),
-		"",
-		`当前状态：${state.currentAction ?? "等待操作"} / MCP ${formatMcpStatus(state)}`
+		`当前状态：${state.currentAction ?? "等待操作"} / MCP ${formatMcpStatus(state)}`,
+		...state.lastAction ? [`最近操作：${state.lastAction}`] : []
 	].join("\n");
 }
 /**
@@ -2200,6 +2557,7 @@ function formatDevHotkeyHelpWithState(state) {
 function formatDevHotkeyHintWithState(state) {
 	const key = (value) => colors.bold(colors.green(value));
 	if (state.currentAction) return `${formatFooterLine(state)}，按 ${key("h")} 显示帮助，按 ${key("q")} 退出`;
+	if (state.lastAction) return `开发快捷键已就绪，最近操作：${state.lastAction}，按 ${key("h")} 显示帮助，按 ${key("q")} 退出`;
 	return `开发快捷键已就绪，按 ${key("h")} 显示帮助，按 ${key("q")} 退出`;
 }
 function normalizeInputChar(input) {
@@ -2252,43 +2610,6 @@ function createToggleMcpAction(options) {
 	};
 }
 //#endregion
-//#region src/cli/devHotkeys/screenshot.ts
-const DEV_SCREENSHOT_DIR = ".weapp-vite/dev-screenshots";
-const DEFAULT_SCREENSHOT_TIMEOUT = 3e4;
-/**
-* @description 生成开发态截图输出路径。
-*/
-function resolveDevScreenshotOutputPath(cwd, now = /* @__PURE__ */ new Date()) {
-	const stamp = now.toISOString().replace(/[:.]/g, "-");
-	return path.join(cwd, DEV_SCREENSHOT_DIR, `screenshot-${stamp}.png`);
-}
-function formatLogPath(cwd, targetPath) {
-	const relativePath = path.relative(cwd, targetPath);
-	if (!relativePath || relativePath.startsWith("..")) return targetPath;
-	return relativePath;
-}
-function formatResolvedScreenshotPath(cwd, fallbackPath, result) {
-	return formatLogPath(cwd, result.path ?? fallbackPath);
-}
-/**
-* @description 执行当前页面截图并输出结果日志。
-*/
-async function runScreenshotAction(options) {
-	const outputPath = resolveDevScreenshotOutputPath(options.cwd);
-	await fs$2.mkdir(path.dirname(outputPath), { recursive: true });
-	logger_default.info(`[dev action] 正在截图当前页面，输出到 ${colors.cyan(formatLogPath(options.cwd, outputPath))}`);
-	const result = await takeScreenshot({
-		fullPage: true,
-		projectPath: options.projectPath,
-		sharedSession: true,
-		outputPath,
-		timeout: DEFAULT_SCREENSHOT_TIMEOUT
-	});
-	const resolvedPath = formatResolvedScreenshotPath(options.cwd, outputPath, result);
-	logger_default.success(`[dev action] 当前页面截图完成：${colors.cyan(resolvedPath)}`);
-	return resolvedPath;
-}
-//#endregion
 //#region src/cli/devHotkeys/index.ts
 function forwardSigint() {
 	process.kill(process.pid, "SIGINT");
@@ -2301,10 +2622,6 @@ function forwardSigtstp() {
 */
 function startDevHotkeys(options) {
 	if (options.platform !== "weapp" || !process.stdin.isTTY) return;
-	emitKeypressEvents(process.stdin);
-	const hasSetRawMode = typeof process.stdin.setRawMode === "function";
-	if (hasSetRawMode) process.stdin.setRawMode(true);
-	process.stdin.resume();
 	let closed = false;
 	let running = false;
 	let mcpHandle;
@@ -2323,27 +2640,20 @@ function startDevHotkeys(options) {
 		mcpRunning: Boolean(mcpHandle?.close),
 		projectLabel: resolveProjectLabel(options.cwd)
 	});
-	const detachTerminal = () => {
-		if (hasSetRawMode) process.stdin.setRawMode(false);
-		process.stdin.pause();
-	};
-	const attachTerminal = () => {
-		if (closed) return;
-		if (hasSetRawMode) process.stdin.setRawMode(true);
-		process.stdin.resume();
-	};
-	const ensureTerminalActive = () => {
-		if (closed) return;
-		if (hasSetRawMode) process.stdin.setRawMode(true);
-		process.stdin.resume();
-	};
+	let inputSession = createSharedInputSession({
+		onData: (chunk) => {
+			onData?.(chunk);
+		},
+		onKeypress: (str, key) => {
+			onKeypress?.(str, key);
+		}
+	});
 	const close = () => {
 		if (closed) return;
 		closed = true;
-		if (onData) process.stdin.off("data", onData);
-		if (onKeypress) process.stdin.off("keypress", onKeypress);
 		if (onSigcont) process.off("SIGCONT", onSigcont);
-		detachTerminal();
+		inputSession?.close();
+		inputSession = void 0;
 		if (mcpHandle?.close) mcpHandle.close().catch((error) => {
 			logger_default.warn(`[dev action] MCP 服务关闭失败：${error instanceof Error ? error.message : String(error)}`);
 		});
@@ -2358,24 +2668,18 @@ function startDevHotkeys(options) {
 	};
 	const printHelp = () => {
 		printPanel(formatDevHotkeyHelpWithState(getState()), true);
-		ensureTerminalActive();
 	};
 	const printHint = () => {
 		printPanel(formatDevHotkeyHintWithState(getState()));
-		ensureTerminalActive();
 	};
 	const restore = () => {
 		if (closed) return;
-		if (onData) process.stdin.off("data", onData);
-		if (onKeypress) process.stdin.off("keypress", onKeypress);
-		attachTerminal();
-		if (onData) process.stdin.on("data", onData);
-		if (onKeypress) process.stdin.on("keypress", onKeypress);
+		inputSession?.resume();
 		printHint();
 	};
 	const suspend = () => {
 		lastRenderedPanel = "";
-		detachTerminal();
+		inputSession?.suspend();
 		forwardSigtstp();
 	};
 	const toggleMcp = createToggleMcpAction({
@@ -2386,6 +2690,9 @@ function startDevHotkeys(options) {
 			mcpHandle = handle;
 		}
 	});
+	const resolvePendingLabel = (input) => {
+		if (input === "m") return mcpHandle?.close ? "正在关闭 MCP 服务" : "正在启动 MCP 服务";
+	};
 	const runAction = (label, pendingLabel, action) => {
 		if (running) {
 			const current = currentAction ?? "已有命令";
@@ -2427,14 +2734,12 @@ function startDevHotkeys(options) {
 			printHelp();
 			return;
 		}
-		if (normalized === "s") {
-			runAction("截图", "正在截图当前页面", async () => {
-				return `截图已保存到 ${await runScreenshotAction(options)}`;
+		const action = resolveRunnableHotkeyDefinition(normalizedInput) ?? resolveRunnableHotkeyDefinition(normalized);
+		if (action?.run) runAction(action.label ?? action.description, resolvePendingLabel(normalized) ?? action.pendingLabel ?? `正在执行 ${action.description}`, async () => {
+			return await action.run({
+				options,
+				toggleMcp
 			});
-			return;
-		}
-		if (normalized === "m") runAction("MCP 切换", mcpHandle?.close ? "正在关闭 MCP 服务" : "正在启动 MCP 服务", async () => {
-			return await toggleMcp();
 		});
 	};
 	const handleInputOnce = (input, source) => {
@@ -2454,7 +2759,6 @@ function startDevHotkeys(options) {
 		const text = typeof chunk === "string" ? chunk : Buffer.from(chunk).toString("utf8");
 		for (const char of text) handleInputOnce(char, "data");
 	};
-	process.stdin.on("data", onData);
 	onKeypress = (str, key) => {
 		if (key?.ctrl && key.name === "c") {
 			handleInputOnce("", "keypress");
@@ -2466,7 +2770,6 @@ function startDevHotkeys(options) {
 		}
 		if (typeof str === "string" && str) handleInputOnce(str, "keypress");
 	};
-	process.stdin.on("keypress", onKeypress);
 	onSigcont = () => {
 		restore();
 	};
@@ -2697,6 +3000,24 @@ function resolveWebHost(host) {
 	if (typeof host === "string") return host;
 	return String(host);
 }
+/**
+* @description 为 serve 模式构造统一的小程序开发动作，供热键与命令复用。
+*/
+function createServeMiniProgramDevActions(options) {
+	const projectPath = options.projectPath ?? options.fallbackProjectPath;
+	return {
+		projectPath,
+		openIde: async () => {
+			if (await options.tryReuseForwardConsole?.()) return "已通过控制台转发复用当前开发者工具会话";
+			await options.openIde(projectPath);
+			return "已重新打开微信开发者工具项目";
+		},
+		rebuild: async () => {
+			await options.build();
+			return "已手动重新构建当前小程序产物";
+		}
+	};
+}
 function waitForServeShutdownSignal() {
 	return new Promise((resolve) => {
 		const onSignal = () => {
@@ -2758,11 +3079,34 @@ function registerServeCommand(cli) {
 		logRuntimeTarget(targets, { resolvedConfigPlatform: configService.platform });
 		const enableAnalyze = Boolean(isUiEnabled(options) && targets.runMini);
 		let analyzeHandle;
+		const miniProgramDevActions = createServeMiniProgramDevActions({
+			build: async () => {
+				await buildService.build(options);
+			},
+			fallbackProjectPath: configService.cwd,
+			openIde: async (projectPath) => {
+				await openIde(configService.platform, projectPath, {
+					reuseOpenedProject: false,
+					trustProject: options.trustProject
+				});
+			},
+			projectPath: resolveIdeProjectRoot(configService.mpDistRoot, configService.cwd),
+			tryReuseForwardConsole: async () => {
+				return await maybeStartForwardConsole({
+					platform: configService.platform,
+					mpDistRoot: configService.mpDistRoot,
+					cwd: configService.cwd,
+					weappViteConfig: configService.weappViteConfig
+				});
+			}
+		});
 		const devHotkeysSession = targets.runMini ? startDevHotkeys({
 			cwd: configService.cwd,
 			mcpConfig: configService.weappViteConfig?.mcp,
+			openIde: miniProgramDevActions.openIde,
 			platform: configService.platform,
-			projectPath: resolveIdeProjectRoot(configService.mpDistRoot, configService.cwd) ?? configService.cwd,
+			projectPath: miniProgramDevActions.projectPath ?? configService.cwd,
+			rebuild: miniProgramDevActions.rebuild,
 			silentStartupHint: true
 		}) : void 0;
 		try {
@@ -2824,15 +3168,7 @@ function registerServeCommand(cli) {
 					detail: "开发服务已就绪，准备打开 IDE 项目。",
 					tags: ["ide", "open"]
 				}]);
-				if (!await maybeStartForwardConsole({
-					platform: configService.platform,
-					mpDistRoot: configService.mpDistRoot,
-					cwd: configService.cwd,
-					weappViteConfig: configService.weappViteConfig
-				})) await openIde(configService.platform, resolveIdeProjectRoot(configService.mpDistRoot, configService.cwd), {
-					reuseOpenedProject: false,
-					trustProject: options.trustProject
-				});
+				await miniProgramDevActions.openIde();
 				devHotkeysSession?.restore();
 			}
 			if (analyzeHandle) await analyzeController.waitForExit();
@@ -2904,18 +3240,18 @@ async function tryRunIdeCommand(argv) {
 	if (!command) return false;
 	if (command === "ide") {
 		if (argv[1] === "logs") return false;
-		await parse(argv.slice(1));
+		if (!await dispatchWechatCliCommand(argv.slice(1))) await executeWechatIdeCliCommand(argv.slice(1));
 		return true;
 	}
 	if (command.startsWith("-")) return false;
 	if (command === "help") {
 		const target = argv[1];
 		if (!target || WEAPP_VITE_NATIVE_COMMANDS.has(target) || !isWeappIdeTopLevelCommand(target)) return false;
-		await parse(argv);
+		await executeWechatIdeCliCommand(argv);
 		return true;
 	}
 	if (WEAPP_VITE_NATIVE_COMMANDS.has(command) || !isWeappIdeTopLevelCommand(command)) return false;
-	await parse(argv);
+	if (!await dispatchWechatCliCommand(argv)) await executeWechatIdeCliCommand(argv);
 	return true;
 }
 //#endregion