weapp-ide-cli 6.1.9 → 6.2.0

package/dist/managed-Sq8y8FzP.js

@@ -0,0 +1,212 @@
+import { a as assertWechatDevtoolsPort, t as persistAutomatorSession } from "./sessionStore-zdzy2UFM.js";
+import { h as startWechatIdeAgent, t as beginManagedWechatProject } from "./devtoolsProjectOwnership-yDD6h0dO.js";
+import path from "node:path";
+import { withMachineE2ELease } from "@weapp-vite/devtools-runtime";
+import { execa } from "execa";
+import fs from "node:fs/promises";
+import process from "node:process";
+import { acquireAutomatorPortLease } from "@weapp-vite/miniprogram-automator";
+//#region src/cli/projectImport.ts
+function isRecord(value) {
+	return typeof value === "object" && value !== null && !Array.isArray(value);
+}
+/** 使用同一安装的 skill 入口；Windows 由 execa 处理官方 cmd 包装器。 */
+function resolveProjectImportCli(cliPath, platform = process.platform) {
+	const paths = platform === "win32" ? path.win32 : path.posix;
+	return paths.join(paths.dirname(cliPath), platform === "win32" ? "wechatide.cmd" : "wechatide");
+}
+/** 官方导入会重写项目根、条件页和基础库选择；窗口启动前恢复原始输入。 */
+async function preserveProjectConfig(projectPath, fileName, run) {
+	const file = path.join(projectPath, fileName);
+	const original = await fs.readFile(file).catch((error) => {
+		if (error.code !== "ENOENT") throw error;
+	});
+	let failure;
+	let failed = false;
+	try {
+		await run();
+	} catch (error) {
+		failure = error;
+		failed = true;
+	}
+	try {
+		if (original) {
+			if (!(await fs.readFile(file).catch((error) => {
+				if (error.code !== "ENOENT") throw error;
+			}))?.equals(original)) await fs.writeFile(file, original);
+		} else await fs.rm(file, { force: true });
+	} catch (error) {
+		if (failed) throw new AggregateError([failure, error], "Official import failed and fixture config restoration did not complete");
+		throw error;
+	}
+	if (failed) throw failure;
+}
+/** 先完成官方项目导入，再启动受管窗口；导入不编译、不导航，也不修改私有能力记录。 */
+async function importManagedDevtoolsProject(options) {
+	if (!options.trusted || !process.env["WEAPP_IDE_MANAGED_PROJECT_JOURNAL"]) return;
+	options.signal.throwIfAborted();
+	const projectPath = path.resolve(options.projectPath);
+	await withMachineE2ELease(() => preserveProjectConfig(projectPath, "project.config.json", () => preserveProjectConfig(projectPath, "project.private.config.json", async () => {
+		options.signal.throwIfAborted();
+		const { stdout } = await execa(resolveProjectImportCli(options.cliPath), [
+			"-c",
+			"weapp-vite-e2e",
+			"project_import",
+			"--project",
+			projectPath
+		], {
+			timeout: options.timeout,
+			cancelSignal: options.signal,
+			killDescendants: false
+		});
+		const payload = JSON.parse(stdout);
+		const result = isRecord(payload) && isRecord(payload.result) ? payload.result : void 0;
+		if (!isRecord(payload) || payload.ok !== true || payload.tool !== "project_import" || payload.clientName !== "weapp-vite-e2e" || result?.success !== true || result.projectPath !== projectPath || typeof result.alreadyImported !== "boolean" || result.taskId !== void 0 || result.status !== void 0 || result.error !== void 0) throw new Error("DEVTOOLS_PROJECT_IMPORT_INCOMPLETE: 官方项目导入未完成；请检查本地 weapp-vite-e2e 客户端授权与导入结果，未启动项目窗口。");
+		options.signal.throwIfAborted();
+	})));
+}
+//#endregion
+//#region src/cli/automator/managed.ts
+/** 受管启动持有完整窗口回执，失败清理不受启动 deadline 的短暂宽限限制。 */
+async function launchManagedAutomator(options) {
+	const { launcher, scope, target, projectPath, sourceProjectPath, port } = options;
+	await scope.step(() => importManagedDevtoolsProject({
+		cliPath: target.cliPath,
+		projectPath,
+		trusted: options.trustProject,
+		timeout: scope.remainingMs(),
+		signal: scope.signal
+	}), { stage: "project-import" });
+	scope.throwIfAborted();
+	const portLease = await scope.step(() => acquireAutomatorPortLease(port), {
+		stage: "port-lease",
+		disposeLate: (lease) => lease.release()
+	});
+	const rawReleasePortLease = portLease.release.bind(portLease);
+	let releasedPortLease;
+	portLease.release = () => releasedPortLease ??= rawReleasePortLease();
+	const disownPortLease = scope.own(() => portLease.release(), "automator-port-lease");
+	let releasePortLeaseOnExit = true;
+	let intent;
+	let program;
+	try {
+		intent = await beginManagedWechatProject({
+			target,
+			projectPath,
+			port
+		});
+		if (!intent) throw new Error("DEVTOOLS_MANAGED_PROJECT_JOURNAL_REQUIRED: managed launch requires a project ownership journal.");
+		scope.throwIfAborted();
+		await startWechatIdeAgent({
+			target,
+			projectPath,
+			port,
+			trustProject: options.trustProject,
+			signal: scope.signal,
+			timeout: scope.remainingMs(),
+			onStarted: async (result) => await intent.confirm({
+				openedProjectWindow: result.openedProjectWindow,
+				port: result.autoPort
+			})
+		});
+		scope.throwIfAborted();
+		await assertWechatDevtoolsPort(target, port, {
+			signal: scope.signal,
+			timeout: scope.remainingMs()
+		});
+		scope.throwIfAborted();
+		const wsEndpoint = `ws://127.0.0.1:${port}`;
+		program = await launcher.connect({
+			wsEndpoint,
+			signal: scope.signal,
+			timeout: scope.remainingMs()
+		});
+		scope.throwIfAborted();
+		await program.waitForAppReady(scope.remainingMs());
+		scope.throwIfAborted();
+		Reflect.set(program, "__WEAPP_VITE_SESSION_METADATA", {
+			port,
+			projectPath,
+			wsEndpoint,
+			managedProject: {
+				id: intent.id,
+				journalPath: intent.journalPath
+			}
+		});
+		await persistAutomatorSession({
+			installationId: target.installationId,
+			signal: scope.signal,
+			port,
+			projectPath: sourceProjectPath,
+			sessionId: options.sessionId,
+			wsEndpoint
+		});
+		scope.throwIfAborted();
+		if (options.persistAsDefaultSession) {
+			await persistAutomatorSession({
+				installationId: target.installationId,
+				signal: scope.signal,
+				projectPath: sourceProjectPath,
+				wsEndpoint
+			});
+			scope.throwIfAborted();
+		}
+		const connectedProgram = program;
+		const ownedIntent = intent;
+		const rawDisconnect = connectedProgram.disconnect.bind(connectedProgram);
+		connectedProgram.disconnect = (...args) => {
+			try {
+				return rawDisconnect(...args);
+			} finally {
+				portLease.release();
+			}
+		};
+		let closing;
+		connectedProgram.close = async () => {
+			closing ??= (async () => {
+				try {
+					connectedProgram.disconnect();
+				} finally {
+					try {
+						await ownedIntent.close();
+					} finally {
+						await portLease.release();
+					}
+				}
+			})().finally(() => {
+				closing = void 0;
+			});
+			return await closing;
+		};
+		releasePortLeaseOnExit = false;
+		disownPortLease();
+		return connectedProgram;
+	} catch (error) {
+		const errors = [error];
+		try {
+			program?.disconnect();
+		} catch (disconnectError) {
+			errors.push(disconnectError);
+		}
+		if (intent) {
+			try {
+				await intent.fail(error);
+			} catch (recordError) {
+				errors.push(recordError);
+			}
+			try {
+				await intent.close();
+			} catch (closeError) {
+				errors.push(closeError);
+			}
+		}
+		if (releasePortLeaseOnExit) {
+			disownPortLease();
+			await portLease.release().catch((releaseError) => errors.push(releaseError));
+		}
+		if (errors.length > 1) throw new AggregateError(errors, "Managed DevTools launch failed and project cleanup did not complete.", { cause: error });
+		throw error;
+	}
+}
+//#endregion
+export { launchManagedAutomator };

