weapp-ide-cli 5.4.6 → 5.4.8

package/dist/{automator-session-JEM5q8tK.js → automator-session-C8JdS2rx.js}

@@ -1268,6 +1268,7 @@ async function connectMiniProgram(options) {
 				};
 			} catch (error) {
 				const normalizedOpenSessionError = normalizeMiniProgramConnectionError(error);
+				if (options.openedOnly) throw normalizedOpenSessionError;
 				if (normalizedOpenSessionError instanceof Error && normalizedOpenSessionError.message === "DEVTOOLS_PROTOCOL_TIMEOUT") throw normalizedOpenSessionError;
 				try {
 					return {

package/dist/{cli-Cy53rG5o.js → cli-BUx9wWVK.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, et as readCustomConfig, q as colors, r as connectMiniProgram, rt as defaultCustomConfigFilePath, tt as removeCustomConfigKey, w as i18nText, z as resolveCliPath } from "./automator-session-JEM5q8tK.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-8Wamgvv0.js";
-import "./run-mcp-L4shbBPP.js";
+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-C8JdS2rx.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-C6ATyJuz.js";
+import "./run-mcp-X00XjC8Z.js";
 import fs from "node:fs/promises";
 import path from "node:path";
 import { fs as fs$1 } from "@weapp-core/shared/fs";
@@ -313,7 +313,7 @@ async function runScreenshot(argv) {
 	}
 	const options = parseScreenshotArgs(argv);
 	const isJsonOutput = argv.includes("--json");
-	const { takeScreenshot } = await import("./commands-BIKOtazW.js");
+	const { takeScreenshot } = await import("./commands-CEJ6rVma.js");
 	const result = await takeScreenshot(options);
 	if (isJsonOutput) {
 		console.log(JSON.stringify(result, null, 2));
@@ -324,7 +324,7 @@ async function runScreenshot(argv) {
 //#endregion
 //#region src/cli/runtime-service.ts
 const DEFAULT_RUNTIME_SERVICE_URL = "http://127.0.0.1:3088/api/weapp/devtools";
-const SERVICE_UNAVAILABLE_CODES = new Set([
+const SERVICE_UNAVAILABLE_CODES = /* @__PURE__ */ new Set([
 	"ECONNREFUSED",
 	"ECONNRESET",
 	"ENOTFOUND",
@@ -500,7 +500,7 @@ const COMMON_OPTION_DEFINITIONS = [
 		}
 	}
 ];
-const COMMON_ALLOWED_OPTIONS = new Set([
+const COMMON_ALLOWED_OPTIONS = /* @__PURE__ */ new Set([
 	"-p",
 	"--project",
 	"-t",
@@ -517,7 +517,7 @@ function createDefinition(input) {
 		description: input.description,
 		usage: input.usage,
 		options: input.options ?? [],
-		allowedOptions: new Set([...COMMON_ALLOWED_OPTIONS, ...input.allowedOptions ?? []]),
+		allowedOptions: /* @__PURE__ */ new Set([...COMMON_ALLOWED_OPTIONS, ...input.allowedOptions ?? []]),
 		handler: input.handler
 	};
 }
@@ -1010,7 +1010,7 @@ const ENGINE_BUILD_ENDPOINT_MISSING_PATTERNS = [/Cannot GET \/engine\/build\b/i,
 const ENGINE_BUILD_ENDPOINT_MISSING_MESSAGE = "当前微信开发者工具未提供 engine build 接口，已跳过自动 engine build 刷新。";
 const ENGINE_BUILD_CLI_OPENED_PATTERN = /打开项目成功|project\s+opened|open\s+project\s+success|(?:^|\n)\s*✔\s*open(?:\n|$)/i;
 const COMPACT_WHITESPACE_PATTERN = /\s+/g;
-function sleep(ms) {
+function sleep$1(ms) {
 	return new Promise((resolve) => setTimeout(resolve, ms));
 }
 function createEngineBuildLogFilename() {
@@ -1089,7 +1089,7 @@ async function runWechatIdeEngineBuildByHttp(projectPath, options = {}) {
 		options.onProgress?.(result);
 		if (result.failed) throw createEngineBuildError(result.msg || result.body || "WECHAT_DEVTOOLS_ENGINE_BUILD_FAILED", "WECHAT_DEVTOOLS_ENGINE_BUILD_FAILED");
 		if (result.done) return result;
-		await sleep(options.pollIntervalMs ?? 1e3);
+		await sleep$1(options.pollIntervalMs ?? 1e3);
 	}
 }
 /**
@@ -1129,39 +1129,43 @@ const DEFAULT_FORWARD_CONSOLE_LEVELS = [
 	"warn",
 	"error"
 ];
-/**
-* @description 启动小程序控制台日志转发，并保持 automator 会话常驻。
-*/
-async function startForwardConsole(options) {
-	const miniProgram = await connectMiniProgram(options);
-	const logLevels = new Set(options.logLevels?.length ? options.logLevels : DEFAULT_FORWARD_CONSOLE_LEVELS);
-	const logHandler = options.onLog ?? printForwardConsoleEvent;
-	const onConsole = (payload) => {
-		const event = normalizeConsoleEvent(payload);
-		if (!logLevels.has(event.level)) return;
-		logHandler(event);
-	};
-	const onException = (payload) => {
-		if (options.unhandledErrors === false) return;
-		logHandler(normalizeExceptionEvent(payload));
-	};
-	miniProgram.on("console", onConsole);
-	miniProgram.on("exception", onException);
-	options.onReady?.();
-	let closed = false;
-	return { async close() {
-		if (closed) return;
-		closed = true;
-		detachMiniProgramListener(miniProgram, "console", onConsole);
-		detachMiniProgramListener(miniProgram, "exception", onException);
-		await miniProgram.close();
-	} };
+const ENABLE_LOG_RETRY_DELAY_MS = 500;
+const ENABLE_LOG_RETRY_TIMES = 5;
+const ENABLE_LOG_REFRESH_INTERVAL_MS = 2e3;
+const AUXILIARY_FORWARD_CONSOLE_DELAY_MS = 2500;
+const DUPLICATE_LOG_SUPPRESS_MS = 800;
+function getStringValue(value) {
+	return typeof value === "string" && value.trim() ? value : void 0;
+}
+function toPlainObject(value) {
+	if (!value || typeof value !== "object") return {};
+	return value;
+}
+function normalizeLogLevel(value) {
+	const normalized = String(value ?? "log").toLowerCase();
+	if (normalized === "warning") return "warn";
+	if (normalized === "debug" || normalized === "info" || normalized === "warn" || normalized === "error") return normalized;
+	return "log";
 }
 function detachMiniProgramListener(miniProgram, event, listener) {
 	if (typeof miniProgram.off === "function") miniProgram.off(event, listener);
 }
+function formatForwardConsolePrefix(level) {
+	const label = `[mini:${level.padEnd(5)}]`;
+	if (level === "error") return colors.bold(colors.red(label));
+	if (level === "warn") return colors.bold(colors.yellow(label));
+	if (level === "info") return colors.bold(colors.cyan(label));
+	if (level === "debug") return colors.dim(label);
+	return colors.bold(colors.green(label));
+}
+function formatForwardConsoleMessage(event) {
+	if (event.level === "debug") return colors.dim(event.message);
+	if (event.level === "error") return colors.red(event.message);
+	if (event.level === "warn") return colors.yellow(event.message);
+	return event.message;
+}
 function printForwardConsoleEvent(event) {
-	const line = `${colors.dim(`[mini:${event.level}]`)} ${event.message}`;
+	const line = `${formatForwardConsolePrefix(event.level)} ${formatForwardConsoleMessage(event)}`;
 	switch (event.level) {
 		case "error":
 			logger_default.error(line);
@@ -1175,6 +1179,35 @@ function printForwardConsoleEvent(event) {
 		default: logger_default.log(line);
 	}
 }
+function formatConsoleArgument(value) {
+	const record = toPlainObject(value);
+	const rawValue = record.value;
+	const description = getStringValue(record.description);
+	if (typeof rawValue === "string" || typeof rawValue === "number" || typeof rawValue === "boolean") return String(rawValue);
+	if (rawValue !== void 0) return inspect(rawValue, {
+		depth: 4,
+		colors: false,
+		compact: true
+	});
+	if (description) return description;
+	if (typeof value === "string") return value;
+	return inspect(value, {
+		depth: 4,
+		colors: false,
+		compact: true
+	});
+}
+function resolveLogMessage(record, payload) {
+	const text = getStringValue(record.text) ?? getStringValue(record.message);
+	if (text) return text;
+	if (Array.isArray(record.args) && record.args.length > 0) return record.args.map(formatConsoleArgument).join(" ");
+	if (typeof payload === "string") return payload;
+	return inspect(payload, {
+		depth: 4,
+		colors: false,
+		compact: true
+	});
+}
 function normalizeConsoleEvent(payload) {
 	const record = toPlainObject(payload);
 	return {
@@ -1196,47 +1229,116 @@ function normalizeExceptionEvent(payload) {
 		raw: payload
 	};
 }
-function normalizeLogLevel(value) {
-	const normalized = String(value ?? "log").toLowerCase();
-	if (normalized === "warning") return "warn";
-	if (normalized === "debug" || normalized === "info" || normalized === "warn" || normalized === "error") return normalized;
-	return "log";
+function sleep(ms) {
+	return new Promise((resolve) => setTimeout(resolve, ms));
 }
-function resolveLogMessage(record, payload) {
-	const text = getStringValue(record.text) ?? getStringValue(record.message);
-	if (text) return text;
-	if (Array.isArray(record.args) && record.args.length > 0) return record.args.map(formatConsoleArgument).join(" ");
-	if (typeof payload === "string") return payload;
-	return inspect(payload, {
-		depth: 4,
-		colors: false,
-		compact: true
-	});
+async function enableMiniProgramConsoleLog(miniProgram) {
+	if (typeof miniProgram.enableLog !== "function") return;
+	let lastError;
+	for (let attempt = 0; attempt <= ENABLE_LOG_RETRY_TIMES; attempt += 1) try {
+		await miniProgram.enableLog();
+		return;
+	} catch (error) {
+		lastError = error;
+		if (attempt < ENABLE_LOG_RETRY_TIMES) await sleep(ENABLE_LOG_RETRY_DELAY_MS);
+	}
+	throw lastError instanceof Error ? lastError : new Error(String(lastError));
 }
-function formatConsoleArgument(value) {
-	const record = toPlainObject(value);
-	const rawValue = record.value;
-	const description = getStringValue(record.description);
-	if (typeof rawValue === "string" || typeof rawValue === "number" || typeof rawValue === "boolean") return String(rawValue);
-	if (rawValue !== void 0) return inspect(rawValue, {
-		depth: 4,
-		colors: false,
-		compact: true
-	});
-	if (description) return description;
-	if (typeof value === "string") return value;
-	return inspect(value, {
-		depth: 4,
-		colors: false,
-		compact: true
+async function refreshOpenedMiniProgramConsoleLog(options) {
+	const miniProgram = await connectMiniProgram({
+		...options,
+		openedOnly: true
 	});
+	try {
+		await enableMiniProgramConsoleLog(miniProgram);
+	} finally {
+		miniProgram.disconnect();
+	}
 }
-function getStringValue(value) {
-	return typeof value === "string" && value.trim() ? value : void 0;
+function startEnableLogRefresh(miniProgram, options) {
+	if (typeof miniProgram.enableLog !== "function") return;
+	const timer = setInterval(() => {
+		miniProgram.enableLog().catch(() => {});
+		refreshOpenedMiniProgramConsoleLog(options).catch(() => {});
+	}, ENABLE_LOG_REFRESH_INTERVAL_MS);
+	return () => {
+		clearInterval(timer);
+	};
 }
-function toPlainObject(value) {
-	if (!value || typeof value !== "object") return {};
-	return value;
+/**
+* @description 启动小程序控制台日志转发，并保持 automator 会话常驻。
+*/
+async function startForwardConsole(options) {
+	const miniProgram = await acquireSharedMiniProgram(options);
+	const logLevels = new Set(options.logLevels?.length ? options.logLevels : DEFAULT_FORWARD_CONSOLE_LEVELS);
+	const logHandler = options.onLog ?? printForwardConsoleEvent;
+	const recentLogTimes = /* @__PURE__ */ new Map();
+	const emitLog = (event) => {
+		const key = `${event.level}\0${event.message}`;
+		const now = Date.now();
+		if (now - (recentLogTimes.get(key) ?? 0) < DUPLICATE_LOG_SUPPRESS_MS) return;
+		recentLogTimes.set(key, now);
+		logHandler(event);
+	};
+	const onConsole = (payload) => {
+		const event = normalizeConsoleEvent(payload);
+		if (!logLevels.has(event.level)) return;
+		emitLog(event);
+	};
+	const onException = (payload) => {
+		if (options.unhandledErrors === false) return;
+		emitLog(normalizeExceptionEvent(payload));
+	};
+	let closed = false;
+	let stopEnableLogRefresh;
+	let auxiliaryMiniProgram;
+	let auxiliaryTimer;
+	const closeSession = async () => {
+		if (closed) return;
+		closed = true;
+		if (auxiliaryTimer) {
+			clearTimeout(auxiliaryTimer);
+			auxiliaryTimer = void 0;
+		}
+		stopEnableLogRefresh?.();
+		stopEnableLogRefresh = void 0;
+		detachMiniProgramListener(miniProgram, "console", onConsole);
+		detachMiniProgramListener(miniProgram, "exception", onException);
+		if (auxiliaryMiniProgram) {
+			detachMiniProgramListener(auxiliaryMiniProgram, "console", onConsole);
+			detachMiniProgramListener(auxiliaryMiniProgram, "exception", onException);
+			auxiliaryMiniProgram.disconnect();
+			auxiliaryMiniProgram = void 0;
+		}
+		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);
+	auxiliaryTimer = setTimeout(() => {
+		(async () => {
+			const openedMiniProgram = await connectMiniProgram({
+				...options,
+				openedOnly: true
+			});
+			if (closed) {
+				openedMiniProgram.disconnect();
+				return;
+			}
+			auxiliaryMiniProgram = openedMiniProgram;
+			await enableMiniProgramConsoleLog(openedMiniProgram);
+			openedMiniProgram.on("console", onConsole);
+			openedMiniProgram.on("exception", onException);
+		})().catch(() => {});
+	}, AUXILIARY_FORWARD_CONSOLE_DELAY_MS);
+	options.onReady?.();
+	return { close: closeSession };
 }
 //#endregion
 //#region src/cli/minidev.ts
@@ -1623,7 +1725,7 @@ async function parse(argv) {
 		return;
 	}
 	if (matchedCommand === "mcp") {
-		const { runMcpCommand } = await import("./run-mcp-C0yaUdqC.js");
+		const { runMcpCommand } = await import("./run-mcp-B5RshzSs.js");
 		await runMcpCommand(argv.slice(1));
 		return;
 	}

package/dist/cli.js

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

package/dist/{commands-8Wamgvv0.js → commands-C6ATyJuz.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-JEM5q8tK.js";
+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-C8JdS2rx.js";
 import { Buffer } from "node:buffer";
 import fs from "node:fs/promises";
 import path from "node:path";
@@ -167,6 +167,7 @@ function removeOption(argv, optionName) {
 //#endregion
 //#region src/cli/fullPageScreenshot.ts
 function decodeScreenshotBuffer(raw) {
+	if (raw === void 0) throw new Error("Failed to capture screenshot");
 	const buffer = typeof raw === "string" ? Buffer.from(raw, "base64") : Buffer.from(raw);
 	if (buffer.length === 0) throw new Error("Failed to capture screenshot");
 	return buffer;
@@ -210,7 +211,7 @@ async function captureFullPageScreenshotBuffer(options) {
 	const initialScrollTop = typeof page.scrollTop === "function" ? await page.scrollTop() : 0;
 	const pageHeight = toPositiveNumber(pageSize.height);
 	const viewportHeight = toPositiveNumber(systemInfo.windowHeight);
-	if (!pageHeight || !viewportHeight) return decodeScreenshotBuffer(await runWithTimeout(miniProgram.screenshot(), timeoutMs, screenshotTimeoutMessage, "DEVTOOLS_SCREENSHOT_TIMEOUT"));
+	if (!pageHeight || !viewportHeight) return decodeScreenshotBuffer(await runWithTimeout(miniProgram.screenshot({ timeout: timeoutMs }), timeoutMs, screenshotTimeoutMessage, "DEVTOOLS_SCREENSHOT_TIMEOUT"));
 	const segments = [];
 	const positions = createScrollPositions(pageHeight, viewportHeight);
 	let coveredUntil = 0;
@@ -219,7 +220,7 @@ async function captureFullPageScreenshotBuffer(options) {
 		for (const scrollTop of positions) {
 			await miniProgram.pageScrollTo(scrollTop);
 			await page.waitFor(150);
-			const rawScreenshot = await runWithTimeout(miniProgram.screenshot(), timeoutMs, screenshotTimeoutMessage, "DEVTOOLS_SCREENSHOT_TIMEOUT");
+			const rawScreenshot = await runWithTimeout(miniProgram.screenshot({ timeout: timeoutMs }), timeoutMs, screenshotTimeoutMessage, "DEVTOOLS_SCREENSHOT_TIMEOUT");
 			const png = PNG.sync.read(decodeScreenshotBuffer(rawScreenshot));
 			if (viewportHeight > 0) scale = png.height / viewportHeight;
 			const visibleEnd = Math.min(scrollTop + viewportHeight, pageHeight);
@@ -937,6 +938,14 @@ function isDevtoolsProtocolTimeoutError(error) {
 function isScreenshotNavigationTimeoutError(error) {
 	return error instanceof Error && Reflect.get(error, "code") === "DEVTOOLS_SCREENSHOT_NAVIGATION_TIMEOUT";
 }
+function isScreenshotRequestTimeoutError(error) {
+	if (!(error instanceof Error)) return false;
+	return error.message === "DEVTOOLS_SCREENSHOT_TIMEOUT" || Reflect.get(error, "code") === "DEVTOOLS_SCREENSHOT_TIMEOUT";
+}
+function toScreenshotBuffer(screenshot) {
+	if (screenshot === void 0) return Buffer.alloc(0);
+	return typeof screenshot === "string" ? Buffer.from(screenshot, "base64") : Buffer.from(screenshot);
+}
 async function reLaunchForScreenshot(miniProgram, page) {
 	const routeOptions = { url: page };
 	if (typeof miniProgram.callWxMethod === "function") await miniProgram.callWxMethod("reLaunch", routeOptions);
@@ -1119,8 +1128,7 @@ async function captureScreenshotBuffer(options) {
 			});
 		}
 		logger_default.info(i18nText("正在截图...", "Taking screenshot..."));
-		const screenshot = await withCommandTimeout(miniProgram.screenshot(), commandTimeout, screenshotTimeoutMessage, "DEVTOOLS_SCREENSHOT_TIMEOUT");
-		const buffer = typeof screenshot === "string" ? Buffer.from(screenshot, "base64") : Buffer.from(screenshot);
+		const buffer = toScreenshotBuffer(await withCommandTimeout(miniProgram.screenshot({ timeout: commandTimeout }), commandTimeout, screenshotTimeoutMessage, "DEVTOOLS_SCREENSHOT_TIMEOUT"));
 		if (buffer.length === 0) throw new Error(i18nText("截图失败", "Failed to capture screenshot"));
 		return buffer;
 	});
@@ -1138,7 +1146,8 @@ async function takeScreenshot(options) {
 	} catch (error) {
 		const isProtocolTimeout = error instanceof Error && error.message === "DEVTOOLS_PROTOCOL_TIMEOUT";
 		const isNavigationTimeout = isScreenshotNavigationTimeoutError(error);
-		if (!Boolean(!nextOptions.miniProgram && (isProtocolTimeout || isNavigationTimeout) && !hasRetriedWithFreshSession)) throw error;
+		const isScreenshotTimeout = isScreenshotRequestTimeoutError(error);
+		if (!Boolean(!nextOptions.miniProgram && (isProtocolTimeout || isNavigationTimeout || isScreenshotTimeout) && !hasRetriedWithFreshSession)) throw error;
 		hasRetriedWithFreshSession = true;
 		await closeWechatIdeProject().catch((closeError) => {
 			logger_default.warn(i18nText(`关闭当前微信开发者工具项目窗口失败：${closeError instanceof Error ? closeError.message : String(closeError)}，仍将继续尝试重建自动化会话。`, `Failed to close the current Wechat DevTools project window: ${closeError instanceof Error ? closeError.message : String(closeError)}. Continuing to rebuild the automation session.`));

package/dist/commands-CEJ6rVma.js

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

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-JEM5q8tK.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-8Wamgvv0.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-Cy53rG5o.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-L4shbBPP.js";
+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-C8JdS2rx.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-C6ATyJuz.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-BUx9wWVK.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-X00XjC8Z.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 };

package/dist/run-mcp-B5RshzSs.js

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

package/dist/{run-mcp-L4shbBPP.js → run-mcp-X00XjC8Z.js}

@@ -1,4 +1,4 @@
-import { o as withMiniProgram$1 } from "./automator-session-JEM5q8tK.js";
+import { o as withMiniProgram$1 } from "./automator-session-C8JdS2rx.js";
 import { Buffer } from "node:buffer";
 import fs from "node:fs/promises";
 import path from "node:path";
@@ -298,7 +298,7 @@ function registerWeappIdeMcpTools(server, options) {
 		try {
 			const result = await withConnectedMiniProgram(options.runtimeHooks, workspaceRoot, input, async (miniProgram) => {
 				const screenshot = await miniProgram.screenshot();
-				const base64 = typeof screenshot === "string" ? screenshot : Buffer.from(screenshot).toString("base64");
+				const base64 = typeof screenshot === "string" ? screenshot : Buffer.from(screenshot ?? "").toString("base64");
 				const buffer = Buffer.from(base64, "base64");
 				if (input.outputPath) {
 					const resolvedOutputPath = createResolvedOutputPath(workspaceRoot, input.outputPath);

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "weapp-ide-cli",
   "type": "module",
-  "version": "5.4.6",
+  "version": "5.4.8",
   "description": "让微信开发者工具，用起来更加方便！",
   "author": "ice breaker <1324318532@qq.com>",
   "license": "MIT",
@@ -71,8 +71,8 @@
     "zod": "^4.4.3",
     "@weapp-core/logger": "3.1.1",
     "@weapp-core/shared": "3.0.4",
-    "@weapp-vite/devtools-runtime": "0.4.4",
-    "@weapp-vite/miniprogram-automator": "1.2.3"
+    "@weapp-vite/miniprogram-automator": "1.2.5",
+    "@weapp-vite/devtools-runtime": "0.4.6"
   },
   "scripts": {
     "dev": "tsdown -w --sourcemap",

package/dist/commands-BIKOtazW.js

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

package/dist/run-mcp-C0yaUdqC.js

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