android-midscene-automation 1.1.3 → 1.1.5

package/server/appium-recorder/element-tap.test.ts

@@ -7,13 +7,14 @@ import { tmpdir } from 'node:os';
 import { join } from 'node:path';
 import type { AppiumRecordedScriptRecord } from './repository';
 
-test('element taps use the live element center through ADB without waiting for Appium click acknowledgement', async () => {
+test('element taps and long presses use the live element center through ADB without waiting for Appium gesture acknowledgement', async () => {
   const root = await mkdtemp(join(tmpdir(), 'element-tap-'));
   const env = { ...process.env };
   const original = { execFile: childProcess.execFile, fetch: globalThis.fetch };
   const appiumPaths: string[] = [];
   const adbCalls: string[][] = [];
   let elementRequestCount = 0;
+  let absentRequestCount = 0;
   try {
     const sdk = join(root, 'sdk');
     await mkdir(join(sdk, 'platform-tools'), { recursive: true });
@@ -26,7 +27,10 @@ test('element taps use the live element center through ADB without waiting for A
     });
     childProcess.execFile = ((_command, args: string[], _options, callback) => {
       adbCalls.push(args);
-      queueMicrotask(() => callback(null, '', ''));
+      const stdout = args.includes('activities')
+        ? 'topResumedActivity=ActivityRecord{abc example.test/.Login t1}'
+        : '';
+      queueMicrotask(() => callback(null, stdout, ''));
       return {};
     }) as typeof childProcess.execFile;
     syncBuiltinESMExports();
@@ -37,13 +41,19 @@ test('element taps use the live element center through ADB without waiting for A
         return Response.json({ value: { sessionId: 'test-session' } });
       }
       if (path === '/session/test-session/element' && init?.method === 'POST') {
+        const selector = JSON.parse(String(init.body)).value;
+        if (selector === 'example:id/absent') {
+          absentRequestCount += 1;
+          await new Promise(resolve => setTimeout(resolve, 70));
+          return Response.json({ value: { error: 'no such element', message: 'not found' } }, { status: 404 });
+        }
         elementRequestCount += 1;
         return Response.json({ value: { 'element-6066-11e4-a52e-4f735466cecf': `button-${elementRequestCount}` } });
       }
-      if (path === '/session/test-session/element/button-2/rect') {
+      if (path === '/session/test-session/element/button-4/rect') {
         return Response.json({ value: { error: 'stale element reference', message: 'element changed' } }, { status: 404 });
       }
-      if (/\/element\/button-[13]\/rect$/.test(path)) {
+      if (/\/element\/button-(?:[1-3]|[5-6])\/rect$/.test(path)) {
         return Response.json({ value: { x: 10, y: 20, width: 100, height: 60 } });
       }
       return Response.json({ value: null });
@@ -52,6 +62,16 @@ test('element taps use the live element center through ADB without waiting for A
     const script: AppiumRecordedScriptRecord = {
       id: 'tap', name: 'tap', deviceId: 'fake-device', appPackage: '', appActivity: '', createdAt: '', updatedAt: '',
       steps: [{
+        id: 'recorded', type: 'tap', label: '点击录制页面按钮',
+        selector: { strategy: 'id', value: 'example:id/recorded', unique: true },
+        fallback: { strategy: 'bounds', centerX: 90, centerY: 190 },
+        pageBefore: { activity: 'example.test/.Login' },
+      }, {
+        id: 'invalid-recorded-position', type: 'tap', label: '无效录制坐标改用实时组件位置',
+        selector: { strategy: 'id', value: 'example:id/live-position', unique: true },
+        fallback: { strategy: 'bounds', centerX: 0, centerY: 0 },
+        pageBefore: { activity: 'example.test/.Login' },
+      }, {
         id: 'login', type: 'tap', label: '点击登录按钮',
         selector: { strategy: 'id', value: 'example:id/login', unique: true },
         fallback: { strategy: 'bounds', centerX: 999, centerY: 999 },
@@ -59,6 +79,19 @@ test('element taps use the live element center through ADB without waiting for A
         id: 'refreshing', type: 'tap', label: '点击刷新列表中的按钮',
         selector: { strategy: 'id', value: 'example:id/refreshing', unique: true },
         fallback: { strategy: 'bounds', centerX: 999, centerY: 999 },
+      }, {
+        id: 'long-press', type: 'longPress', label: '长按设备', longPressMode: 'element', timeoutMs: 800,
+        selector: { strategy: 'id', value: 'example:id/device', unique: true },
+        fallback: { strategy: 'bounds', centerX: 999, centerY: 999 },
+      }, {
+        id: 'home', type: 'key', label: 'Home', keyCode: 3,
+      }, {
+        id: 'back-if-exists', type: 'backIfExists', label: '弹窗存在则返回',
+        selector: { strategy: 'id', value: 'example:id/dialog', unique: true }, timeoutMs: 100,
+      }, {
+        id: 'absent', type: 'tapIfExists', label: '不存在则跳过',
+        selector: { strategy: 'id', value: 'example:id/absent', unique: true },
+        selectorChain: [{ strategy: 'xpath', value: "//*[@resource-id='example:id/absent']", unique: true }], timeoutMs: 100,
       }],
     };
     const result = await replayAppiumScript(script, 'fake-device', undefined, undefined, {
@@ -67,13 +100,145 @@ test('element taps use the live element center through ADB without waiting for A
     });
     assert.equal(result.success, true, result.output);
     assert.ok(appiumPaths.includes('GET /session/test-session/element/button-1/rect'));
-    assert.ok(appiumPaths.includes('GET /session/test-session/element/button-3/rect'));
-    assert.equal(elementRequestCount, 3, 're-locate once after a stale element rect');
+    assert.ok(appiumPaths.includes('GET /session/test-session/element/button-5/rect'));
+    assert.equal(elementRequestCount, 7, 'always locate component ids first and re-locate once after a stale rect');
+    assert.equal(absentRequestCount, 1, 'do not repeat the primary selector with an unsafe deadline remainder');
     assert.equal(appiumPaths.some(path => path.endsWith('/click')), false, 'must not call the blocking Appium click endpoint');
+    assert.equal(appiumPaths.some(path => path.endsWith('/execute/sync')), false, 'must not call the blocking Appium gesture endpoint for long presses');
+    assert.equal(appiumPaths.some(path => path.endsWith('/press_keycode')), false, 'must not call the blocking Appium key endpoint');
     assert.deepEqual(adbCalls.filter(args => args.includes('tap')).map(args => args.slice(-4)), [
       ['input', 'tap', '60', '50'],
       ['input', 'tap', '60', '50'],
+      ['input', 'tap', '60', '50'],
+      ['input', 'tap', '60', '50'],
     ]);
+    assert.deepEqual(adbCalls.find(args => args.includes('swipe'))?.slice(-7), ['input', 'swipe', '60', '50', '60', '50', '800']);
+    assert.deepEqual(adbCalls.filter(args => args.includes('keyevent')).map(args => args.slice(-3)), [
+      ['input', 'keyevent', '3'],
+      ['input', 'keyevent', '4'],
+    ]);
+  } finally {
+    childProcess.execFile = original.execFile;
+    globalThis.fetch = original.fetch;
+    syncBuiltinESMExports();
+    for (const key of ['ANDROID_MIDSCENE_DATA_ROOT', 'ANDROID_HOME', 'ANDROID_SDK_ROOT', 'APPIUM_SERVER_URL']) {
+      if (env[key] === undefined) delete process.env[key]; else process.env[key] = env[key];
+    }
+    await rm(root, { recursive: true, force: true });
+  }
+});
+
+test('text matching does not start another Appium query at the node deadline', async () => {
+  const root = await mkdtemp(join(tmpdir(), 'text-deadline-'));
+  const env = { ...process.env };
+  const original = { execFile: childProcess.execFile, fetch: globalThis.fetch };
+  let elementQueries = 0;
+  try {
+    const sdk = join(root, 'sdk');
+    await mkdir(join(sdk, 'platform-tools'), { recursive: true });
+    await writeFile(join(sdk, 'platform-tools', 'adb'), '');
+    Object.assign(process.env, {
+      ANDROID_MIDSCENE_DATA_ROOT: root,
+      ANDROID_HOME: sdk,
+      ANDROID_SDK_ROOT: sdk,
+      APPIUM_SERVER_URL: 'http://external.invalid',
+    });
+    childProcess.execFile = ((_command, _args: string[], _options, callback) => {
+      queueMicrotask(() => callback(null, '', ''));
+      return {};
+    }) as typeof childProcess.execFile;
+    syncBuiltinESMExports();
+    globalThis.fetch = async (input, init) => {
+      const path = new URL(String(input)).pathname;
+      if (path === '/session' && init?.method === 'POST') {
+        return Response.json({ value: { sessionId: 'deadline-session' } });
+      }
+      if (path === '/session/deadline-session/elements') {
+        elementQueries += 1;
+        await new Promise(resolve => setTimeout(resolve, 70));
+        return Response.json({ value: [] });
+      }
+      return Response.json({ value: null });
+    };
+    const { replayAppiumScript } = await import('./appium-runner');
+    const script: AppiumRecordedScriptRecord = {
+      id: 'deadline', name: 'deadline', deviceId: 'fake-device', appPackage: '', appActivity: '', createdAt: '', updatedAt: '',
+      steps: [{
+        id: 'text', type: 'textClick', label: '短时间查找文字', value: '不存在', timeoutMs: 100,
+        timeoutBranch: 'no', flow: { noTargetId: 'done' },
+      }, { id: 'done', type: 'noop', label: '继续执行' }],
+    };
+    const result = await replayAppiumScript(script, 'fake-device', undefined, undefined, {
+      screenshotReport: false,
+      reportSummaryEnabled: false,
+    });
+    assert.equal(result.success, true, result.output);
+    assert.equal(elementQueries, 1, 'the final 30ms must not start another Appium query');
+    assert.match(result.output, /判断超时，按配置进入右侧分支/);
+  } finally {
+    childProcess.execFile = original.execFile;
+    globalThis.fetch = original.fetch;
+    syncBuiltinESMExports();
+    for (const key of ['ANDROID_MIDSCENE_DATA_ROOT', 'ANDROID_HOME', 'ANDROID_SDK_ROOT', 'APPIUM_SERVER_URL']) {
+      if (env[key] === undefined) delete process.env[key]; else process.env[key] = env[key];
+    }
+    await rm(root, { recursive: true, force: true });
+  }
+});
+
+test('optional tap recovers a blocked UiAutomator2 session and uses the ADB hierarchy', async () => {
+  const root = await mkdtemp(join(tmpdir(), 'optional-recovery-'));
+  const env = { ...process.env };
+  const original = { execFile: childProcess.execFile, fetch: globalThis.fetch };
+  const adbCalls: string[][] = [];
+  let sessions = 0;
+  try {
+    const sdk = join(root, 'sdk');
+    await mkdir(join(sdk, 'platform-tools'), { recursive: true });
+    await writeFile(join(sdk, 'platform-tools', 'adb'), '');
+    Object.assign(process.env, {
+      ANDROID_MIDSCENE_DATA_ROOT: root,
+      ANDROID_HOME: sdk,
+      ANDROID_SDK_ROOT: sdk,
+      APPIUM_SERVER_URL: 'http://external.invalid',
+    });
+    childProcess.execFile = ((_command, args: string[], _options, callback) => {
+      adbCalls.push(args);
+      const stdout = args.includes('cat')
+        ? '<hierarchy><node resource-id="example:id/optional" bounds="[20,40][120,100]" /></hierarchy>'
+        : args.includes('dump') ? 'UI hierchary dumped' : '';
+      queueMicrotask(() => callback(null, stdout, ''));
+      return {};
+    }) as typeof childProcess.execFile;
+    syncBuiltinESMExports();
+    globalThis.fetch = async (input, init) => {
+      const path = new URL(String(input)).pathname;
+      if (path === '/session' && init?.method === 'POST') {
+        sessions += 1;
+        return Response.json({ value: { sessionId: sessions === 1 ? 'blocked-session' : 'recovered-session' } });
+      }
+      if (path === '/session/blocked-session/element') {
+        await new Promise((_resolve, reject) => init?.signal?.addEventListener('abort', () => reject(init.signal?.reason), { once: true }));
+      }
+      return Response.json({ value: null });
+    };
+    const { replayAppiumScript } = await import('./appium-runner');
+    const script: AppiumRecordedScriptRecord = {
+      id: 'recover', name: 'recover', deviceId: 'fake-device', appPackage: '', appActivity: '', createdAt: '', updatedAt: '',
+      steps: [{
+        id: 'optional', type: 'tapIfExists', label: '存在则点击', timeoutMs: 100,
+        selector: { strategy: 'id', value: 'example:id/optional', unique: true },
+        fallback: { strategy: 'bounds', centerX: 999, centerY: 999 },
+      }],
+    };
+    const result = await replayAppiumScript(script, 'fake-device', undefined, undefined, {
+      screenshotReport: false,
+      reportSummaryEnabled: false,
+    });
+    assert.equal(result.success, true, result.output);
+    assert.equal(sessions, 2, 'replace the blocked session before continuing');
+    assert.deepEqual(adbCalls.find(args => args.includes('tap'))?.slice(-4), ['input', 'tap', '70', '70']);
+    assert.match(result.output, /ADB 组件树发现目标并已点击/);
   } finally {
     childProcess.execFile = original.execFile;
     globalThis.fetch = original.fetch;

package/server/appium-recorder/managed-cleanup.test.ts

@@ -15,7 +15,7 @@ test('replay survives command idle periods and cleans sessions after success, ab
   const calls: string[][] = [];
   let mode = 'success', stopped = false;
   let elapsedMs = 0, lastCommandMs = 0, commandTimeoutMs = 60_000;
-  let keyCommands = 0, deletedSessions = 0;
+  let gestureCommands = 0, deletedSessions = 0;
   let controller = new AbortController();
   try {
     const sdk = join(root, 'sdk');
@@ -47,13 +47,13 @@ test('replay survives command idle periods and cleans sessions after success, ab
       if (path === '/session' && init?.method === 'POST') {
         if (mode === 'creation-failure') return Response.json({ value: { error: 'session not created', message: 'creation failed' } }, { status: 500 });
         const capabilities = JSON.parse(String(init.body)).capabilities.alwaysMatch;
-        assert.deepEqual(capabilities['appium:settings'], { waitForIdleTimeout: 1000 }, 'bound UiAutomator idle waits for animated screens');
+        assert.deepEqual(capabilities['appium:settings'], { waitForIdleTimeout: 0 }, 'disable UiAutomator idle waits for continuously updating screens');
         commandTimeoutMs = (capabilities['appium:newCommandTimeout'] ?? 60) * 1000;
         lastCommandMs = elapsedMs;
         return Response.json({ value: { sessionId: 'test-session' } });
       }
-      if (path.endsWith('/press_keycode')) {
-        keyCommands++;
+      if (path.endsWith('/execute/sync')) {
+        gestureCommands++;
         // Model Appium's idle expiry without waiting a real minute or touching a device.
         if (commandTimeoutMs && elapsedMs - lastCommandMs > commandTimeoutMs) {
           return Response.json({ value: { error: 'invalid session id', message: 'New Command Timeout expired' } }, { status: 404 });
@@ -70,7 +70,7 @@ test('replay survives command idle periods and cleans sessions after success, ab
     };
     for (mode of ['success', 'long-idle', 'abort', 'creation-failure', 'cleanup-failure', 'external', 'external-abort']) {
       calls.length = 0;
-      elapsedMs = lastCommandMs = keyCommands = deletedSessions = 0;
+      elapsedMs = lastCommandMs = gestureCommands = deletedSessions = 0;
       controller = new AbortController();
       const external = mode.startsWith('external');
       const aborted = mode.endsWith('abort');
@@ -79,7 +79,7 @@ test('replay survives command idle periods and cleans sessions after success, ab
       else delete process.env.APPIUM_SERVER_URL;
       const replayScript = longIdle ? { ...script, steps: [
         ...script.steps,
-        { id: 'home', type: 'key' as const, label: 'Home', keyCode: 3 },
+        { id: 'pinch', type: 'pinch' as const, label: '缩放', pinch: { direction: 'out' as const, centerX: 200, centerY: 300, percent: 0.5 } },
       ] } : script;
       const result = await replayAppiumScript(replayScript, 'test-device', line => {
         // ADB operations and model inference do not reset Appium's command timer.
@@ -93,7 +93,7 @@ test('replay survives command idle periods and cleans sessions after success, ab
         assert.deepEqual(calls.map(args => args.at(-1)).sort(), ['io.appium.uiautomator2.server', 'io.appium.uiautomator2.server.test']);
       }
       if (longIdle) {
-        assert.equal(keyCommands, 1, 'execute Home after the long interval without Appium commands');
+        assert.equal(gestureCommands, 1, 'execute an Appium gesture after the long interval without Appium commands');
         assert.equal(result.success, true, result.output);
       }
       if (aborted) assert.equal(result.stopped, true);

package/server/appium-recorder/replay-lifecycle.test.ts

@@ -70,7 +70,7 @@ test('ADB cancellation and deadlines cover actions; external sessions survive id
     // A local HTTP server models the idle lease at accelerated time, without a real device.
     globalThis.fetch = original.fetch;
     globalThis.setInterval = ((fn, ms, ...args) => original.setInterval(fn, ms === 15000 ? 15 : ms, ...args)) as typeof setInterval;
-    let active = false, timeoutSeconds = 0, heartbeats = 0, homeKeys = 0, deleted = 0;
+    let active = false, timeoutSeconds = 0, heartbeats = 0, gestures = 0, deleted = 0;
     let expiry: ReturnType<typeof setTimeout> | undefined;
     let createdResolve: () => void = () => {};
     const renew = () => { clearTimeout(expiry); expiry = setTimeout(() => { active = false; }, timeoutSeconds * 3); };
@@ -89,7 +89,7 @@ test('ADB cancellation and deadlines cover actions; external sessions survive id
       } else {
         renew();
         if (req.url?.endsWith('/timeouts')) heartbeats++;
-        if (req.url?.endsWith('/press_keycode')) homeKeys++;
+        if (req.url?.endsWith('/execute/sync')) gestures++;
         res.end('{"value":{}}');
       }
     });
@@ -97,9 +97,9 @@ test('ADB cancellation and deadlines cover actions; external sessions survive id
     process.env.APPIUM_SERVER_URL = `http://127.0.0.1:${(server.address() as { port: number }).port}`;
     try {
       mode = 'long-idle'; controller = new AbortController();
-      const result = await run([{ id: 'wait', type: 'delay', label: 'idle', timeoutMs: 450 }, { id: 'home', type: 'key', label: 'Home', keyCode: 3 }]);
+      const result = await run([{ id: 'wait', type: 'delay', label: 'idle', timeoutMs: 450 }, { id: 'pinch', type: 'pinch', label: '缩放', pinch: { direction: 'out', centerX: 200, centerY: 300, percent: 0.5 } }]);
       assert.equal(result.success, true, result.output);
-      assert.equal(timeoutSeconds, 60); assert.ok(heartbeats > 3); assert.equal(homeKeys, 1); assert.equal(deleted, 1);
+      assert.equal(timeoutSeconds, 60); assert.ok(heartbeats > 3); assert.equal(gestures, 1); assert.equal(deleted, 1);
       const heartbeatCount = heartbeats;
       await new Promise(resolve => setTimeout(resolve, 40));
       assert.equal(heartbeats, heartbeatCount, 'heartbeat stops after cleanup');

package/server/appium-recorder/repository.ts

@@ -475,6 +475,7 @@ export function deleteAppiumRecordedScript(id: string) {
 }
 
 export function importAppiumRecordedScript(input: {
+  sourceId?: string;
   variables?: TestVariable[];
   name: string;
   appPackage: string;
@@ -482,16 +483,45 @@ export function importAppiumRecordedScript(input: {
   deviceId?: string;
   steps: AppiumRecordedStepRecord[];
 }) {
+  return importAppiumRecordedScripts([input])[0];
+}
+
+export function importAppiumRecordedScripts(inputs: Array<{
+  sourceId?: string;
+  variables?: TestVariable[];
+  name: string;
+  appPackage: string;
+  appActivity?: string;
+  deviceId?: string;
+  steps: AppiumRecordedStepRecord[];
+}>) {
   initDb();
-  const baseName = input.name.trim() || '导入脚本';
-  const existingNames = new Set(listAppiumRecordedScripts().map((script) => script.name));
-  let name = baseName;
-  let suffix = 2;
-  while (existingNames.has(name)) {
-    name = `${baseName} (${suffix})`;
-    suffix += 1;
-  }
-  return saveAppiumRecordedScript({ ...input, name });
+  const usedNames = new Set(listAppiumRecordedScripts().map((script) => script.name));
+  const sourceIds = new Set<string>();
+  const planned = inputs.map((input) => {
+    const sourceId = input.sourceId?.trim() || '';
+    if (sourceId && sourceIds.has(sourceId)) throw new Error(`导入文件包含重复脚本 ID：${sourceId}`);
+    if (sourceId) sourceIds.add(sourceId);
+
+    const baseName = input.name.trim() || '导入脚本';
+    let name = baseName;
+    let suffix = 2;
+    while (usedNames.has(name)) name = `${baseName} (${suffix++})`;
+    usedNames.add(name);
+    return { ...input, sourceId, id: createId('appium_script'), name };
+  });
+  const importedIds = new Map(planned.filter(item => item.sourceId).map(item => [item.sourceId, item.id]));
+
+  return planned.map((input) => {
+    const steps = input.steps.map(step => (
+      step.type === 'runScript' && step.value && importedIds.has(step.value)
+        ? { ...step, value: importedIds.get(step.value) }
+        : step
+    ));
+    const script = saveAppiumRecordedScript({ ...input, id: input.id, steps });
+    if (!script) throw new Error(`脚本「${input.name}」导入失败`);
+    return script;
+  });
 }
 
 export function saveAppiumReplayReport(input: Omit<AppiumReplayReportRecord, 'id' | 'createdAt'>) {

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

@@ -7,6 +7,11 @@ export function withElementDeadline<T>(timeoutMs: number, action: () => Promise<
   return deadline.run(Date.now() + Math.max(1, timeoutMs), action);
 }
 
+export function remainingElementDeadlineMs() {
+  const value = deadline.getStore();
+  return value === undefined ? Number.POSITIVE_INFINITY : value - Date.now();
+}
+
 // 响应体也受同一个期限约束，避免收到 HTTP 头后继续无限等待。
 export async function timedAppiumFetch(url: string, init: RequestInit, timeoutMs: number) {
   const remaining = Math.max(1, Math.min(timeoutMs, (deadline.getStore() ?? Infinity) - Date.now()));

package/server/appium-recorder/routes.ts

@@ -19,6 +19,7 @@ import {
   linkedScriptSnapshot,
   getAppiumRecordedScript,
   importAppiumRecordedScript,
+  importAppiumRecordedScripts,
   listAppiumRecordedScripts,
   saveAppiumRecordedScript,
   type AppiumRecordedStepRecord,
@@ -322,7 +323,20 @@ export async function handleAppiumRecorderRequest(
     if (pathname === '/api/appium-recorder/scripts/import' && req.method === 'POST') {
       const parsed = await readBody<{
         schemaVersion?: number;
+        files?: Array<{
+          schemaVersion?: number;
+          script?: {
+            id?: string;
+            name?: string;
+            appPackage?: string;
+            appActivity?: string;
+            deviceId?: string;
+            steps?: AppiumRecordedStepRecord[];
+            variables?: TestVariable[];
+          };
+        }>;
         script?: {
+          id?: string;
           name?: string;
           appPackage?: string;
           appActivity?: string;
@@ -331,22 +345,31 @@ export async function handleAppiumRecorderRequest(
           variables?: TestVariable[];
         };
       }>(req);
-      const imported = parsed.script;
-      if (!imported || typeof imported !== 'object') throw new Error('导入文件缺少 script 数据');
-      if (!Array.isArray(imported.steps)) throw new Error('导入文件的 steps 格式无效');
-      const invalidStep = imported.steps.some((step) => (
-        !step || typeof step !== 'object' || typeof step.id !== 'string' || typeof step.type !== 'string'
-      ));
-      if (invalidStep) throw new Error('导入文件包含无效节点');
-      const script = importAppiumRecordedScript({
-        name: imported.name || '',
-        appPackage: imported.appPackage || '',
-        appActivity: imported.appActivity || '',
-        deviceId: imported.deviceId || '',
-        steps: imported.steps,
-        variables: imported.variables,
+      const files = Array.isArray(parsed.files) ? parsed.files : [parsed];
+      if (!files.length) throw new Error('没有可导入的脚本文件');
+      const imports = files.map((file, index) => {
+        const imported = file.script;
+        const prefix = files.length > 1 ? `第 ${index + 1} 个导入文件` : '导入文件';
+        if (!imported || typeof imported !== 'object') throw new Error(`${prefix}缺少 script 数据`);
+        if (!Array.isArray(imported.steps)) throw new Error(`${prefix}的 steps 格式无效`);
+        const invalidStep = imported.steps.some((step) => (
+          !step || typeof step !== 'object' || typeof step.id !== 'string' || typeof step.type !== 'string'
+        ));
+        if (invalidStep) throw new Error(`${prefix}包含无效节点`);
+        return {
+          sourceId: imported.id || '',
+          name: imported.name || '',
+          appPackage: imported.appPackage || '',
+          appActivity: imported.appActivity || '',
+          deviceId: imported.deviceId || '',
+          steps: imported.steps,
+          variables: imported.variables,
+        };
       });
-      sendJson(res, { script });
+      const scripts = files.length === 1
+        ? [importAppiumRecordedScript(imports[0])]
+        : importAppiumRecordedScripts(imports);
+      sendJson(res, { script: scripts[0], scripts });
       return true;
     }
 

package/server/appium-recorder/script-import.test.ts

@@ -0,0 +1,45 @@
+import assert from 'node:assert/strict';
+import { mkdtemp, rm } from 'node:fs/promises';
+import { tmpdir } from 'node:os';
+import { join } from 'node:path';
+import { test } from 'node:test';
+
+test('batch import remaps linked script ids and keeps imported names unique', async () => {
+  const root = await mkdtemp(join(tmpdir(), 'appium-script-import-'));
+  const previousRoot = process.env.ANDROID_MIDSCENE_DATA_ROOT;
+  process.env.ANDROID_MIDSCENE_DATA_ROOT = root;
+  try {
+    const { importAppiumRecordedScripts } = await import('./repository');
+    const scripts = importAppiumRecordedScripts([
+      {
+        sourceId: 'exported-root',
+        name: '回归测试',
+        appPackage: 'test.app',
+        steps: [{ id: 'link', type: 'runScript', label: '连接脚本 子流程', value: 'exported-child' }],
+      },
+      {
+        sourceId: 'exported-child',
+        name: '子流程',
+        appPackage: 'test.app',
+        steps: [{ id: 'delay', type: 'delay', label: '等待', timeoutMs: 100 }],
+      },
+    ]);
+
+    assert.equal(scripts.length, 2);
+    assert.notEqual(scripts[0].id, 'exported-root');
+    assert.notEqual(scripts[1].id, 'exported-child');
+    assert.equal(scripts[0].steps[0].value, scripts[1].id);
+
+    const duplicate = importAppiumRecordedScripts([{
+      sourceId: 'another-child',
+      name: '子流程',
+      appPackage: 'test.app',
+      steps: [],
+    }])[0];
+    assert.equal(duplicate.name, '子流程 (2)');
+  } finally {
+    if (previousRoot === undefined) delete process.env.ANDROID_MIDSCENE_DATA_ROOT;
+    else process.env.ANDROID_MIDSCENE_DATA_ROOT = previousRoot;
+    await rm(root, { recursive: true, force: true });
+  }
+});

package/server/appium-recorder/tree-dump.ts

@@ -2,6 +2,50 @@ import { randomUUID } from 'node:crypto';
 
 type ExecText = (command: string, args: string[]) => Promise<string>;
 
+export type HierarchySelector = {
+  strategy: 'accessibilityId' | 'id' | 'androidUiAutomator' | 'xpath' | 'bounds';
+  value?: string;
+};
+
+export type HierarchyBounds = { left: number; top: number; right: number; bottom: number; centerX: number; centerY: number };
+
+function decodeXml(value: string) {
+  return value
+    .replace(/&quot;/g, '"').replace(/&apos;/g, "'").replace(/&lt;/g, '<').replace(/&gt;/g, '>').replace(/&amp;/g, '&')
+    .replace(/&#(\d+);/g, (_match, code) => String.fromCodePoint(Number(code)));
+}
+
+function selectorAttribute(selector: HierarchySelector): { name: string; value: string } | undefined {
+  const value = selector.value || '';
+  if (selector.strategy === 'id') return { name: 'resource-id', value };
+  if (selector.strategy === 'accessibilityId') return { name: 'content-desc', value };
+  if (selector.strategy === 'xpath') {
+    const match = value.match(/@(resource-id|content-desc|text)\s*=\s*(['"])(.*?)\2/);
+    return match ? { name: match[1], value: decodeXml(match[3]) } : undefined;
+  }
+  if (selector.strategy === 'androidUiAutomator') {
+    const match = value.match(/\.(resourceId|description|text)\("((?:\\.|[^"])*)"\)/);
+    if (!match) return undefined;
+    const name = { resourceId: 'resource-id', description: 'content-desc', text: 'text' }[match[1]];
+    return { name, value: match[2].replace(/\\"/g, '"').replace(/\\\\/g, '\\') };
+  }
+  return undefined;
+}
+
+export function findHierarchyBounds(xml: string, selectors: HierarchySelector[]) {
+  const targets = selectors.map(selectorAttribute).filter((item): item is { name: string; value: string } => Boolean(item));
+  if (!targets.length) return undefined;
+  for (const tag of xml.match(/<node\b[^>]*>/g) || []) {
+    const attributes = new Map(Array.from(tag.matchAll(/([\w:-]+)="([^"]*)"/g), match => [match[1], decodeXml(match[2])]));
+    if (!targets.some(target => attributes.get(target.name) === target.value)) continue;
+    const bounds = attributes.get('bounds')?.match(/^\[(\d+),(\d+)\]\[(\d+),(\d+)\]$/);
+    if (!bounds) continue;
+    const [left, top, right, bottom] = bounds.slice(1).map(Number);
+    return { left, top, right, bottom, centerX: Math.round((left + right) / 2), centerY: Math.round((top + bottom) / 2) };
+  }
+  return undefined;
+}
+
 export async function readFreshWindowHierarchy(deviceId: string, adb: string, execText: ExecText) {
   // dump 失败可能仍以 0 退出。每次独立文件，避免误读上一次成功抓取的树。
   const remotePath = `/data/local/tmp/midscene_uidump_${randomUUID()}.xml`;

package/server/remote-agents/replay-integration.test.ts

@@ -16,14 +16,14 @@ test('real agent receives stop during replay and retries result delivery without
   const { listRemoteAndroidDevices } = await import('./registry');
   const { saveAppiumRecordedScript } = await import('../appium-recorder/repository');
   const { listRunHistory } = await import('../appium-recorder/run-history');
-  let sessions = 0, deletes = 0, keys = 0, resultAttempts = 0;
+  let sessions = 0, deletes = 0, gestures = 0, resultAttempts = 0;
   const server = createServer(async (req, res) => {
     if (req.url === '/session') {
       sessions++; res.setHeader('Content-Type', 'application/json'); res.end('{"value":{"sessionId":"test-session"}}'); return;
     }
     if (req.url?.startsWith('/session/')) {
       if (req.method === 'DELETE') deletes++;
-      if (req.url.endsWith('/press_keycode')) keys++;
+      if (req.url.endsWith('/execute/sync')) gestures++;
       res.setHeader('Content-Type', 'application/json'); res.end('{"value":{}}'); return;
     }
     if (req.url === '/api/remote-agents/result' && ++resultAttempts === 1) {
@@ -46,7 +46,7 @@ test('real agent receives stop during replay and retries result delivery without
     const base = `http://127.0.0.1:${(server.address() as { port: number }).port}`;
     const script = saveAppiumRecordedScript({ name: 'remote-test', appPackage: 'example.test', steps: [
       { id: 'wait', type: 'delay', label: 'wait', timeoutMs: 60000 },
-      { id: 'home', type: 'key', label: 'Home', keyCode: 3 },
+      { id: 'pinch', type: 'pinch', label: '缩放', pinch: { direction: 'out', centerX: 200, centerY: 300, percent: 0.5 } },
     ] });
     agent = spawn(process.execPath, ['--import', 'tsx', resolve('remote-agent/index.ts'), '--server', base, '--agent-id', 'integration-agent'], {
       env: { ...process.env, ANDROID_MIDSCENE_DATA_ROOT: join(root, 'agent'), ANDROID_HOME: sdk, ANDROID_SDK_ROOT: sdk, APPIUM_SERVER_URL: base, PATH: `${bin}:${process.env.PATH}` },
@@ -63,7 +63,7 @@ test('real agent receives stop during replay and retries result delivery without
     const result = await running;
     assert.equal(result.stopped, true, stderr);
     assert.equal(sessions, 1, 'retrying the result never replays device actions');
-    assert.equal(deletes, 1); assert.equal(keys, 0, 'Home must not run after cancellation');
+    assert.equal(deletes, 1); assert.equal(gestures, 0, 'the gesture must not run after cancellation');
     assert.equal(resultAttempts, 2, 'temporary result failure is retried');
     const history = listRunHistory(script.id);
     assert.equal(history.length, 1); assert.equal(history[0]?.status, 'stopped'); assert.equal(history[0]?.deviceId, deviceId);

package/src/App.vue

@@ -790,7 +790,15 @@ onUnmounted(() => {
       width="760px"
       class="code-dialog"
     >
-      <div class="code-dialog__toolbar">
+      <el-input
+        v-if="codeDialog.editing"
+        v-model="codeDialog.draftCode"
+        type="textarea"
+        resize="none"
+        class="code-dialog__editor"
+      />
+      <pre v-else class="code-block code-dialog__body"><code>{{ codeDialog.code || '暂无代码' }}</code></pre>
+      <template #footer>
         <el-button :icon="CopyDocument" @click="copyDialogCode">复制</el-button>
         <el-button v-if="!codeDialog.editing" type="primary" :icon="Edit" @click="editCodeDialog">
           编辑
@@ -803,15 +811,7 @@ onUnmounted(() => {
             保存
           </el-button>
         </template>
-      </div>
-      <el-input
-        v-if="codeDialog.editing"
-        v-model="codeDialog.draftCode"
-        type="textarea"
-        resize="none"
-        class="code-dialog__editor"
-      />
-      <pre v-else class="code-block code-dialog__body"><code>{{ codeDialog.code || '暂无代码' }}</code></pre>
+      </template>
     </el-dialog>
 
     <AppSidebar :active-menu="activeMenu" :collapsed="sidebarCollapsed"