android-midscene-automation 0.1.36 → 0.1.37

package/CHANGELOG.md

@@ -1,4 +1,10 @@
 # 更新记录
+## v0.1.37
+- 修复元素查找超时未覆盖 Appium 请求的问题，驱动无响应时及时中止并明确报错，不再误判为找不到元素；唯一原生定位优先使用 ID 或 Accessibility ID。
+- 设备预览新增设备信息，展示设备名称、品牌、型号、处理器、Android 版本、物理分辨率及当前分辨率，支持远程设备；问号位于标题右侧，样式与全局变量帮助图标一致。
+- 新增独立“杀死 APP”操作节点，默认使用当前选中应用包名，支持编辑目标包名；停止当前设备用户下的应用进程，不清除应用数据。
+- Midscene 相关模块由 1.12.5 统一升级至 1.12.6。
+
 ## v0.1.36
 - 新合并支持取消：原合并按钮切换为取消合并，还原分支和被删除的重复节点，保留配置编辑；公共流程新增的普通操作可选择保留左侧、右侧或两侧，结构冲突时阻止还原。本地保存还原记录，导出及节点复制不携带历史记录。
 - 启动相册前先停止当前设备用户下的目标相册进程，再重新打开；保留相册自动适配，不清除照片及应用数据，停止失败时明确报错。

package/README.md

@@ -1229,6 +1229,12 @@ 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
 - 新合并支持取消：原合并按钮切换为取消合并，还原分支和被删除的重复节点，保留配置编辑；公共流程新增的普通操作可选择保留左侧、右侧或两侧，结构冲突时阻止还原。本地保存还原记录，导出及节点复制不携带历史记录。
 - 启动相册前先停止当前设备用户下的目标相册进程，再重新打开；保留相册自动适配，不清除照片及应用数据，停止失败时明确报错。

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "android-midscene-automation",
-  "version": "0.1.36",
+  "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/repository.ts

@@ -38,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/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

@@ -122,6 +122,7 @@ const insertableRecorderActions: RecorderAction[] = [
   'clearInput',
   'coordinateTap',
   'launchApp',
+  'stopApp',
   'openGallery',
   'endFlow',
   'loop',
@@ -1580,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)}`,

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/FlowStepEditor.vue

@@ -156,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" />
@@ -164,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"
@@ -176,7 +176,7 @@ 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', 'clearAppData'].includes(step.type)" :label="step.type === 'waitActivity' ? '目标 Activity' : '目标 APP 包名'">
+      <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'">

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: '终止流程',

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-graph.ts

@@ -24,6 +24,7 @@ export type InsertAction =
   | 'swipe'
   | 'pinch'
   | 'launchApp'
+  | 'stopApp'
   | 'openGallery'
   | 'endFlow'
   | 'loop'

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/types.ts

@@ -93,6 +93,7 @@ export type AppiumRecordedStep = {
     | 'swipe'
     | 'screenshot'
     | 'launchApp'
+    | 'stopApp'
     | 'openGallery'
     | 'endFlow'
     | 'loop'

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;
+};