weapp-ide-cli 6.2.0 → 6.3.0

package/dist/index.d.ts

@@ -16,6 +16,37 @@ interface WechatDevtoolsProfileOptions {
   platform?: NodeJS.Platform;
 }
 //#endregion
+//#region src/devtoolsTarget/types.d.ts
+type WechatDevtoolsChannel = 'stable' | 'rc' | 'nightly';
+interface ResolvedWechatDevtoolsTarget extends WechatDevtoolsMetadata {
+  cliPath: string;
+  installationId: string;
+  appPath: string;
+  profileDir: string;
+}
+interface WechatDevtoolsSelectionOptions {
+  cliPath?: string;
+  target?: ResolvedWechatDevtoolsTarget;
+  devtoolsChannel?: WechatDevtoolsChannel;
+  devtoolsVersion?: string;
+  requireOfficialLatest?: boolean;
+}
+interface ResolveWechatDevtoolsTargetOptions extends WechatDevtoolsProfileOptions, WechatDevtoolsSelectionOptions {
+  searchRoots?: string[];
+  registryPath?: string;
+}
+interface WechatDevtoolsInstallation {
+  cliPath: string;
+  target?: ResolvedWechatDevtoolsTarget;
+  error?: string;
+}
+//#endregion
+//#region src/devtoolsTarget/discovery.d.ts
+/** 产品版本按数字段比较，避免日期版本的字符串排序漂移。 */
+export declare function compareWechatDevtoolsVersions(a: string, b: string): number;
+/** 只扫描已知安装根，不递归遍历磁盘，也不执行候选应用。 */
+export declare function listWechatDevtoolsInstallations(options?: ResolveWechatDevtoolsTargetOptions): Promise<WechatDevtoolsInstallation[]>;
+//#endregion
 //#region src/devtoolsTarget/host.d.ts
 interface WechatDevtoolsHostInspectionOptions {
   platform?: NodeJS.Platform;
@@ -27,19 +58,36 @@ export declare function assertWechatDevtoolsHost(target: ResolvedWechatDevtoolsT
 /** HTTP 与 WebSocket 的显式端口均需由所选安装持有，端口号本身不是宿主身份。 */
 export declare function assertWechatDevtoolsPort(target: ResolvedWechatDevtoolsTarget, port: number, options?: WechatDevtoolsHostInspectionOptions): Promise<void>;
 //#endregion
+//#region src/devtoolsTarget/official.d.ts
+export declare const WECHAT_DEVTOOLS_OFFICIAL_CHANNELS_URL = "https://devtools.wxqcloud.qq.com.cn/WechatWebDev/nightly/versions/config.json";
+/** 官方查询只提供版本证据，默认选择不依赖网络可用性。 */
+export declare function readOfficialWechatDevtoolsVersion(channel?: WechatDevtoolsChannel): Promise<{
+  version: string;
+  source: string;
+  queriedAt: string;
+}>;
+/** 仅显式严格模式要求所选安装匹配官方渠道最新版本。 */
+export declare function assertOfficialWechatDevtoolsVersion(target: ResolvedWechatDevtoolsTarget): Promise<{
+  version: string;
+  source: string;
+  queriedAt: string;
+}>;
+//#endregion
+//#region src/devtoolsTarget/registry.d.ts
+/** 校验安装后登记真实 CLI 路径，不更改默认选择或登录数据。 */
+export declare function registerWechatDevtoolsInstallation(cliPath: string, registryPath?: string): Promise<ResolvedWechatDevtoolsTarget>;
+/** 允许移除已经失效的登记；不会删除应用或用户配置。 */
+export declare function unregisterWechatDevtoolsInstallation(cliPath: string, registryPath?: string): Promise<void>;
+//#endregion
 //#region src/devtoolsTarget/index.d.ts
-export interface ResolvedWechatDevtoolsTarget extends WechatDevtoolsMetadata {
-  cliPath: string;
-  installationId: string;
-  appPath: string;
-  profileDir: string;
-}
-export interface ResolveWechatDevtoolsTargetOptions extends WechatDevtoolsProfileOptions {
-  cliPath?: string;
-  target?: ResolvedWechatDevtoolsTarget;
-}
-/** 一次解析 CLI、应用身份及配置目录，供本次操作的所有阶段共同使用。 */
+export declare function validateWechatDevtoolsSelection(options: WechatDevtoolsSelectionOptions): void;
+export declare function readWechatDevtoolsSelectionEnvironment(env?: NodeJS.ProcessEnv): WechatDevtoolsSelectionOptions;
+/** 每次操作只解析一次安装，显式选择覆盖继承的配置但不写回全局设置。 */
 export declare function resolveWechatDevtoolsTarget(options?: ResolveWechatDevtoolsTargetOptions): Promise<ResolvedWechatDevtoolsTarget>;
+/** 命令的所有异步阶段复用同一安装，彼此并发的调用不会污染环境变量。 */
+export declare function withWechatDevtoolsSelection<T>(options: ResolveWechatDevtoolsTargetOptions, runner: (target: ResolvedWechatDevtoolsTarget) => Promise<T>): Promise<T>;
+/** 读取当前操作固定的安装；没有活动选择时不触发发现或启动。 */
+export declare function getActiveWechatDevtoolsTarget(): ResolvedWechatDevtoolsTarget | undefined;
 //#endregion
 //#region src/cli/agentStart.d.ts
 export interface StartWechatIdeAgentOptions {
@@ -50,6 +98,8 @@ export interface StartWechatIdeAgentOptions {
   trustProject?: boolean;
   timeout?: number;
   signal?: AbortSignal;
+  /** 预检完成后、命令派发前登记启动意图；钩子开始后取消仍按派发结果未知处理。 */
+  onBeforeDispatch?: () => void | Promise<void>;
   /** 官方回执验证后先登记窗口所有权，再检查取消状态。 */
   onStarted?: (result: StartWechatIdeAgentResult) => void | Promise<void>;
 }
@@ -62,7 +112,7 @@ export interface StartWechatIdeAgentResult {
 export declare function startWechatIdeAgent(options: StartWechatIdeAgentOptions): Promise<StartWechatIdeAgentResult>;
 //#endregion
 //#region src/cli/automator/context.d.ts
-interface AutomatorInstallationOptions extends DevtoolsRuntimeSessionOptions {
+interface AutomatorInstallationOptions extends DevtoolsRuntimeSessionOptions, WechatDevtoolsSelectionOptions {
   target?: ResolvedWechatDevtoolsTarget;
   signal?: AbortSignal;
 }
@@ -173,7 +223,7 @@ export declare function removeOption(argv: readonly string[], optionName: string
 type MiniProgramLike = AutomatorMiniProgram;
 type MiniProgramPage = AutomatorPage;
 type MiniProgramElement = AutomatorElement;
-interface AutomatorSessionOptions extends DevtoolsRuntimeSessionOptions {
+interface AutomatorSessionOptions extends DevtoolsRuntimeSessionOptions, WechatDevtoolsSelectionOptions {
   signal?: AbortSignal;
   target?: ResolvedWechatDevtoolsTarget;
 }
@@ -329,8 +379,17 @@ export declare function parseCompareArgs(argv: string[]): CompareOptions;
  */
 export declare function handleConfigCommand(argv: string[]): Promise<void>;
 //#endregion
+//#region src/cli/devtoolsSelection.d.ts
+/** 包装参数不会透传官方 CLI，选项值和双横线后的内容保持原样。 */
+export declare function splitWechatDevtoolsSelectionArgs(argv: readonly string[]): {
+  args: string[];
+  selection: WechatDevtoolsSelectionOptions;
+};
+/** 显式选择在任何 helper 或 CLI 回退之前固定，避免入口间选版漂移。 */
+export declare function withWechatDevtoolsSelectionArgs<T>(argv: readonly string[], runner: (args: string[]) => Promise<T>): Promise<T>;
+//#endregion
 //#region src/cli/http.d.ts
-export interface WechatDevtoolsHttpCommandOptions {
+export interface WechatDevtoolsHttpCommandOptions extends WechatDevtoolsSelectionOptions {
   cliPath?: string;
   target?: ResolvedWechatDevtoolsTarget;
   port?: number;
@@ -552,9 +611,7 @@ export declare function promptWechatIdeLoginRetry(options: WechatIdeLoginRetryOp
  * @description 基于 cac 注册顶层命令，用于统一识别入口。
  */
 export declare function createCli(): import("cac").CAC;
-/**
- * @description CLI 入口解析与分发。
- */
+/** 在分发前剥离公共选择参数并固定本次安装。 */
 export declare function parse(argv: string[]): Promise<void>;
 //#endregion
 //#region src/cli/run-automator.d.ts
@@ -573,7 +630,7 @@ export declare function getAutomatorCommandHelp(command: string): string | undef
 export declare function runAutomatorCommand(command: string, argv: string[]): Promise<void>;
 //#endregion
 //#region src/cli/run-login.d.ts
-export interface RunWechatCliWithRetryOptions {
+export interface RunWechatCliWithRetryOptions extends WechatDevtoolsSelectionOptions {
   target?: ResolvedWechatDevtoolsTarget;
   silent?: boolean;
   timeout?: number;
@@ -623,24 +680,24 @@ export declare function parseScreenshotArgs(argv: string[]): ScreenshotOptions;
 export declare function validateWechatCliCommandArgs(argv: readonly string[]): void;
 //#endregion
 //#region src/cli/wechat-commands.d.ts
-export interface LoginWechatIdeOptions {
+export interface LoginWechatIdeOptions extends WechatDevtoolsSelectionOptions {
   qrFormat?: 'base64' | 'image' | 'terminal';
   qrOutput?: string;
   qrSize?: string;
   resultOutput?: string;
 }
-export interface OpenWechatIdeOptions {
+export interface OpenWechatIdeOptions extends WechatDevtoolsSelectionOptions {
   appid?: string;
   extAppid?: string;
   platform?: string;
   projectPath?: string;
   trustProject?: boolean;
 }
-export interface BuildWechatIdeNpmOptions {
+export interface BuildWechatIdeNpmOptions extends WechatDevtoolsSelectionOptions {
   compileType?: string;
   projectPath?: string;
 }
-export interface PreviewWechatIdeOptions {
+export interface PreviewWechatIdeOptions extends WechatDevtoolsSelectionOptions {
   appid?: string;
   compileCondition?: string;
   extAppid?: string;
@@ -650,14 +707,14 @@ export interface PreviewWechatIdeOptions {
   qrOutput?: string;
   qrSize?: string;
 }
-export interface AutoPreviewWechatIdeOptions {
+export interface AutoPreviewWechatIdeOptions extends WechatDevtoolsSelectionOptions {
   appid?: string;
   compileCondition?: string;
   extAppid?: string;
   infoOutput?: string;
   projectPath?: string;
 }
-export interface UploadWechatIdeOptions {
+export interface UploadWechatIdeOptions extends WechatDevtoolsSelectionOptions {
   appid?: string;
   desc: string;
   extAppid?: string;
@@ -665,7 +722,7 @@ export interface UploadWechatIdeOptions {
   projectPath?: string;
   version: string;
 }
-export interface AutoWechatIdeOptions {
+export interface AutoWechatIdeOptions extends WechatDevtoolsSelectionOptions {
   account?: string;
   appid?: string;
   extAppid?: string;
@@ -675,7 +732,7 @@ export interface AutoWechatIdeOptions {
   ticket?: string;
   trustProject?: boolean;
 }
-export interface AutoReplayWechatIdeOptions {
+export interface AutoReplayWechatIdeOptions extends WechatDevtoolsSelectionOptions {
   account?: string;
   appid?: string;
   extAppid?: string;
@@ -687,21 +744,21 @@ export interface AutoReplayWechatIdeOptions {
   ticket?: string;
   trustProject?: boolean;
 }
-export interface OpenWechatIdeOtherProjectOptions {
+export interface OpenWechatIdeOtherProjectOptions extends WechatDevtoolsSelectionOptions {
   projectPath?: string;
 }
-export interface CloseWechatIdeProjectOptions {
+export interface CloseWechatIdeProjectOptions extends WechatDevtoolsSelectionOptions {
   projectPath?: string;
   cliPath?: string;
   target?: ResolvedWechatDevtoolsTarget;
 }
-export interface ClearWechatIdeCacheOptions {
+export interface ClearWechatIdeCacheOptions extends WechatDevtoolsSelectionOptions {
   clean: 'all' | 'auth' | 'compile' | 'file' | 'network' | 'session' | 'storage';
 }
-export interface ResetWechatIdeFileUtilsOptions {
+export interface ResetWechatIdeFileUtilsOptions extends WechatDevtoolsSelectionOptions {
   projectPath: string;
 }
-export interface WechatIdeAutomatorSessionOptions {
+export interface WechatIdeAutomatorSessionOptions extends WechatDevtoolsSelectionOptions {
   port?: number;
   preferOpenedSession?: boolean;
   preserveProjectRoot?: boolean;
@@ -719,7 +776,7 @@ export interface ClearWechatIdeCacheByAutomatorOptions extends WechatIdeAutomato
 export interface SetWechatIdeTicketOptions extends WechatIdeAutomatorSessionOptions {
   ticket: string;
 }
-export interface BuildWechatIdeApkOptions {
+export interface BuildWechatIdeApkOptions extends WechatDevtoolsSelectionOptions {
   desc?: string;
   isUploadResourceBundle?: boolean;
   keyAlias: string;
@@ -731,7 +788,7 @@ export interface BuildWechatIdeApkOptions {
   storePass: string;
   useAab?: boolean;
 }
-export interface BuildWechatIdeIpaOptions {
+export interface BuildWechatIdeIpaOptions extends WechatDevtoolsSelectionOptions {
   certificateName?: string;
   isDistribute: boolean;
   isRemoteBuild?: boolean;
@@ -760,7 +817,7 @@ export declare function loginWechatIde(options?: LoginWechatIdeOptions): Promise
 export declare function isWechatIdeLoggedIn(options?: {
   nonInteractive?: boolean;
   silent?: boolean;
-}): Promise<void>;
+} & WechatDevtoolsSelectionOptions): Promise<void>;
 /**
  * @description 调用微信开发者工具 build-npm 命令。
  */
@@ -792,7 +849,7 @@ export declare function closeWechatIdeProject(options?: CloseWechatIdeProjectOpt
 /**
  * @description 调用微信开发者工具 quit 命令。
  */
-export declare function quitWechatIde(): Promise<void>;
+export declare function quitWechatIde(options?: WechatDevtoolsSelectionOptions): Promise<void>;
 /**
  * @description 调用微信开发者工具 cache 命令。
  */
@@ -800,7 +857,7 @@ export declare function clearWechatIdeCache(options: ClearWechatIdeCacheOptions)
 /**
  * @description 调用微信开发者工具 open-other 命令。
  */
-export declare function openWechatIdeOtherProject(_options?: OpenWechatIdeOtherProjectOptions): Promise<void>;
+export declare function openWechatIdeOtherProject(options?: OpenWechatIdeOtherProjectOptions): Promise<void>;
 /**
  * @description 通过微信开发者工具 HTTP 服务端口重置指定项目的 fileutils 状态。
  */
@@ -1003,7 +1060,7 @@ interface ManagedWechatInstallationExitEvidence {
   installationId: string;
   profileDir: string;
   previous: {
-    state: 'starting' | 'unconfirmed' | 'failed';
+    state: 'starting' | 'unconfirmed' | 'failed' | 'borrowed';
     error?: string;
     updatedAt: string;
     recordSha256: string;
@@ -1060,6 +1117,20 @@ interface ManagedWechatWindowCloseEvidence {
     cursors: ManagedWechatWindowLogCursor[];
   };
 }
+interface ManagedWechatProjectSnapshot {
+  protocol: 'wechat-devtools-project-snapshot-v1';
+  sourceProjectPath: string;
+  token: string;
+  state: 'reserved' | 'ready' | 'removed';
+  directoryIdentity?: {
+    dev: string;
+    ino: string;
+  };
+  dispatchedAt?: string;
+  cleanupStartedAt?: string;
+  removedAt?: string;
+  cleanupError?: string;
+}
 interface ManagedWechatProjectRecord {
   schemaVersion: 1;
   id: string;
@@ -1079,10 +1150,11 @@ interface ManagedWechatProjectRecord {
   closeAcknowledgedAt?: string;
   /** 端口退出不是窗口退出；保存所选 profile 的增量销毁证据供父任务恢复。 */
   windowClose?: ManagedWechatWindowCloseEvidence;
-  releasedReason?: 'borrowed' | 'project-closed' | 'installation-exited';
+  releasedReason?: 'borrowed' | 'project-closed' | 'installation-exited' | 'not-started';
   /** 显式恢复只终结已退出安装的活资源；原启动失败与归属缺口仍保留。 */
   installationExitRecovery?: ManagedWechatInstallationExitEvidence;
   error?: string;
+  snapshot?: ManagedWechatProjectSnapshot;
 }
 interface BeginManagedWechatProjectOptions {
   target: ResolvedWechatDevtoolsTarget;
@@ -1092,10 +1164,15 @@ interface BeginManagedWechatProjectOptions {
   journalPath?: string;
   /** 当前任务根作用域最多持有一个窗口；双项目验收须显式指定两个。 */
   maxOwnedWindows?: 1 | 2;
+  /** 将输入项目的布局快照持久绑定当前任务 owner。 */
+  snapshotProject?: boolean;
 }
 interface ManagedWechatProjectIntent {
   id: string;
   journalPath: string;
+  projectPath: string;
+  prepareSnapshot: (populate: (projectPath: string) => Promise<void>) => Promise<void>;
+  markLaunchDispatched: () => Promise<void>;
   confirm: (result: {
     openedProjectWindow: boolean;
     port: number;
@@ -1129,6 +1206,13 @@ export declare const MANAGED_PROJECT_MAX_WINDOWS_ENV = "WEAPP_IDE_MANAGED_PROJEC
 /** 仅递归当前任务明确传递的 children；不扫描用户缓存，不跟随符号链接。 */
 export declare function readManagedWechatProjectRecords(journalPath?: string): Promise<ManagedWechatProjectRecord[]>;
 //#endregion
+//#region src/devtoolsProjectOwnership/snapshot/index.d.ts
+/** 窗口已经释放不代表本任务快照也已回收。 */
+export declare function isManagedWechatProjectFullyReleased(record: {
+  state: ManagedWechatProjectRecord['state'];
+  snapshot?: Pick<NonNullable<ManagedWechatProjectRecord['snapshot']>, 'state'>;
+}): boolean;
+//#endregion
 //#region src/devtoolsProjectOwnership/index.d.ts
 /** 窗口销毁与连接断开分别验证；失败保留登记供后续继续观察。 */
 export declare function closeManagedWechatProject(options: {
@@ -1236,4 +1320,4 @@ export declare function execute(cliPath: string, argv: string[], options?: Execu
  */
 export declare function resolvePath(filePath: string): string;
 //#endregion
-export { type AutomatorSessionOptions, type BaseConfig, type BeginManagedWechatProjectOptions, type CleanupManagedWechatProjectsOptions, type ConfigSource, type DevtoolsConnectionInput, type DevtoolsContext, type DevtoolsElementSnapshot, type DevtoolsPageSnapshot, type DevtoolsToolResult, type ManagedWechatHostIdentity, type ManagedWechatInstallationExitEvidence, type ManagedWechatProjectIntent, type ManagedWechatProjectRecord, type ManagedWechatProjectState, type ManagedWechatWindowCloseCall, type ManagedWechatWindowCloseEvidence, type ManagedWechatWindowLogCursor, type MiniProgramElement, type MiniProgramEventMap, type MiniProgramLike, type MiniProgramPage, type ResolvedConfig, type WechatDevtoolsHostInspectionOptions, closeSharedMiniProgram, getSharedMiniProgramSessionCount, readElementSnapshot, releaseSharedMiniProgram, resolveProjectPath, toSerializableValue };
+export { type AutomatorSessionOptions, type BaseConfig, type BeginManagedWechatProjectOptions, type CleanupManagedWechatProjectsOptions, type ConfigSource, type DevtoolsConnectionInput, type DevtoolsContext, type DevtoolsElementSnapshot, type DevtoolsPageSnapshot, type DevtoolsToolResult, type ManagedWechatHostIdentity, type ManagedWechatInstallationExitEvidence, type ManagedWechatProjectIntent, type ManagedWechatProjectRecord, type ManagedWechatProjectSnapshot, type ManagedWechatProjectState, type ManagedWechatWindowCloseCall, type ManagedWechatWindowCloseEvidence, type ManagedWechatWindowLogCursor, type MiniProgramElement, type MiniProgramEventMap, type MiniProgramLike, type MiniProgramPage, type ResolveWechatDevtoolsTargetOptions, type ResolvedConfig, type ResolvedWechatDevtoolsTarget, type WechatDevtoolsChannel, type WechatDevtoolsHostInspectionOptions, type WechatDevtoolsInstallation, type WechatDevtoolsSelectionOptions, closeSharedMiniProgram, getSharedMiniProgramSessionCount, readElementSnapshot, releaseSharedMiniProgram, resolveProjectPath, toSerializableValue };

package/dist/index.js

@@ -1,8 +1,8 @@
-import { C as getDefaultCliPath, S as SupportedPlatformsMap, T as operatingSystemName, _ as readCustomConfig, a as assertWechatDevtoolsPort, b as defaultCustomConfigFilePath, d as resolveDevtoolsAutomationDefaults, f as createAutoBootstrapDevtoolsConfig, g as overwriteCustomConfig, h as createLocaleConfig, i as assertWechatDevtoolsHost, l as getConfig, m as createCustomConfig, p as createAutoTrustProjectConfig, r as resolveWechatDevtoolsTarget, u as getConfiguredLocale, v as removeCustomConfigKey, w as isOperatingSystemSupported, x as resolvePath, y as defaultCustomConfigDirPath } from "./sessionStore-zdzy2UFM.js";
-import { d as MANAGED_PROJECT_MAX_WINDOWS_ENV, h as startWechatIdeAgent, i as recoverManagedWechatProjectsAfterInstallationExit, n as cleanupManagedWechatProjects, o as readManagedWechatProjectRecords, r as closeManagedWechatProject, t as beginManagedWechatProject, u as MANAGED_PROJECT_JOURNAL_ENV } from "./devtoolsProjectOwnership-yDD6h0dO.js";
-import { a as bootstrapWechatDevtoolsSettings, c as getAutomatorProtocolTimeoutMethod, d as isAutomatorProtocolTimeoutError, f as isAutomatorWsConnectError, g as resolveAutomatorSessionOptions, h as isRetryableAutomatorLaunchError, i as resolveProjectAutomatorPort, l as isAutomatorLoginError, m as isDevtoolsHttpPortError, n as launchAutomator, o as detectWechatDevtoolsServicePort, p as isDevtoolsExtensionContextInvalidatedError, r as persistOpenedAutomatorSession, s as formatAutomatorLoginError, t as connectOpenedAutomator, u as isAutomatorPortInUseError } from "./automator-CRpB6_pA.js";
-import { $ as MINIDEV_NAMESPACE_COMMAND_NAMES, A as queryWechatIdeLogin, B as WECHAT_DEVTOOLS_ENGINE_BUILD_STATUSES, C as refreshWechatIdeTicket, D as validateWechatCliCommandArgs, E as uploadWechatIde, F as startForwardConsole, G as startWechatIdeEngineBuildByHttp, H as pollWechatIdeEngineBuildResultByHttp, I as isWechatIdeEngineBuildEndpointMissingError, J as handleConfigCommand, K as getRuntimeWechatDevtoolsServicePort, L as prepareAcceptanceProject, M as createAlias, N as createPathCompat, O as runWechatCliWithRetry, P as transformArgv, Q as MCP_COMMAND_NAME, R as runWechatIdeEngineBuild, S as quitWechatIde, T as setWechatIdeTicket, U as requestWechatDevtoolsHttp, V as openWechatIdeProjectByHttp, W as resetWechatIdeFileUtilsByHttp, X as promptForCliPath, Y as resolveCliPath, Z as CONFIG_COMMAND_NAME, _ as isWechatIdeLoggedIn, a as autoReplayWechatIde, at as isAutomatorCommand, b as openWechatIdeOtherProject, c as buildWechatIdeIpa, ct as printScreenshotHelp, d as clearWechatIdeCacheByAutomator, dt as parseAutomatorArgs, et as WEAPP_IDE_TOP_LEVEL_COMMAND_NAMES, f as closeWechatIdeProject, ft as readBooleanOption, g as getWechatIdeToolInfo, h as getWechatIdeTicket, i as autoPreviewWechatIde, it as getAutomatorCommandHelp, j as execute, k as runMinidev, l as buildWechatIdeNpm, lt as parseCompareArgs, m as getWechatIdeTestAccounts, mt as removeOption, n as parse, nt as isWeappIdeTopLevelCommand, o as autoWechatIde, ot as runAutomatorCommand, p as compileWechatIdeByAutomator, pt as readOptionValue, q as setRuntimeWechatDevtoolsServicePort, r as dispatchWechatCliCommand, rt as AUTOMATOR_COMMAND_NAMES, s as buildWechatIdeApk, st as parseScreenshotArgs, t as createCli, tt as WECHAT_CLI_COMMAND_NAMES, u as clearWechatIdeCache, ut as printCompareHelp, v as loginWechatIde, w as resetWechatIdeFileUtils, x as previewWechatIde, y as openWechatIde, z as runWechatIdeEngineBuildByHttp } from "./cli-ChMQqi5w.js";
-import { C as runWithSuspendedSharedInput, S as createSharedInputSession, _ as isWechatIdeLoginRequiredError, a as connectMiniProgram, b as promptWechatIdeLoginRetry, c as withMiniProgram, d as RETRY_CONFIRM_KEYS, f as RETRY_PROMPT_INITIAL_IGNORE_MS, g as formatWechatIdeLoginRequiredError, h as formatRetryHotkeyPrompt, l as runRetryableCommand, m as extractExecutionErrorText, n as acquireSharedMiniProgram, o as getSharedMiniProgramSessionCount, p as createWechatIdeLoginRequiredExitError, r as closeSharedMiniProgram, s as releaseSharedMiniProgram, u as RETRY_CANCEL_KEYS, v as isWechatIdeLoginRequiredExitError, w as waitForExclusiveKeypress, x as waitForRetryKeypress, y as promptRetryKeypress } from "./automator-session-gWEsSs_A.js";
-import { a as navigateBack, c as pageStack, d as remote, f as scrollTo, g as tap, h as takeScreenshot, i as input, l as reLaunch, m as systemInfo, n as captureScreenshotBuffer, o as navigateTo, p as switchTab, r as currentPage, s as pageData, t as audit, u as redirectTo } from "./commands-C1PF1B4P.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-Dl_1TH1x.js";
-export { AUTOMATOR_COMMAND_NAMES, CONFIG_COMMAND_NAME, MANAGED_PROJECT_JOURNAL_ENV, MANAGED_PROJECT_MAX_WINDOWS_ENV, 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, assertWechatDevtoolsHost, assertWechatDevtoolsPort, audit, autoPreviewWechatIde, autoReplayWechatIde, autoWechatIde, beginManagedWechatProject, bootstrapWechatDevtoolsSettings, buildWechatIdeApk, buildWechatIdeIpa, buildWechatIdeNpm, captureScreenshotBuffer, cleanupManagedWechatProjects, clearWechatIdeCache, clearWechatIdeCacheByAutomator, closeManagedWechatProject, closeSharedMiniProgram, closeWechatIdeProject, compileWechatIdeByAutomator, connectMiniProgram, connectOpenedAutomator, createAlias, createAutoBootstrapDevtoolsConfig, createAutoTrustProjectConfig, createCli, createCustomConfig, createLocaleConfig, createPathCompat, createSharedInputSession, createWeappIdeMcpServer, createWechatIdeLoginRequiredExitError, currentPage, defaultCustomConfigDirPath, defaultCustomConfigFilePath, detectWechatDevtoolsServicePort, dispatchWechatCliCommand, execute, extractExecutionErrorText, formatAutomatorLoginError, formatRetryHotkeyPrompt, formatWechatIdeLoginRequiredError, getAutomatorCommandHelp, getAutomatorProtocolTimeoutMethod, getConfig, getConfiguredLocale, getDefaultCliPath, getRuntimeWechatDevtoolsServicePort, getSharedMiniProgramSessionCount, getWechatIdeTestAccounts, getWechatIdeTicket, getWechatIdeToolInfo, handleConfigCommand, input, isAutomatorCommand, isAutomatorLoginError, isAutomatorPortInUseError, isAutomatorProtocolTimeoutError, isAutomatorWsConnectError, isDevtoolsExtensionContextInvalidatedError, isDevtoolsHttpPortError, isOperatingSystemSupported, isRetryableAutomatorLaunchError, isWeappIdeTopLevelCommand, isWechatIdeEngineBuildEndpointMissingError, isWechatIdeLoggedIn, isWechatIdeLoginRequiredError, isWechatIdeLoginRequiredExitError, launchAutomator, loginWechatIde, navigateBack, navigateTo, openWechatIde, openWechatIdeOtherProject, openWechatIdeProjectByHttp, operatingSystemName, overwriteCustomConfig, pageData, pageStack, parse, parseAutomatorArgs, parseCompareArgs, parseScreenshotArgs, persistOpenedAutomatorSession, pollWechatIdeEngineBuildResultByHttp, prepareAcceptanceProject, previewWechatIde, printCompareHelp, printScreenshotHelp, promptForCliPath, promptRetryKeypress, promptWechatIdeLoginRetry, queryWechatIdeLogin, quitWechatIde, reLaunch, readBooleanOption, readCustomConfig, readElementSnapshot, readManagedWechatProjectRecords, readOptionValue, recoverManagedWechatProjectsAfterInstallationExit, redirectTo, refreshWechatIdeTicket, registerWeappIdeMcpTools, releaseSharedMiniProgram, remote, removeCustomConfigKey, removeOption, requestWechatDevtoolsHttp, resetWechatIdeFileUtils, resetWechatIdeFileUtilsByHttp, resolveAutomatorSessionOptions, resolveCliPath, resolveDevtoolsAutomationDefaults, resolvePath, resolveProjectAutomatorPort, resolveProjectPath, resolveWechatDevtoolsTarget, runAutomatorCommand, runMcpCommand, runMinidev, runRetryableCommand, runWechatCliWithRetry, runWechatIdeEngineBuild, runWechatIdeEngineBuildByHttp, runWithSuspendedSharedInput, scrollTo, setRuntimeWechatDevtoolsServicePort, setWechatIdeTicket, startForwardConsole, startWeappIdeMcpServer, startWechatIdeAgent, startWechatIdeEngineBuildByHttp, switchTab, systemInfo, takeScreenshot, tap, toSerializableValue, transformArgv, uploadWechatIde, validateWechatCliCommandArgs, waitForExclusiveKeypress, waitForRetryKeypress, withMiniProgram };
+import { A as operatingSystemName, B as removeCustomConfigKey, C as registerWechatDevtoolsInstallation, D as SupportedPlatformsMap, F as createAutoTrustProjectConfig, H as defaultCustomConfigFilePath, I as createCustomConfig, L as createLocaleConfig, O as getDefaultCliPath, P as createAutoBootstrapDevtoolsConfig, R as overwriteCustomConfig, U as resolvePath, V as defaultCustomConfigDirPath, _ as WECHAT_DEVTOOLS_OFFICIAL_CHANNELS_URL, b as compareWechatDevtoolsVersions, c as getActiveWechatDevtoolsTarget, d as validateWechatDevtoolsSelection, f as withWechatDevtoolsSelection, k as isOperatingSystemSupported, l as readWechatDevtoolsSelectionEnvironment, m as assertWechatDevtoolsPort, o as MANAGED_PROJECT_JOURNAL_ENV, p as assertWechatDevtoolsHost, s as MANAGED_PROJECT_MAX_WINDOWS_ENV, u as resolveWechatDevtoolsTarget, v as assertOfficialWechatDevtoolsVersion, w as unregisterWechatDevtoolsInstallation, x as listWechatDevtoolsInstallations, y as readOfficialWechatDevtoolsVersion, z as readCustomConfig } from "./automatorProject-DjYLqMj6.js";
+import { a as isManagedWechatProjectFullyReleased, i as recoverManagedWechatProjectsAfterInstallationExit, m as startWechatIdeAgent, n as cleanupManagedWechatProjects, r as closeManagedWechatProject, s as readManagedWechatProjectRecords, t as beginManagedWechatProject } from "./devtoolsProjectOwnership-BMfSAg4n.js";
+import { A as waitForExclusiveKeypress, C as isWechatIdeLoginRequiredError, D as waitForRetryKeypress, E as promptWechatIdeLoginRetry, O as createSharedInputSession, P as resolveAutomatorSessionOptions, S as formatWechatIdeLoginRequiredError, T as promptRetryKeypress, _ as RETRY_CONFIRM_KEYS, a as bootstrapWechatDevtoolsSettings, b as extractExecutionErrorText, c as getAutomatorProtocolTimeoutMethod, d as isAutomatorProtocolTimeoutError, f as isAutomatorWsConnectError, g as RETRY_CANCEL_KEYS, h as isRetryableAutomatorLaunchError, i as resolveProjectAutomatorPort, k as runWithSuspendedSharedInput, l as isAutomatorLoginError, m as isDevtoolsHttpPortError, n as launchAutomator, o as detectWechatDevtoolsServicePort, p as isDevtoolsExtensionContextInvalidatedError, r as persistOpenedAutomatorSession, s as formatAutomatorLoginError, t as connectOpenedAutomator, u as isAutomatorPortInUseError, v as RETRY_PROMPT_INITIAL_IGNORE_MS, w as isWechatIdeLoginRequiredExitError, x as formatRetryHotkeyPrompt, y as createWechatIdeLoginRequiredExitError } from "./automator-BOe32upt.js";
+import { $ as getConfig, A as queryWechatIdeLogin, B as WECHAT_DEVTOOLS_ENGINE_BUILD_STATUSES, C as refreshWechatIdeTicket, D as validateWechatCliCommandArgs, E as uploadWechatIde, F as startForwardConsole, G as startWechatIdeEngineBuildByHttp, H as pollWechatIdeEngineBuildResultByHttp, I as isWechatIdeEngineBuildEndpointMissingError, J as splitWechatDevtoolsSelectionArgs, K as getRuntimeWechatDevtoolsServicePort, L as prepareAcceptanceProject, M as createAlias, N as createPathCompat, O as runWechatCliWithRetry, P as transformArgv, Q as promptForCliPath, R as runWechatIdeEngineBuild, S as quitWechatIde, T as setWechatIdeTicket, U as requestWechatDevtoolsHttp, V as openWechatIdeProjectByHttp, W as resetWechatIdeFileUtilsByHttp, X as handleConfigCommand, Y as withWechatDevtoolsSelectionArgs, Z as resolveCliPath, _ as isWechatIdeLoggedIn, _t as readBooleanOption, a as autoReplayWechatIde, at as WEAPP_IDE_TOP_LEVEL_COMMAND_NAMES, b as openWechatIdeOtherProject, c as buildWechatIdeIpa, ct as AUTOMATOR_COMMAND_NAMES, d as clearWechatIdeCacheByAutomator, dt as runAutomatorCommand, et as getConfiguredLocale, f as closeWechatIdeProject, ft as parseScreenshotArgs, g as getWechatIdeToolInfo, gt as parseAutomatorArgs, h as getWechatIdeTicket, ht as printCompareHelp, i as autoPreviewWechatIde, it as MINIDEV_NAMESPACE_COMMAND_NAMES, j as execute, k as runMinidev, l as buildWechatIdeNpm, lt as getAutomatorCommandHelp, m as getWechatIdeTestAccounts, mt as parseCompareArgs, n as parse, nt as CONFIG_COMMAND_NAME, o as autoWechatIde, ot as WECHAT_CLI_COMMAND_NAMES, p as compileWechatIdeByAutomator, pt as printScreenshotHelp, q as setRuntimeWechatDevtoolsServicePort, r as dispatchWechatCliCommand, rt as MCP_COMMAND_NAME, s as buildWechatIdeApk, st as isWeappIdeTopLevelCommand, t as createCli, tt as resolveDevtoolsAutomationDefaults, u as clearWechatIdeCache, ut as isAutomatorCommand, v as loginWechatIde, vt as readOptionValue, w as resetWechatIdeFileUtils, x as previewWechatIde, y as openWechatIde, yt as removeOption, z as runWechatIdeEngineBuildByHttp } from "./cli-CFlqFpIw.js";
+import { c as releaseSharedMiniProgram, i as closeSharedMiniProgram, l as withMiniProgram, n as acquireSharedMiniProgram, o as connectMiniProgram, s as getSharedMiniProgramSessionCount, u as runRetryableCommand } from "./automator-session-VOB03glx.js";
+import { a as navigateBack, c as pageStack, d as remote, f as scrollTo, g as tap, h as takeScreenshot, i as input, l as reLaunch, m as systemInfo, n as captureScreenshotBuffer, o as navigateTo, p as switchTab, r as currentPage, s as pageData, t as audit, u as redirectTo } from "./commands-mslf7-sP.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-Ni139Z5C.js";
+export { AUTOMATOR_COMMAND_NAMES, CONFIG_COMMAND_NAME, MANAGED_PROJECT_JOURNAL_ENV, MANAGED_PROJECT_MAX_WINDOWS_ENV, 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, WECHAT_DEVTOOLS_OFFICIAL_CHANNELS_URL, acquireSharedMiniProgram, assertOfficialWechatDevtoolsVersion, assertWechatDevtoolsHost, assertWechatDevtoolsPort, audit, autoPreviewWechatIde, autoReplayWechatIde, autoWechatIde, beginManagedWechatProject, bootstrapWechatDevtoolsSettings, buildWechatIdeApk, buildWechatIdeIpa, buildWechatIdeNpm, captureScreenshotBuffer, cleanupManagedWechatProjects, clearWechatIdeCache, clearWechatIdeCacheByAutomator, closeManagedWechatProject, closeSharedMiniProgram, closeWechatIdeProject, compareWechatDevtoolsVersions, compileWechatIdeByAutomator, connectMiniProgram, connectOpenedAutomator, createAlias, createAutoBootstrapDevtoolsConfig, createAutoTrustProjectConfig, createCli, createCustomConfig, createLocaleConfig, createPathCompat, createSharedInputSession, createWeappIdeMcpServer, createWechatIdeLoginRequiredExitError, currentPage, defaultCustomConfigDirPath, defaultCustomConfigFilePath, detectWechatDevtoolsServicePort, dispatchWechatCliCommand, execute, extractExecutionErrorText, formatAutomatorLoginError, formatRetryHotkeyPrompt, formatWechatIdeLoginRequiredError, getActiveWechatDevtoolsTarget, getAutomatorCommandHelp, getAutomatorProtocolTimeoutMethod, getConfig, getConfiguredLocale, getDefaultCliPath, getRuntimeWechatDevtoolsServicePort, getSharedMiniProgramSessionCount, getWechatIdeTestAccounts, getWechatIdeTicket, getWechatIdeToolInfo, handleConfigCommand, input, isAutomatorCommand, isAutomatorLoginError, isAutomatorPortInUseError, isAutomatorProtocolTimeoutError, isAutomatorWsConnectError, isDevtoolsExtensionContextInvalidatedError, isDevtoolsHttpPortError, isManagedWechatProjectFullyReleased, isOperatingSystemSupported, isRetryableAutomatorLaunchError, isWeappIdeTopLevelCommand, isWechatIdeEngineBuildEndpointMissingError, isWechatIdeLoggedIn, isWechatIdeLoginRequiredError, isWechatIdeLoginRequiredExitError, launchAutomator, listWechatDevtoolsInstallations, loginWechatIde, navigateBack, navigateTo, openWechatIde, openWechatIdeOtherProject, openWechatIdeProjectByHttp, operatingSystemName, overwriteCustomConfig, pageData, pageStack, parse, parseAutomatorArgs, parseCompareArgs, parseScreenshotArgs, persistOpenedAutomatorSession, pollWechatIdeEngineBuildResultByHttp, prepareAcceptanceProject, previewWechatIde, printCompareHelp, printScreenshotHelp, promptForCliPath, promptRetryKeypress, promptWechatIdeLoginRetry, queryWechatIdeLogin, quitWechatIde, reLaunch, readBooleanOption, readCustomConfig, readElementSnapshot, readManagedWechatProjectRecords, readOfficialWechatDevtoolsVersion, readOptionValue, readWechatDevtoolsSelectionEnvironment, recoverManagedWechatProjectsAfterInstallationExit, redirectTo, refreshWechatIdeTicket, registerWeappIdeMcpTools, registerWechatDevtoolsInstallation, releaseSharedMiniProgram, remote, removeCustomConfigKey, removeOption, requestWechatDevtoolsHttp, resetWechatIdeFileUtils, resetWechatIdeFileUtilsByHttp, resolveAutomatorSessionOptions, resolveCliPath, resolveDevtoolsAutomationDefaults, resolvePath, resolveProjectAutomatorPort, resolveProjectPath, resolveWechatDevtoolsTarget, runAutomatorCommand, runMcpCommand, runMinidev, runRetryableCommand, runWechatCliWithRetry, runWechatIdeEngineBuild, runWechatIdeEngineBuildByHttp, runWithSuspendedSharedInput, scrollTo, setRuntimeWechatDevtoolsServicePort, setWechatIdeTicket, splitWechatDevtoolsSelectionArgs, startForwardConsole, startWeappIdeMcpServer, startWechatIdeAgent, startWechatIdeEngineBuildByHttp, switchTab, systemInfo, takeScreenshot, tap, toSerializableValue, transformArgv, unregisterWechatDevtoolsInstallation, uploadWechatIde, validateWechatCliCommandArgs, validateWechatDevtoolsSelection, waitForExclusiveKeypress, waitForRetryKeypress, withMiniProgram, withWechatDevtoolsSelection, withWechatDevtoolsSelectionArgs };

package/dist/{managed-Sq8y8FzP.js → managed-B04Xo9U_.js}

@@ -1,5 +1,5 @@
-import { a as assertWechatDevtoolsPort, t as persistAutomatorSession } from "./sessionStore-zdzy2UFM.js";
-import { h as startWechatIdeAgent, t as beginManagedWechatProject } from "./devtoolsProjectOwnership-yDD6h0dO.js";
+import { i as persistAutomatorSession, m as assertWechatDevtoolsPort, n as readAutomatorProjectPlan, t as populateAutomatorProjectSnapshot } from "./automatorProject-DjYLqMj6.js";
+import { m as startWechatIdeAgent, t as beginManagedWechatProject } from "./devtoolsProjectOwnership-BMfSAg4n.js";
 import path from "node:path";
 import { withMachineE2ELease } from "@weapp-vite/devtools-runtime";
 import { execa } from "execa";
@@ -67,30 +67,77 @@ async function importManagedDevtoolsProject(options) {
 }
 //#endregion
 //#region src/cli/automator/managed.ts
-/** 受管启动持有完整窗口回执，失败清理不受启动 deadline 的短暂宽限限制。 */
+/** 受管启动持有完整窗口回执，快照始终由持久 journal 持有。 */
 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;
+	const { launcher, scope, target, sourceProjectPath, port } = options;
+	let projectPath = options.projectPath;
+	let portLease;
 	let intent;
 	let program;
+	let allowCleanup;
+	const acquisitionSettled = new Promise((resolve) => {
+		allowCleanup = resolve;
+	});
+	let cleaning;
+	const cleanupLaunch = () => cleaning ??= (async () => {
+		await acquisitionSettled;
+		const errors = [];
+		let disconnected = !program;
+		try {
+			await program?.disconnect();
+			disconnected = true;
+		} catch (error) {
+			errors.push(error);
+		}
+		let projectClosed = !intent;
+		try {
+			await intent?.close();
+			projectClosed = true;
+		} catch (error) {
+			errors.push(error);
+		}
+		if (disconnected && projectClosed) await portLease?.release().catch((error) => errors.push(error));
+		if (errors.length) throw new AggregateError(errors, "Managed DevTools session cleanup failed");
+	})().catch((error) => {
+		cleaning = void 0;
+		throw error;
+	});
+	let disownResources = () => {};
 	try {
-		intent = await beginManagedWechatProject({
+		disownResources = scope.own(cleanupLaunch, "managed-automator-session");
+		const snapshotPlan = options.preserveProjectRoot ? void 0 : await readAutomatorProjectPlan(projectPath);
+		scope.throwIfAborted();
+		if (snapshotPlan) {
+			intent = await beginManagedWechatProject({
+				target,
+				projectPath,
+				port,
+				snapshotProject: true
+			});
+			if (!intent) throw new Error("DEVTOOLS_MANAGED_PROJECT_JOURNAL_REQUIRED: managed launch requires a project ownership journal.");
+			projectPath = intent.projectPath;
+			await intent.prepareSnapshot(async (destination) => await populateAutomatorProjectSnapshot(snapshotPlan, destination));
+			scope.throwIfAborted();
+		}
+		await scope.step(() => importManagedDevtoolsProject({
+			cliPath: target.cliPath,
+			projectPath,
+			trusted: options.trustProject,
+			timeout: scope.remainingMs(),
+			signal: scope.signal
+		}), { stage: "project-import" });
+		scope.throwIfAborted();
+		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().catch((error) => {
+			releasedPortLease = void 0;
+			throw error;
+		});
+		intent ??= await beginManagedWechatProject({
 			target,
 			projectPath,
 			port
@@ -104,6 +151,7 @@ async function launchManagedAutomator(options) {
 			trustProject: options.trustProject,
 			signal: scope.signal,
 			timeout: scope.remainingMs(),
+			...snapshotPlan ? { onBeforeDispatch: async () => await intent.markLaunchDispatched() } : {},
 			onStarted: async (result) => await intent.confirm({
 				openedProjectWindow: result.openedProjectWindow,
 				port: result.autoPort
@@ -153,56 +201,60 @@ async function launchManagedAutomator(options) {
 		}
 		const connectedProgram = program;
 		const ownedIntent = intent;
+		const ownedPortLease = portLease;
 		const rawDisconnect = connectedProgram.disconnect.bind(connectedProgram);
+		let disconnecting;
 		connectedProgram.disconnect = (...args) => {
-			try {
-				return rawDisconnect(...args);
-			} finally {
-				portLease.release();
-			}
+			disconnecting ??= (async () => {
+				await rawDisconnect(...args);
+				await ownedPortLease.release();
+			})().catch((error) => {
+				disconnecting = void 0;
+				throw error;
+			});
+			return disconnecting;
 		};
 		let closing;
 		connectedProgram.close = async () => {
 			closing ??= (async () => {
+				const errors = [];
+				let disconnected = false;
 				try {
-					connectedProgram.disconnect();
-				} finally {
-					try {
-						await ownedIntent.close();
-					} finally {
-						await portLease.release();
-					}
+					await connectedProgram.disconnect();
+					disconnected = true;
+				} catch (error) {
+					errors.push(error);
 				}
+				let projectClosed = false;
+				try {
+					await ownedIntent.close();
+					projectClosed = true;
+				} catch (error) {
+					errors.push(error);
+				}
+				if (disconnected && projectClosed) await ownedPortLease.release().catch((error) => errors.push(error));
+				if (errors.length) throw new AggregateError(errors, "Managed DevTools session cleanup failed");
 			})().finally(() => {
 				closing = void 0;
 			});
 			return await closing;
 		};
-		releasePortLeaseOnExit = false;
-		disownPortLease();
+		disownResources();
+		allowCleanup();
 		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 (intent) try {
+			await intent.fail(error);
+		} catch (recordError) {
+			errors.push(recordError);
 		}
-		if (releasePortLeaseOnExit) {
-			disownPortLease();
-			await portLease.release().catch((releaseError) => errors.push(releaseError));
+		allowCleanup();
+		try {
+			await cleanupLaunch();
+			disownResources();
+		} catch (cleanupError) {
+			errors.push(...cleanupError instanceof AggregateError ? cleanupError.errors : [cleanupError]);
 		}
 		if (errors.length > 1) throw new AggregateError(errors, "Managed DevTools launch failed and project cleanup did not complete.", { cause: error });
 		throw error;

package/dist/run-mcp-83-VKZVA.js

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

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

@@ -1,4 +1,4 @@
-import { c as withMiniProgram$1 } from "./automator-session-gWEsSs_A.js";
+import { l as withMiniProgram$1 } from "./automator-session-VOB03glx.js";
 import path from "node:path";
 import { readDevtoolsElementSnapshot as readElementSnapshot, resolveDevtoolsProjectPath as resolveProjectPath, toDevtoolsSerializableValue as toSerializableValue } from "@weapp-vite/devtools-runtime";
 import fs from "node:fs/promises";
@@ -15,6 +15,9 @@ function createResolvedOutputPath(workspaceRoot, outputPath) {
 async function withConnectedMiniProgram(runtimeHooks, workspaceRoot, input, runner) {
 	return await runtimeHooks.withMiniProgram({
 		cliPath: input.cliPath,
+		devtoolsChannel: input.devtoolsChannel,
+		devtoolsVersion: input.devtoolsVersion,
+		requireOfficialLatest: input.requireOfficialLatest,
 		preferOpenedSession: input.preferOpenedSession,
 		port: input.port,
 		projectPath: createResolvedProjectPath(workspaceRoot, input.projectPath),
@@ -31,6 +34,13 @@ async function withConnectedPage(runtimeHooks, workspaceRoot, input, runner) {
 function defineConnectionSchema() {
 	return {
 		cliPath: z.string().trim().min(1).optional().describe("指定微信开发者工具 CLI 安装路径"),
+		devtoolsChannel: z.enum([
+			"stable",
+			"rc",
+			"nightly"
+		]).optional(),
+		devtoolsVersion: z.string().regex(/^\d+(?:\.\d+){2,}$/).optional(),
+		requireOfficialLatest: z.boolean().optional(),
 		projectPath: z.string().trim().min(1).describe("小程序项目路径，支持 workspaceRoot 相对路径"),
 		timeout: z.number().int().positive().optional(),
 		port: z.number().int().positive().max(65535).optional(),