package/dist/run-mcp-CPv8cesh.js

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

package/dist/{run-mcp-LqaWlQJ_.js → run-mcp-Dl_1TH1x.js}

@@ -1,11 +1,9 @@
-import { c as withMiniProgram$1 } from "./automator-session-fbanL2eW.js";
-import { Buffer } from "node:buffer";
-import fs from "node:fs/promises";
+import { c as withMiniProgram$1 } from "./automator-session-gWEsSs_A.js";
 import path from "node:path";
-import process from "node:process";
 import { readDevtoolsElementSnapshot as readElementSnapshot, resolveDevtoolsProjectPath as resolveProjectPath, toDevtoolsSerializableValue as toSerializableValue } from "@weapp-vite/devtools-runtime";
-import { serveStdio } from "@modelcontextprotocol/server/stdio";
-import { McpServer } from "@modelcontextprotocol/server";
+import fs from "node:fs/promises";
+import process from "node:process";
+import { Buffer } from "node:buffer";
 import { z } from "zod";
 //#region src/mcp/server.ts
 function createResolvedProjectPath(workspaceRoot, projectPath) {
@@ -16,6 +14,7 @@ function createResolvedOutputPath(workspaceRoot, outputPath) {
 }
 async function withConnectedMiniProgram(runtimeHooks, workspaceRoot, input, runner) {
 	return await runtimeHooks.withMiniProgram({
+		cliPath: input.cliPath,
 		preferOpenedSession: input.preferOpenedSession,
 		port: input.port,
 		projectPath: createResolvedProjectPath(workspaceRoot, input.projectPath),
@@ -31,9 +30,10 @@ async function withConnectedPage(runtimeHooks, workspaceRoot, input, runner) {
 }
 function defineConnectionSchema() {
 	return {
+		cliPath: z.string().trim().min(1).optional().describe("指定微信开发者工具 CLI 安装路径"),
 		projectPath: z.string().trim().min(1).describe("小程序项目路径，支持 workspaceRoot 相对路径"),
 		timeout: z.number().int().positive().optional(),
-		port: z.number().int().positive().optional(),
+		port: z.number().int().positive().max(65535).optional(),
 		preferOpenedSession: z.boolean().optional(),
 		sessionId: z.string().trim().min(1).optional()
 	};
@@ -367,6 +367,7 @@ function registerWeappIdeMcpTools(server, options) {
 	});
 }
 async function createWeappIdeMcpServer(options) {
+	const { McpServer } = await import("@modelcontextprotocol/server");
 	const server = new McpServer({
 		name: "weapp-ide-cli",
 		version: "1.0.0"
@@ -380,8 +381,12 @@ async function createWeappIdeMcpServer(options) {
 //#endregion
 //#region src/mcp/runtime.ts
 async function startWeappIdeMcpServer(options = {}) {
+	const { serveStdio } = await import("@modelcontextprotocol/server/stdio");
 	const serverOptions = {
-		runtimeHooks: { withMiniProgram: withMiniProgram$1 },
+		runtimeHooks: { withMiniProgram: (input, runner) => withMiniProgram$1({
+			...input,
+			cliPath: input.cliPath ?? options.cliPath
+		}, runner) },
 		workspaceRoot: options.workspaceRoot
 	};
 	const handle = serveStdio(async () => {
@@ -415,6 +420,7 @@ function printMcpHelp() {
 Start the weapp-ide-cli MCP server over stdio.
 
 Options:
+  --cli-path <path>        Select the WeChat DevTools installation
   --workspace-root <path>  Resolve relative project/output paths from this root
   -h, --help              Show this help
 
@@ -434,7 +440,10 @@ async function runMcpCommand(argv) {
 		printMcpHelp();
 		return;
 	}
-	await startWeappIdeMcpServer({ workspaceRoot: readOptionValue(argv, "--workspace-root") });
+	await startWeappIdeMcpServer({
+		cliPath: readOptionValue(argv, "--cli-path"),
+		workspaceRoot: readOptionValue(argv, "--workspace-root")
+	});
 }
 //#endregion
 export { readElementSnapshot as a, registerWeappIdeMcpTools as i, startWeappIdeMcpServer as n, resolveProjectPath as o, createWeappIdeMcpServer as r, toSerializableValue as s, runMcpCommand as t };