android-midscene-automation 0.1.35 → 0.1.37

package/CHANGELOG.md

@@ -1,7 +1,16 @@
 # 更新记录
+## v0.1.37
+- 修复元素查找超时未覆盖 Appium 请求的问题，驱动无响应时及时中止并明确报错，不再误判为找不到元素；唯一原生定位优先使用 ID 或 Accessibility ID。
+- 设备预览新增设备信息，展示设备名称、品牌、型号、处理器、Android 版本、物理分辨率及当前分辨率，支持远程设备；问号位于标题右侧，样式与全局变量帮助图标一致。
+- 新增独立“杀死 APP”操作节点，默认使用当前选中应用包名，支持编辑目标包名；停止当前设备用户下的应用进程，不清除应用数据。
+- Midscene 相关模块由 1.12.5 统一升级至 1.12.6。
+
+## v0.1.36
+- 新合并支持取消：原合并按钮切换为取消合并，还原分支和被删除的重复节点，保留配置编辑；公共流程新增的普通操作可选择保留左侧、右侧或两侧，结构冲突时阻止还原。本地保存还原记录，导出及节点复制不携带历史记录。
+- 启动相册前先停止当前设备用户下的目标相册进程，再重新打开；保留相册自动适配，不清除照片及应用数据，停止失败时明确报错。
+- 修复修改元素或父级定位后仍使用旧备用定位、画面变化像素容差无法设为 0 的问题。
+
 ## v0.1.35
-- 修复已有图像判断配置无效时导致整个脚本列表加载失败的问题，读取保留原数据，保存和执行时再校验。
-- 图像判断配置显示模板尺寸，提前提示模板超出检测区域，并支持手动一键扩大框选区域；回放尺寸不匹配时展示具体尺寸，避免仅在运行时得到笼统错误。
 - 新增“图像判断”分支节点，支持本地 OpenCV 模板匹配、图片勾选双模板、黑屏、区域颜色和多帧变化检测；支持组件定位、框选区域、模板采集与上传、连续采样及 true/false 分支，证据不足时明确报告无法判定。HTML 报告展示指标和可放大的检测图片，并沿用敏感运行截图保护。
 - 合流后的公共节点上方新增插入入口，支持新增和粘贴操作，所有汇入分支先执行新操作再进入原公共节点。
 - 修复嵌套判断显式合流到外层公共节点时连接被过滤、公共节点提前排列的问题，支持跨层分支合流。

package/README.md

@@ -1229,9 +1229,18 @@ Linux: ~/.local/share/android-midscene-automation
 
 # 项目更新记录
 
+## v0.1.37
+- 修复元素查找超时未覆盖 Appium 请求的问题，驱动无响应时及时中止并明确报错，不再误判为找不到元素；唯一原生定位优先使用 ID 或 Accessibility ID。
+- 设备预览新增设备信息，展示设备名称、品牌、型号、处理器、Android 版本、物理分辨率及当前分辨率，支持远程设备；问号位于标题右侧，样式与全局变量帮助图标一致。
+- 新增独立“杀死 APP”操作节点，默认使用当前选中应用包名，支持编辑目标包名；停止当前设备用户下的应用进程，不清除应用数据。
+- Midscene 相关模块由 1.12.5 统一升级至 1.12.6。
+
+## v0.1.36
+- 新合并支持取消：原合并按钮切换为取消合并，还原分支和被删除的重复节点，保留配置编辑；公共流程新增的普通操作可选择保留左侧、右侧或两侧，结构冲突时阻止还原。本地保存还原记录，导出及节点复制不携带历史记录。
+- 启动相册前先停止当前设备用户下的目标相册进程，再重新打开；保留相册自动适配，不清除照片及应用数据，停止失败时明确报错。
+- 修复修改元素或父级定位后仍使用旧备用定位、画面变化像素容差无法设为 0 的问题。
+
 ## v0.1.35
