weapp-ide-cli 6.0.7 → 6.1.0

package/dist/{automator-session-CkojbnCg.js → automator-session-BIjYknSi.js}

@@ -166,11 +166,6 @@ function createWrapperProjectConfig(source, patch) {
 		}
 	};
 }
-async function copyJsonConfigAsWrapper(sourcePath, targetPath, patch) {
-	const source = await readJsonObject$1(sourcePath);
-	if (!source) return;
-	await writeJsonObject$1(targetPath, createWrapperProjectConfig(source, patch));
-}
 async function ensureWrapperAppConfig(wrapperProjectPath) {
 	const appConfigPath = path.join(wrapperProjectPath, "app.json");
 	const appConfig = await readJsonObject$1(appConfigPath);
@@ -191,6 +186,7 @@ async function resolveAutomatorProjectPath(projectPath) {
 		projectPath: sourceProjectPath,
 		sourceProjectPath
 	};
+	const sourceProjectConfig = projectConfig ?? {};
 	const distRoot = path.join(sourceProjectPath, miniprogramRoot);
 	if (!await pathExists(path.join(distRoot, "app.json"))) return {
 		projectPath: sourceProjectPath,
@@ -208,15 +204,19 @@ async function resolveAutomatorProjectPath(projectPath) {
 		force: true,
 		recursive: true
 	});
-	const pluginRoot = normalizeProjectRelativeRoot(projectConfig?.pluginRoot);
+	const pluginRoot = normalizeProjectRelativeRoot(sourceProjectConfig.pluginRoot);
 	if (pluginRoot) await copyProjectRoot(sourceProjectPath, wrapperProjectPath, pluginRoot);
 	const rootPatch = {
-		compileType: projectConfig?.compileType === "plugin" ? "plugin" : "miniprogram",
+		compileType: sourceProjectConfig.compileType === "plugin" ? "plugin" : "miniprogram",
 		miniprogramRoot: "./",
 		srcMiniprogramRoot: "./"
 	};
-	await copyJsonConfigAsWrapper(path.join(sourceProjectPath, "project.config.json"), path.join(wrapperProjectPath, "project.config.json"), rootPatch);
-	await copyJsonConfigAsWrapper(path.join(sourceProjectPath, "project.private.config.json"), path.join(wrapperProjectPath, "project.private.config.json"), rootPatch);
+	const projectPrivateConfig = await readJsonObject$1(path.join(sourceProjectPath, "project.private.config.json")) ?? {};
+	await writeJsonObject$1(path.join(wrapperProjectPath, "project.config.json"), createWrapperProjectConfig(sourceProjectConfig, {
+		...projectPrivateConfig,
+		...rootPatch
+	}));
+	await fs.rm(path.join(wrapperProjectPath, "project.private.config.json"), { force: true });
 	await ensureWrapperAppConfig(wrapperProjectPath);
 	return {
 		cleanup: async () => {
@@ -622,6 +622,7 @@ const DEVTOOLS_HTTP_PORT_ERROR = "Failed to launch wechat web devTools, please m
 const DEVTOOLS_EXTENSION_CONTEXT_INVALIDATED_RE = /Extension context invalidated/i;
 const AUTOMATOR_LAUNCH_TIMEOUT_RE = /Wait timed out after \d+ ms/i;
 const AUTOMATOR_WS_CONNECT_RE = /Failed connecting to ws:\/\/127\.0\.0\.1:\d+/i;
+const AUTOMATOR_PORT_IN_USE_RE = /Port \d+ is in use, please specify another port/i;
 const DEVTOOLS_PROTOCOL_TIMEOUT_RE = /DevTools did not respond to protocol method (\S+) within \d+ms/i;
 const DEVTOOLS_INFRA_ERROR_PATTERNS = [
 	/#initialize-error:\s*wait IDE port timeout/i,
@@ -745,6 +746,13 @@ function isAutomatorWsConnectError(error) {
 	return AUTOMATOR_WS_CONNECT_RE.test(message);
 }
 /**
+* @description 判断错误是否属于目标项目 automator 端口仍被旧会话占用。
+*/
+function isAutomatorPortInUseError(error) {
+	const message = error instanceof Error ? error.message : String(error);
+	return AUTOMATOR_PORT_IN_USE_RE.test(message);
+}
+/**
 * @description 判断错误是否属于开发者工具协议调用超时。
 */
 function isAutomatorProtocolTimeoutError(error) {
@@ -798,6 +806,7 @@ async function launchAutomator(options) {
 		trustProject: resolvedTrustProject
 	});
 	if (bootstrapResult?.servicePortEnabled === false) throw new Error("Detected WeChat DevTools service port is disabled in current settings. Please enable it manually; existing user settings were not modified.");
+	const launchStartedAt = Date.now();
 	for (let attempt = 0; attempt < 2; attempt += 1) try {
 		const miniProgram = await launcher.launch({
 			cliPath: resolvedCliPath,
@@ -822,7 +831,7 @@ async function launchAutomator(options) {
 		return miniProgram;
 	} catch (error) {
 		lastError = error;
-		if (!isRetryableAutomatorLaunchError(error) || attempt === 1) throw error;
+		if (!isRetryableAutomatorLaunchError(error) || attempt === 1 || Date.now() - launchStartedAt >= timeout) throw error;
 	}
 	throw lastError instanceof Error ? lastError : new Error(String(lastError));
 }
@@ -1246,7 +1255,7 @@ function normalizeMiniProgramConnectionError(error) {
 		logger_default.warn(i18nText("请稍后重试；若持续失败，关闭多余的开发者工具窗口后重试。", "Please retry shortly. If it keeps failing, close extra DevTools windows and try again."));
 		return /* @__PURE__ */ new Error("DEVTOOLS_EXTENSION_CONTEXT_INVALIDATED");
 	}
-	if (isAutomatorWsConnectError(error)) {
+	if (isAutomatorWsConnectError(error) || isAutomatorPortInUseError(error)) {
 		logger_default.error(i18nText("无法连接到当前项目的微信开发者工具自动化 websocket。", "Cannot connect to the Wechat DevTools automation websocket for the current project."));
 		logger_default.warn(i18nText("请确认当前打开的是目标项目；若之前跑过其他 e2e / screenshot 任务，关闭多余的微信开发者工具窗口，或结束残留的 `wechatwebdevtools cli auto --project ...` 进程后重试。", "Please confirm the current DevTools window is the target project. If you recently ran other e2e / screenshot tasks, close extra windows or stop stale `wechatwebdevtools cli auto --project ...` processes and retry."));
 		return /* @__PURE__ */ new Error("DEVTOOLS_WS_CONNECT_ERROR");
@@ -1266,7 +1275,7 @@ async function connectMiniProgram(options) {
 	const result = await runRetryableCommand({
 		createCancelError: (result) => createWechatIdeLoginRequiredExitError(unwrapAutomatorConnectionError(result), "cancelled"),
 		execute: async () => {
-			if (options.preferOpenedSession === false) try {
+			if (options.preferOpenedSession === false && options.openedOnly !== true) try {
 				return {
 					kind: "result",
 					value: await launchFreshAutomator(options)
@@ -1285,7 +1294,7 @@ async function connectMiniProgram(options) {
 				};
 			} catch (error) {
 				const normalizedOpenSessionError = normalizeMiniProgramConnectionError(error);
-				if (options.openedOnly) throw normalizedOpenSessionError;
+				if (options.openedOnly || options.preferOpenedSession !== false && Boolean(options.port || options.sessionId)) throw normalizedOpenSessionError;
 				if (normalizedOpenSessionError instanceof Error && normalizedOpenSessionError.message === "DEVTOOLS_PROTOCOL_TIMEOUT") throw normalizedOpenSessionError;
 				try {
 					return {
@@ -1332,4 +1341,4 @@ async function withMiniProgram$1(options, runner) {
 	return await withMiniProgram(runtimeHooks, options, runner);
 }
 //#endregion
-export { overwriteCustomConfig as $, isAutomatorProtocolTimeoutError as A, getConfig as B, configureLocaleFromArgv as C, formatAutomatorLoginError as D, connectOpenedAutomator as E, launchAutomator as F, isOperatingSystemSupported as G, resolveDevtoolsAutomationDefaults as H, resolveProjectAutomatorPort as I, logger_default as J, operatingSystemName as K, bootstrapWechatDevtoolsSettings as L, isDevtoolsExtensionContextInvalidatedError as M, isDevtoolsHttpPortError as N, getAutomatorProtocolTimeoutMethod as O, isRetryableAutomatorLaunchError as P, createLocaleConfig as Q, detectWechatDevtoolsServicePort as R, waitForExclusiveKeypress as S, validateLocaleOption as T, SupportedPlatformsMap as U, getConfiguredLocale as V, getDefaultCliPath as W, createAutoTrustProjectConfig as X, createAutoBootstrapDevtoolsConfig as Y, createCustomConfig as Z, promptRetryKeypress as _, releaseSharedMiniProgram as a, createSharedInputSession as b, RETRY_CANCEL_KEYS as c, createWechatIdeLoginRequiredExitError as d, readCustomConfig as et, extractExecutionErrorText as f, isWechatIdeLoginRequiredExitError as g, isWechatIdeLoginRequiredError as h, getSharedMiniProgramSessionCount as i, resolvePath as it, isAutomatorWsConnectError as j, isAutomatorLoginError as k, RETRY_CONFIRM_KEYS as l, formatWechatIdeLoginRequiredError as m, closeSharedMiniProgram as n, defaultCustomConfigDirPath as nt, withMiniProgram$1 as o, formatRetryHotkeyPrompt as p, colors as q, connectMiniProgram as r, defaultCustomConfigFilePath as rt, runRetryableCommand as s, acquireSharedMiniProgram$1 as t, removeCustomConfigKey as tt, RETRY_PROMPT_INITIAL_IGNORE_MS as u, promptWechatIdeLoginRetry as v, i18nText as w, runWithSuspendedSharedInput as x, waitForRetryKeypress as y, resolveCliPath as z };
+export { createLocaleConfig as $, isAutomatorPortInUseError as A, resolveCliPath as B, configureLocaleFromArgv as C, formatAutomatorLoginError as D, connectOpenedAutomator as E, isRetryableAutomatorLaunchError as F, getDefaultCliPath as G, getConfiguredLocale as H, launchAutomator as I, colors as J, isOperatingSystemSupported as K, resolveProjectAutomatorPort as L, isAutomatorWsConnectError as M, isDevtoolsExtensionContextInvalidatedError as N, getAutomatorProtocolTimeoutMethod as O, isDevtoolsHttpPortError as P, createCustomConfig as Q, bootstrapWechatDevtoolsSettings as R, waitForExclusiveKeypress as S, validateLocaleOption as T, resolveDevtoolsAutomationDefaults as U, getConfig as V, SupportedPlatformsMap as W, createAutoBootstrapDevtoolsConfig as X, logger_default as Y, createAutoTrustProjectConfig as Z, promptRetryKeypress as _, releaseSharedMiniProgram as a, resolvePath as at, createSharedInputSession as b, RETRY_CANCEL_KEYS as c, createWechatIdeLoginRequiredExitError as d, overwriteCustomConfig as et, extractExecutionErrorText as f, isWechatIdeLoginRequiredExitError as g, isWechatIdeLoginRequiredError as h, getSharedMiniProgramSessionCount as i, defaultCustomConfigFilePath as it, isAutomatorProtocolTimeoutError as j, isAutomatorLoginError as k, RETRY_CONFIRM_KEYS as l, formatWechatIdeLoginRequiredError as m, closeSharedMiniProgram as n, removeCustomConfigKey as nt, withMiniProgram$1 as o, formatRetryHotkeyPrompt as p, operatingSystemName as q, connectMiniProgram as r, defaultCustomConfigDirPath as rt, runRetryableCommand as s, acquireSharedMiniProgram$1 as t, readCustomConfig as tt, RETRY_PROMPT_INITIAL_IGNORE_MS as u, promptWechatIdeLoginRetry as v, i18nText as w, runWithSuspendedSharedInput as x, waitForRetryKeypress as y, detectWechatDevtoolsServicePort as z };

package/dist/{cli-DSrMNDWQ.js → cli-CFRAOBIw.js}

@@ -1,6 +1,6 @@
-import { $ as overwriteCustomConfig, C as configureLocaleFromArgv, H as resolveDevtoolsAutomationDefaults, J as logger_default, Q as createLocaleConfig, T as validateLocaleOption, V as getConfiguredLocale, X as createAutoTrustProjectConfig, Y as createAutoBootstrapDevtoolsConfig, Z as createCustomConfig, a as releaseSharedMiniProgram, et as readCustomConfig, q as colors, r as connectMiniProgram, rt as defaultCustomConfigFilePath, t as acquireSharedMiniProgram, tt as removeCustomConfigKey, w as i18nText, z as resolveCliPath } from "./automator-session-CkojbnCg.js";
-import { A as isWechatIdeLoggedIn, B as runWechatCliCommand, C as clearWechatIdeCache, F as quitWechatIde, G as transformArgv, H as execute, K as promptForCliPath, L as resetWechatIdeFileUtils, M as openWechatIde, N as openWechatIdeOtherProject, P as previewWechatIde, Q as startWechatIdeEngineBuildByHttp, S as buildWechatIdeNpm, T as closeWechatIdeProject, U as createAlias, W as createPathCompat, Y as pollWechatIdeEngineBuildResultByHttp, _ as autoPreviewWechatIde, a as navigateBack, b as buildWechatIdeApk, c as pageStack, d as remote, f as scrollTo, g as tap, i as input, it as removeOption, j as loginWechatIde, l as reLaunch, m as systemInfo, n as captureScreenshotBuffer, nt as readBooleanOption, o as navigateTo, p as switchTab, r as currentPage, rt as readOptionValue, s as pageData, t as audit, tt as parseAutomatorArgs, u as redirectTo, v as autoReplayWechatIde, x as buildWechatIdeIpa, y as autoWechatIde, z as uploadWechatIde } from "./commands-Ijtoy2_F.js";
-import "./run-mcp-CUUdfBm7.js";
+import { $ as createLocaleConfig, B as resolveCliPath, C as configureLocaleFromArgv, H as getConfiguredLocale, J as colors, Q as createCustomConfig, T as validateLocaleOption, U as resolveDevtoolsAutomationDefaults, X as createAutoBootstrapDevtoolsConfig, Y as logger_default, Z as createAutoTrustProjectConfig, a as releaseSharedMiniProgram, et as overwriteCustomConfig, it as defaultCustomConfigFilePath, n as closeSharedMiniProgram, nt as removeCustomConfigKey, r as connectMiniProgram, t as acquireSharedMiniProgram, tt as readCustomConfig, w as i18nText } from "./automator-session-BIjYknSi.js";
+import { A as isWechatIdeLoggedIn, B as runWechatCliCommand, C as clearWechatIdeCache, F as quitWechatIde, G as transformArgv, H as execute, K as promptForCliPath, L as resetWechatIdeFileUtils, M as openWechatIde, N as openWechatIdeOtherProject, P as previewWechatIde, Q as startWechatIdeEngineBuildByHttp, S as buildWechatIdeNpm, T as closeWechatIdeProject, U as createAlias, W as createPathCompat, Y as pollWechatIdeEngineBuildResultByHttp, _ as autoPreviewWechatIde, a as navigateBack, b as buildWechatIdeApk, c as pageStack, d as remote, f as scrollTo, g as tap, i as input, it as removeOption, j as loginWechatIde, l as reLaunch, m as systemInfo, n as captureScreenshotBuffer, nt as readBooleanOption, o as navigateTo, p as switchTab, r as currentPage, rt as readOptionValue, s as pageData, t as audit, tt as parseAutomatorArgs, u as redirectTo, v as autoReplayWechatIde, x as buildWechatIdeIpa, y as autoWechatIde, z as uploadWechatIde } from "./commands-9WCVsqHn.js";
+import "./run-mcp-BTB9ire3.js";
 import fs from "node:fs/promises";
 import path from "node:path";
 import { fs as fs$1 } from "@weapp-core/shared/fs";
@@ -231,6 +231,8 @@ ${colors.bold("参数:")}
       --page <path>      截图前先跳转页面
       --full-page        输出整页长截图
   -t, --timeout <ms>     连接超时时间（默认：30000）
+      --port <port>      连接已打开的 automator 端口
+      --session-id <id>  复用指定的 automator 会话
       --runtime-url <url> 复用本地 runtime service 地址
       --no-runtime-service 跳过 runtime service，直接连接 DevTools
       --json             以 JSON 格式输出
@@ -261,6 +263,8 @@ ${colors.bold("Options:")}
       --page <path>      Navigate to page before taking screenshot
       --full-page        Capture a stitched full-page screenshot
   -t, --timeout <ms>     Connection timeout in milliseconds (default: 30000)
+      --port <port>      Connect to an opened automator port
+      --session-id <id>  Reuse a named automator session
       --runtime-url <url> Runtime service URL for shared sessions
       --no-runtime-service Skip runtime service and connect to DevTools directly
       --json             Output as JSON format
@@ -313,7 +317,7 @@ async function runScreenshot(argv) {
 	}
 	const options = parseScreenshotArgs(argv);
 	const isJsonOutput = argv.includes("--json");
-	const { takeScreenshot } = await import("./commands-qLfRse7L.js");
+	const { takeScreenshot } = await import("./commands-BsYTeMoY.js");
 	const result = await takeScreenshot(options);
 	if (isJsonOutput) {
 		console.log(JSON.stringify(result, null, 2));
@@ -464,6 +468,20 @@ const COMMON_OPTION_DEFINITIONS = [
 			en: "Connection timeout (default: 30000)"
 		}
 	},
+	{
+		flag: "--port <port>",
+		description: {
+			zh: "连接已打开的 automator 端口",
+			en: "Connect to an opened automator port"
+		}
+	},
+	{
+		flag: "--session-id <id>",
+		description: {
+			zh: "复用指定的 automator 会话",
+			en: "Reuse a named automator session"
+		}
+	},
 	{
 		flag: "--runtime-url <url>",
 		description: {
@@ -505,6 +523,8 @@ const COMMON_ALLOWED_OPTIONS = /* @__PURE__ */ new Set([
 	"--project",
 	"-t",
 	"--timeout",
+	"--port",
+	"--session-id",
 	"--runtime-url",
 	"--no-runtime-service",
 	"--json",
@@ -1135,6 +1155,8 @@ const DEFAULT_FORWARD_CONSOLE_LEVELS = [
 ];
 const ENABLE_LOG_RETRY_DELAY_MS = 500;
 const ENABLE_LOG_RETRY_TIMES = 5;
+const ENABLE_LOG_TIMEOUT_MS = 3e3;
+const FORWARD_CONSOLE_SESSION_TIMEOUT_MS = 3e3;
 const ENABLE_LOG_REFRESH_INTERVAL_MS = 2e3;
 const AUXILIARY_FORWARD_CONSOLE_DELAY_MS = 2500;
 const DUPLICATE_LOG_SUPPRESS_MS = 800;
@@ -1236,15 +1258,39 @@ function normalizeExceptionEvent(payload) {
 function sleep(ms) {
 	return new Promise((resolve) => setTimeout(resolve, ms));
 }
-async function enableMiniProgramConsoleLog(miniProgram) {
+async function enableMiniProgramConsoleLog(miniProgram, retryTimes = ENABLE_LOG_RETRY_TIMES) {
 	if (typeof miniProgram.enableLog !== "function") return;
 	let lastError;
-	for (let attempt = 0; attempt <= ENABLE_LOG_RETRY_TIMES; attempt += 1) try {
-		await miniProgram.enableLog();
+	for (let attempt = 0; attempt <= retryTimes; attempt += 1) try {
+		await miniProgram.enableLog(ENABLE_LOG_TIMEOUT_MS);
 		return;
 	} catch (error) {
 		lastError = error;
-		if (attempt < ENABLE_LOG_RETRY_TIMES) await sleep(ENABLE_LOG_RETRY_DELAY_MS);
+		if (attempt < retryTimes) await sleep(ENABLE_LOG_RETRY_DELAY_MS);
+	}
+	throw lastError instanceof Error ? lastError : new Error(String(lastError));
+}
+async function acquireForwardConsoleMiniProgram(options) {
+	if (options.miniProgram) {
+		await enableMiniProgramConsoleLog(options.miniProgram);
+		return options.miniProgram;
+	}
+	let lastError;
+	for (let attempt = 0; attempt <= ENABLE_LOG_RETRY_TIMES; attempt += 1) {
+		let miniProgram;
+		try {
+			miniProgram = await acquireSharedMiniProgram({
+				...options,
+				timeout: Math.min(options.timeout ?? FORWARD_CONSOLE_SESSION_TIMEOUT_MS, FORWARD_CONSOLE_SESSION_TIMEOUT_MS)
+			});
+			await enableMiniProgramConsoleLog(miniProgram, 0);
+			return miniProgram;
+		} catch (error) {
+			lastError = error;
+			if (miniProgram) releaseSharedMiniProgram(options.projectPath, options.sessionId || options.port);
+			await closeSharedMiniProgram(options.projectPath, options.sessionId || options.port);
+			if (attempt < ENABLE_LOG_RETRY_TIMES) await sleep(ENABLE_LOG_RETRY_DELAY_MS);
+		}
 	}
 	throw lastError instanceof Error ? lastError : new Error(String(lastError));
 }
@@ -1262,7 +1308,7 @@ async function refreshOpenedMiniProgramConsoleLog(options) {
 function startEnableLogRefresh(miniProgram, options, refreshOpenedSession) {
 	if (typeof miniProgram.enableLog !== "function") return;
 	const timer = setInterval(() => {
-		miniProgram.enableLog().catch(() => {});
+		miniProgram.enableLog(ENABLE_LOG_TIMEOUT_MS).catch(() => {});
 		if (refreshOpenedSession) refreshOpenedMiniProgramConsoleLog(options).catch(() => {});
 	}, ENABLE_LOG_REFRESH_INTERVAL_MS);
 	return () => {
@@ -1274,7 +1320,7 @@ function startEnableLogRefresh(miniProgram, options, refreshOpenedSession) {
 */
 async function startForwardConsole(options) {
 	const usesSharedSession = !options.miniProgram;
-	const miniProgram = options.miniProgram ?? await acquireSharedMiniProgram(options);
+	const miniProgram = await acquireForwardConsoleMiniProgram(options);
 	const logLevels = new Set(options.logLevels?.length ? options.logLevels : DEFAULT_FORWARD_CONSOLE_LEVELS);
 	const logHandler = options.onLog ?? printForwardConsoleEvent;
 	const recentLogTimes = /* @__PURE__ */ new Map();
@@ -1317,12 +1363,6 @@ async function startForwardConsole(options) {
 		}
 		if (usesSharedSession) releaseSharedMiniProgram(options.projectPath, options.sessionId || options.port);
 	};
-	try {
-		await enableMiniProgramConsoleLog(miniProgram);
-	} catch (error) {
-		await closeSession();
-		throw error;
-	}
 	miniProgram.on("console", onConsole);
 	miniProgram.on("exception", onException);
 	stopEnableLogRefresh = startEnableLogRefresh(miniProgram, options, usesSharedSession);
@@ -1734,7 +1774,7 @@ async function parse(argv) {
 		return;
 	}
 	if (matchedCommand === "mcp") {
-		const { runMcpCommand } = await import("./run-mcp-D1G1d_Le.js");
+		const { runMcpCommand } = await import("./run-mcp-Q3skAZs_.js");
 		await runMcpCommand(argv.slice(1));
 		return;
 	}

package/dist/cli.js

@@ -1,5 +1,5 @@
-import { J as logger_default } from "./automator-session-CkojbnCg.js";
-import { n as parse } from "./cli-DSrMNDWQ.js";
+import { Y as logger_default } from "./automator-session-BIjYknSi.js";
+import { n as parse } from "./cli-CFRAOBIw.js";
 import process from "node:process";
 //#region src/cli.ts
 const argv = process.argv.slice(2);

package/dist/{commands-Ijtoy2_F.js → commands-9WCVsqHn.js}

@@ -1,4 +1,4 @@
-import { G as isOperatingSystemSupported, J as logger_default, K as operatingSystemName, L as bootstrapWechatDevtoolsSettings, R as detectWechatDevtoolsServicePort, Z as createCustomConfig, d as createWechatIdeLoginRequiredExitError, et as readCustomConfig, h as isWechatIdeLoginRequiredError, it as resolvePath, n as closeSharedMiniProgram, o as withMiniProgram, q as colors, rt as defaultCustomConfigFilePath, s as runRetryableCommand, v as promptWechatIdeLoginRetry, w as i18nText, x as runWithSuspendedSharedInput, z as resolveCliPath } from "./automator-session-CkojbnCg.js";
+import { B as resolveCliPath, J as colors, K as isOperatingSystemSupported, Q as createCustomConfig, R as bootstrapWechatDevtoolsSettings, Y as logger_default, at as resolvePath, d as createWechatIdeLoginRequiredExitError, h as isWechatIdeLoginRequiredError, it as defaultCustomConfigFilePath, n as closeSharedMiniProgram, o as withMiniProgram, q as operatingSystemName, s as runRetryableCommand, tt as readCustomConfig, v as promptWechatIdeLoginRetry, w as i18nText, x as runWithSuspendedSharedInput, z as detectWechatDevtoolsServicePort } from "./automator-session-BIjYknSi.js";
 import { Buffer } from "node:buffer";
 import fs from "node:fs/promises";
 import path from "node:path";
@@ -579,9 +579,9 @@ function createPathCompat(option) {
 * @description 执行 CLI 命令并透传输出
 */
 async function execute(cliPath, argv, options = {}) {
-	const { pipeStdout = true, pipeStderr = true } = options;
+	const { pipeStdout = true, pipeStderr = true, timeout } = options;
 	const { execa } = await import("execa");
-	const task = execa(cliPath, argv);
+	const task = execa(cliPath, argv, { timeout });
 	if (pipeStdout) task?.stdout?.pipe(process.stdout);
 	if (pipeStderr) task?.stderr?.pipe(process.stderr);
 	return await task;
@@ -681,7 +681,8 @@ async function runWechatCliWithRetry(cliPath, argv, options = {}) {
 						kind: "result",
 						value: await execute(cliPath, loginRetryOptions.runtimeArgv, {
 							pipeStdout: false,
-							pipeStderr: false
+							pipeStderr: false,
+							timeout: options.timeout
 						})
 					};
 				} catch (error) {
@@ -775,6 +776,7 @@ async function runWechatCliCommand(argv, options = {}) {
 }
 //#endregion
 //#region src/cli/wechat-commands.ts
+const DEVTOOLS_SHUTDOWN_TIMEOUT_MS = 1e4;
 function appendProjectLocatorArgv(argv, options) {
 	if (options.projectPath) argv.push("--project", path.resolve(options.projectPath));
 	if (options.appid) argv.push("--appid", options.appid);
@@ -887,13 +889,13 @@ async function uploadWechatIde(options) {
 * @description 调用微信开发者工具 close 命令。
 */
 async function closeWechatIdeProject() {
-	await runWechatCliCommand(["close"]);
+	await runWechatCliCommand(["close"], { timeout: DEVTOOLS_SHUTDOWN_TIMEOUT_MS });
 }
 /**
 * @description 调用微信开发者工具 quit 命令。
 */
 async function quitWechatIde() {
-	await runWechatCliCommand(["quit"]);
+	await runWechatCliCommand(["quit"], { timeout: DEVTOOLS_SHUTDOWN_TIMEOUT_MS });
 }
 /**
 * @description 调用微信开发者工具 cache 命令。

package/dist/commands-BsYTeMoY.js

@@ -0,0 +1,2 @@
+import { h as takeScreenshot } from "./commands-9WCVsqHn.js";
+export { takeScreenshot };

package/dist/index.d.ts

@@ -1,6 +1,6 @@
 import { Buffer } from "node:buffer";
 import { AutomatorElement, AutomatorMiniProgram, AutomatorPage, DevtoolsConnectionInput, DevtoolsContext, DevtoolsElementSnapshot, DevtoolsPageSnapshot, DevtoolsRuntimeSessionOptions, DevtoolsToolResult, MiniProgramEventMap, closeSharedMiniProgram, getSharedMiniProgramSessionCount, readDevtoolsElementSnapshot as readElementSnapshot, releaseSharedMiniProgram, resolveDevtoolsProjectPath as resolveProjectPath, toDevtoolsSerializableValue as toSerializableValue } from "@weapp-vite/devtools-runtime";
-import { McpServer } from "@modelcontextprotocol/sdk/server/mcp.js";
+import { McpServer } from "@modelcontextprotocol/server";
 //#region src/cli/automator.d.ts
 interface AutomatorOptions {
   projectPath: string;
@@ -33,6 +33,10 @@ declare function isRetryableAutomatorLaunchError(error: unknown): boolean;
  * @description 判断错误是否属于开发者工具 websocket 连接失败。
  */
 declare function isAutomatorWsConnectError(error: unknown): boolean;
+/**
+ * @description 判断错误是否属于目标项目 automator 端口仍被旧会话占用。
+ */
+declare function isAutomatorPortInUseError(error: unknown): boolean;
 /**
  * @description 判断错误是否属于开发者工具协议调用超时。
  */
@@ -467,6 +471,7 @@ declare function runAutomatorCommand(command: string, argv: string[]): Promise<v
 //#region src/cli/run-login.d.ts
 interface RunWechatCliWithRetryOptions {
   silent?: boolean;
+  timeout?: number;
 }
 /**
  * @description 运行微信开发者工具 CLI，并在登录失效时允许按键重试。
@@ -957,11 +962,14 @@ declare function createPathCompat(option: string): ArgvTransform;
 interface ExecuteOptions {
   pipeStdout?: boolean;
   pipeStderr?: boolean;
+  timeout?: number;
 }
 /**
  * @description 执行 CLI 命令并透传输出
  */
-declare function execute(cliPath: string, argv: string[], options?: ExecuteOptions): Promise<import("execa").Result<{}>>;
+declare function execute(cliPath: string, argv: string[], options?: ExecuteOptions): Promise<import("execa").Result<{
+  timeout: number | undefined;
+}>>;
 //#endregion
 //#region src/utils/path.d.ts
 /**
@@ -969,4 +977,4 @@ declare function execute(cliPath: string, argv: string[], options?: ExecuteOptio
  */
 declare function resolvePath(filePath: string): string;
 //#endregion
-export { AUTOMATOR_COMMAND_NAMES, ArgvTransform, AuditOptions, AutoPreviewWechatIdeOptions, AutoReplayWechatIdeOptions, AutoWechatIdeOptions, AutomatorCommandOptions, AutomatorOptions, AutomatorSessionOptions, type BaseConfig, BootstrapWechatDevtoolsSettingsOptions, BootstrapWechatDevtoolsSettingsResult, BuildWechatIdeApkOptions, BuildWechatIdeIpaOptions, BuildWechatIdeNpmOptions, CONFIG_COMMAND_NAME, ClearWechatIdeCacheByAutomatorOptions, ClearWechatIdeCacheOptions, CompileWechatIdeByAutomatorOptions, type ConfigSource, DetectWechatDevtoolsServicePortOptions, DetectWechatDevtoolsServicePortResult, DetectedWechatDevtoolsServicePortSettings, type DevtoolsConnectionInput, type DevtoolsContext, type DevtoolsElementSnapshot, type DevtoolsPageSnapshot, type DevtoolsToolResult, ExclusiveKeypressOptions, ForwardConsoleEvent, ForwardConsoleLogLevel, ForwardConsoleOptions, ForwardConsoleSession, InputOptions, LoginWechatIdeOptions, MCP_COMMAND_NAME, MINIDEV_NAMESPACE_COMMAND_NAMES, McpCommandOptions, MiniProgramElement, type MiniProgramEventMap, MiniProgramLike, MiniProgramPage, NavigateOptions, OpenWechatIdeOptions, OpenWechatIdeOtherProjectOptions, PageDataOptions, PageInfoOptions, ParsedAutomatorArgs, PollWechatIdeEngineBuildResult, PreviewWechatIdeOptions, RETRY_CANCEL_KEYS, RETRY_CONFIRM_KEYS, RETRY_PROMPT_INITIAL_IGNORE_MS, RemoteOptions, ResetWechatIdeFileUtilsOptions, type ResolvedConfig, RetryKeypressOptions, RetryLogger, RetryPromptOptions, RetryPromptResult, RetryableCommandExecutorOptions, RunWechatCliWithRetryOptions, RunWechatIdeEngineBuildByHttpOptions, RunWechatIdeEngineBuildOptions, ScreenshotOptions, ScreenshotResult, ScrollOptions, SelectorOptions, SetWechatIdeTicketOptions, SharedInputSession, SharedInputSessionOptions, StartWeappIdeMcpServerOptions, StartWechatIdeEngineBuildResult, SupportedPlatform, SupportedPlatformsMap, TapOptions, UploadWechatIdeOptions, WEAPP_IDE_TOP_LEVEL_COMMAND_NAMES, WECHAT_CLI_COMMAND_NAMES, WECHAT_DEVTOOLS_ENGINE_BUILD_STATUSES, WeappIdeMcpRuntimeHooks, WeappIdeMcpServerHandle, WeappIdeMcpServerOptions, WechatDevtoolsEngineBuildResult, WechatDevtoolsHttpCommandOptions, WechatDevtoolsSecuritySettings, WechatIdeAutomatorSessionOptions, WechatIdeLoginRetryOptions, acquireSharedMiniProgram, audit, autoPreviewWechatIde, autoReplayWechatIde, autoWechatIde, bootstrapWechatDevtoolsSettings, buildWechatIdeApk, buildWechatIdeIpa, buildWechatIdeNpm, captureScreenshotBuffer, clearWechatIdeCache, clearWechatIdeCacheByAutomator, closeSharedMiniProgram, closeWechatIdeProject, compileWechatIdeByAutomator, connectMiniProgram, connectOpenedAutomator, createAlias, createAutoBootstrapDevtoolsConfig, createAutoTrustProjectConfig, createCli, createCustomConfig, createLocaleConfig, createPathCompat, createSharedInputSession, createWeappIdeMcpServer, createWechatIdeLoginRequiredExitError, currentPage, defaultCustomConfigDirPath, defaultCustomConfigFilePath, detectWechatDevtoolsServicePort, dispatchWechatCliCommand, execute, extractExecutionErrorText, formatAutomatorLoginError, formatRetryHotkeyPrompt, formatWechatIdeLoginRequiredError, getAutomatorCommandHelp, getAutomatorProtocolTimeoutMethod, getConfig, getConfiguredLocale, getDefaultCliPath, getRuntimeWechatDevtoolsServicePort, getSharedMiniProgramSessionCount, getWechatIdeTestAccounts, getWechatIdeTicket, getWechatIdeToolInfo, handleConfigCommand, input, isAutomatorCommand, isAutomatorLoginError, isAutomatorProtocolTimeoutError, isAutomatorWsConnectError, isDevtoolsExtensionContextInvalidatedError, isDevtoolsHttpPortError, isOperatingSystemSupported, isRetryableAutomatorLaunchError, isWeappIdeTopLevelCommand, isWechatIdeEngineBuildEndpointMissingError, isWechatIdeLoggedIn, isWechatIdeLoginRequiredError, isWechatIdeLoginRequiredExitError, launchAutomator, loginWechatIde, navigateBack, navigateTo, openWechatIde, openWechatIdeOtherProject, openWechatIdeProjectByHttp, operatingSystemName, overwriteCustomConfig, pageData, pageStack, parse, parseAutomatorArgs, parseCompareArgs, parseScreenshotArgs, pollWechatIdeEngineBuildResultByHttp, previewWechatIde, printCompareHelp, printScreenshotHelp, promptForCliPath, promptRetryKeypress, promptWechatIdeLoginRetry, quitWechatIde, reLaunch, readBooleanOption, readCustomConfig, readElementSnapshot, readOptionValue, redirectTo, refreshWechatIdeTicket, registerWeappIdeMcpTools, releaseSharedMiniProgram, remote, removeCustomConfigKey, removeOption, requestWechatDevtoolsHttp, resetWechatIdeFileUtils, resetWechatIdeFileUtilsByHttp, resolveCliPath, resolveDevtoolsAutomationDefaults, resolvePath, resolveProjectAutomatorPort, resolveProjectPath, runAutomatorCommand, runMcpCommand, runMinidev, runRetryableCommand, runWechatCliWithRetry, runWechatIdeEngineBuild, runWechatIdeEngineBuildByHttp, runWithSuspendedSharedInput, scrollTo, setRuntimeWechatDevtoolsServicePort, setWechatIdeTicket, startForwardConsole, startWeappIdeMcpServer, startWechatIdeEngineBuildByHttp, switchTab, systemInfo, takeScreenshot, tap, toSerializableValue, transformArgv, uploadWechatIde, validateWechatCliCommandArgs, waitForExclusiveKeypress, waitForRetryKeypress, withMiniProgram };
+export { AUTOMATOR_COMMAND_NAMES, ArgvTransform, AuditOptions, AutoPreviewWechatIdeOptions, AutoReplayWechatIdeOptions, AutoWechatIdeOptions, AutomatorCommandOptions, AutomatorOptions, AutomatorSessionOptions, type BaseConfig, BootstrapWechatDevtoolsSettingsOptions, BootstrapWechatDevtoolsSettingsResult, BuildWechatIdeApkOptions, BuildWechatIdeIpaOptions, BuildWechatIdeNpmOptions, CONFIG_COMMAND_NAME, ClearWechatIdeCacheByAutomatorOptions, ClearWechatIdeCacheOptions, CompileWechatIdeByAutomatorOptions, type ConfigSource, DetectWechatDevtoolsServicePortOptions, DetectWechatDevtoolsServicePortResult, DetectedWechatDevtoolsServicePortSettings, type DevtoolsConnectionInput, type DevtoolsContext, type DevtoolsElementSnapshot, type DevtoolsPageSnapshot, type DevtoolsToolResult, ExclusiveKeypressOptions, ForwardConsoleEvent, ForwardConsoleLogLevel, ForwardConsoleOptions, ForwardConsoleSession, InputOptions, LoginWechatIdeOptions, MCP_COMMAND_NAME, MINIDEV_NAMESPACE_COMMAND_NAMES, McpCommandOptions, MiniProgramElement, type MiniProgramEventMap, MiniProgramLike, MiniProgramPage, NavigateOptions, OpenWechatIdeOptions, OpenWechatIdeOtherProjectOptions, PageDataOptions, PageInfoOptions, ParsedAutomatorArgs, PollWechatIdeEngineBuildResult, PreviewWechatIdeOptions, RETRY_CANCEL_KEYS, RETRY_CONFIRM_KEYS, RETRY_PROMPT_INITIAL_IGNORE_MS, RemoteOptions, ResetWechatIdeFileUtilsOptions, type ResolvedConfig, RetryKeypressOptions, RetryLogger, RetryPromptOptions, RetryPromptResult, RetryableCommandExecutorOptions, RunWechatCliWithRetryOptions, RunWechatIdeEngineBuildByHttpOptions, RunWechatIdeEngineBuildOptions, ScreenshotOptions, ScreenshotResult, ScrollOptions, SelectorOptions, SetWechatIdeTicketOptions, SharedInputSession, SharedInputSessionOptions, StartWeappIdeMcpServerOptions, StartWechatIdeEngineBuildResult, SupportedPlatform, SupportedPlatformsMap, TapOptions, UploadWechatIdeOptions, WEAPP_IDE_TOP_LEVEL_COMMAND_NAMES, WECHAT_CLI_COMMAND_NAMES, WECHAT_DEVTOOLS_ENGINE_BUILD_STATUSES, WeappIdeMcpRuntimeHooks, WeappIdeMcpServerHandle, WeappIdeMcpServerOptions, WechatDevtoolsEngineBuildResult, WechatDevtoolsHttpCommandOptions, WechatDevtoolsSecuritySettings, WechatIdeAutomatorSessionOptions, WechatIdeLoginRetryOptions, acquireSharedMiniProgram, audit, autoPreviewWechatIde, autoReplayWechatIde, autoWechatIde, bootstrapWechatDevtoolsSettings, buildWechatIdeApk, buildWechatIdeIpa, buildWechatIdeNpm, captureScreenshotBuffer, clearWechatIdeCache, clearWechatIdeCacheByAutomator, closeSharedMiniProgram, closeWechatIdeProject, compileWechatIdeByAutomator, connectMiniProgram, connectOpenedAutomator, createAlias, createAutoBootstrapDevtoolsConfig, createAutoTrustProjectConfig, createCli, createCustomConfig, createLocaleConfig, createPathCompat, createSharedInputSession, createWeappIdeMcpServer, createWechatIdeLoginRequiredExitError, currentPage, defaultCustomConfigDirPath, defaultCustomConfigFilePath, detectWechatDevtoolsServicePort, dispatchWechatCliCommand, execute, extractExecutionErrorText, formatAutomatorLoginError, formatRetryHotkeyPrompt, formatWechatIdeLoginRequiredError, getAutomatorCommandHelp, getAutomatorProtocolTimeoutMethod, getConfig, getConfiguredLocale, getDefaultCliPath, getRuntimeWechatDevtoolsServicePort, getSharedMiniProgramSessionCount, getWechatIdeTestAccounts, getWechatIdeTicket, getWechatIdeToolInfo, handleConfigCommand, input, isAutomatorCommand, isAutomatorLoginError, isAutomatorPortInUseError, isAutomatorProtocolTimeoutError, isAutomatorWsConnectError, isDevtoolsExtensionContextInvalidatedError, isDevtoolsHttpPortError, isOperatingSystemSupported, isRetryableAutomatorLaunchError, isWeappIdeTopLevelCommand, isWechatIdeEngineBuildEndpointMissingError, isWechatIdeLoggedIn, isWechatIdeLoginRequiredError, isWechatIdeLoginRequiredExitError, launchAutomator, loginWechatIde, navigateBack, navigateTo, openWechatIde, openWechatIdeOtherProject, openWechatIdeProjectByHttp, operatingSystemName, overwriteCustomConfig, pageData, pageStack, parse, parseAutomatorArgs, parseCompareArgs, parseScreenshotArgs, pollWechatIdeEngineBuildResultByHttp, previewWechatIde, printCompareHelp, printScreenshotHelp, promptForCliPath, promptRetryKeypress, promptWechatIdeLoginRetry, quitWechatIde, reLaunch, readBooleanOption, readCustomConfig, readElementSnapshot, readOptionValue, redirectTo, refreshWechatIdeTicket, registerWeappIdeMcpTools, releaseSharedMiniProgram, remote, removeCustomConfigKey, removeOption, requestWechatDevtoolsHttp, resetWechatIdeFileUtils, resetWechatIdeFileUtilsByHttp, resolveCliPath, resolveDevtoolsAutomationDefaults, resolvePath, resolveProjectAutomatorPort, resolveProjectPath, runAutomatorCommand, runMcpCommand, runMinidev, runRetryableCommand, runWechatCliWithRetry, runWechatIdeEngineBuild, runWechatIdeEngineBuildByHttp, runWithSuspendedSharedInput, scrollTo, setRuntimeWechatDevtoolsServicePort, setWechatIdeTicket, startForwardConsole, startWeappIdeMcpServer, startWechatIdeEngineBuildByHttp, switchTab, systemInfo, takeScreenshot, tap, toSerializableValue, transformArgv, uploadWechatIde, validateWechatCliCommandArgs, waitForExclusiveKeypress, waitForRetryKeypress, withMiniProgram };

package/dist/index.js

@@ -1,5 +1,5 @@
-import { $ as overwriteCustomConfig, A as isAutomatorProtocolTimeoutError, B as getConfig, D as formatAutomatorLoginError, E as connectOpenedAutomator, F as launchAutomator, G as isOperatingSystemSupported, H as resolveDevtoolsAutomationDefaults, I as resolveProjectAutomatorPort, K as operatingSystemName, L as bootstrapWechatDevtoolsSettings, M as isDevtoolsExtensionContextInvalidatedError, N as isDevtoolsHttpPortError, O as getAutomatorProtocolTimeoutMethod, P as isRetryableAutomatorLaunchError, Q as createLocaleConfig, R as detectWechatDevtoolsServicePort, S as waitForExclusiveKeypress, U as SupportedPlatformsMap, V as getConfiguredLocale, W as getDefaultCliPath, X as createAutoTrustProjectConfig, Y as createAutoBootstrapDevtoolsConfig, Z as createCustomConfig, _ as promptRetryKeypress, a as releaseSharedMiniProgram, b as createSharedInputSession, c as RETRY_CANCEL_KEYS, d as createWechatIdeLoginRequiredExitError, et as readCustomConfig, f as extractExecutionErrorText, g as isWechatIdeLoginRequiredExitError, h as isWechatIdeLoginRequiredError, i as getSharedMiniProgramSessionCount, it as resolvePath, j as isAutomatorWsConnectError, k as isAutomatorLoginError, l as RETRY_CONFIRM_KEYS, m as formatWechatIdeLoginRequiredError, n as closeSharedMiniProgram, nt as defaultCustomConfigDirPath, o as withMiniProgram, p as formatRetryHotkeyPrompt, r as connectMiniProgram, rt as defaultCustomConfigFilePath, s as runRetryableCommand, t as acquireSharedMiniProgram, tt as removeCustomConfigKey, u as RETRY_PROMPT_INITIAL_IGNORE_MS, v as promptWechatIdeLoginRetry, x as runWithSuspendedSharedInput, y as waitForRetryKeypress, z as resolveCliPath } from "./automator-session-CkojbnCg.js";
-import { $ as getRuntimeWechatDevtoolsServicePort, A as isWechatIdeLoggedIn, C as clearWechatIdeCache, D as getWechatIdeTestAccounts, E as compileWechatIdeByAutomator, F as quitWechatIde, G as transformArgv, H as execute, I as refreshWechatIdeTicket, J as openWechatIdeProjectByHttp, K as promptForCliPath, L as resetWechatIdeFileUtils, M as openWechatIde, N as openWechatIdeOtherProject, O as getWechatIdeTicket, P as previewWechatIde, Q as startWechatIdeEngineBuildByHttp, R as setWechatIdeTicket, S as buildWechatIdeNpm, T as closeWechatIdeProject, U as createAlias, V as runWechatCliWithRetry, W as createPathCompat, X as requestWechatDevtoolsHttp, Y as pollWechatIdeEngineBuildResultByHttp, Z as resetWechatIdeFileUtilsByHttp, _ as autoPreviewWechatIde, a as navigateBack, b as buildWechatIdeApk, c as pageStack, d as remote, et as setRuntimeWechatDevtoolsServicePort, f as scrollTo, g as tap, h as takeScreenshot, i as input, it as removeOption, j as loginWechatIde, k as getWechatIdeToolInfo, l as reLaunch, m as systemInfo, n as captureScreenshotBuffer, nt as readBooleanOption, o as navigateTo, p as switchTab, q as WECHAT_DEVTOOLS_ENGINE_BUILD_STATUSES, r as currentPage, rt as readOptionValue, s as pageData, t as audit, tt as parseAutomatorArgs, u as redirectTo, v as autoReplayWechatIde, w as clearWechatIdeCacheByAutomator, x as buildWechatIdeIpa, y as autoWechatIde, z as uploadWechatIde } from "./commands-Ijtoy2_F.js";
-import { C as parseCompareArgs, S as printScreenshotHelp, _ as AUTOMATOR_COMMAND_NAMES, a as runMinidev, b as runAutomatorCommand, c as runWechatIdeEngineBuild, d as CONFIG_COMMAND_NAME, f as MCP_COMMAND_NAME, g as isWeappIdeTopLevelCommand, h as WECHAT_CLI_COMMAND_NAMES, i as validateWechatCliCommandArgs, l as runWechatIdeEngineBuildByHttp, m as WEAPP_IDE_TOP_LEVEL_COMMAND_NAMES, n as parse, o as startForwardConsole, p as MINIDEV_NAMESPACE_COMMAND_NAMES, r as dispatchWechatCliCommand, s as isWechatIdeEngineBuildEndpointMissingError, t as createCli, u as handleConfigCommand, v as getAutomatorCommandHelp, w as printCompareHelp, x as parseScreenshotArgs, y as isAutomatorCommand } from "./cli-DSrMNDWQ.js";
-import { a as readElementSnapshot, i as registerWeappIdeMcpTools, n as startWeappIdeMcpServer, o as resolveProjectPath, r as createWeappIdeMcpServer, s as toSerializableValue, t as runMcpCommand } from "./run-mcp-CUUdfBm7.js";
-export { AUTOMATOR_COMMAND_NAMES, CONFIG_COMMAND_NAME, MCP_COMMAND_NAME, MINIDEV_NAMESPACE_COMMAND_NAMES, RETRY_CANCEL_KEYS, RETRY_CONFIRM_KEYS, RETRY_PROMPT_INITIAL_IGNORE_MS, SupportedPlatformsMap, WEAPP_IDE_TOP_LEVEL_COMMAND_NAMES, WECHAT_CLI_COMMAND_NAMES, WECHAT_DEVTOOLS_ENGINE_BUILD_STATUSES, acquireSharedMiniProgram, audit, autoPreviewWechatIde, autoReplayWechatIde, autoWechatIde, bootstrapWechatDevtoolsSettings, buildWechatIdeApk, buildWechatIdeIpa, buildWechatIdeNpm, captureScreenshotBuffer, clearWechatIdeCache, clearWechatIdeCacheByAutomator, closeSharedMiniProgram, closeWechatIdeProject, compileWechatIdeByAutomator, connectMiniProgram, connectOpenedAutomator, createAlias, createAutoBootstrapDevtoolsConfig, createAutoTrustProjectConfig, createCli, createCustomConfig, createLocaleConfig, createPathCompat, createSharedInputSession, createWeappIdeMcpServer, createWechatIdeLoginRequiredExitError, currentPage, defaultCustomConfigDirPath, defaultCustomConfigFilePath, detectWechatDevtoolsServicePort, dispatchWechatCliCommand, execute, extractExecutionErrorText, formatAutomatorLoginError, formatRetryHotkeyPrompt, formatWechatIdeLoginRequiredError, getAutomatorCommandHelp, getAutomatorProtocolTimeoutMethod, getConfig, getConfiguredLocale, getDefaultCliPath, getRuntimeWechatDevtoolsServicePort, getSharedMiniProgramSessionCount, getWechatIdeTestAccounts, getWechatIdeTicket, getWechatIdeToolInfo, handleConfigCommand, input, isAutomatorCommand, isAutomatorLoginError, isAutomatorProtocolTimeoutError, isAutomatorWsConnectError, isDevtoolsExtensionContextInvalidatedError, isDevtoolsHttpPortError, isOperatingSystemSupported, isRetryableAutomatorLaunchError, isWeappIdeTopLevelCommand, isWechatIdeEngineBuildEndpointMissingError, isWechatIdeLoggedIn, isWechatIdeLoginRequiredError, isWechatIdeLoginRequiredExitError, launchAutomator, loginWechatIde, navigateBack, navigateTo, openWechatIde, openWechatIdeOtherProject, openWechatIdeProjectByHttp, operatingSystemName, overwriteCustomConfig, pageData, pageStack, parse, parseAutomatorArgs, parseCompareArgs, parseScreenshotArgs, pollWechatIdeEngineBuildResultByHttp, previewWechatIde, printCompareHelp, printScreenshotHelp, promptForCliPath, promptRetryKeypress, promptWechatIdeLoginRetry, quitWechatIde, reLaunch, readBooleanOption, readCustomConfig, readElementSnapshot, readOptionValue, redirectTo, refreshWechatIdeTicket, registerWeappIdeMcpTools, releaseSharedMiniProgram, remote, removeCustomConfigKey, removeOption, requestWechatDevtoolsHttp, resetWechatIdeFileUtils, resetWechatIdeFileUtilsByHttp, resolveCliPath, resolveDevtoolsAutomationDefaults, resolvePath, resolveProjectAutomatorPort, resolveProjectPath, runAutomatorCommand, runMcpCommand, runMinidev, runRetryableCommand, runWechatCliWithRetry, runWechatIdeEngineBuild, runWechatIdeEngineBuildByHttp, runWithSuspendedSharedInput, scrollTo, setRuntimeWechatDevtoolsServicePort, setWechatIdeTicket, startForwardConsole, startWeappIdeMcpServer, startWechatIdeEngineBuildByHttp, switchTab, systemInfo, takeScreenshot, tap, toSerializableValue, transformArgv, uploadWechatIde, validateWechatCliCommandArgs, waitForExclusiveKeypress, waitForRetryKeypress, withMiniProgram };
+import { $ as createLocaleConfig, A as isAutomatorPortInUseError, B as resolveCliPath, D as formatAutomatorLoginError, E as connectOpenedAutomator, F as isRetryableAutomatorLaunchError, G as getDefaultCliPath, H as getConfiguredLocale, I as launchAutomator, K as isOperatingSystemSupported, L as resolveProjectAutomatorPort, M as isAutomatorWsConnectError, N as isDevtoolsExtensionContextInvalidatedError, O as getAutomatorProtocolTimeoutMethod, P as isDevtoolsHttpPortError, Q as createCustomConfig, R as bootstrapWechatDevtoolsSettings, S as waitForExclusiveKeypress, U as resolveDevtoolsAutomationDefaults, V as getConfig, W as SupportedPlatformsMap, X as createAutoBootstrapDevtoolsConfig, Z as createAutoTrustProjectConfig, _ as promptRetryKeypress, a as releaseSharedMiniProgram, at as resolvePath, b as createSharedInputSession, c as RETRY_CANCEL_KEYS, d as createWechatIdeLoginRequiredExitError, et as overwriteCustomConfig, f as extractExecutionErrorText, g as isWechatIdeLoginRequiredExitError, h as isWechatIdeLoginRequiredError, i as getSharedMiniProgramSessionCount, it as defaultCustomConfigFilePath, j as isAutomatorProtocolTimeoutError, k as isAutomatorLoginError, l as RETRY_CONFIRM_KEYS, m as formatWechatIdeLoginRequiredError, n as closeSharedMiniProgram, nt as removeCustomConfigKey, o as withMiniProgram, p as formatRetryHotkeyPrompt, q as operatingSystemName, r as connectMiniProgram, rt as defaultCustomConfigDirPath, s as runRetryableCommand, t as acquireSharedMiniProgram, tt as readCustomConfig, u as RETRY_PROMPT_INITIAL_IGNORE_MS, v as promptWechatIdeLoginRetry, x as runWithSuspendedSharedInput, y as waitForRetryKeypress, z as detectWechatDevtoolsServicePort } from "./automator-session-BIjYknSi.js";
+import { $ as getRuntimeWechatDevtoolsServicePort, A as isWechatIdeLoggedIn, C as clearWechatIdeCache, D as getWechatIdeTestAccounts, E as compileWechatIdeByAutomator, F as quitWechatIde, G as transformArgv, H as execute, I as refreshWechatIdeTicket, J as openWechatIdeProjectByHttp, K as promptForCliPath, L as resetWechatIdeFileUtils, M as openWechatIde, N as openWechatIdeOtherProject, O as getWechatIdeTicket, P as previewWechatIde, Q as startWechatIdeEngineBuildByHttp, R as setWechatIdeTicket, S as buildWechatIdeNpm, T as closeWechatIdeProject, U as createAlias, V as runWechatCliWithRetry, W as createPathCompat, X as requestWechatDevtoolsHttp, Y as pollWechatIdeEngineBuildResultByHttp, Z as resetWechatIdeFileUtilsByHttp, _ as autoPreviewWechatIde, a as navigateBack, b as buildWechatIdeApk, c as pageStack, d as remote, et as setRuntimeWechatDevtoolsServicePort, f as scrollTo, g as tap, h as takeScreenshot, i as input, it as removeOption, j as loginWechatIde, k as getWechatIdeToolInfo, l as reLaunch, m as systemInfo, n as captureScreenshotBuffer, nt as readBooleanOption, o as navigateTo, p as switchTab, q as WECHAT_DEVTOOLS_ENGINE_BUILD_STATUSES, r as currentPage, rt as readOptionValue, s as pageData, t as audit, tt as parseAutomatorArgs, u as redirectTo, v as autoReplayWechatIde, w as clearWechatIdeCacheByAutomator, x as buildWechatIdeIpa, y as autoWechatIde, z as uploadWechatIde } from "./commands-9WCVsqHn.js";
+import { C as parseCompareArgs, S as printScreenshotHelp, _ as AUTOMATOR_COMMAND_NAMES, a as runMinidev, b as runAutomatorCommand, c as runWechatIdeEngineBuild, d as CONFIG_COMMAND_NAME, f as MCP_COMMAND_NAME, g as isWeappIdeTopLevelCommand, h as WECHAT_CLI_COMMAND_NAMES, i as validateWechatCliCommandArgs, l as runWechatIdeEngineBuildByHttp, m as WEAPP_IDE_TOP_LEVEL_COMMAND_NAMES, n as parse, o as startForwardConsole, p as MINIDEV_NAMESPACE_COMMAND_NAMES, r as dispatchWechatCliCommand, s as isWechatIdeEngineBuildEndpointMissingError, t as createCli, u as handleConfigCommand, v as getAutomatorCommandHelp, w as printCompareHelp, x as parseScreenshotArgs, y as isAutomatorCommand } from "./cli-CFRAOBIw.js";
+import { a as readElementSnapshot, i as registerWeappIdeMcpTools, n as startWeappIdeMcpServer, o as resolveProjectPath, r as createWeappIdeMcpServer, s as toSerializableValue, t as runMcpCommand } from "./run-mcp-BTB9ire3.js";
+export { AUTOMATOR_COMMAND_NAMES, CONFIG_COMMAND_NAME, MCP_COMMAND_NAME, MINIDEV_NAMESPACE_COMMAND_NAMES, RETRY_CANCEL_KEYS, RETRY_CONFIRM_KEYS, RETRY_PROMPT_INITIAL_IGNORE_MS, SupportedPlatformsMap, WEAPP_IDE_TOP_LEVEL_COMMAND_NAMES, WECHAT_CLI_COMMAND_NAMES, WECHAT_DEVTOOLS_ENGINE_BUILD_STATUSES, acquireSharedMiniProgram, audit, autoPreviewWechatIde, autoReplayWechatIde, autoWechatIde, bootstrapWechatDevtoolsSettings, buildWechatIdeApk, buildWechatIdeIpa, buildWechatIdeNpm, captureScreenshotBuffer, clearWechatIdeCache, clearWechatIdeCacheByAutomator, closeSharedMiniProgram, closeWechatIdeProject, compileWechatIdeByAutomator, connectMiniProgram, connectOpenedAutomator, createAlias, createAutoBootstrapDevtoolsConfig, createAutoTrustProjectConfig, createCli, createCustomConfig, createLocaleConfig, createPathCompat, createSharedInputSession, createWeappIdeMcpServer, createWechatIdeLoginRequiredExitError, currentPage, defaultCustomConfigDirPath, defaultCustomConfigFilePath, detectWechatDevtoolsServicePort, dispatchWechatCliCommand, execute, extractExecutionErrorText, formatAutomatorLoginError, formatRetryHotkeyPrompt, formatWechatIdeLoginRequiredError, getAutomatorCommandHelp, getAutomatorProtocolTimeoutMethod, getConfig, getConfiguredLocale, getDefaultCliPath, getRuntimeWechatDevtoolsServicePort, getSharedMiniProgramSessionCount, getWechatIdeTestAccounts, getWechatIdeTicket, getWechatIdeToolInfo, handleConfigCommand, input, isAutomatorCommand, isAutomatorLoginError, isAutomatorPortInUseError, isAutomatorProtocolTimeoutError, isAutomatorWsConnectError, isDevtoolsExtensionContextInvalidatedError, isDevtoolsHttpPortError, isOperatingSystemSupported, isRetryableAutomatorLaunchError, isWeappIdeTopLevelCommand, isWechatIdeEngineBuildEndpointMissingError, isWechatIdeLoggedIn, isWechatIdeLoginRequiredError, isWechatIdeLoginRequiredExitError, launchAutomator, loginWechatIde, navigateBack, navigateTo, openWechatIde, openWechatIdeOtherProject, openWechatIdeProjectByHttp, operatingSystemName, overwriteCustomConfig, pageData, pageStack, parse, parseAutomatorArgs, parseCompareArgs, parseScreenshotArgs, pollWechatIdeEngineBuildResultByHttp, previewWechatIde, printCompareHelp, printScreenshotHelp, promptForCliPath, promptRetryKeypress, promptWechatIdeLoginRetry, quitWechatIde, reLaunch, readBooleanOption, readCustomConfig, readElementSnapshot, readOptionValue, redirectTo, refreshWechatIdeTicket, registerWeappIdeMcpTools, releaseSharedMiniProgram, remote, removeCustomConfigKey, removeOption, requestWechatDevtoolsHttp, resetWechatIdeFileUtils, resetWechatIdeFileUtilsByHttp, resolveCliPath, resolveDevtoolsAutomationDefaults, resolvePath, resolveProjectAutomatorPort, resolveProjectPath, runAutomatorCommand, runMcpCommand, runMinidev, runRetryableCommand, runWechatCliWithRetry, runWechatIdeEngineBuild, runWechatIdeEngineBuildByHttp, runWithSuspendedSharedInput, scrollTo, setRuntimeWechatDevtoolsServicePort, setWechatIdeTicket, startForwardConsole, startWeappIdeMcpServer, startWechatIdeEngineBuildByHttp, switchTab, systemInfo, takeScreenshot, tap, toSerializableValue, transformArgv, uploadWechatIde, validateWechatCliCommandArgs, waitForExclusiveKeypress, waitForRetryKeypress, withMiniProgram };

package/dist/{run-mcp-CUUdfBm7.js → run-mcp-BTB9ire3.js}

@@ -1,11 +1,11 @@
-import { o as withMiniProgram$1 } from "./automator-session-CkojbnCg.js";
+import { o as withMiniProgram$1 } from "./automator-session-BIjYknSi.js";
 import { Buffer } from "node:buffer";
 import fs from "node:fs/promises";
 import path from "node:path";
 import process from "node:process";
 import { readDevtoolsElementSnapshot as readElementSnapshot, resolveDevtoolsProjectPath as resolveProjectPath, toDevtoolsSerializableValue as toSerializableValue } from "@weapp-vite/devtools-runtime";
-import { StdioServerTransport } from "@modelcontextprotocol/sdk/server/stdio.js";
-import { McpServer } from "@modelcontextprotocol/sdk/server/mcp.js";
+import { serveStdio } from "@modelcontextprotocol/server/stdio";
+import { McpServer } from "@modelcontextprotocol/server";
 import { z } from "zod";
 //#region src/mcp/server.ts
 function createResolvedProjectPath(workspaceRoot, projectPath) {
@@ -55,7 +55,7 @@ function registerWeappIdeMcpTools(server, options) {
 	server.registerTool("weapp_devtools_connect", {
 		title: "Connect DevTools",
 		description: "连接当前项目的微信开发者工具并返回页面信息。",
-		inputSchema: defineConnectionSchema()
+		inputSchema: z.object(defineConnectionSchema())
 	}, async (input) => {
 		try {
 			const result = await withConnectedMiniProgram(options.runtimeHooks, workspaceRoot, input, async (miniProgram) => {
@@ -91,7 +91,7 @@ function registerWeappIdeMcpTools(server, options) {
 	server.registerTool("weapp_devtools_active_page", {
 		title: "Current Page",
 		description: "读取当前页面路径、query、尺寸、滚动位置和页面 data。",
-		inputSchema: definePageSchema()
+		inputSchema: z.object(definePageSchema())
 	}, async (input) => {
 		try {
 			const result = await withConnectedPage(options.runtimeHooks, workspaceRoot, input, async (page) => {
@@ -128,7 +128,7 @@ function registerWeappIdeMcpTools(server, options) {
 	server.registerTool("weapp_devtools_page_stack", {
 		title: "Page Stack",
 		description: "读取当前小程序页面栈。",
-		inputSchema: defineConnectionSchema()
+		inputSchema: z.object(defineConnectionSchema())
 	}, async (input) => {
 		try {
 			const result = await withConnectedMiniProgram(options.runtimeHooks, workspaceRoot, input, async (miniProgram) => {
@@ -157,11 +157,11 @@ function registerWeappIdeMcpTools(server, options) {
 	server.registerTool("weapp_runtime_find_node", {
 		title: "Find Node",
 		description: "通过 selector 查找单个节点，并返回节点快照。",
-		inputSchema: {
+		inputSchema: z.object({
 			...defineElementSchema(),
 			attributes: z.array(z.string().trim().min(1)).optional(),
 			styles: z.array(z.string().trim().min(1)).optional()
-		}
+		})
 	}, async (input) => {
 		try {
 			const result = await withConnectedPage(options.runtimeHooks, workspaceRoot, input, async (page) => {
@@ -189,10 +189,10 @@ function registerWeappIdeMcpTools(server, options) {
 	server.registerTool("weapp_runtime_find_nodes", {
 		title: "Find Nodes",
 		description: "通过 selector 查找多个节点，并返回节点快照列表。",
-		inputSchema: {
+		inputSchema: z.object({
 			...defineElementSchema(),
 			limit: z.number().int().positive().max(100).optional()
-		}
+		})
 	}, async (input) => {
 		try {
 			const result = await withConnectedPage(options.runtimeHooks, workspaceRoot, input, async (page) => {
@@ -220,7 +220,7 @@ function registerWeappIdeMcpTools(server, options) {
 	server.registerTool("weapp_runtime_tap_node", {
 		title: "Tap Node",
 		description: "点击指定节点。",
-		inputSchema: defineElementSchema()
+		inputSchema: z.object(defineElementSchema())
 	}, async (input) => {
 		try {
 			const result = await withConnectedPage(options.runtimeHooks, workspaceRoot, input, async (page) => {
@@ -252,10 +252,10 @@ function registerWeappIdeMcpTools(server, options) {
 	server.registerTool("weapp_runtime_input_node", {
 		title: "Input Node",
 		description: "向指定节点输入文本。",
-		inputSchema: {
+		inputSchema: z.object({
 			...defineElementSchema(),
 			value: z.string()
-		}
+		})
 	}, async (input) => {
 		try {
 			const result = await withConnectedPage(options.runtimeHooks, workspaceRoot, input, async (page) => {
@@ -290,10 +290,10 @@ function registerWeappIdeMcpTools(server, options) {
 	server.registerTool("weapp_devtools_capture", {
 		title: "Capture Screenshot",
 		description: "截取当前小程序视口并返回 base64，支持保存到文件。",
-		inputSchema: {
+		inputSchema: z.object({
 			...defineConnectionSchema(),
 			outputPath: z.string().trim().min(1).optional()
-		}
+		})
 	}, async (input) => {
 		try {
 			const result = await withConnectedMiniProgram(options.runtimeHooks, workspaceRoot, input, async (miniProgram) => {
@@ -334,11 +334,11 @@ function registerWeappIdeMcpTools(server, options) {
 	server.registerTool("weapp_devtools_host_api", {
 		title: "Call wx Method",
 		description: "调用小程序 wx API。",
-		inputSchema: {
+		inputSchema: z.object({
 			...defineConnectionSchema(),
 			method: z.string().trim().min(1),
 			args: z.array(z.unknown()).optional()
-		}
+		})
 	}, async (input) => {
 		try {
 			const result = await withConnectedMiniProgram(options.runtimeHooks, workspaceRoot, input, async (miniProgram) => {
@@ -380,14 +380,16 @@ async function createWeappIdeMcpServer(options) {
 //#endregion
 //#region src/mcp/runtime.ts
 async function startWeappIdeMcpServer(options = {}) {
-	const { server } = await createWeappIdeMcpServer({
+	const serverOptions = {
 		runtimeHooks: { withMiniProgram: withMiniProgram$1 },
 		workspaceRoot: options.workspaceRoot
+	};
+	const handle = serveStdio(async () => {
+		const { server } = await createWeappIdeMcpServer(serverOptions);
+		return server;
 	});
-	const transport = new StdioServerTransport();
-	await server.connect(transport);
 	return { close: async () => {
-		await transport.close();
+		await handle.close();
 	} };
 }
 //#endregion

package/dist/run-mcp-Q3skAZs_.js

@@ -0,0 +1,2 @@
+import { t as runMcpCommand } from "./run-mcp-BTB9ire3.js";
+export { runMcpCommand };

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "weapp-ide-cli",
   "type": "module",
-  "version": "6.0.7",
+  "version": "6.1.0",
   "description": "让微信开发者工具，用起来更加方便！",
   "author": "ice breaker <1324318532@qq.com>",
   "license": "MIT",
@@ -62,7 +62,7 @@
     "registry": "https://registry.npmjs.org/"
   },
   "dependencies": {
-    "@modelcontextprotocol/sdk": "^1.30.0",
+    "@modelcontextprotocol/server": "^2.0.0",
     "cac": "^7.0.0",
     "execa": "10.0.1",
     "pathe": "^2.0.3",
@@ -70,9 +70,12 @@
     "pngjs": "^7.0.0",
     "zod": "^4.4.3",
     "@weapp-core/logger": "3.1.1",
-    "@weapp-vite/miniprogram-automator": "1.2.14",
-    "@weapp-vite/devtools-runtime": "0.4.15",
-    "@weapp-core/shared": "3.1.1"
+    "@weapp-core/shared": "3.2.0",
+    "@weapp-vite/devtools-runtime": "0.4.17",
+    "@weapp-vite/miniprogram-automator": "1.2.16"
+  },
+  "devDependencies": {
+    "@types/node": "^26.4.0"
   },
   "scripts": {
     "dev": "tsdown -w --sourcemap",

package/dist/commands-qLfRse7L.js

@@ -1,2 +0,0 @@
-import { h as takeScreenshot } from "./commands-Ijtoy2_F.js";
-export { takeScreenshot };

package/dist/run-mcp-D1G1d_Le.js

@@ -1,2 +0,0 @@
-import { t as runMcpCommand } from "./run-mcp-CUUdfBm7.js";
-export { runMcpCommand };