weapp-ide-cli 6.1.2 → 6.1.3

package/README.md

@@ -98,10 +98,10 @@ weapp mcp --workspace-root .
 
 从当前版本开始，`weapp-ide-cli` 会在调用微信开发者工具前自动尝试预热本机 DevTools 配置：
 
-- 确保安全设置里启用服务端口
+- 检测安全设置中的服务端口；未启用时请在 IDE 中开启
 - 根据命令或全局配置决定是否自动信任项目
 
-在 macOS 上，它会写入 `~/Library/Application Support/微信开发者工具/*/WeappLocalData` 下对应的本地配置；如果你不希望自动处理，也可以通过下文的 `config` 配置项关闭。
+仅对 IDE 已完成导入的项目更新信任状态，并保留已有能力信息。首次打开项目时，由 IDE 负责初始化项目记录，CLI 不会提前创建不完整的本地缓存；自动化启动使用 IDE 的 `trustProject` 参数。可以通过下文的 `config` 配置项关闭自动处理。
 
 ## 支付宝小程序（minidev）支持
 

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

@@ -506,16 +506,6 @@ async function resolveWechatDevtoolsInstanceDirs(baseDir) {
 		throw error;
 	}
 }
-async function syncHashKeyMap(localDataDir, key) {
-	const hash = createStorageHash(key);
-	const hashKeyMapPath = path.join(localDataDir, "hash_key_map_2.json");
-	const current = await readJsonObject(hashKeyMapPath);
-	if (current[hash] !== key) {
-		current[hash] = key;
-		await writeJsonObject(hashKeyMapPath, current);
-	}
-	return hash;
-}
 async function detectWechatDevtoolsSecuritySettings(localDataDir) {
 	for (const fileName of SETTINGS_STORAGE_FILE_NAMES) {
 		const security = normalizeWechatDevtoolsSecuritySettings((await readJsonObject(path.join(localDataDir, fileName))).security);
@@ -524,18 +514,20 @@ async function detectWechatDevtoolsSecuritySettings(localDataDir) {
 }
 async function trustWechatDevtoolsProject(localDataDir, projectPath) {
 	const normalizedProjectPath = path.resolve(projectPath);
-	const projectHash = await syncHashKeyMap(localDataDir, `project2_${normalizedProjectPath}`);
+	const projectHash = createStorageHash(`project2_${normalizedProjectPath}`);
 	const fileNames = [`localstorage_${projectHash}.json`, `ls_${projectHash}.json`];
+	let trusted = false;
 	for (const fileName of fileNames) {
 		const projectFilePath = path.join(localDataDir, fileName);
 		const current = await readJsonObject(projectFilePath);
+		if (current.projectid !== normalizedProjectPath || current.projectpath !== normalizedProjectPath || typeof current.appid !== "string" || !current.appid || !isRecord(current.attr) || !isRecord(current.attr.setting)) continue;
 		await writeJsonObject(projectFilePath, {
 			...current,
-			projectid: typeof current.projectid === "string" && current.projectid.length > 0 ? current.projectid : normalizedProjectPath,
-			projectpath: typeof current.projectpath === "string" && current.projectpath.length > 0 ? current.projectpath : normalizedProjectPath,
 			isTrusted: true
 		});
+		trusted = true;
 	}
+	return trusted;
 }
 async function scanWechatDevtoolsServicePort(context) {
 	const instanceDirs = await resolveWechatDevtoolsInstanceDirs(context.baseDir);
@@ -596,8 +588,7 @@ async function bootstrapWechatDevtoolsSettings(options = {}) {
 	for (const instanceDir of scanResult.instanceDirs) {
 		const localDataDir = path.join(instanceDir, "WeappLocalData");
 		if (options.projectPath && options.trustProject !== false) {
-			await trustWechatDevtoolsProject(localDataDir, options.projectPath);
-			trustedProjectCount += 1;
+			if (await trustWechatDevtoolsProject(localDataDir, options.projectPath)) trustedProjectCount += 1;
 		}
 	}
 	return {
@@ -1239,31 +1230,35 @@ async function launchFreshAutomator(options) {
 		} : {}
 	});
 }
-function normalizeMiniProgramConnectionError(error) {
+function normalizeMiniProgramConnectionError(error, background = false) {
+	const diagnostics = background ? {
+		error: (message) => logger_default.debug(message),
+		warn: (message) => logger_default.debug(message)
+	} : logger_default;
 	if (isAutomatorLoginError(error)) {
-		logger_default.error(i18nText("检测到微信开发者工具登录状态失效，请先登录后重试。", "Wechat DevTools login has expired. Please login and retry."));
-		logger_default.warn(formatAutomatorLoginError(error));
+		diagnostics.error(i18nText("检测到微信开发者工具登录状态失效，请先登录后重试。", "Wechat DevTools login has expired. Please login and retry."));
+		diagnostics.warn(formatAutomatorLoginError(error));
 		return /* @__PURE__ */ new Error("DEVTOOLS_LOGIN_REQUIRED");
 	}
 	if (isDevtoolsHttpPortError(error)) {
-		logger_default.error(i18nText("无法连接到微信开发者工具，请确保已开启 HTTP 服务端口。", "Cannot connect to Wechat DevTools. Please ensure HTTP service port is enabled."));
-		logger_default.warn(i18nText("请在微信开发者工具中：设置 -> 安全设置 -> 开启服务端口", "Please enable service port in Wechat DevTools: Settings -> Security -> Service Port"));
+		diagnostics.error(i18nText("无法连接到微信开发者工具，请确保已开启 HTTP 服务端口。", "Cannot connect to Wechat DevTools. Please ensure HTTP service port is enabled."));
+		diagnostics.warn(i18nText("请在微信开发者工具中：设置 -> 安全设置 -> 开启服务端口", "Please enable service port in Wechat DevTools: Settings -> Security -> Service Port"));
 		return /* @__PURE__ */ new Error("DEVTOOLS_HTTP_PORT_ERROR");
 	}
 	if (isDevtoolsExtensionContextInvalidatedError(error)) {
-		logger_default.error(i18nText("微信开发者工具自动化上下文尚未就绪，通常是刚启动或正在重载。", "Wechat DevTools automation context is not ready yet, usually because the IDE has just started or is still reloading."));
-		logger_default.warn(i18nText("请稍后重试；若持续失败，关闭多余的开发者工具窗口后重试。", "Please retry shortly. If it keeps failing, close extra DevTools windows and try again."));
+		diagnostics.error(i18nText("微信开发者工具自动化上下文尚未就绪，通常是刚启动或正在重载。", "Wechat DevTools automation context is not ready yet, usually because the IDE has just started or is still reloading."));
+		diagnostics.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) || 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."));
+		diagnostics.error(i18nText("无法连接到当前项目的微信开发者工具自动化 websocket。", "Cannot connect to the Wechat DevTools automation websocket for the current project."));
+		diagnostics.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");
 	}
 	if (isAutomatorProtocolTimeoutError(error)) {
 		const method = getAutomatorProtocolTimeoutMethod(error) ?? "unknown";
-		logger_default.error(i18nText(`微信开发者工具在协议调用 ${method} 上超时，未按预期返回结果。`, `Wechat DevTools timed out while executing protocol method ${method} and did not return a result.`));
-		logger_default.warn(i18nText("这通常表示当前 DevTools 自动化会话已卡住、窗口不在目标项目、或当前 DevTools 版本对该协议调用无响应。请重开目标项目窗口后重试；若仍复现，优先记录当前 DevTools 版本与协议方法名继续排查。", "This usually means the current DevTools automation session is stuck, the window is not on the target project, or the current DevTools version is not responding to that protocol method. Reopen the target project window and retry. If it still reproduces, record the current DevTools version and protocol method name for follow-up debugging."));
+		diagnostics.error(i18nText(`微信开发者工具在协议调用 ${method} 上超时，未按预期返回结果。`, `Wechat DevTools timed out while executing protocol method ${method} and did not return a result.`));
+		diagnostics.warn(i18nText("这通常表示当前 DevTools 自动化会话已卡住、窗口不在目标项目、或当前 DevTools 版本对该协议调用无响应。请重开目标项目窗口后重试；若仍复现，优先记录当前 DevTools 版本与协议方法名继续排查。", "This usually means the current DevTools automation session is stuck, the window is not on the target project, or the current DevTools version is not responding to that protocol method. Reopen the target project window and retry. If it still reproduces, record the current DevTools version and protocol method name for follow-up debugging."));
 		return /* @__PURE__ */ new Error("DEVTOOLS_PROTOCOL_TIMEOUT");
 	}
 	return error instanceof Error ? error : new Error(String(error));
@@ -1271,7 +1266,7 @@ function normalizeMiniProgramConnectionError(error) {
 /**
 * @description 建立 automator 会话，并统一处理常见连接错误提示。
 */
-async function connectMiniProgram(options) {
+async function connectMiniProgramWithDiagnostics(options, background) {
 	const result = await runRetryableCommand({
 		createCancelError: (result) => createWechatIdeLoginRequiredExitError(unwrapAutomatorConnectionError(result), "cancelled"),
 		execute: async () => {
@@ -1281,7 +1276,7 @@ async function connectMiniProgram(options) {
 					value: await launchFreshAutomator(options)
 				};
 			} catch (error) {
-				if (!isAutomatorLoginError(error)) throw normalizeMiniProgramConnectionError(error);
+				if (!isAutomatorLoginError(error)) throw normalizeMiniProgramConnectionError(error, background);
 				return {
 					error,
 					kind: "retryable"
@@ -1293,7 +1288,7 @@ async function connectMiniProgram(options) {
 					value: await connectOpenedAutomator(options)
 				};
 			} catch (error) {
-				const normalizedOpenSessionError = normalizeMiniProgramConnectionError(error);
+				const normalizedOpenSessionError = normalizeMiniProgramConnectionError(error, background);
 				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 {
@@ -1302,7 +1297,7 @@ async function connectMiniProgram(options) {
 						value: await launchFreshAutomator(options)
 					};
 				} catch (launchError) {
-					if (!isAutomatorLoginError(launchError)) throw normalizeMiniProgramConnectionError(launchError);
+					if (!isAutomatorLoginError(launchError)) throw normalizeMiniProgramConnectionError(launchError, background);
 					return {
 						error: launchError,
 						kind: "retryable"
@@ -1324,6 +1319,21 @@ async function connectMiniProgram(options) {
 	if (result.kind === "retryable") throw createWechatIdeLoginRequiredExitError(result.error);
 	return result.value;
 }
+/** 建立交互式会话，并报告最终连接错误。 */
+async function connectMiniProgram(options) {
+	return await connectMiniProgramWithDiagnostics(options, false);
+}
+/** 后台日志桥接的连接探针，不在每次可恢复失败时输出终局错误。 */
+async function connectConsoleMiniProgram(options) {
+	return await connectMiniProgramWithDiagnostics(options, true);
+}
+/** 为后台日志桥接保留共享会话所有权和诊断级别。 */
+async function acquireConsoleMiniProgram(options) {
+	return await acquireSharedMiniProgram({
+		connectMiniProgram: connectConsoleMiniProgram,
+		normalizeConnectionError: (error) => normalizeMiniProgramConnectionError(error, true)
+	}, options);
+}
 const runtimeHooks = {
 	connectMiniProgram,
 	normalizeConnectionError: normalizeMiniProgramConnectionError
@@ -1341,4 +1351,4 @@ async function withMiniProgram$1(options, runner) {
 	return await withMiniProgram(runtimeHooks, options, runner);
 }
 //#endregion
-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 };
+export { createAutoTrustProjectConfig as $, getAutomatorProtocolTimeoutMethod as A, bootstrapWechatDevtoolsSettings as B, runWithSuspendedSharedInput as C, validateLocaleOption as D, i18nText as E, isDevtoolsExtensionContextInvalidatedError as F, resolveDevtoolsAutomationDefaults as G, resolveCliPath as H, isDevtoolsHttpPortError as I, isOperatingSystemSupported as J, SupportedPlatformsMap as K, isRetryableAutomatorLaunchError as L, isAutomatorPortInUseError as M, isAutomatorProtocolTimeoutError as N, connectOpenedAutomator as O, isAutomatorWsConnectError as P, createAutoBootstrapDevtoolsConfig as Q, launchAutomator as R, createSharedInputSession as S, configureLocaleFromArgv as T, getConfig as U, detectWechatDevtoolsServicePort as V, getConfiguredLocale as W, colors as X, operatingSystemName as Y, logger_default as Z, isWechatIdeLoginRequiredError as _, connectMiniProgram as a, defaultCustomConfigDirPath as at, promptWechatIdeLoginRetry as b, withMiniProgram$1 as c, RETRY_CONFIRM_KEYS as d, createCustomConfig as et, RETRY_PROMPT_INITIAL_IGNORE_MS as f, formatWechatIdeLoginRequiredError as g, formatRetryHotkeyPrompt as h, connectConsoleMiniProgram as i, removeCustomConfigKey as it, isAutomatorLoginError as j, formatAutomatorLoginError as k, runRetryableCommand as l, extractExecutionErrorText as m, acquireSharedMiniProgram$1 as n, overwriteCustomConfig as nt, getSharedMiniProgramSessionCount as o, defaultCustomConfigFilePath as ot, createWechatIdeLoginRequiredExitError as p, getDefaultCliPath as q, closeSharedMiniProgram as r, readCustomConfig as rt, releaseSharedMiniProgram as s, resolvePath as st, acquireConsoleMiniProgram as t, createLocaleConfig as tt, RETRY_CANCEL_KEYS as u, isWechatIdeLoginRequiredExitError as v, waitForExclusiveKeypress as w, waitForRetryKeypress as x, promptRetryKeypress as y, resolveProjectAutomatorPort as z };

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

@@ -1,6 +1,6 @@
-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 { $ as createAutoTrustProjectConfig, D as validateLocaleOption, E as i18nText, G as resolveDevtoolsAutomationDefaults, H as resolveCliPath, Q as createAutoBootstrapDevtoolsConfig, T as configureLocaleFromArgv, W as getConfiguredLocale, X as colors, Z as logger_default, et as createCustomConfig, i as connectConsoleMiniProgram, it as removeCustomConfigKey, nt as overwriteCustomConfig, ot as defaultCustomConfigFilePath, r as closeSharedMiniProgram, rt as readCustomConfig, s as releaseSharedMiniProgram, t as acquireConsoleMiniProgram, tt as createLocaleConfig } from "./automator-session-B0GSCA8Z.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-C2M-B-Nd.js";
+import "./run-mcp-i4WLaQoh.js";
 import fs from "node:fs/promises";
 import path from "node:path";
 import { fs as fs$1 } from "@weapp-core/shared/fs";
@@ -317,7 +317,7 @@ async function runScreenshot(argv) {
 	}
 	const options = parseScreenshotArgs(argv);
 	const isJsonOutput = argv.includes("--json");
-	const { takeScreenshot } = await import("./commands-BsYTeMoY.js");
+	const { takeScreenshot } = await import("./commands-CWIOxZm3.js");
 	const result = await takeScreenshot(options);
 	if (isJsonOutput) {
 		console.log(JSON.stringify(result, null, 2));
@@ -1034,8 +1034,20 @@ 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$1(ms) {
-	return new Promise((resolve) => setTimeout(resolve, ms));
+function sleep$1(ms, signal) {
+	signal?.throwIfAborted();
+	return new Promise((resolve, reject) => {
+		let timer;
+		const onAbort = () => {
+			clearTimeout(timer);
+			reject(signal?.reason);
+		};
+		timer = setTimeout(() => {
+			signal?.removeEventListener("abort", onAbort);
+			resolve();
+		}, ms);
+		signal?.addEventListener("abort", onAbort, { once: true });
+	});
 }
 function createEngineBuildLogFilename() {
 	const now = /* @__PURE__ */ new Date();
@@ -1076,20 +1088,32 @@ function compactOutput(value) {
 	return typeof value === "string" ? value.replace(COMPACT_WHITESPACE_PATTERN, " ").trim() : "";
 }
 async function runWechatIdeEngineBuildByCli(projectPath, options = {}) {
-	const { cliPath } = await resolveCliPath();
+	options.signal?.throwIfAborted();
+	const { cliPath } = await resolveCliPath().catch((error) => {
+		options.signal?.throwIfAborted();
+		throw error;
+	});
+	options.signal?.throwIfAborted();
 	if (!cliPath) throw createEngineBuildError("WECHAT_DEVTOOLS_CLI_NOT_FOUND", "WECHAT_DEVTOOLS_CLI_NOT_FOUND");
 	const result = await execa(cliPath, [
 		"engine",
 		"build",
 		path.resolve(projectPath)
 	], {
+		...options.signal ? { cancelSignal: options.signal } : {},
+		killDescendants: true,
 		reject: false,
 		timeout: options.overallTimeoutMs ?? 12e4
+	}).catch((error) => {
+		options.signal?.throwIfAborted();
+		throw error;
 	});
+	options.signal?.throwIfAborted();
 	const stdout = typeof result.stdout === "string" ? result.stdout : "";
 	const stderr = typeof result.stderr === "string" ? result.stderr : "";
 	const output = [stdout, stderr].filter(Boolean).join("\n");
 	await writeEngineBuildLog(options.logPath, output);
+	options.signal?.throwIfAborted();
 	if ((result.exitCode ?? 1) === 0) {
 		if (stdout) process.stdout.write(stdout);
 		if (stderr) process.stderr.write(stderr);
@@ -1105,15 +1129,19 @@ async function runWechatIdeEngineBuildByCli(projectPath, options = {}) {
 * @description 通过开发者工具 HTTP 服务端口执行 engine build，并轮询直到构建结束。
 */
 async function runWechatIdeEngineBuildByHttp(projectPath, options = {}) {
+	options.signal?.throwIfAborted();
 	await startWechatIdeEngineBuildByHttp(projectPath, options);
 	const startedAt = Date.now();
 	while (true) {
+		options.signal?.throwIfAborted();
 		if (Date.now() - startedAt > (options.overallTimeoutMs ?? 12e4)) throw createEngineBuildError("WECHAT_DEVTOOLS_ENGINE_BUILD_TIMEOUT", "WECHAT_DEVTOOLS_ENGINE_BUILD_TIMEOUT");
 		const result = await pollWechatIdeEngineBuildResultByHttp(options);
+		options.signal?.throwIfAborted();
 		options.onProgress?.(result);
+		options.signal?.throwIfAborted();
 		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$1(options.pollIntervalMs ?? 1e3);
+		await sleep$1(options.pollIntervalMs ?? 1e3, options.signal);
 	}
 }
 /**
@@ -1134,8 +1162,10 @@ async function runWechatIdeEngineBuild(projectPath, options = {}) {
 			}
 		});
 		await writeEngineBuildLog(options.logPath, logs.join("\n"));
+		options.signal?.throwIfAborted();
 		return result;
 	} catch (error) {
+		options.signal?.throwIfAborted();
 		if (isEngineBuildEndpointMissingError(error)) {
 			if (options.fallbackToCli === false) throw createEngineBuildEndpointMissingError();
 			return await runWechatIdeEngineBuildByCli(projectPath, options);
@@ -1279,7 +1309,7 @@ async function acquireForwardConsoleMiniProgram(options) {
 	for (let attempt = 0; attempt <= ENABLE_LOG_RETRY_TIMES; attempt += 1) {
 		let miniProgram;
 		try {
-			miniProgram = await acquireSharedMiniProgram({
+			miniProgram = await acquireConsoleMiniProgram({
 				...options,
 				timeout: Math.min(options.timeout ?? FORWARD_CONSOLE_SESSION_TIMEOUT_MS, FORWARD_CONSOLE_SESSION_TIMEOUT_MS)
 			});
@@ -1295,7 +1325,7 @@ async function acquireForwardConsoleMiniProgram(options) {
 	throw lastError instanceof Error ? lastError : new Error(String(lastError));
 }
 async function refreshOpenedMiniProgramConsoleLog(options) {
-	const miniProgram = await connectMiniProgram({
+	const miniProgram = await connectConsoleMiniProgram({
 		...options,
 		openedOnly: true
 	});
@@ -1368,7 +1398,7 @@ async function startForwardConsole(options) {
 	stopEnableLogRefresh = startEnableLogRefresh(miniProgram, options, usesSharedSession);
 	if (usesSharedSession) auxiliaryTimer = setTimeout(() => {
 		(async () => {
-			const openedMiniProgram = await connectMiniProgram({
+			const openedMiniProgram = await connectConsoleMiniProgram({
 				...options,
 				openedOnly: true
 			});
@@ -1774,7 +1804,7 @@ async function parse(argv) {
 		return;
 	}
 	if (matchedCommand === "mcp") {
-		const { runMcpCommand } = await import("./run-mcp-Q3skAZs_.js");
+		const { runMcpCommand } = await import("./run-mcp-BuEgRLOT.js");
 		await runMcpCommand(argv.slice(1));
 		return;
 	}

package/dist/cli.js

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

package/dist/{commands-9WCVsqHn.js → commands-C2M-B-Nd.js}

@@ -1,4 +1,4 @@
-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 { B as bootstrapWechatDevtoolsSettings, C as runWithSuspendedSharedInput, E as i18nText, H as resolveCliPath, J as isOperatingSystemSupported, V as detectWechatDevtoolsServicePort, X as colors, Y as operatingSystemName, Z as logger_default, _ as isWechatIdeLoginRequiredError, b as promptWechatIdeLoginRetry, c as withMiniProgram, et as createCustomConfig, l as runRetryableCommand, ot as defaultCustomConfigFilePath, p as createWechatIdeLoginRequiredExitError, r as closeSharedMiniProgram, rt as readCustomConfig, st as resolvePath } from "./automator-session-B0GSCA8Z.js";
 import { Buffer } from "node:buffer";
 import fs from "node:fs/promises";
 import path from "node:path";
@@ -437,21 +437,29 @@ function parseWechatDevtoolsEngineBuildResult(body) {
 	}
 }
 async function requestWechatDevtoolsHttp(pathname, query, options = {}) {
-	const url = createWechatDevtoolsHttpUrl(await resolveWechatDevtoolsHttpPort(options.port), pathname, query);
+	options.signal?.throwIfAborted();
+	const port = await resolveWechatDevtoolsHttpPort(options.port).catch((error) => {
+		options.signal?.throwIfAborted();
+		throw error;
+	});
+	options.signal?.throwIfAborted();
+	const url = createWechatDevtoolsHttpUrl(port, pathname, query);
 	const controller = new AbortController();
+	const signal = options.signal ? AbortSignal.any([options.signal, controller.signal]) : controller.signal;
 	const timeout = setTimeout(() => {
-		controller.abort();
+		controller.abort(createWechatDevtoolsHttpError("WECHAT_DEVTOOLS_HTTP_TIMEOUT", "WECHAT_DEVTOOLS_HTTP_TIMEOUT"));
 	}, options.timeoutMs ?? 1e4);
 	try {
 		const response = await fetch(url, {
 			method: "GET",
-			signal: controller.signal
+			signal
 		});
 		const body = await response.text();
+		signal.throwIfAborted();
 		if (!response.ok) throw createWechatDevtoolsHttpError(body || `HTTP ${response.status}`, "WECHAT_DEVTOOLS_HTTP_REQUEST_FAILED");
 		return body;
 	} catch (error) {
-		if (error instanceof Error && error.name === "AbortError") throw createWechatDevtoolsHttpError("WECHAT_DEVTOOLS_HTTP_TIMEOUT", "WECHAT_DEVTOOLS_HTTP_TIMEOUT");
+		signal.throwIfAborted();
 		throw error;
 	} finally {
 		clearTimeout(timeout);
@@ -790,6 +798,10 @@ async function openWechatIde(options = {}) {
 	appendProjectLocatorArgv(argv, options);
 	if (options.platform) argv.push("--platform", options.platform);
 	if (options.trustProject) argv.push("--trust-project");
+	if (options.projectPath) try {
+		await openWechatIdeProjectByHttp(options.projectPath);
+		return;
+	} catch {}
 	await runWechatCliCommand(argv);
 }
 /**

package/dist/commands-CWIOxZm3.js

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