-- 修复已有图像判断配置无效时导致整个脚本列表加载失败的问题，读取保留原数据，保存和执行时再校验。
-- 图像判断配置显示模板尺寸，提前提示模板超出检测区域，并支持手动一键扩大框选区域；回放尺寸不匹配时展示具体尺寸，避免仅在运行时得到笼统错误。
 - 新增“图像判断”分支节点，支持本地 OpenCV 模板匹配、图片勾选双模板、黑屏、区域颜色和多帧变化检测；支持组件定位、框选区域、模板采集与上传、连续采样及 true/false 分支，证据不足时明确报告无法判定。HTML 报告展示指标和可放大的检测图片，并沿用敏感运行截图保护。
 - 合流后的公共节点上方新增插入入口，支持新增和粘贴操作，所有汇入分支先执行新操作再进入原公共节点。
 - 修复嵌套判断显式合流到外层公共节点时连接被过滤、公共节点提前排列的问题，支持跨层分支合流。

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "android-midscene-automation",
-  "version": "0.1.35",
+  "version": "0.1.37",
   "repository": {
     "type": "git",
     "url": "git+https://github.com/oooooooko/android-midscene-automation.git"
@@ -38,12 +38,12 @@
   "dependencies": {
     "@dagrejs/dagre": "1.1.5",
     "@element-plus/icons-vue": "2.3.2",
-    "@midscene/android": "https://registry.npmjs.org/@midscene/android/-/android-1.12.5.tgz",
-    "@midscene/android-playground": "https://registry.npmjs.org/@midscene/android-playground/-/android-playground-1.12.5.tgz",
-    "@midscene/core": "https://registry.npmjs.org/@midscene/core/-/core-1.12.5.tgz",
-    "@midscene/playground": "https://registry.npmjs.org/@midscene/playground/-/playground-1.12.5.tgz",
-    "@midscene/shared": "https://registry.npmjs.org/@midscene/shared/-/shared-1.12.5.tgz",
-    "@midscene/web": "https://registry.npmjs.org/@midscene/web/-/web-1.12.5.tgz",
+    "@midscene/android": "https://registry.npmjs.org/@midscene/android/-/android-1.12.6.tgz",
+    "@midscene/android-playground": "https://registry.npmjs.org/@midscene/android-playground/-/android-playground-1.12.6.tgz",
+    "@midscene/core": "https://registry.npmjs.org/@midscene/core/-/core-1.12.6.tgz",
+    "@midscene/playground": "https://registry.npmjs.org/@midscene/playground/-/playground-1.12.6.tgz",
+    "@midscene/shared": "https://registry.npmjs.org/@midscene/shared/-/shared-1.12.6.tgz",
+    "@midscene/web": "https://registry.npmjs.org/@midscene/web/-/web-1.12.6.tgz",
     "@techstark/opencv-js": "5.0.0-release.1",
     "@vitejs/plugin-vue": "6.0.7",
     "@vue-flow/core": "1.48.2",

package/remote-agent/index.ts

@@ -1,5 +1,6 @@
 import { execFile } from 'node:child_process';
 import os from 'node:os';
+import { readAndroidDeviceInfo } from '../server/android-device-info';
 import { readFreshWindowHierarchy } from '../server/appium-recorder/tree-dump';
 import type { RemoteAgentDevice, RemoteCommand } from '../server/remote-agents/protocol';
 import { replayAppiumScript } from '../server/appium-recorder/appium-runner';
@@ -100,6 +101,7 @@ async function handleCommand(command: RemoteCommand) {
     return { base64: image.toString('base64') };
   }
   if (command.type === 'displayInfo') return await getDisplayInfo(command.deviceId);
+  if (command.type === 'deviceInfo') return await readAndroidDeviceInfo(command.deviceId, 'adb');
   if (command.type === 'tree') {
     const [xml, activity] = await Promise.all([
       dumpWindowHierarchy(command.deviceId),

package/server/android-device-info.ts

@@ -0,0 +1,28 @@
+import { execFile } from 'node:child_process';
+import type { AndroidDeviceDetails } from '../src/types';
+
+export function parseAndroidDeviceInfo(properties: string, size: string, deviceName = ''): AndroidDeviceDetails {
+  const values = new Map([...properties.matchAll(/^\[([^\]]+)\]: \[(.*)\]\s*$/gm)].map(match => [match[1], match[2]]));
+  const get = (...keys: string[]) => keys.map(key => values.get(key)?.trim()).find(Boolean) || '';
+  const physical = size.match(/Physical size:\s*(\d+)x(\d+)/i);
+  const current = size.match(/Override size:\s*(\d+)x(\d+)/i) || physical;
+  const resolution = (match: RegExpMatchArray | null) => match ? `${match[1]} × ${match[2]}` : '';
+  return {
+    name: deviceName.trim() && deviceName.trim() !== 'null' ? deviceName.trim() : get('persist.sys.device_name', 'ro.product.marketname', 'ro.product.model'),
+    brand: get('ro.product.brand', 'ro.product.manufacturer'), model: get('ro.product.model'),
+    processor: get('ro.soc.model', 'ro.board.platform', 'ro.hardware'),
+    androidVersion: get('ro.build.version.release'), physicalResolution: resolution(physical), resolution: resolution(current),
+  };
+}
+
+export async function readAndroidDeviceInfo(deviceId: string, adb: string) {
+  const run = (args: string[]) => new Promise<string>((resolve, reject) => {
+    execFile(adb, ['-s', deviceId, 'shell', ...args], { timeout: 4000, maxBuffer: 1024 * 1024 }, (error, stdout) => {
+      if (error) reject(error); else resolve(stdout);
+    });
+  });
+  const properties = await run(['getprop']);
+  const size = await run(['wm', 'size']).catch(() => '');
+  const name = await run(['settings', 'get', 'global', 'device_name']).catch(() => '');
+  return parseAndroidDeviceInfo(properties, size, name);
+}

package/server/appium-recorder/appium-runner.ts

@@ -11,6 +11,8 @@ import { checkImage } from './image-check';
 import { IMAGE_CHECK_MODES, type ImageCheckResult } from '../../src/appium-recorder/image-check';
 import { formatStageLog } from '../../src/appium-recorder/stage-log';
 import { openGalleryOnDevice } from './open-gallery';
+import { stopAppOnDevice } from './stop-app';
+import { AppiumRequestTimeoutError, timedAppiumFetch, withElementDeadline } from './request-timeout';
 import { textClickSelector } from '../../src/appium-recorder/text-click';
 import { AsyncLocalStorage } from 'node:async_hooks';
 import { mkdir, writeFile } from 'node:fs/promises';
@@ -83,6 +85,8 @@ function isReplayStopped(error?: unknown) {
 
 function throwIfReplayStopped(error?: unknown) {
   if (isReplayStopped(error)) throw new ReplayStoppedError();
+  // 驱动失去响应不是“元素不存在”，不能被备用定位或可选步骤吞掉。
+  if (error instanceof AppiumRequestTimeoutError) throw error;
 }
 
 function errorDetail(error: unknown) {
@@ -276,30 +280,31 @@ async function appiumRequest<T>(
   if (!options?.ignoreAbort) throwIfReplayStopped();
   context?.appiumLog(`[Appium] 请求：${method} ${path}`);
   let response: Response;
+  let responseText: string;
   try {
-    response = await fetch(requestUrl, {
+    const result = await timedAppiumFetch(requestUrl, {
       ...init,
-      signal: options?.ignoreAbort
-        ? (options.timeoutMs ? AbortSignal.timeout(options.timeoutMs) : undefined)
-        : context?.signal || init?.signal,
+      signal: options?.ignoreAbort ? undefined : context?.signal || init?.signal,
       headers: {
         'Content-Type': 'application/json',
         ...(init?.headers || {}),
       },
-    });
+    }, options?.timeoutMs ?? (path === '/session' && method === 'POST' ? 120000 : 30000));
+    response = result.response;
+    responseText = result.text;
   } catch (error) {
     if (isReplayStopped(error) && !options?.ignoreAbort) {
       context?.appiumLog(`[Appium] 取消：${method} ${path}`);
       throw new ReplayStoppedError();
     }
     context?.appiumLog(`[Appium] 异常：${method} ${path}（${errorDetail(error)}）`);
+    if (error instanceof AppiumRequestTimeoutError) throw error;
     if (isTimeoutError(error)) {
       throw new Error(`Appium 请求超时 ${requestUrl}，${errorDetail(error)}`);
     }
     throw new Error(`无法连接 Appium 服务 ${requestUrl}，${errorDetail(error)}`);
   }
 
-  const responseText = await response.text();
   context?.appiumLog(`[Appium] 响应：HTTP ${response.status} ${method} ${path}（${Date.now() - startedAt}ms）`);
   const payload = (() => {
     try {
@@ -439,7 +444,11 @@ async function findElementBySelector(
   return elementId;
 }
 
-async function findElement(sessionId: string, step: AppiumRecordedStepRecord) {
+async function findElement(sessionId: string, step: AppiumRecordedStepRecord, timeoutMs = step.timeoutMs ?? 10000) {
+  return withElementDeadline(timeoutMs, () => findElementWithinDeadline(sessionId, step));
+}
+
+async function findElementWithinDeadline(sessionId: string, step: AppiumRecordedStepRecord) {
   if (!step.selector) throw new Error(`${step.label} 缺少 selector`);
   const attempts: string[] = [];
 
@@ -454,7 +463,9 @@ async function findElement(sessionId: string, step: AppiumRecordedStepRecord) {
     }
   }
 
-  for (const selector of step.selectorChain || []) {
+  // 唯一原生定位优先；非唯一元素仍保留父级与备用 XPath 的精确匹配。
+  const preferPrimary = step.selector.unique === true && ['id', 'accessibilityId'].includes(step.selector.strategy);
+  for (const selector of [...(preferPrimary ? [step.selector] : []), ...(step.selectorChain || [])]) {
     try {
       attempts.push(`${selector.strategy} ${selector.value || ''}`);
       return await findElementBySelector(sessionId, selector);
@@ -506,7 +517,7 @@ async function waitForElement(sessionId: string, step: AppiumRecordedStepRecord)
   let lastError: unknown;
   while (Date.now() - startedAt <= timeoutMs) {
     try {
-      return await findElement(sessionId, step);
+      return await findElement(sessionId, step, Math.max(1, timeoutMs - (Date.now() - startedAt)));
     } catch (error) {
       throwIfReplayStopped(error);
       lastError = error;
@@ -521,7 +532,7 @@ async function findOptionalElement(sessionId: string, step: AppiumRecordedStepRe
   const timeoutMs = step.timeoutMs ?? 2000;
   while (Date.now() - startedAt <= timeoutMs) {
     try {
-      return await findElement(sessionId, step);
+      return await findElement(sessionId, step, Math.max(1, timeoutMs - (Date.now() - startedAt)));
     } catch (error) {
       throwIfReplayStopped(error);
       await wait(250);
@@ -535,7 +546,7 @@ async function waitForElementGone(sessionId: string, step: AppiumRecordedStepRec
   const timeoutMs = step.timeoutMs || 10000;
   while (Date.now() - startedAt <= timeoutMs) {
     try {
-      await findElement(sessionId, step);
+      await findElement(sessionId, step, Math.max(1, timeoutMs - (Date.now() - startedAt)));
     } catch (error) {
       throwIfReplayStopped(error);
       return;
@@ -768,6 +779,10 @@ async function runStep(
     return `ADB 已启动 ${packageName}`;
   }
 
+  if (step.type === 'stopApp') {
+    return stopAppOnDevice(deviceId, step.value || '', replayContext.getStore()?.signal);
+  }
+
   if (step.type === 'clearAppData') {
     const packageName = step.value || '';
     await clearAppDataOnDevice(deviceId, packageName);

package/server/appium-recorder/open-gallery.ts

@@ -43,10 +43,19 @@ export async function openGalleryOnDevice(deviceId: string, signal?: AbortSignal
     }
   }
   if (!component) throw new Error('未找到可启动的相册应用，请检查手机是否安装并启用了相册');
+  // 仅停止已解析出的目标相册，避免复用后台页面；不清除应用数据。
+  const packageName = component.split('/')[0]!;
+  try {
+    const stopped = await run(['am', 'force-stop', '--user', 'current', packageName]);
+    if (/Error:|Exception|Permission Denial/i.test(stopped)) throw new Error(stopped);
+  } catch (error) {
+    if (signal?.aborted) throw error;
+    throw new Error(`停止相册失败（${packageName}）：${error instanceof Error ? error.message : String(error)}`);
+  }
   const output = await run(['am', 'start', '-W', '--user', 'current', '-a', MAIN, '-n', component]);
   // am start 某些错误仍返回 0，不能只检查进程退出码。
   if (!/^Status:\s*ok\s*$/im.test(output) || /Error:|Exception|Permission Denial/i.test(output)) {
     throw new Error(`启动相册失败：${output || component}`);
   }
-  return `已启动相册：${component}`;
+  return `已启动相册：${component}（启动前已停止相册进程）`;
 }

package/server/appium-recorder/repository.ts

@@ -13,6 +13,7 @@ import { getPresetVariables, savePresetVariables, deleteScriptVariables } from '
 import { validateImageCheck, type ImageCheckConfig } from '../../src/appium-recorder/image-check';
 
 export type AppiumRecordedStepRecord = {
+  mergeUndo?: import('../../src/appium-recorder/types').BranchMergeUndo;
   id: string;
   type:
     | 'tap'
@@ -37,6 +38,7 @@ export type AppiumRecordedStepRecord = {
     | 'swipe'
     | 'screenshot'
     | 'launchApp'
+    | 'stopApp'
     | 'openGallery'
     | 'endFlow'
     | 'loop'

package/server/appium-recorder/request-timeout.ts

@@ -0,0 +1,25 @@
+import { AsyncLocalStorage } from 'node:async_hooks';
+
+const deadline = new AsyncLocalStorage<number>();
+export class AppiumRequestTimeoutError extends Error {}
+
+export function withElementDeadline<T>(timeoutMs: number, action: () => Promise<T>) {
+  return deadline.run(Date.now() + Math.max(1, timeoutMs), action);
+}
+
+// 响应体也受同一个期限约束，避免收到 HTTP 头后继续无限等待。
+export async function timedAppiumFetch(url: string, init: RequestInit, timeoutMs: number) {
+  const remaining = Math.max(1, Math.min(timeoutMs, (deadline.getStore() ?? Infinity) - Date.now()));
+  const timeout = AbortSignal.timeout(Math.ceil(remaining));
+  const signal = init.signal ? AbortSignal.any([init.signal, timeout]) : timeout;
+  try {
+    const response = await fetch(url, { ...init, signal });
+    const text = await response.text();
+    return { response, text };
+  } catch (error) {
+    if (timeout.aborted && !init.signal?.aborted) {
+      throw new AppiumRequestTimeoutError(`设备自动化服务无响应：Appium 请求超过 ${Math.ceil(remaining)}ms，已停止等待（${url}）`);
+    }
+    throw error;
+  }
+}

package/server/appium-recorder/script-export.ts

@@ -45,7 +45,7 @@ export async function createAppiumScriptExport(
       appActivity: script.appActivity,
       deviceId: script.deviceId,
       variables: clearSecrets(script.variables),
-      steps: script.steps.map(step => ({ ...step, ...(step.parameters ? { parameters: clearSecrets(step.parameters) } : {}) })),
+      steps: script.steps.map(step => ({ ...step, mergeUndo: undefined, ...(step.parameters ? { parameters: clearSecrets(step.parameters) } : {}) })),
     },
   }), null, 2);
   };

package/server/appium-recorder/stop-app.ts

@@ -0,0 +1,18 @@
+import { execFile } from 'node:child_process';
+import { getAdbCommand } from '../android-sdk';
+
+export function stopAppOnDevice(deviceId: string, packageName: string, signal?: AbortSignal) {
+  if (!/^[A-Za-z][\w]*(?:\.[A-Za-z][\w]*)+$/.test(packageName)) {
+    throw new Error('杀死 APP 需要有效的应用包名');
+  }
+  // force-stop 只停止指定应用，不使用 pm clear，不删除应用数据。
+  return new Promise<string>((resolve, reject) => {
+    execFile(getAdbCommand(), ['-s', deviceId, 'shell', 'am', 'force-stop', '--user', 'current', packageName],
+      { timeout: 10000, maxBuffer: 1024 * 1024, signal }, (error, stdout, stderr) => {
+        const output = `${stdout || ''}\n${stderr || ''}`.trim();
+        if (error || /Error:|Exception|Permission Denial/i.test(output)) {
+          reject(new Error(`停止 APP 失败（${packageName}）：${output || error?.message}`));
+        } else resolve(`已停止 APP 进程：${packageName}（保留应用数据）`);
+      });
+  });
+}

package/server/http-api.ts

@@ -38,6 +38,7 @@ import { handleAppiumRecorderRequest } from './appium-recorder/routes';
 import { handleRemoteAgentRequest } from './remote-agents/routes';
 import { isRemoteDeviceId, listRemoteAndroidDevices, sendRemoteCommand } from './remote-agents/registry';
 import { getAdbCommand } from './android-sdk';
+import { readAndroidDeviceInfo } from './android-device-info';
 
 async function readBody<T>(req: IncomingMessage) {
   let body = '';
@@ -873,6 +874,24 @@ export function createApiMiddleware() {
       return;
     }
 
+    if (req.url?.startsWith('/api/android-device-info') && req.method === 'GET') {
+      try {
+        const deviceId = getRequestedDeviceId(req) || selectedDeviceId;
+        if (!deviceId) throw new Error('未检测到可用设备');
+        assertDeviceAllowedForRequest(req, deviceId);
+        const details = isRemoteDeviceId(deviceId)
+          ? await sendRemoteCommand(deviceId, 'deviceInfo')
+          : await readAndroidDeviceInfo(deviceId, getAdbCommand());
+        res.setHeader('Content-Type', 'application/json; charset=utf-8');
+        res.end(JSON.stringify({ deviceId, details }));
+      } catch (error) {
+        res.statusCode = 500;
+        res.setHeader('Content-Type', 'application/json; charset=utf-8');
+        res.end(JSON.stringify({ message: error instanceof Error ? error.message : '读取设备信息失败' }));
+      }
+      return;
+    }
+
     if (req.url?.startsWith('/api/android-display-info') && req.method === 'GET') {
       try {
         const deviceId = getRequestedDeviceId(req) || selectedDeviceId;

package/server/remote-agents/protocol.ts

@@ -8,6 +8,7 @@ export type RemoteAgentDevice = {
 export type RemoteCommandType =
   | 'screenshot'
   | 'displayInfo'
+  | 'deviceInfo'
   | 'tree'
   | 'tap'
   | 'swipe'

package/src/appium-recorder/AppiumPage.vue

@@ -60,6 +60,7 @@ import {
   boundsToVisualRegion,
   createStepId,
   normalizeVisualChangeConfig,
+  syncVisualChangeThreshold,
   visualRegionToBounds,
 } from './visual-change';
 import {
@@ -121,6 +122,7 @@ const insertableRecorderActions: RecorderAction[] = [
   'clearInput',
   'coordinateTap',
   'launchApp',
+  'stopApp',
   'openGallery',
   'endFlow',
   'loop',
@@ -182,6 +184,7 @@ const currentActivity = shallowRef('');
 const replayOutput = shallowRef('');
 const replayOutputDialogVisible = shallowRef(false);
 const linkedScriptDialogVisible = shallowRef(false);
+const linkedScriptEditingId = shallowRef('');
 const linkedScriptTargetId = shallowRef('');
 const linkedParameters = reactive<AppiumRecordedStep>({ id: 'link-parameters', type: 'runScript', label: '', parameters: [], returns: [] });
 const linkedScriptInsertIndex = shallowRef<number | undefined>();
@@ -1166,6 +1169,7 @@ async function addSwipeStep(index?: number, branchTarget?: BranchTarget) {
 }
 
 function openLinkedScriptDialog(index?: number, branchTarget?: BranchTarget) {
+  linkedScriptEditingId.value = '';
   if (!linkableScripts.value.length) {
     ElMessage.warning('暂无可连接的已保存脚本');
     return;
@@ -1215,7 +1219,14 @@ function addLinkedScriptStep() {
     );
     return;
   }
-  insertStep(
+  const editingIndex = linkedScriptEditingId.value ? steps.value.findIndex(step => step.id === linkedScriptEditingId.value) : -1;
+  if (linkedScriptEditingId.value && editingIndex < 0) { ElMessage.warning('原节点已删除，请重新打开'); return; }
+  if (editingIndex >= 0) {
+    const original = steps.value[editingIndex]!;
+    updateStep(editingIndex, { ...original, value: script.id,
+      ...(original.label.startsWith('连接脚本 ') ? { label: `连接脚本 ${script.name}` } : {}),
+      parameters: JSON.parse(JSON.stringify(linkedParameters.parameters || [])), returns: JSON.parse(JSON.stringify(linkedParameters.returns || [])) });
+  } else insertStep(
     { ...createRunScriptStep(script), parameters: JSON.parse(JSON.stringify(linkedParameters.parameters || [])), returns: JSON.parse(JSON.stringify(linkedParameters.returns || [])) },
     linkedScriptInsertIndex.value,
     linkedScriptBranchTarget.value || undefined,
@@ -1224,10 +1235,12 @@ function addLinkedScriptStep() {
   linkedScriptBranchTarget.value = null;
   linkedScriptExpectedActivity.value = '';
   linkedScriptDialogVisible.value = false;
-  ElMessage.success('已添加连接脚本步骤');
+  ElMessage.success(editingIndex >= 0 ? '已修改连接脚本' : '已添加连接脚本步骤');
+  linkedScriptEditingId.value = '';
 }
 
 function closeLinkedScriptDialog() {
+  linkedScriptEditingId.value = '';
   linkedScriptDialogVisible.value = false;
   linkedScriptInsertIndex.value = undefined;
   linkedScriptBranchTarget.value = null;
@@ -1568,6 +1581,10 @@ async function addAction(
       value: form.appPackage,
     }, index, branchTarget);
   }
+  if (action === 'stopApp') {
+    return insertStep({ id: createStepId(), type: 'stopApp', label: `杀死 APP ${form.appPackage}`,
+      value: form.appPackage, flow: { nodeKind: 'action' } }, index, branchTarget);
+  }
   if (action === 'clearAppData') {
     return insertStep({
       id: `step_${Date.now().toString(36)}_${Math.random().toString(36).slice(2, 8)}`,
@@ -1791,11 +1808,21 @@ function updateStep(index: number, step: AppiumRecordedStep) {
         ? syncVisualChangePairConfig(candidate, visualChange)
         : candidate
   ));
-  steps.value = nextSteps;
+  steps.value = syncVisualChangeThreshold(nextSteps, step);
 }
 
 async function editInputStep(index: number) {
   const step = steps.value[index];
+  if (step?.type === 'runScript' && !recordingBusy.value) {
+    const parentId = step.flow?.parentConditionId;
+    openLinkedScriptDialog(index - 1, parentId && step.flow?.parentBranch ? { stepId: parentId, branch: step.flow.parentBranch } : undefined);
+    if (!linkedScriptDialogVisible.value) return;
+    linkedScriptEditingId.value = step.id;
+    linkedScriptTargetId.value = step.value || '';
+    linkedParameters.parameters = JSON.parse(JSON.stringify(step.parameters || []));
+    linkedParameters.returns = JSON.parse(JSON.stringify(step.returns || []));
+    return;
+  }
   if (step?.type === 'imageCheck' && !recordingBusy.value) {
     imageCheckIndex = index;
     imageCheckEditing = true;
@@ -2491,7 +2518,7 @@ watch(
       </el-form>
       <template #footer>
         <el-button @click="closeLinkedScriptDialog">取消</el-button>
-        <el-button type="primary" @click="addLinkedScriptStep">添加连接</el-button>
+        <el-button type="primary" @click="addLinkedScriptStep">{{ linkedScriptEditingId ? '保存' : '添加连接' }}</el-button>
       </template>
     </el-dialog>
 

package/src/appium-recorder/action-descriptions.ts

@@ -16,6 +16,7 @@ export const actionDescriptions: Record<InsertAction, string> = {
   swipe: '按指定起点、终点和时长滑动屏幕。',
   pinch: '执行双指放大或缩小手势，需要当前页面支持缩放。',
   launchApp: '启动指定应用，可放在流程中途或分支中执行。',
+  stopApp: '停止当前所选包名的 APP 进程，不删除应用或清除数据；可在节点配置中修改目标包名。',
   openGallery: '打开设备相册应用，不自动选择照片或视频。',
   endFlow: '立即结束当前回放流程，后续节点不再执行。',
   loop: '重复执行循环体，支持固定次数或条件退出，必须设置最大次数。',

package/src/appium-recorder/components/FlowNodeCard.vue

@@ -1,7 +1,7 @@
 <script setup lang="ts">
 import { computed, nextTick, onBeforeUnmount, onMounted, shallowRef, watch } from 'vue';
 import { Handle, Position } from '@vue-flow/core';
-import { CopyDocument, Delete, Edit, Plus, VideoPlay, View, WarningFilled, Connection } from '@element-plus/icons-vue';
+import { CopyDocument, Delete, Edit, Plus, VideoPlay, View, WarningFilled, Connection, RefreshLeft } from '@element-plus/icons-vue';
 import { AI_MODEL_CONFIG_HINT } from '../ai-recognition';
 import type { AppiumRecordedStep } from '../types';
 import {
@@ -187,9 +187,9 @@ watch(() => props.data, () => {
         </span>
       </button>
       <span v-if="!props.readonly && !data.deleteMode" class="appium-flow-step-card__actions nodrag nopan" @click.stop>
-        <el-tooltip v-if="data.flowKind === 'condition' && data.step.type !== 'loop' && !data.copyMode" content="合并分支：将两侧后续节点汇入公共流程" placement="top" :show-after="200">
-        <span class="appium-node-action-tooltip"><el-button text size="small" :icon="Connection"
-          title="合并分支" aria-label="合并分支" :disabled="data.mergeDisabled || Boolean(data.step.flow?.successTargetId)"
+        <el-tooltip v-if="data.flowKind === 'condition' && data.step.type !== 'loop' && !data.copyMode" :content="data.step.flow?.successTargetId ? '取消合并：还原分支并保留后续编辑' : '合并分支：将两侧后续节点汇入公共流程'" placement="top" :show-after="200">
+        <span class="appium-node-action-tooltip"><el-button text size="small" :icon="data.step.flow?.successTargetId ? RefreshLeft : Connection"
+          :title="data.step.flow?.successTargetId ? '取消合并' : '合并分支'" :aria-label="data.step.flow?.successTargetId ? '取消合并' : '合并分支'" :disabled="data.mergeDisabled"
           @click="emit('merge', data.index)" />
         </span></el-tooltip>
         <el-tooltip v-if="!data.copyMode && data.canCopy" content="复制节点：复制后可在插入位置粘贴" placement="top" :show-after="200">
@@ -215,14 +215,14 @@ watch(() => props.data, () => {
           @click="emit('execute', data.index)"
         />
         </span></el-tooltip>
-        <el-tooltip v-if="data.canEditInput" :content="data.step.type === 'imageCheck' ? '修改图像判断配置' : '修改输入内容：编辑此节点要输入的文字'" placement="top" :show-after="200">
+        <el-tooltip v-if="data.canEditInput" :content="data.step.type === 'runScript' ? '修改连接脚本' : data.step.type === 'imageCheck' ? '修改图像判断配置' : '修改输入内容：编辑此节点要输入的文字'" placement="top" :show-after="200">
         <span class="appium-node-action-tooltip">
         <el-button
           text
           size="small"
           :icon="Edit"
           :disabled="data.disabled"
-          :title="data.step.type === 'imageCheck' ? '修改图像判断配置' : '修改输入内容'"
+          :title="data.step.type === 'runScript' ? '修改连接脚本' : data.step.type === 'imageCheck' ? '修改图像判断配置' : '修改输入内容'"
           @click="emit('editInput', data.index)"
         />
         </span></el-tooltip>

package/src/appium-recorder/components/FlowStepEditor.vue

@@ -5,7 +5,6 @@ import { normalizeVisualChangeConfig } from '../visual-change';
 import { longPressMode } from '../long-press';
 import { defaultFlowKind, isBooleanCondition } from '../flow-labels';
 import TextClickSettings from './TextClickSettings.vue';
-import { isNativeStateCondition } from '../native-control-state';
 import LongPressSettings from './LongPressSettings.vue';
 import StageLogSettings from './StageLogSettings.vue';
 import LoopSettings from './LoopSettings.vue';
@@ -47,7 +46,7 @@ function defaultKind(): FlowKind {
 function patchStep(patch: Partial<AppiumRecordedStep>) {
   emit('update', {
     index: props.index,
-    step: { ...props.step, ...patch },
+    step: { ...props.step, ...patch, ...('contextSelector' in patch ? { selectorChain: undefined } : {}) },
   });
 }
 
@@ -79,6 +78,10 @@ function patchSwipe(patch: Partial<SwipeGesture>) {
   });
 }
 
+function patchPinch(patch: Partial<NonNullable<AppiumRecordedStep['pinch']>>) {
+  patchStep({ pinch: { direction: 'out', centerX: 0, centerY: 0, percent: 0.5, ...props.step.pinch, ...patch } });
+}
+
 function patchTapCoordinate(axis: 'centerX' | 'centerY', value: number | undefined) {
   if (value === undefined || !Number.isFinite(value)) return;
   const fallback = {
@@ -125,7 +128,7 @@ function patchSelector(patch: Partial<AppiumSelector>) {
   patchStep({
     selector: { ...props.step.selector!, ...patch },
     // 修改元素目标后，不能继续优先使用录制时的备用 XPath。
-    ...(props.step.type === 'longPress' || props.step.type === 'extractVariable' || isNativeStateCondition(props.step) ? { selectorChain: undefined } : {}),
+    selectorChain: undefined,
   });
 }
 </script>
@@ -153,7 +156,7 @@ function patchSelector(patch: Partial<AppiumSelector>) {
         <el-form-item label="节点类型">
           <el-select
             :model-value="defaultKind()"
-            :disabled="disabled || isBooleanCondition(step) || step.type === 'extractVariable' || step.type === 'log' || step.type === 'openGallery' || step.type === 'endFlow' || step.type === 'loop' || step.type === 'breakLoop'"
+            :disabled="disabled || isBooleanCondition(step) || step.type === 'stopApp' || step.type === 'extractVariable' || step.type === 'log' || step.type === 'openGallery' || step.type === 'endFlow' || step.type === 'loop' || step.type === 'breakLoop'"
             @update:model-value="patchFlow({ nodeKind: $event as FlowKind })"
           >
             <el-option label="操作" value="action" />
@@ -161,7 +164,7 @@ function patchSelector(patch: Partial<AppiumSelector>) {
             <el-option label="校验" value="assertion" />
           </el-select>
         </el-form-item>
-        <el-form-item v-if="!['longPress', 'log', 'openGallery', 'endFlow', 'loop', 'breakLoop'].includes(step.type)" label="超时时间 ms">
+        <el-form-item v-if="!['longPress', 'stopApp', 'log', 'openGallery', 'endFlow', 'loop', 'breakLoop'].includes(step.type)" label="超时时间 ms">
           <el-input-number
             :model-value="step.timeoutMs || undefined"
             :disabled="disabled"
@@ -173,6 +176,22 @@ function patchSelector(patch: Partial<AppiumSelector>) {
         </el-form-item>
       </div>
       <LongPressSettings v-if="step.type === 'longPress'" :step="step" :disabled="disabled" @update="patchStep" />
+      <el-form-item v-if="['waitActivity', 'launchApp', 'stopApp', 'clearAppData'].includes(step.type)" :label="step.type === 'waitActivity' ? '目标 Activity' : '目标 APP 包名'">
+        <el-input :model-value="step.value || ''" :disabled="disabled" @update:model-value="patchStep({ value: String($event) })" />
+      </el-form-item>
+      <template v-if="step.type === 'pinch'">
+        <el-form-item label="缩放方向">
+          <el-select :model-value="step.pinch?.direction || 'out'" :disabled="disabled" @update:model-value="patchPinch({ direction: $event })">
+            <el-option label="放大" value="out" /><el-option label="缩小" value="in" />
+          </el-select>
+        </el-form-item>
+        <el-form-item v-for="axis in (['centerX', 'centerY'] as const)" :key="axis" :label="axis === 'centerX' ? '中心 X' : '中心 Y'">
+          <el-input-number :model-value="step.pinch?.[axis] ?? 0" :disabled="disabled" :min="0" :max="99999" :precision="0" controls-position="right" @update:model-value="patchPinch({ [axis]: $event ?? 0 })" />
+        </el-form-item>
+        <el-form-item label="缩放比例">
+          <el-input-number :model-value="step.pinch?.percent ?? 0.5" :disabled="disabled" :min="0.01" :max="1" :step="0.05" controls-position="right" @update:model-value="patchPinch({ percent: $event ?? 0.5 })" />
+        </el-form-item>
+      </template>
       <div v-if="step.type === 'coordinateTap'" class="appium-flow-editor__grid">
         <el-form-item label="坐标 X">
           <el-input-number :model-value="step.fallback?.centerX ?? 0" :disabled="disabled" :min="0" :max="99999" :precision="0" controls-position="right" aria-label="坐标 X" @update:model-value="patchTapCoordinate('centerX', $event)" />
@@ -221,7 +240,7 @@ function patchSelector(patch: Partial<AppiumSelector>) {
           <el-form-item label="变化阈值 %">
             <el-input-number
               :model-value="visualChangeConfig.changeRatioThreshold"
-              :disabled="visualChangeConfigDisabled"
+              :disabled="disabled"
               :min="0.01"
               :max="100"
               :step="0.1"

package/src/appium-recorder/components/MergeBranchesDialog.vue

@@ -4,6 +4,7 @@ import { ElMessage } from 'element-plus';
 import type { AppiumRecordedStep } from '../types';
 import { branchSteps, mergeBranches } from '../flow-merge';
 import { flowBranchLabel } from '../flow-labels';
+import { unmergeBranches, type AddedNodeSide } from '../flow-unmerge';
 
 const props = defineProps<{ steps: AppiumRecordedStep[]; conditionId: string; disabled?: boolean }>();
 const emit = defineEmits<{ close: []; confirm: [steps: AppiumRecordedStep[]] }>();
@@ -12,6 +13,13 @@ const duplicateId = ref('');
 const confirmed = ref(false);
 const retainedSide = ref<'yes' | 'no'>('yes');
 const condition = computed(() => props.steps.find((step) => step.id === props.conditionId));
+const unmerging = ref(false);
+const addedSide = ref<AddedNodeSide>('both');
+const undoPreview = computed(() => {
+  if (!unmerging.value) return undefined;
+  try { return unmergeBranches(props.steps, props.conditionId, addedSide.value); }
+  catch (error) { return error instanceof Error ? error.message : String(error); }
+});
 const candidates = computed(() => branchSteps(props.steps, props.conditionId, retainedSide.value));
 const duplicates = computed(() => branchSteps(props.steps, props.conditionId, retainedSide.value === 'yes' ? 'no' : 'yes'));
 const preview = computed(() => {
@@ -20,6 +28,7 @@ const preview = computed(() => {
   catch (error) { return error instanceof Error ? error.message : String(error); }
 });
 watch(() => props.conditionId, () => {
+  if (props.conditionId) unmerging.value = Boolean(condition.value?.flow?.successTargetId);
   retainedSide.value = branchSteps(props.steps, props.conditionId, 'yes').length ? 'yes' : 'no';
   commonId.value = ''; duplicateId.value = ''; confirmed.value = false;
 });
@@ -28,6 +37,12 @@ watch(retainedSide, () => { commonId.value = ''; duplicateId.value = ''; confirm
 watch(commonId, () => { duplicateId.value = ''; confirmed.value = false; });
 watch(duplicateId, () => { confirmed.value = false; });
 function submit() {
+  if (unmerging.value) {
+    if (props.disabled || !undoPreview.value || typeof undoPreview.value === 'string') return;
+    try { emit('confirm', unmergeBranches(props.steps, props.conditionId, addedSide.value).steps); emit('close'); }
+    catch (error) { ElMessage.error(String(error)); }
+    return;
+  }
   if (props.disabled || !preview.value || typeof preview.value === 'string') return;
   if (preview.value.removedCount && !confirmed.value) return;
   try {
@@ -38,8 +53,20 @@ function submit() {
 </script>
 
 <template>
-  <el-dialog :model-value="Boolean(conditionId)" title="合并分支" width="min(520px, 94vw)" append-to-body :close-on-click-modal="false" @close="emit('close')">
-    <el-form label-position="top">
+  <el-dialog :model-value="Boolean(conditionId)" :title="unmerging ? '取消合并' : '合并分支'" width="min(520px, 94vw)" append-to-body :close-on-click-modal="false" @close="emit('close')">
+    <el-form v-if="unmerging" label-position="top">
+      <el-alert v-if="typeof undoPreview === 'string'" :title="undoPreview" type="warning" :closable="false" />
+        <el-alert v-else title="还原合并前的分支及被删除的重复节点，保留现有节点配置修改。" type="info" :closable="false" />
+        <el-form-item v-if="condition?.mergeUndo && (typeof undoPreview === 'string' || undoPreview?.addedCount)" label="公共流程新增操作保留位置">
+          <el-radio-group v-model="addedSide" aria-label="新增操作保留位置">
+            <el-radio-button value="both">两侧都保留</el-radio-button>
+            <el-radio-button value="yes">仅左侧</el-radio-button>
+            <el-radio-button value="no">仅右侧</el-radio-button>
+          </el-radio-group>
+          <p>原来源分支保留新增操作的相对位置；分配到另一侧的操作放在该分支末尾。</p>
+        </el-form-item>
+    </el-form>
+    <el-form v-else label-position="top">
       <el-form-item label="合并方向">
         <el-radio-group v-model="retainedSide" aria-label="合并方向">
           <el-radio-button value="yes">保留左侧流程</el-radio-button>
@@ -63,7 +90,8 @@ function submit() {
     </el-form>
     <template #footer>
       <el-button @click="emit('close')">取消</el-button>
-      <el-button type="primary" :disabled="disabled || !preview || typeof preview === 'string' || Boolean(preview.removedCount && !confirmed)" @click="submit">合并分支</el-button>
+      <el-button v-if="unmerging" type="primary" :disabled="disabled || !undoPreview || typeof undoPreview === 'string'" @click="submit">取消合并</el-button>
+      <el-button v-else type="primary" :disabled="disabled || !preview || typeof preview === 'string' || Boolean(preview.removedCount && !confirmed)" @click="submit">合并分支</el-button>
     </template>
   </el-dialog>
 </template>

package/src/appium-recorder/components/NestedConditionBranches.vue

@@ -23,6 +23,7 @@ type InsertAction =
   | 'swipe'
   | 'pinch'
   | 'launchApp'
+  | 'stopApp'
   | 'openGallery'
   | 'endFlow'
   | 'loop'
@@ -103,6 +104,7 @@ const actionGroups: Array<{ title: string; actions: Array<{ type: InsertAction;
     title: '设备操作',
     actions: [
       { type: 'launchApp', label: '启动 App' },
+      { type: 'stopApp', label: '杀死 APP' },
       { type: 'keyBack', label: '系统返回' },
       { type: 'keyHome', label: 'Home 键' },
       { type: 'openGallery', label: '启动相册' },
@@ -153,7 +155,7 @@ function typeLabel(step: AppiumRecordedStep) {
     clearIfExists: '存在则清空', backIfExists: '存在则返回', clearInput: '清空',
     waitFor: '等待出现', waitDisappear: '等待消失', assertExists: '断言存在',
     assertText: '断言文本', key: '按键', waitActivity: '等待 Activity', delay: '延时',
-    coordinateTap: '坐标点击', swipe: '滑动', launchApp: '启动 APP', clearAppData: '清理 APP 缓存', longPress: '长按',
+    coordinateTap: '坐标点击', swipe: '滑动', launchApp: '启动 APP', stopApp: '杀死 APP', clearAppData: '清理 APP 缓存', longPress: '长按',
     pinch: '双指缩放', runScript: '连接脚本', screenshot: '截图', visualChange: '检测画面变化',
     noop: '空节点',
     endFlow: '终止流程',
@@ -340,14 +342,14 @@ function branchSplitPath() {
                   @click="$emit('copy', [item.index])"
                 />
                 </span></el-tooltip>
-                <el-tooltip v-if="item.step.type === 'input' || item.step.type === 'inputIfExists' || item.step.type === 'imageCheck'" :content="item.step.type === 'imageCheck' ? '修改图像判断配置' : '修改输入内容：编辑此节点要输入的文字'" placement="top" :show-after="200">
+                <el-tooltip v-if="['input', 'inputIfExists', 'imageCheck', 'runScript'].includes(item.step.type)" :content="item.step.type === 'runScript' ? '修改连接脚本' : item.step.type === 'imageCheck' ? '修改图像判断配置' : '修改输入内容：编辑此节点要输入的文字'" placement="top" :show-after="200">
                 <span style="display: inline-flex">
                 <el-button
                   text
                   size="small"
                   :icon="Edit"
                   :disabled="disabled"
-                  :title="item.step.type === 'imageCheck' ? '修改图像判断配置' : '修改输入内容'"
+                  :title="item.step.type === 'runScript' ? '修改连接脚本' : item.step.type === 'imageCheck' ? '修改图像判断配置' : '修改输入内容'"
                   @click="$emit('editInput', item.index)"
                 />
                 </span></el-tooltip>

package/src/appium-recorder/components/RecordedSteps.vue

@@ -80,6 +80,7 @@ const insertActionGroups: FlowActionGroup[] = [
       { type: 'pinch', label: '双指缩放' },
       { type: 'clearAppData', label: '清理 App 缓存' },
       { type: 'launchApp', label: '启动 App' },
+      { type: 'stopApp', label: '杀死 APP' },
       { type: 'openGallery', label: '启动相册' },
     ],
   },

package/src/appium-recorder/flow-copy.ts

@@ -180,6 +180,8 @@ export function pasteFlowClipboard(
   });
   const copies = clipboard.steps.map((source) => {
     const step = clone(source);
+    // 合并记录引用原流程 ID，不能随节点复制到另一条流程。
+    delete step.mergeUndo;
     step.id = idMap.get(source.id) || createId();
     if (step.breakLoopTargetId) step.breakLoopTargetId = idMap.get(step.breakLoopTargetId) || step.breakLoopTargetId;
     const flow = { ...(step.flow || {}) };

package/src/appium-recorder/flow-graph.ts

@@ -24,6 +24,7 @@ export type InsertAction =
   | 'swipe'
   | 'pinch'
   | 'launchApp'
+  | 'stopApp'
   | 'openGallery'
   | 'endFlow'
   | 'loop'
@@ -458,7 +459,7 @@ export function buildFlowGraph(
         canCopy: item.step.type !== 'launchApp'
           && item.step.type !== 'clearAppData'
           && item.step.visualChange?.role !== 'end',
-        canEditInput: item.step.type === 'input' || item.step.type === 'inputIfExists' || item.step.type === 'imageCheck',
+        canEditInput: ['input', 'inputIfExists', 'imageCheck', 'runScript'].includes(item.step.type),
         canExecute: item.step.type === 'launchApp' || item.step.type === 'clearAppData' || item.step.type === 'aiRecognition',
         missingAiModel: item.step.type === 'aiRecognition' && !options.aiRecognitionModelConfigured,
       },

package/src/appium-recorder/flow-labels.ts

@@ -58,6 +58,7 @@ export function flowTypeLabel(step: AppiumRecordedStep) {
     swipe: '滑动',
     screenshot: '截图',
     launchApp: '启动 APP',
+    stopApp: '杀死 APP',
     openGallery: '启动相册',
     endFlow: '终止流程',
     loop: '有界循环',
@@ -98,6 +99,7 @@ export function flowStepMeta(step: AppiumRecordedStep) {
   if (step.type === 'key') return `keyCode ${step.keyCode || ''}`;
   if (step.type === 'waitActivity') return step.value || '';
   if (step.type === 'launchApp') return step.value || '';
+  if (step.type === 'stopApp') return `${step.value || ''}（仅停止进程）`;
   if (step.type === 'clearAppData') return `${step.value || ''}（清除数据与缓存）`;
   if (step.type === 'runScript') return step.value ? `脚本 ${step.value}` : '';
   if (step.type === 'noop') return '';

package/src/appium-recorder/flow-merge.ts

@@ -107,5 +107,17 @@ export function mergeBranches(steps: AppiumRecordedStep[], conditionId: string,
     visited.add(step.id);
   }
   rest.forEach(visit);
+  // 仅记录结构差异和实际被删除的节点，配置编辑不会被取消合并覆盖。
+  const lastCommon = Math.max(...commonRoots.map(step => steps.indexOf(step)));
+  mergedCondition.mergeUndo = JSON.parse(JSON.stringify({
+    version: 1, conditionId, source: side, commonIds: [...commonIds], originalIds: steps.map(step => step.id),
+    boundaryId: steps.slice(lastCommon + 1).find(step => !ownedIds.has(step.id)
+      && step.flow?.parentConditionId === condition.flow?.parentConditionId
+      && step.flow?.parentBranch === condition.flow?.parentBranch)?.id,
+    flows: steps.filter(step => !removedIds.has(step.id) && (ownedIds.has(step.id)
+      || keys.some(key => step.flow?.[key] !== byId.get(step.id)?.flow[key])))
+      .map(step => ({ id: step.id, before: step.flow, after: byId.get(step.id)?.flow })),
+    removed: steps.filter(step => removedIds.has(step.id)),
+  }));
   return { steps: rest, removedCount: removedIds.size };
 }

package/src/appium-recorder/flow-unmerge.ts

@@ -0,0 +1,145 @@
+import type { AppiumRecordedStep } from './types';
+import { branchSteps } from './flow-merge';
+import { defaultFlowKind } from './flow-labels';
+import { createStepId } from './visual-change';
+
+const edges = ['yesTargetId', 'noTargetId', 'successTargetId', 'failureTargetId'] as const;
+const structure = [...edges, 'parentConditionId', 'parentBranch'] as const;
+export type AddedNodeSide = 'yes' | 'no' | 'both';
+
+export function unmergeBranches(steps: AppiumRecordedStep[], conditionId: string, addedSide?: AddedNodeSide) {
+  const condition = steps.find(step => step.id === conditionId);
+  const record = condition?.mergeUndo;
+  if (!record || record.version !== 1 || record.conditionId !== conditionId) {
+    throw new Error('该合并没有可用的还原记录，无法安全取消；仅新执行的合并支持还原');
+  }
+  const original = new Set(record.originalIds);
+  const common = new Set(record.commonIds);
+  const affected = new Set(record.flows.map(item => item.id));
+  const byId = new Map(steps.map(step => [step.id, step]));
+  if (record.flows.some(item => !byId.has(item.id)) || record.removed.some(step => byId.has(step.id))) {
+    throw new Error('合并涉及的节点已删除或 ID 冲突，无法安全取消');
+  }
+  const boundary = record.boundaryId ? steps.findIndex(step => step.id === record.boundaryId) : steps.length;
+  if (boundary < 0) throw new Error('公共流程边界已删除，无法安全取消');
+  const added = steps.slice(steps.indexOf(condition!) + 1, boundary).filter(step => !original.has(step.id)
+    && step.flow?.parentConditionId === condition!.flow?.parentConditionId
+    && step.flow?.parentBranch === condition!.flow?.parentBranch);
+  const shared = new Set([...common, ...added.map(step => step.id)]);
+  // 普通新增操作可分配到任一侧；控制节点和跨节点配对不做猜测性复制。
+  if (added.some(step => defaultFlowKind(step) === 'condition'
+    || ['visualChange', 'breakLoop', 'endFlow'].includes(step.type) || step.mergeUndo)) {
+    throw new Error('公共流程新增了判断、循环、终止或配对节点，请先移出这些节点再取消合并');
+  }
+  if (added.some(step => edges.some(key => step.flow?.[key]
+    && !shared.has(step.flow[key]!) && step.flow[key] !== record.boundaryId))) {
+    throw new Error('公共流程新增操作存在外部连接，请先处理该连接再取消合并');
+  }
+  for (const item of record.flows) {
+    const current = byId.get(item.id)!;
+    for (const key of structure) {
+      if (current.flow?.[key] === item.after?.[key]) continue;
+      const target = edges.includes(key as typeof edges[number]) ? byId.get(current.flow?.[key] || '') : undefined;
+      if (!target || original.has(target.id) || defaultFlowKind(target) === 'condition') {
+        throw new Error('合并后的连接或分支归属已改变，请先处理结构冲突再取消合并');
+      }
+    }
+  }
+  for (const step of steps) {
+    if (!affected.has(step.id) && original.has(step.id) && edges.some(key => shared.has(step.flow?.[key] || ''))) {
+      throw new Error('其他流程引用了公共节点，无法安全取消合并');
+    }
+  }
+  const side = addedSide || record.source;
+  const next: AppiumRecordedStep[] = JSON.parse(JSON.stringify(steps));
+  const nextById = new Map(next.map(step => [step.id, step]));
+  // 只撤回合并写入的结构字段，保留用户修改的名称、参数、备注等。
+  for (const item of record.flows) {
+    const step = nextById.get(item.id)!;
+    const flow = step.flow ||= {};
+    for (const key of structure) {
+      if (item.before?.[key] === item.after?.[key]) continue;
+      const current = flow[key];
+      if (current !== item.after?.[key] && !shared.has(current || '')) continue;
+      if (item.before?.[key] === undefined) delete flow[key];
+      else Object.assign(flow, { [key]: item.before[key] });
+    }
+  }
+  // 恢复被合并删除的另一侧节点，按原始邻接顺序插回，而非覆盖现有节点。
+  for (const backup of record.removed) {
+    const restored: AppiumRecordedStep = JSON.parse(JSON.stringify(backup));
+    const later = record.originalIds.slice(record.originalIds.indexOf(backup.id) + 1);
+    const anchor = later.map(id => next.findIndex(step => step.id === id)).find(index => index >= 0);
+    next.splice(anchor ?? next.length, 0, restored);
+    nextById.set(restored.id, restored);
+  }
+  const assigned = side === 'both' ? record.source : side;
+  for (const item of added) {
+    const step = nextById.get(item.id)!;
+    step.flow = { ...step.flow, parentConditionId: conditionId, parentBranch: assigned };
+    for (const key of edges) delete step.flow[key];
+  }
+  if (assigned !== record.source) {
+    for (const item of added) {
+      const index = next.findIndex(step => step.id === item.id);
+      next.push(...next.splice(index, 1));
+    }
+  }
+  if (side === 'both') {
+    for (const item of added) {
+      const copy: AppiumRecordedStep = JSON.parse(JSON.stringify(nextById.get(item.id)));
+      copy.id = createStepId();
+      copy.flow!.parentBranch = record.source === 'yes' ? 'no' : 'yes';
+      next.push(copy);
+    }
+  }
+  const other = record.source === 'yes' ? 'no' : 'yes';
+  if (added.length && (side === 'both' || side === other)) {
+    const siblings = branchSteps(next, conditionId, other);
+    const appended = siblings.slice(-added.length);
+    const previous = siblings[siblings.length - appended.length - 1];
+    if (previous && (defaultFlowKind(previous) === 'condition' || ['endFlow', 'breakLoop'].includes(previous.type))) {
+      throw new Error('另一侧末尾是判断、循环或终止操作，新增节点不能安全追加，请仅保留在原来源分支');
+    }
+    if (previous?.flow?.successTargetId) {
+      appended[appended.length - 1]!.flow!.successTargetId = previous.flow.successTargetId;
+      previous.flow.successTargetId = appended[0]!.id;
+    }
+  }
+  const restoredCondition = nextById.get(conditionId)!;
+  delete restoredCondition.mergeUndo;
+  const ownerBranch = (step: AppiumRecordedStep): 'yes' | 'no' | undefined => {
+    const visited = new Set<string>();
+    let current: AppiumRecordedStep | undefined = step;
+    while (current?.flow?.parentConditionId && !visited.has(current.id)) {
+      visited.add(current.id);
+      if (current.flow.parentConditionId === conditionId) return current.flow.parentBranch;
+      current = nextById.get(current.flow.parentConditionId);
+    }
+  };
+  // 新增的分支尾节点可能仍指向公共入口，改接自己一侧的后续节点。
+  for (const step of next) {
+    const branch = ownerBranch(step);
+    if (!branch) continue;
+    const siblings = next.filter(item => item.flow?.parentConditionId === step.flow?.parentConditionId && item.flow?.parentBranch === step.flow?.parentBranch);
+    const sibling = siblings[siblings.indexOf(step) + 1];
+    for (const key of edges) {
+      const target = nextById.get(step.flow?.[key] || '');
+      if (!target || !shared.has(target.id)) continue;
+      if (ownerBranch(target) === branch && !added.some(item => item.id === target.id)) continue;
+      if (sibling) step.flow![key] = sibling.id;
+      else delete step.flow![key];
+    }
+  }
+  for (const branch of ['yes', 'no'] as const) {
+    const first = branchSteps(next, conditionId, branch)[0];
+    const key = branch === 'yes' ? 'yesTargetId' : 'noTargetId';
+    if (first) restoredCondition.flow![key] = first.id;
+    else delete restoredCondition.flow![key];
+  }
+  // 将两个分支的完整子树重新放到判断之后，公共后继保持原位。
+  const owned = next.filter(step => ownerBranch(step));
+  const result = next.filter(step => !owned.includes(step));
+  result.splice(result.indexOf(restoredCondition) + 1, 0, ...owned);
+  return { steps: result, addedCount: added.length };
+}

package/src/appium-recorder/types.ts

@@ -68,6 +68,7 @@ export type AppiumNode = {
 };
 
 export type AppiumRecordedStep = {
+  mergeUndo?: BranchMergeUndo;
   id: string;
   type:
     | 'tap'
@@ -92,6 +93,7 @@ export type AppiumRecordedStep = {
     | 'swipe'
     | 'screenshot'
     | 'launchApp'
+    | 'stopApp'
     | 'openGallery'
     | 'endFlow'
     | 'loop'
@@ -161,6 +163,17 @@ export type AppiumRecordedStep = {
   };
 };
 
+export type BranchMergeUndo = {
+  version: 1;
+  conditionId: string;
+  source: 'yes' | 'no';
+  commonIds: string[];
+  originalIds: string[];
+  boundaryId?: string;
+  flows: { id: string; before: AppiumRecordedStep['flow']; after: AppiumRecordedStep['flow'] }[];
+  removed: AppiumRecordedStep[];
+};
+
 export type AppiumRecordedScript = {
   id: string;
   name: string;

package/src/appium-recorder/visual-change.ts

@@ -11,6 +11,18 @@ export function createStepId() {
   return `step_${Date.now().toString(36)}_${Math.random().toString(36).slice(2, 8)}`;
 }
 
+export function syncVisualChangeThreshold(steps: AppiumRecordedStep[], source: AppiumRecordedStep) {
+  const config = source.visualChange;
+  if (source.type !== 'visualChange' || config?.role !== 'end' || !config.pairId) return steps;
+  const { changeRatioThreshold } = normalizeVisualChangeConfig(config);
+  // 回放以开始节点配置为准，结束节点修改阈值时同步整组；不同配对互不影响。
+  return steps.map(step => (
+    step.type === 'visualChange' && step.visualChange && step.visualChange.pairId === config.pairId
+      ? { ...step, visualChange: { ...step.visualChange, changeRatioThreshold } }
+      : step
+  ));
+}
+
 export function boundsToVisualRegion(bounds: AppiumBounds) {
   return {
     x: bounds.left,
@@ -47,7 +59,7 @@ export function normalizeVisualChangeConfig(
     changeRatioThreshold: Math.max(0.01, Number(config?.changeRatioThreshold) || VISUAL_CHANGE_DEFAULTS.changeRatioThreshold),
     pixelmatchThreshold: Math.min(
       1,
-      Math.max(0, Number(config?.pixelmatchThreshold) || VISUAL_CHANGE_DEFAULTS.pixelmatchThreshold),
+      Math.max(0, Number.isFinite(config?.pixelmatchThreshold) ? Number(config?.pixelmatchThreshold) : VISUAL_CHANGE_DEFAULTS.pixelmatchThreshold),
     ),
   };
 }

package/src/components/device/DeviceInfoTooltip.vue

@@ -0,0 +1,55 @@
+<script setup lang="ts">
+import { shallowRef, watch, onBeforeUnmount } from 'vue';
+import { QuestionFilled } from '@element-plus/icons-vue';
+import { APP_BASE } from '../../api';
+import type { AndroidDeviceDetails } from '../../types';
+
+const props = defineProps<{ deviceId: string }>();
+const details = shallowRef<AndroidDeviceDetails>();
+const loading = shallowRef(false);
+const error = shallowRef('');
+let request: AbortController | undefined;
+const fields: [keyof AndroidDeviceDetails, string][] = [
+  ['name', '设备名称'], ['brand', '品牌'], ['model', '型号'], ['processor', '处理器'],
+  ['androidVersion', 'Android 版本'], ['physicalResolution', '物理分辨率'], ['resolution', '分辨率'],
+];
+watch(() => props.deviceId, () => { request?.abort(); request = undefined; details.value = undefined; error.value = ''; loading.value = false; });
+onBeforeUnmount(() => request?.abort());
+async function load() {
+  if (!props.deviceId || loading.value) return;
+  const controller = new AbortController();
+  request = controller; loading.value = true; error.value = '';
+  try {
+    const response = await fetch(`${APP_BASE}/api/android-device-info?deviceId=${encodeURIComponent(props.deviceId)}`, { signal: controller.signal });
+    const payload = await response.json();
+    if (!response.ok) throw new Error(payload.message || '读取设备信息失败');
+    if (request === controller) details.value = payload.details;
+  } catch (cause) {
+    if (request === controller && !controller.signal.aborted) error.value = cause instanceof Error ? cause.message : '读取失败';
+  } finally { if (request === controller) loading.value = false; }
+}
+</script>
+
+<template>
+  <el-tooltip placement="bottom" effect="dark" :show-after="200" @before-show="load">
+    <template #content>
+      <div class="device-info">
+        <div v-if="!deviceId">未选择设备</div>
+        <template v-else>
+          <div v-if="loading">正在读取设备信息…</div>
+          <div v-if="error" role="status">{{ error }}</div>
+          <dl><template v-for="[key, label] in fields" :key="key"><dt>{{ label }}</dt><dd>{{ details?.[key] || '未知' }}</dd></template></dl>
+        </template>
+      </div>
+    </template>
+    <el-button class="device-info-help" :icon="QuestionFilled" text aria-label="设备信息" />
+  </el-tooltip>
+</template>
+
+<style scoped>
+.device-info-help { width: 28px; height: 28px; padding: 0; font-size: 16px; }
+.device-info { max-width: min(340px, calc(100vw - 40px)); font-size: 12px; overflow-wrap: anywhere; }
+.device-info dl { display: grid; grid-template-columns: auto minmax(0, 1fr); gap: 6px 14px; margin: 4px 0; }
+.device-info dt { color: #cbd5e1; }
+.device-info dd { margin: 0; }
+</style>

package/src/components/device/DevicePreviewPanel.vue

@@ -2,6 +2,7 @@
 import { computed, onBeforeUnmount, onMounted, ref, shallowRef, watch } from 'vue';
 import { Close, Cpu, FullScreen, Refresh } from '@element-plus/icons-vue';
 import type { AndroidDevice, DeviceAction } from '../../types';
+import DeviceInfoTooltip from './DeviceInfoTooltip.vue';
 
 type DeviceOverlayBounds = {
   id: string;
@@ -293,7 +294,7 @@ function handlePointerCancel(event: PointerEvent) {
   <el-card shadow="never" class="automation-card device-preview-card" :class="{ 'device-preview-card--compact': compact, 'device-preview-card--enlarged': enlarged }">
     <template #header>
       <div class="panel-header">
-        <span>设备预览</span>
+        <div class="device-preview-title"><span>设备预览</span><DeviceInfoTooltip :device-id="selectedDeviceId" /></div>
         <div class="device-status">
           <el-tag v-if="compact" :type="available ? 'success' : 'info'">
             {{ available ? '已连接' : '未连接' }}
@@ -444,6 +445,7 @@ function handlePointerCancel(event: PointerEvent) {
 </template>
 
 <style scoped>
+.device-preview-title { display: flex; align-items: center; gap: 8px; }
 .device-preview-card--compact { display: flex; flex-direction: column; min-height: 0; }
 .device-preview-card--compact :deep(> .el-card__body) { display: flex; flex-direction: column; flex: 1; min-height: 0; overflow: hidden; gap: 8px; }
 .device-preview-card--compact .panel-header { flex-wrap: wrap; gap: 8px; font-size: 14px; }

package/src/types.ts

@@ -147,3 +147,12 @@ export type DeviceAction = {
   icon: string;
   keyCode: number;
 };
+export type AndroidDeviceDetails = {
+  name: string;
+  brand: string;
+  model: string;
+  processor: string;
+  androidVersion: string;
+  physicalResolution: string;
+  resolution: string;
+};