weapp-ide-cli 5.4.9 → 5.4.11

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

@@ -650,7 +650,8 @@ function normalizeAutomatorSessionId(sessionId, port) {
 * @description 为项目路径派生稳定的 DevTools automator 端口，避免多个 dev:open 项目抢占默认端口。
 */
 function resolveProjectAutomatorPort(projectPath) {
-	return PROJECT_AUTOMATOR_PORT_BASE + createHash("sha1").update(path.resolve(projectPath)).digest().readUInt32BE(0) % PROJECT_AUTOMATOR_PORT_RANGE;
+	const offset = createHash("sha1").update(path.resolve(projectPath)).digest().readUInt32BE(0) % PROJECT_AUTOMATOR_PORT_RANGE;
+	return PROJECT_AUTOMATOR_PORT_BASE + offset;
 }
 function resolveAutomatorSessionFilePath(projectPath, sessionId, port) {
 	const normalizedProjectPath = path.resolve(projectPath);
@@ -816,12 +817,15 @@ async function launchAutomator(options) {
 * @description 连接当前项目已打开的开发者工具自动化会话，不触发新的 IDE 拉起。
 */
 async function connectOpenedAutomator(options) {
-	const { port, projectPath, sessionId } = options;
+	const { port, projectPath, sessionId, timeout } = options;
 	const launcher = new Launcher();
 	const persistedSession = await readPersistedAutomatorSession(projectPath, sessionId, port);
 	const wsEndpoint = persistedSession?.wsEndpoint ?? (port ? `ws://127.0.0.1:${port}` : `ws://127.0.0.1:${DEFAULT_WECHAT_DEVTOOLS_WS_PORT}`);
 	try {
-		return await launcher.connect({ wsEndpoint });
+		return await launcher.connect({
+			timeout,
+			wsEndpoint
+		});
 	} catch (error) {
 		if (persistedSession) await removePersistedAutomatorSession(projectPath, sessionId, port);
 		throw error;

package/dist/{cli-BUx9wWVK.js → cli-BBXXj7vb.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-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 { $ 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-ec0i76Cx.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-CK4N5Nel.js";
+import "./run-mcp-DPz-bwrD.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-CEJ6rVma.js");
+	const { takeScreenshot } = await import("./commands-DKiKnVKp.js");
 	const result = await takeScreenshot(options);
 	if (isJsonOutput) {
 		console.log(JSON.stringify(result, null, 2));
@@ -1725,7 +1725,7 @@ async function parse(argv) {
 		return;
 	}
 	if (matchedCommand === "mcp") {
-		const { runMcpCommand } = await import("./run-mcp-B5RshzSs.js");
+		const { runMcpCommand } = await import("./run-mcp-BFYPend3.js");
 		await runMcpCommand(argv.slice(1));
 		return;
 	}

package/dist/cli.js

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

package/dist/{commands-C6ATyJuz.js → commands-CK4N5Nel.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-C8JdS2rx.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-ec0i76Cx.js";
 import { Buffer } from "node:buffer";
 import fs from "node:fs/promises";
 import path from "node:path";
@@ -166,6 +166,8 @@ function removeOption(argv, optionName) {
 }
 //#endregion
 //#region src/cli/fullPageScreenshot.ts
+const MAX_FULL_PAGE_CAPTURES = 200;
+const DEVTOOLS_INSPECTEE_REFERENCE_ERROR = /__inspectee__ is not defined|Can't find variable:\s*__inspectee__/i;
 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);
@@ -175,13 +177,16 @@ function decodeScreenshotBuffer(raw) {
 function toPositiveNumber(value) {
 	return typeof value === "number" && Number.isFinite(value) && value > 0 ? value : void 0;
 }
-function createScrollPositions(totalHeight, viewportHeight) {
-	if (totalHeight <= viewportHeight) return [0];
-	const positions = [];
-	const lastStart = Math.max(totalHeight - viewportHeight, 0);
-	for (let scrollTop = 0; scrollTop < lastStart; scrollTop += viewportHeight) positions.push(scrollTop);
-	if (positions[positions.length - 1] !== lastStart) positions.push(lastStart);
-	return positions;
+function isDevtoolsInspecteeReferenceError(error) {
+	const message = error instanceof Error ? error.message : String(error);
+	return DEVTOOLS_INSPECTEE_REFERENCE_ERROR.test(message);
+}
+async function captureViewportScreenshotBuffer(miniProgram, timeoutMs, runWithTimeout, screenshotTimeoutMessage) {
+	return decodeScreenshotBuffer(await runWithTimeout(miniProgram.screenshot({ timeout: timeoutMs }), timeoutMs, screenshotTimeoutMessage, "DEVTOOLS_SCREENSHOT_TIMEOUT"));
+}
+function resolveScale(pageWidth, viewportHeight, png) {
+	if (pageWidth && pageWidth > 0) return png.width / pageWidth;
+	return png.height / viewportHeight;
 }
 function cropPngRows(source, startRow, rowCount) {
 	const cropped = new PNG({
@@ -196,9 +201,90 @@ function cropPngRows(source, startRow, rowCount) {
 	}
 	return cropped;
 }
+function areRowsVisuallyEqual(first, second, firstRow, secondRow) {
+	const tolerance = 6;
+	const requiredEqualRatio = .98;
+	let equalPixels = 0;
+	for (let column = 0; column < first.width; column += 1) {
+		const firstIndex = (firstRow * first.width + column) * 4;
+		const secondIndex = (secondRow * second.width + column) * 4;
+		if (Math.abs(first.data[firstIndex] - second.data[secondIndex]) <= tolerance && Math.abs(first.data[firstIndex + 1] - second.data[secondIndex + 1]) <= tolerance && Math.abs(first.data[firstIndex + 2] - second.data[secondIndex + 2]) <= tolerance && Math.abs(first.data[firstIndex + 3] - second.data[secondIndex + 3]) <= tolerance) equalPixels += 1;
+	}
+	return equalPixels / first.width >= requiredEqualRatio;
+}
+function detectFixedBottomRows(first, second, scale) {
+	if (first.width !== second.width || first.height !== second.height) return 0;
+	const maxFixedRows = Math.floor(first.height * .45);
+	const minFixedRows = Math.max(8, Math.round(8 * scale));
+	let fixedRows = 0;
+	for (let offset = 0; offset < maxFixedRows; offset += 1) {
+		if (!areRowsVisuallyEqual(first, second, first.height - 1 - offset, second.height - 1 - offset)) break;
+		fixedRows += 1;
+	}
+	return fixedRows >= minFixedRows ? fixedRows : 0;
+}
 async function restoreScrollPosition(miniProgram, page, scrollTop) {
+	try {
+		await miniProgram.pageScrollTo(scrollTop);
+		await page.waitFor(150);
+	} catch (error) {
+		if (!isDevtoolsInspecteeReferenceError(error)) throw error;
+	}
+}
+async function readRuntimeViewportMetrics(miniProgram) {
+	if (typeof miniProgram.evaluate !== "function") return;
+	const metrics = await miniProgram.evaluate(() => {
+		const wxLike = typeof wx === "undefined" ? void 0 : wx;
+		const systemInfo = wxLike?.getWindowInfo?.() ?? wxLike?.getSystemInfoSync?.();
+		return new Promise((resolve) => {
+			if (!wxLike?.createSelectorQuery) {
+				resolve({
+					pageHeight: void 0,
+					pageWidth: systemInfo?.windowWidth,
+					scrollTop: void 0,
+					viewportHeight: systemInfo?.windowHeight
+				});
+				return;
+			}
+			wxLike.createSelectorQuery().selectViewport().scrollOffset((viewport) => {
+				resolve({
+					pageHeight: viewport?.scrollHeight,
+					pageWidth: viewport?.scrollWidth ?? systemInfo?.windowWidth,
+					scrollTop: viewport?.scrollTop,
+					viewportHeight: systemInfo?.windowHeight
+				});
+			}).exec();
+		});
+	}).catch(() => void 0);
+	if (!metrics || typeof metrics !== "object") return;
+	const raw = metrics;
+	return {
+		pageHeight: toPositiveNumber(raw.pageHeight),
+		pageWidth: toPositiveNumber(raw.pageWidth),
+		scrollTop: typeof raw.scrollTop === "number" && Number.isFinite(raw.scrollTop) ? Math.max(raw.scrollTop, 0) : void 0,
+		viewportHeight: toPositiveNumber(raw.viewportHeight)
+	};
+}
+async function readPageSize(page) {
+	return await page.size().catch(() => null);
+}
+async function readScrollTop(miniProgram, page) {
+	const runtimeMetrics = await readRuntimeViewportMetrics(miniProgram);
+	if (runtimeMetrics?.scrollTop !== void 0) return runtimeMetrics.scrollTop;
+	return typeof page.scrollTop === "function" ? toPositiveNumber(await page.scrollTop().catch(() => void 0)) ?? 0 : 0;
+}
+async function captureScrolledPng(miniProgram, page, scrollTop, timeoutMs, runWithTimeout, screenshotTimeoutMessage) {
 	await miniProgram.pageScrollTo(scrollTop);
 	await page.waitFor(150);
+	const rawScreenshot = await runWithTimeout(miniProgram.screenshot({ timeout: timeoutMs }), timeoutMs, screenshotTimeoutMessage, "DEVTOOLS_SCREENSHOT_TIMEOUT");
+	const runtimeMetrics = await readRuntimeViewportMetrics(miniProgram);
+	const actualScrollTop = runtimeMetrics?.scrollTop ?? (typeof page.scrollTop === "function" ? toPositiveNumber(await page.scrollTop().catch(() => void 0)) ?? scrollTop : scrollTop);
+	const pageSize = runtimeMetrics?.pageHeight ? void 0 : await readPageSize(page);
+	return {
+		pageHeight: runtimeMetrics?.pageHeight ?? toPositiveNumber(pageSize?.height),
+		png: PNG.sync.read(decodeScreenshotBuffer(rawScreenshot)),
+		scrollTop: actualScrollTop
+	};
 }
 /**
 * @description 通过多次滚动和拼接生成整页长截图。
@@ -206,32 +292,75 @@ async function restoreScrollPosition(miniProgram, page, scrollTop) {
 async function captureFullPageScreenshotBuffer(options) {
 	const { miniProgram, timeoutMs, runWithTimeout, screenshotTimeoutMessage } = options;
 	const page = await miniProgram.currentPage();
-	const pageSize = await page.size();
-	const systemInfo = await miniProgram.systemInfo();
-	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({ timeout: timeoutMs }), timeoutMs, screenshotTimeoutMessage, "DEVTOOLS_SCREENSHOT_TIMEOUT"));
+	const runtimeMetrics = await readRuntimeViewportMetrics(miniProgram);
+	const pageSize = runtimeMetrics?.pageHeight && runtimeMetrics.pageWidth ? void 0 : await readPageSize(page);
+	const systemInfo = runtimeMetrics?.viewportHeight ? void 0 : await miniProgram.systemInfo().catch((error) => {
+		if (isDevtoolsInspecteeReferenceError(error)) return;
+		throw error;
+	});
+	const initialScrollTop = runtimeMetrics?.scrollTop ?? await readScrollTop(miniProgram, page);
+	const pageWidth = runtimeMetrics?.pageWidth ?? toPositiveNumber(pageSize?.width);
+	const pageHeight = runtimeMetrics?.pageHeight ?? toPositiveNumber(pageSize?.height);
+	const viewportHeight = runtimeMetrics?.viewportHeight ?? toPositiveNumber(systemInfo?.windowHeight);
+	if (!pageHeight || !viewportHeight) return await captureViewportScreenshotBuffer(miniProgram, timeoutMs, runWithTimeout, screenshotTimeoutMessage);
 	const segments = [];
-	const positions = createScrollPositions(pageHeight, viewportHeight);
+	const capturesByRequestedScrollTop = /* @__PURE__ */ new Map();
 	let coveredUntil = 0;
 	let scale = 1;
+	let fixedBottomRows = 0;
+	let contentViewportHeight = viewportHeight;
+	let latestPageHeight = pageHeight;
 	try {
-		for (const scrollTop of positions) {
-			await miniProgram.pageScrollTo(scrollTop);
-			await page.waitFor(150);
-			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);
+		const firstCapture = await captureScrolledPng(miniProgram, page, 0, timeoutMs, runWithTimeout, screenshotTimeoutMessage);
+		const firstPng = firstCapture.png;
+		capturesByRequestedScrollTop.set(0, firstCapture);
+		scale = resolveScale(pageWidth, viewportHeight, firstPng);
+		latestPageHeight = firstCapture.pageHeight ?? latestPageHeight;
+		if (pageHeight > viewportHeight) {
+			const probeScrollTop = Math.min(viewportHeight, Math.max(pageHeight - viewportHeight, 1));
+			const probeCapture = await captureScrolledPng(miniProgram, page, probeScrollTop, timeoutMs, runWithTimeout, screenshotTimeoutMessage);
+			const probePng = probeCapture.png;
+			capturesByRequestedScrollTop.set(probeScrollTop, probeCapture);
+			latestPageHeight = probeCapture.pageHeight ?? latestPageHeight;
+			fixedBottomRows = detectFixedBottomRows(firstPng, probePng, scale);
+			if (fixedBottomRows > 0) {
+				const screenshotCssHeight = firstPng.height / scale;
+				const fixedBottomCss = fixedBottomRows / scale;
+				const fixedRowsOutsideViewportCss = Math.max(screenshotCssHeight - viewportHeight, 0);
+				const fixedRowsInsideViewportCss = Math.max(fixedBottomCss - fixedRowsOutsideViewportCss, 0);
+				contentViewportHeight = Math.max(1, viewportHeight - fixedRowsInsideViewportCss);
+			}
+		}
+		let requestedScrollTop = 0;
+		for (let captureIndex = 0; captureIndex < MAX_FULL_PAGE_CAPTURES; captureIndex += 1) {
+			const capture = capturesByRequestedScrollTop.get(requestedScrollTop) ?? await captureScrolledPng(miniProgram, page, requestedScrollTop, timeoutMs, runWithTimeout, screenshotTimeoutMessage);
+			capturesByRequestedScrollTop.set(requestedScrollTop, capture);
+			const { png, scrollTop } = capture;
+			latestPageHeight = capture.pageHeight ?? latestPageHeight;
+			const visibleEnd = Math.min(scrollTop + contentViewportHeight, latestPageHeight);
 			const cropTopCss = Math.max(coveredUntil - scrollTop, 0);
 			const segmentHeightCss = Math.max(visibleEnd - scrollTop - cropTopCss, 0);
-			if (segmentHeightCss <= 0) continue;
-			const cropTopRows = Math.min(Math.max(Math.round(cropTopCss * scale), 0), png.height);
-			const segmentRows = Math.min(Math.max(Math.round(segmentHeightCss * scale), 1), png.height - cropTopRows);
-			segments.push(cropPngRows(png, cropTopRows, segmentRows));
-			coveredUntil = visibleEnd;
+			const isAtBottom = visibleEnd >= latestPageHeight - 1;
+			if (segmentHeightCss > 0) {
+				const contentRows = Math.max(png.height - fixedBottomRows, 1);
+				const cropTopRows = Math.min(Math.max(Math.round(cropTopCss * scale), 0), contentRows);
+				const segmentRows = Math.min(Math.max(Math.round(segmentHeightCss * scale), 1), contentRows - cropTopRows);
+				if (segmentRows > 0) segments.push(cropPngRows(png, cropTopRows, segmentRows));
+			}
+			coveredUntil = Math.max(coveredUntil, visibleEnd);
+			if (isAtBottom) {
+				if (fixedBottomRows > 0) segments.push(cropPngRows(png, png.height - fixedBottomRows, fixedBottomRows));
+				break;
+			}
+			if (visibleEnd <= scrollTop || coveredUntil <= requestedScrollTop) {
+				if (fixedBottomRows > 0) segments.push(cropPngRows(png, png.height - fixedBottomRows, fixedBottomRows));
+				break;
+			}
+			requestedScrollTop = coveredUntil;
 		}
+	} catch (error) {
+		if (!isDevtoolsInspecteeReferenceError(error)) throw error;
+		return await captureViewportScreenshotBuffer(miniProgram, timeoutMs, runWithTimeout, screenshotTimeoutMessage);
 	} finally {
 		await restoreScrollPosition(miniProgram, page, initialScrollTop);
 	}
@@ -935,6 +1064,9 @@ function isDevtoolsProtocolTimeoutError(error) {
 	if (!(error instanceof Error)) return false;
 	return error.message === "DEVTOOLS_PROTOCOL_TIMEOUT" || error.message.includes("DevTools did not respond to protocol method") || Reflect.get(error, "code") === "DEVTOOLS_PROTOCOL_TIMEOUT";
 }
+function isPageStackStaleError(error) {
+	return error instanceof Error && error.message.includes("page is not on top of page stack");
+}
 function isScreenshotNavigationTimeoutError(error) {
 	return error instanceof Error && Reflect.get(error, "code") === "DEVTOOLS_SCREENSHOT_NAVIGATION_TIMEOUT";
 }
@@ -972,10 +1104,20 @@ function printStructuredResult(result, json, title) {
 	logger_default.info(title);
 	console.log(JSON.stringify(result, null, 2));
 }
-async function requireElement(page, selector) {
-	const element = await page.$(selector);
-	if (!element) throw new Error(i18nText(`未找到元素: ${selector}`, `Element not found: ${selector}`));
-	return element;
+async function requireElement(page, selector, timeoutMs = 5e3) {
+	const startedAt = Date.now();
+	let lastError;
+	while (Date.now() - startedAt <= timeoutMs) {
+		try {
+			const element = await page.$(selector);
+			if (element) return element;
+		} catch (error) {
+			lastError = error;
+		}
+		await sleep(160);
+	}
+	const reason = lastError instanceof Error ? ` ${lastError.message}` : "";
+	throw new Error(i18nText(`未找到元素: ${selector}${reason}`, `Element not found: ${selector}${reason}`));
 }
 /**
 * @description 执行保留栈页面跳转。
@@ -1055,7 +1197,17 @@ async function pageData(options) {
 async function tap(options) {
 	await withMiniProgram(options, async (miniProgram) => {
 		logger_default.info(i18nText(`正在点击元素 ${colors.cyan(options.selector)}...`, `Tapping element ${colors.cyan(options.selector)}...`));
-		await (await requireElement(await miniProgram.currentPage(), options.selector)).tap();
+		const commandTimeout = options.timeout ?? 3e4;
+		const tapCurrentPageElement = async () => {
+			await (await requireElement(await miniProgram.currentPage(), options.selector, commandTimeout)).tap();
+		};
+		try {
+			await tapCurrentPageElement();
+		} catch (error) {
+			if (!isPageStackStaleError(error)) throw error;
+			logger_default.info(i18nText("页面栈已切换，正在重新获取顶部页面并重试点击...", "Page stack changed. Refreshing the top page and retrying the tap..."));
+			await tapCurrentPageElement();
+		}
 		logger_default.success(i18nText(`已点击元素 ${colors.cyan(options.selector)}`, `Tapped element ${colors.cyan(options.selector)}`));
 	});
 }
@@ -1065,7 +1217,8 @@ async function tap(options) {
 async function input(options) {
 	await withMiniProgram(options, async (miniProgram) => {
 		logger_default.info(i18nText(`正在向 ${colors.cyan(options.selector)} 输入 "${colors.cyan(options.value)}"...`, `Inputting "${colors.cyan(options.value)}" into ${colors.cyan(options.selector)}...`));
-		const element = await requireElement(await miniProgram.currentPage(), options.selector);
+		const commandTimeout = options.timeout ?? 3e4;
+		const element = await requireElement(await miniProgram.currentPage(), options.selector, commandTimeout);
 		if (typeof element.input !== "function") throw new TypeError(i18nText(`元素不支持输入: ${options.selector}`, `Element does not support input: ${options.selector}`));
 		await element.input(options.value);
 		logger_default.success(i18nText(`已向 ${colors.cyan(options.selector)} 输入 "${colors.cyan(options.value)}"`, `Inputted "${colors.cyan(options.value)}" into ${colors.cyan(options.selector)}`));
@@ -1147,7 +1300,7 @@ async function takeScreenshot(options) {
 		const isProtocolTimeout = error instanceof Error && error.message === "DEVTOOLS_PROTOCOL_TIMEOUT";
 		const isNavigationTimeout = isScreenshotNavigationTimeoutError(error);
 		const isScreenshotTimeout = isScreenshotRequestTimeoutError(error);
-		if (!Boolean(!nextOptions.miniProgram && (isProtocolTimeout || isNavigationTimeout || isScreenshotTimeout) && !hasRetriedWithFreshSession)) throw error;
+		if (!Boolean(nextOptions.retryWithFreshSession !== false && !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-DKiKnVKp.js

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

package/dist/index.d.ts

@@ -1,7 +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";
-
 //#region src/cli/automator.d.ts
 interface AutomatorOptions {
   projectPath: string;
@@ -143,6 +142,7 @@ interface ScreenshotOptions extends AutomatorCommandOptions {
   outputPath?: string;
   page?: string;
   fullPage?: boolean;
+  retryWithFreshSession?: boolean;
 }
 interface ScreenshotResult {
   base64?: string;

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-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";
+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-ec0i76Cx.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-CK4N5Nel.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-BBXXj7vb.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-DPz-bwrD.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-BFYPend3.js

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

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

@@ -1,4 +1,4 @@
-import { o as withMiniProgram$1 } from "./automator-session-C8JdS2rx.js";
+import { o as withMiniProgram$1 } from "./automator-session-ec0i76Cx.js";
 import { Buffer } from "node:buffer";
 import fs from "node:fs/promises";
 import path from "node:path";

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "weapp-ide-cli",
   "type": "module",
-  "version": "5.4.9",
+  "version": "5.4.11",
   "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.5",
-    "@weapp-vite/devtools-runtime": "0.4.6",
-    "@weapp-vite/miniprogram-automator": "1.2.5"
+    "@weapp-vite/miniprogram-automator": "1.2.6",
+    "@weapp-vite/devtools-runtime": "0.4.7"
   },
   "scripts": {
     "dev": "tsdown -w --sourcemap",

package/dist/commands-CEJ6rVma.js

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

package/dist/run-mcp-B5RshzSs.js

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