android-midscene-automation 0.1.6 → 0.1.9

package/src/appium-recorder/AppiumPage.vue

@@ -1,14 +1,13 @@
 <script setup lang="ts">
 import { computed, onMounted, reactive, shallowRef, watch } from 'vue';
 import { ElMessage, ElMessageBox } from 'element-plus';
-import { Check, Delete, Refresh, VideoPlay } from '@element-plus/icons-vue';
+import { Check, CopyDocument, Delete, FullScreen, Refresh, VideoPlay } from '@element-plus/icons-vue';
 import type { AndroidDevice, AppPreset, DeviceAction } from '../types';
 import DevicePreviewPanel from '../components/device/DevicePreviewPanel.vue';
 import {
   deleteAppiumScript,
   getAppiumScripts,
   getAppiumTree,
-  pressAppiumDeviceKey,
   replayAppiumScript,
   saveAppiumScript,
   tapAppiumDevice,
@@ -19,10 +18,23 @@ import RecordedSteps from './components/RecordedSteps.vue';
 import { findSmallestNodeAtPoint, flattenNodes, parseWindowHierarchy } from './tree';
 import type { AppiumNode, AppiumRecordedScript, AppiumRecordedStep } from './types';
 
-type NodeStepType = 'tap' | 'input' | 'assertExists';
+type NodeStepType = 'tap' | 'input' | 'assertExists' | 'waitFor';
+type BranchName = 'yes' | 'no';
+type StepScope = 'pre' | 'main' | 'post';
+type BranchTarget = {
+  stepId: string;
+  branch: BranchName;
+  updateTarget?: boolean;
+};
 type RecorderAction =
   | 'delay'
   | NodeStepType
+  | 'tapIfExists'
+  | 'inputIfExists'
+  | 'clearIfExists'
+  | 'backIfExists'
+  | 'popupCondition'
+  | 'runScript'
   | 'keyBack'
   | 'keyHome'
   | 'keyRecent'
@@ -71,18 +83,21 @@ const steps = shallowRef<AppiumRecordedStep[]>([]);
 const rawXml = shallowRef('');
 const currentActivity = shallowRef('');
 const replayOutput = shallowRef('');
+const replayOutputDialogVisible = shallowRef(false);
+const linkedScriptDialogVisible = shallowRef(false);
+const linkedScriptTargetId = shallowRef('');
+const linkedScriptInsertIndex = shallowRef<number | undefined>();
+const linkedScriptBranchTarget = shallowRef<BranchTarget | null>(null);
+const linkedScriptExpectedActivity = shallowRef('');
 const loadingTree = shallowRef(false);
 const saving = shallowRef(false);
 const deletingScriptId = shallowRef('');
 const replaying = shallowRef(false);
 const recordingTap = shallowRef(false);
 const resolvingNavigation = shallowRef(false);
-const maxReplayOutputLength = 20_000;
 const pendingNavigation = shallowRef<{
   beforeActivity: string;
   afterActivity: string;
-  beforeSignature: string;
-  afterSignature: string;
 } | null>(null);
 
 const form = reactive({
@@ -92,9 +107,29 @@ const form = reactive({
 });
 
 const selectedScript = computed(() => scripts.value.find((script) => script.id === selectedScriptId.value) || null);
-const visibleReplayOutput = computed(() => replayOutput.value);
+const linkableScripts = computed(() => scripts.value.filter((script) => script.id !== selectedScriptId.value));
+const compatibleLinkableScripts = computed(() => linkableScripts.value.filter((script) => (
+  Boolean(linkedScriptExpectedActivity.value)
+  && script.appActivity === linkedScriptExpectedActivity.value
+)));
+const visibleReplayOutput = computed(() => {
+  const lines = replayOutput.value.split(/\r?\n/);
+  const maxLines = 80;
+  if (lines.length <= maxLines) return replayOutput.value;
+  return `... 仅显示最近 ${maxLines} 行，点击展开查看完整日志\n${lines.slice(-maxLines).join('\n')}`;
+});
 const hasSelectedAppPackage = computed(() => props.appPresets.some((app) => app.packageName === form.appPackage));
-const recordingLocked = computed(() => recordingTap.value || resolvingNavigation.value || Boolean(pendingNavigation.value));
+const scriptActivityMismatch = computed(() => {
+  const expectedActivity = selectedScript.value?.appActivity?.trim();
+  if (!expectedActivity) return false;
+  return currentActivity.value !== expectedActivity;
+});
+const recordingBusy = computed(() => (
+  recordingTap.value
+  || resolvingNavigation.value
+  || Boolean(pendingNavigation.value)
+));
+const recordingLocked = computed(() => recordingBusy.value || scriptActivityMismatch.value);
 const overlayBounds = computed(() => flattenNodes(tree.value).flatMap((node) => (
   node.bounds ? [{ id: node.id, ...node.bounds }] : []
 )));
@@ -103,19 +138,103 @@ const selectedBounds = computed(() => {
   return bounds && selectedNode.value ? { id: selectedNode.value.id, ...bounds } : undefined;
 });
 
+function stepScope(step?: AppiumRecordedStep): StepScope {
+  return step?.flow?.scope || 'main';
+}
+
+function insertionScope(index?: number): StepScope {
+  if (index === -2) return 'pre';
+  if (index === -3) return 'post';
+  return typeof index === 'number' && index >= 0 ? stepScope(steps.value[index]) : 'main';
+}
+
+function withStepScope(step: AppiumRecordedStep, scope: StepScope): AppiumRecordedStep {
+  if (scope === 'main') return step;
+  return {
+    ...step,
+    flow: {
+      ...(step.flow || {}),
+      scope,
+    },
+  };
+}
+
+function insertStep(step: AppiumRecordedStep, index?: number) {
+  const nextSteps = [...steps.value];
+  if (index === -2) {
+    const firstMainIndex = nextSteps.findIndex((item) => stepScope(item) !== 'pre');
+    const insertAt = firstMainIndex < 0 ? nextSteps.length : firstMainIndex;
+    nextSteps.splice(insertAt, 0, withStepScope(step, 'pre'));
+  } else if (index === -3) {
+    nextSteps.push(withStepScope(step, 'post'));
+  } else if (index === -1) {
+    const firstMainIndex = nextSteps.findIndex((item) => stepScope(item) !== 'pre');
+    nextSteps.splice(firstMainIndex < 0 ? nextSteps.length : firstMainIndex, 0, step);
+  } else {
+    const scope = typeof index === 'number' ? stepScope(nextSteps[index]) : 'main';
+    nextSteps.splice(typeof index === 'number' ? index + 1 : nextSteps.length, 0, withStepScope(step, scope));
+  }
+  steps.value = nextSteps;
+  return step;
+}
+
+function updateBranchTarget(stepId: string, branch: BranchName, targetId: string) {
+  const targetKey = branch === 'yes' ? 'yesTargetId' : 'noTargetId';
+  steps.value = steps.value.map((step) => (
+    step.id === stepId
+      ? {
+          ...step,
+          flow: {
+            ...(step.flow || {}),
+            nodeKind: 'condition',
+            [targetKey]: targetId,
+          },
+        }
+      : step
+  ));
+}
+
+function attachStepToBranch(stepId: string, conditionId: string, branch: BranchName) {
+  steps.value = steps.value.map((step) => (
+    step.id === stepId
+      ? {
+          ...step,
+          flow: {
+            ...(step.flow || {}),
+            parentConditionId: conditionId,
+            parentBranch: branch,
+          },
+        }
+      : step
+  ));
+}
+
+function branchInsertIndex(conditionId: string, branch: BranchName, fallbackIndex: number) {
+  const ownedIndexes = steps.value.flatMap((step, index) => (
+    step.flow?.parentConditionId === conditionId && step.flow?.parentBranch === branch ? [index] : []
+  ));
+  return ownedIndexes.length ? ownedIndexes[ownedIndexes.length - 1] : fallbackIndex;
+}
+
 function createStep(type: NodeStepType, node: AppiumNode): AppiumRecordedStep {
   const labelMap = {
     tap: '点击',
     input: '输入',
     assertExists: '断言存在',
+    waitFor: '等待出现',
   };
   return {
     id: `step_${Date.now().toString(36)}_${Math.random().toString(36).slice(2, 8)}`,
     type,
     label: `${labelMap[type]} ${node.label}`,
     selector: node.selector,
+    contextSelector: node.contextSelector,
+    selectorChain: node.xpath && node.selector.value !== node.xpath
+      ? [{ strategy: 'xpath', value: node.xpath, unique: true, matchCount: 1 }]
+      : undefined,
     fallback: node.bounds ? { strategy: 'bounds', centerX: node.bounds.centerX, centerY: node.bounds.centerY } : undefined,
-    timeoutMs: type === 'assertExists' ? 10000 : undefined,
+    timeoutMs: type === 'assertExists' || type === 'waitFor' ? 10000 : undefined,
+    pageBefore: currentPageSnapshot(node),
     snapshot: {
       text: node.text,
       resourceId: node.resourceId,
@@ -125,9 +244,15 @@ function createStep(type: NodeStepType, node: AppiumNode): AppiumRecordedStep {
   };
 }
 
-function trimReplayOutput(output: string) {
-  if (output.length <= maxReplayOutputLength) return output;
-  return `... 已截断前 ${output.length - maxReplayOutputLength} 个字符，仅显示最后 ${maxReplayOutputLength} 个字符\n${output.slice(-maxReplayOutputLength)}`;
+async function copyReplayOutput() {
+  if (!replayOutput.value) return;
+  await navigator.clipboard.writeText(replayOutput.value);
+  ElMessage.success('回放输出已复制');
+}
+
+function clearReplayOutput() {
+  replayOutput.value = '';
+  replayOutputDialogVisible.value = false;
 }
 
 function createDelayStep(timeoutMs: number): AppiumRecordedStep {
@@ -150,8 +275,13 @@ function createNodeActionStep(
     type,
     label: `${label} ${node.label}`,
     selector: node.selector,
+    contextSelector: node.contextSelector,
+    selectorChain: node.xpath && node.selector.value !== node.xpath
+      ? [{ strategy: 'xpath', value: node.xpath, unique: true, matchCount: 1 }]
+      : undefined,
     fallback: node.bounds ? { strategy: 'bounds', centerX: node.bounds.centerX, centerY: node.bounds.centerY } : undefined,
     ...options,
+    pageBefore: currentPageSnapshot(node),
     snapshot: {
       text: node.text,
       resourceId: node.resourceId,
@@ -203,6 +333,37 @@ function createWaitActivityStep(activity: string): AppiumRecordedStep {
   };
 }
 
+function createRunScriptStep(script: AppiumRecordedScript): AppiumRecordedStep {
+  return {
+    id: `step_${Date.now().toString(36)}_${Math.random().toString(36).slice(2, 8)}`,
+    type: 'runScript',
+    label: `连接脚本 ${script.name}`,
+    value: script.id,
+    flow: { nodeKind: 'action' },
+  };
+}
+
+function linkedScriptExitActivity(script: AppiumRecordedScript) {
+  for (let index = script.steps.length - 1; index >= 0; index -= 1) {
+    const activity = script.steps[index]?.pageAfter?.activity;
+    if (activity) return activity;
+  }
+  return script.appActivity;
+}
+
+function expectedActivityAfterStep(index?: number) {
+  const scriptActivity = selectedScript.value?.appActivity || form.appActivity || currentActivity.value;
+  if (typeof index !== 'number' || index < 0) return scriptActivity;
+
+  const previousStep = steps.value[index];
+  if (!previousStep) return scriptActivity;
+  if (previousStep.type === 'runScript') {
+    const script = scripts.value.find((item) => item.id === previousStep.value);
+    if (script) return linkedScriptExitActivity(script);
+  }
+  return previousStep.pageAfter?.activity || previousStep.pageBefore?.activity || scriptActivity;
+}
+
 function wait(ms: number) {
   return new Promise((resolve) => setTimeout(resolve, ms));
 }
@@ -220,6 +381,15 @@ function treeSignature(root: AppiumNode | null) {
     .join('\n');
 }
 
+function currentPageSnapshot(node = selectedNode.value) {
+  return {
+    activity: currentActivity.value,
+    packageName: node?.packageName || '',
+    treeSignature: treeSignature(tree.value),
+    selectedNodePath: node?.xpath || '',
+  };
+}
+
 function ensureAppPackageSelected() {
   if (hasSelectedAppPackage.value) return true;
   ElMessage.warning('请先从预设 App 参数中选择 App 包名');
@@ -252,9 +422,6 @@ async function loadScripts() {
   if (selectedScriptId.value && !scripts.value.some((script) => script.id === selectedScriptId.value)) {
     selectedScriptId.value = '';
   }
-  if (!selectedScriptId.value) {
-    selectedScriptId.value = scripts.value[0]?.id || '';
-  }
 }
 
 async function switchDevice(deviceId: string) {
@@ -320,7 +487,7 @@ async function swipePreview(gesture: {
   }
 }
 
-async function recordTapStep() {
+async function recordTapStep(index?: number) {
   if (!selectedNode.value || recordingTap.value) return;
   if (!ensureAppPackageSelected()) return;
   if (!selectedDeviceId.value) {
@@ -334,40 +501,40 @@ async function recordTapStep() {
     return;
   }
   const beforeActivity = currentActivity.value;
-  const beforeSignature = treeSignature(tree.value);
   const step = createStep('tap', node);
-  steps.value = [...steps.value, step];
+  insertStep(step, index);
   recordingTap.value = true;
   try {
     await tapAppiumDevice({ deviceId: selectedDeviceId.value, x: bounds.centerX, y: bounds.centerY });
     await wait(1200);
     const after = await loadTreeSnapshot();
+    steps.value = steps.value.map((item) => (
+      item.id === step.id ? { ...item, pageAfter: currentPageSnapshot() } : item
+    ));
     const activityChanged = Boolean(beforeActivity && after.activity && beforeActivity !== after.activity);
-    const treeChanged = Boolean(beforeSignature && after.signature && beforeSignature !== after.signature);
-    if (activityChanged || treeChanged) {
+    if (activityChanged) {
       pendingNavigation.value = {
         beforeActivity,
         afterActivity: after.activity,
-        beforeSignature,
-        afterSignature: after.signature,
       };
-      return;
+      return step;
     }
     ElMessage.success('已录制点击');
+    return step;
   } catch (error) {
     ElMessage.error(error instanceof Error ? error.message : '录制点击失败');
+    return undefined;
   } finally {
     recordingTap.value = false;
   }
 }
 
-async function addStep(type: NodeStepType) {
+async function addStep(type: NodeStepType, index?: number) {
   if (recordingLocked.value) return;
   if (!selectedNode.value) return;
   if (!ensureAppPackageSelected()) return;
   if (type === 'tap') {
-    await recordTapStep();
-    return;
+    return recordTapStep(index);
   }
   const step = createStep(type, selectedNode.value);
   if (type === 'input') {
@@ -380,7 +547,7 @@ async function addStep(type: NodeStepType) {
     if (!input) return;
     step.value = input.value;
   }
-  steps.value = [...steps.value, step];
+  return insertStep(step, index);
 }
 
 async function addDelayStep(index?: number) {
@@ -395,37 +562,106 @@ async function addDelayStep(index?: number) {
   if (!input) return;
   const timeoutMs = Number(input.value);
   const step = createDelayStep(timeoutMs);
-  const nextSteps = [...steps.value];
-  nextSteps.splice(typeof index === 'number' ? index + 1 : nextSteps.length, 0, step);
-  steps.value = nextSteps;
+  return insertStep(step, index);
 }
 
-async function addAction(action: RecorderAction) {
-  if (recordingLocked.value) return;
+function openLinkedScriptDialog(index?: number, branchTarget?: BranchTarget) {
+  if (!linkableScripts.value.length) {
+    ElMessage.warning('暂无可连接的已保存脚本');
+    return;
+  }
+  linkedScriptExpectedActivity.value = expectedActivityAfterStep(index);
+  if (!linkedScriptExpectedActivity.value) {
+    ElMessage.warning('无法确定当前插入点的 Activity，请先刷新组件树');
+    return;
+  }
+  if (!compatibleLinkableScripts.value.length) {
+    ElMessage.warning(`没有入口 Activity 为 ${linkedScriptExpectedActivity.value} 的可连接脚本`);
+    linkedScriptExpectedActivity.value = '';
+    return;
+  }
+  linkedScriptTargetId.value = compatibleLinkableScripts.value[0]?.id || '';
+  linkedScriptInsertIndex.value = index;
+  linkedScriptBranchTarget.value = branchTarget || null;
+  linkedScriptDialogVisible.value = true;
+}
+
+function addLinkedScriptStep() {
+  const script = scripts.value.find((item) => item.id === linkedScriptTargetId.value);
+  if (!script) {
+    ElMessage.warning('请选择要连接的脚本');
+    return;
+  }
+  if (!linkedScriptExpectedActivity.value || script.appActivity !== linkedScriptExpectedActivity.value) {
+    ElMessage.error(
+      `无法连接：插入点 Activity 为 ${linkedScriptExpectedActivity.value || '-'}，`
+      + `目标脚本入口 Activity 为 ${script.appActivity || '-'}`,
+    );
+    return;
+  }
+  const step = insertStep(createRunScriptStep(script), linkedScriptInsertIndex.value);
+  if (linkedScriptBranchTarget.value) {
+    attachStepToBranch(step.id, linkedScriptBranchTarget.value.stepId, linkedScriptBranchTarget.value.branch);
+    if (linkedScriptBranchTarget.value.updateTarget) {
+      updateBranchTarget(
+        linkedScriptBranchTarget.value.stepId,
+        linkedScriptBranchTarget.value.branch,
+        step.id,
+      );
+    }
+  }
+  linkedScriptInsertIndex.value = undefined;
+  linkedScriptBranchTarget.value = null;
+  linkedScriptExpectedActivity.value = '';
+  linkedScriptDialogVisible.value = false;
+  ElMessage.success('已添加连接脚本步骤');
+}
+
+function closeLinkedScriptDialog() {
+  linkedScriptDialogVisible.value = false;
+  linkedScriptInsertIndex.value = undefined;
+  linkedScriptBranchTarget.value = null;
+  linkedScriptExpectedActivity.value = '';
+}
+
+async function addAction(
+  action: RecorderAction,
+  index?: number,
+  branchTarget?: BranchTarget,
+) {
+  if (recordingBusy.value) return;
+  if (scriptActivityMismatch.value && !['keyBack', 'runScript', 'launchApp', 'delay'].includes(action)) return;
   if (!ensureAppPackageSelected()) return;
-  if (action === 'delay') {
-    await addDelayStep();
+  const scope = insertionScope(index);
+  if (scope !== 'main' && action !== 'launchApp' && action !== 'delay') {
+    ElMessage.warning('前置和后置操作仅支持启动 APP 和添加延时');
     return;
   }
-  if (action === 'tap' || action === 'input' || action === 'assertExists') {
-    await addStep(action);
+  if (scope === 'main' && action === 'launchApp') {
+    ElMessage.warning('启动 APP 只能添加到前置或后置操作');
     return;
   }
-  if (action === 'keyBack') {
-    steps.value = [...steps.value, createKeyStep(4, '返回键')];
+  if (action === 'runScript') {
+    openLinkedScriptDialog(index, branchTarget);
     return;
   }
+  if (action === 'delay') {
+    return addDelayStep(index);
+  }
+  if (action === 'tap' || action === 'input' || action === 'assertExists' || action === 'waitFor') {
+    return addStep(action, index);
+  }
+  if (action === 'keyBack') {
+    return insertStep(createKeyStep(4, '系统返回'), index);
+  }
   if (action === 'keyHome') {
-    steps.value = [...steps.value, createKeyStep(3, 'Home 键')];
-    return;
+    return insertStep(createKeyStep(3, 'Home 键'), index);
   }
   if (action === 'keyRecent') {
-    steps.value = [...steps.value, createKeyStep(187, '最近任务')];
-    return;
+    return insertStep(createKeyStep(187, '最近任务'), index);
   }
   if (action === 'keyPower') {
-    steps.value = [...steps.value, createKeyStep(26, '电源键')];
-    return;
+    return insertStep(createKeyStep(26, '电源键'), index);
   }
   if (action === 'waitActivity') {
     const input = await ElMessageBox.prompt('请输入目标 Activity', '等待 Activity', {
@@ -433,7 +669,7 @@ async function addAction(action: RecorderAction) {
       confirmButtonText: '添加',
       cancelButtonText: '取消',
     }).catch(() => null);
-    if (input?.value) steps.value = [...steps.value, createWaitActivityStep(input.value)];
+    if (input?.value) return insertStep(createWaitActivityStep(input.value), index);
     return;
   }
   if (action === 'swipe') {
@@ -444,7 +680,7 @@ async function addAction(action: RecorderAction) {
       confirmButtonText: '添加',
       cancelButtonText: '取消',
     }).catch(() => null);
-    if (input?.value) steps.value = [...steps.value, createSwipeStep(input.value)];
+    if (input?.value) return insertStep(createSwipeStep(input.value), index);
     return;
   }
   if (action === 'pinch') {
@@ -457,7 +693,7 @@ async function addAction(action: RecorderAction) {
     }).catch(() => null);
     if (!input?.value) return;
     const direction = input.value === '缩小' || input.value === 'in' ? 'in' : 'out';
-    steps.value = [...steps.value, {
+    return insertStep({
       id: `step_${Date.now().toString(36)}_${Math.random().toString(36).slice(2, 8)}`,
       type: 'pinch',
       label: direction === 'out' ? '双指放大' : '双指缩小',
@@ -467,54 +703,73 @@ async function addAction(action: RecorderAction) {
         centerY: Math.round((props.deviceHeight || 1920) / 2),
         percent: 0.5,
       },
-    }];
-    return;
+    }, index);
   }
   if (action === 'launchApp') {
-    steps.value = [...steps.value, {
+    return insertStep({
       id: `step_${Date.now().toString(36)}_${Math.random().toString(36).slice(2, 8)}`,
       type: 'launchApp',
-      label: `启动 App ${form.appPackage}`,
+      label: `启动 APP ${form.appPackage}`,
       value: form.appPackage,
-    }];
-    return;
+    }, index);
   }
   const node = getSelectedNode();
   if (!node) return;
+  if (action === 'popupCondition') {
+    const step = createNodeActionStep('assertExists', '判断存在', node, { timeoutMs: 2000 });
+    const inserted = insertStep({ ...step, flow: { nodeKind: 'condition' } }, index);
+    ElMessage.success('已添加判断节点，请在节点面板配置是/否分支');
+    return inserted;
+  }
+  if (action === 'tapIfExists') {
+    return insertStep(createNodeActionStep('tapIfExists', '存在则点击', node, { timeoutMs: 2000 }), index);
+  }
+  if (action === 'inputIfExists') {
+    const input = await ElMessageBox.prompt('', '存在则输入', {
+      inputValue: '',
+      confirmButtonText: '添加',
+      cancelButtonText: '取消',
+      center: true,
+    }).catch(() => null);
+    if (!input) return;
+    return insertStep(createNodeActionStep('inputIfExists', '存在则输入', node, { timeoutMs: 2000, value: input.value }), index);
+  }
+  if (action === 'clearIfExists') {
+    return insertStep(createNodeActionStep('clearIfExists', '存在则清空', node, { timeoutMs: 2000 }), index);
+  }
+  if (action === 'backIfExists') {
+    return insertStep(createNodeActionStep('backIfExists', '存在则返回', node, { timeoutMs: 2000 }), index);
+  }
   if (action === 'clearInput') {
-    steps.value = [...steps.value, createNodeActionStep('clearInput', '清空输入', node)];
-    return;
+    return insertStep(createNodeActionStep('clearInput', '清空输入', node), index);
   }
   if (action === 'coordinateTap') {
     if (!node.bounds) {
       ElMessage.warning('当前组件没有可点击坐标');
       return;
     }
-    steps.value = [...steps.value, {
+    return insertStep({
       id: `step_${Date.now().toString(36)}_${Math.random().toString(36).slice(2, 8)}`,
       type: 'coordinateTap',
       label: `点击坐标 ${node.bounds.centerX},${node.bounds.centerY}`,
       fallback: { strategy: 'bounds', centerX: node.bounds.centerX, centerY: node.bounds.centerY },
-    }];
-    return;
+    }, index);
   }
   if (action === 'longPress') {
     if (!node.bounds) {
       ElMessage.warning('当前组件没有可长按坐标');
       return;
     }
-    steps.value = [...steps.value, {
+    return insertStep({
       id: `step_${Date.now().toString(36)}_${Math.random().toString(36).slice(2, 8)}`,
       type: 'longPress',
       label: `长按 ${node.label}`,
       fallback: { strategy: 'bounds', centerX: node.bounds.centerX, centerY: node.bounds.centerY },
       timeoutMs: 800,
-    }];
-    return;
+    }, index);
   }
   if (action === 'waitDisappear') {
-    steps.value = [...steps.value, createNodeActionStep('waitDisappear', '等待元素消失', node, { timeoutMs: 10000 })];
-    return;
+    return insertStep(createNodeActionStep('waitDisappear', '等待元素消失', node, { timeoutMs: 10000 }), index);
   }
   if (action === 'assertText') {
     const input = await ElMessageBox.prompt('请输入要断言的文本', '断言文本', {
@@ -522,82 +777,96 @@ async function addAction(action: RecorderAction) {
       confirmButtonText: '添加',
       cancelButtonText: '取消',
     }).catch(() => null);
-    if (input?.value) steps.value = [...steps.value, createNodeActionStep('assertText', '断言文本', node, { value: input.value })];
-  }
-}
-
-async function returnToPreviousPage() {
-  const pending = pendingNavigation.value;
-  if (!pending || resolvingNavigation.value) return;
-  resolvingNavigation.value = true;
-  try {
-    await pressAppiumDeviceKey({ deviceId: selectedDeviceId.value, keyCode: 4 });
-    let returned = false;
-    for (let index = 0; index < 6; index += 1) {
-      await wait(700);
-      const snapshot = await loadTreeSnapshot();
-      const activityReturned = !pending.beforeActivity || snapshot.activity === pending.beforeActivity;
-      const leftDestination = !pending.afterSignature || snapshot.signature !== pending.afterSignature;
-      if (activityReturned && leftDestination) {
-        returned = true;
-        break;
-      }
-    }
-    if (!returned) throw new Error('设备页面未返回，请确认当前页面支持系统返回键');
-    steps.value = [
-      ...steps.value,
-      createKeyStep(4),
-      ...(pending.beforeActivity ? [createWaitActivityStep(pending.beforeActivity)] : []),
-    ];
-    pendingNavigation.value = null;
-    ElMessage.success('已返回原页面，可继续录制');
-  } catch (error) {
-    ElMessage.error(error instanceof Error ? error.message : '返回原页面失败');
-  } finally {
-    resolvingNavigation.value = false;
+    if (input?.value) return insertStep(createNodeActionStep('assertText', '断言文本', node, { value: input.value }), index);
   }
 }
 
-function stayOnCurrentPage() {
-  if (resolvingNavigation.value) return;
-  pendingNavigation.value = null;
-  ElMessage.success('继续在当前页面录制');
+async function addBranchAction(index: number, branch: BranchName, action: RecorderAction) {
+  const source = steps.value[index];
+  if (!source) return;
+  const currentTargetId = branch === 'yes' ? source.flow?.yesTargetId : source.flow?.noTargetId;
+  const insertIndex = branchInsertIndex(source.id, branch, index);
+  const inserted = await addAction(action, insertIndex, {
+    stepId: source.id,
+    branch,
+    updateTarget: !currentTargetId,
+  });
+  if (!inserted) return;
+  attachStepToBranch(inserted.id, source.id, branch);
+  if (!currentTargetId) updateBranchTarget(source.id, branch, inserted.id);
 }
 
-async function saveAsBranchScript() {
+async function saveOnActivityChange() {
   const pending = pendingNavigation.value;
   if (!pending || resolvingNavigation.value) return;
   if (!ensureAppPackageSelected()) return;
   resolvingNavigation.value = true;
-  const activityName = (pending.afterActivity || 'branch').split(/[/.]/).filter(Boolean).pop() || 'branch';
-  const branchName = `${form.name || 'Appium脚本'}-${activityName}-${Date.now().toString(36).slice(-4)}`;
+  const activityName = (pending.beforeActivity || 'Activity').split(/[/.]/).filter(Boolean).pop() || 'Activity';
+  const scriptName = form.name.trim() || `${activityName}-${Date.now().toString(36).slice(-4)}`;
   try {
     const payload = await saveAppiumScript({
-      name: branchName,
+      id: selectedScript.value?.id,
+      name: scriptName,
       appPackage: form.appPackage,
-      appActivity: form.appActivity,
+      appActivity: pending.beforeActivity || form.appActivity,
       deviceId: selectedDeviceId.value,
       steps: steps.value,
     });
     await loadScripts();
-    selectedScriptId.value = payload.script.id;
-    form.name = payload.script.name;
     pendingNavigation.value = null;
-    ElMessage.success('已保存为新用例');
+    resetCurrentScript();
+    form.appActivity = pending.afterActivity;
+    ElMessage.success(`脚本「${payload.script.name}」已保存，可开始录制新 Activity`);
   } catch (error) {
-    ElMessage.error(error instanceof Error ? error.message : '保存新用例失败');
+    ElMessage.error(error instanceof Error ? error.message : '保存脚本失败');
   } finally {
     resolvingNavigation.value = false;
   }
 }
 
 function removeStep(index: number) {
-  steps.value = steps.value.filter((_step, stepIndex) => stepIndex !== index);
+  if (recordingLocked.value) return;
+  const removed = steps.value[index];
+  if (!removed) return;
+  const nextBranchStep = removed.flow?.parentConditionId && removed.flow.parentBranch
+    ? steps.value.slice(index + 1).find((step) => (
+        step.flow?.parentConditionId === removed.flow?.parentConditionId
+        && step.flow?.parentBranch === removed.flow?.parentBranch
+      ))
+    : undefined;
+  const replacementId = removed.flow?.parentConditionId
+    ? nextBranchStep?.id || ''
+    : steps.value[index + 1]?.id || '';
+  steps.value = steps.value
+    .filter((_step, stepIndex) => stepIndex !== index)
+    .map((step) => {
+      if (!step.flow) return step;
+      const flow = { ...step.flow };
+      let changed = false;
+      (['yesTargetId', 'noTargetId', 'successTargetId', 'failureTargetId'] as const).forEach((key) => {
+        if (flow[key] !== removed.id) return;
+        flow[key] = replacementId;
+        changed = true;
+      });
+      if (flow.parentConditionId === removed.id) {
+        delete flow.parentConditionId;
+        delete flow.parentBranch;
+        changed = true;
+      }
+      return changed ? { ...step, flow } : step;
+    });
+}
+
+function updateStep(index: number, step: AppiumRecordedStep) {
+  if (recordingLocked.value) return;
+  const nextSteps = [...steps.value];
+  nextSteps[index] = step;
+  steps.value = nextSteps;
 }
 
 async function editInputStep(index: number) {
   const step = steps.value[index];
-  if (!step || step.type !== 'input' || recordingLocked.value) return;
+  if (!step || (step.type !== 'input' && step.type !== 'inputIfExists') || recordingLocked.value) return;
   const input = await ElMessageBox.prompt('请输入新的录制文本', '修改输入内容', {
     inputValue: step.value || '',
     confirmButtonText: '保存',
@@ -623,7 +892,11 @@ function loadScript(script: AppiumRecordedScript) {
 }
 
 function loadSelectedScript() {
-  if (selectedScript.value) loadScript(selectedScript.value);
+  if (selectedScript.value) {
+    loadScript(selectedScript.value);
+    return;
+  }
+  resetCurrentScript();
 }
 
 function resetCurrentScript() {
@@ -699,10 +972,10 @@ async function replayScript() {
   replayOutput.value = '';
   try {
     const result = await replayAppiumScript({ id: selectedScript.value.id, deviceId: selectedDeviceId.value });
-    replayOutput.value = trimReplayOutput(result.output);
+    replayOutput.value = result.output || '';
     if (result.success) ElMessage.success('回放完成');
   } catch (error) {
-    replayOutput.value = trimReplayOutput(error instanceof Error ? error.message : '回放失败');
+    replayOutput.value = error instanceof Error ? error.message : '回放失败';
     ElMessage.error('回放失败，详情见回放输出');
   } finally {
     replaying.value = false;
@@ -711,6 +984,15 @@ async function replayScript() {
 
 onMounted(loadScripts);
 
+watch(() => form.appPackage, (packageName) => {
+  if (!packageName) return;
+  steps.value = steps.value.map((step) => (
+    step.type === 'launchApp'
+      ? { ...step, label: `启动 APP ${packageName}`, value: packageName }
+      : step
+  ));
+});
+
 watch(
   () => [props.active, props.playgroundDeviceId] as const,
   ([active, deviceId]) => {
@@ -725,6 +1007,7 @@ watch(
     <div v-if="active" class="appium-header-actions">
       <el-select
         v-model="selectedScriptId"
+        clearable
         placeholder="选择脚本"
         class="appium-header-actions__script"
         @change="loadSelectedScript"
@@ -803,11 +1086,30 @@ watch(
                     />
                   </el-select>
                 </div>
+                <el-alert
+                  v-if="scriptActivityMismatch"
+                  class="appium-activity-lock-alert"
+                  title="当前脚本已锁定"
+                  type="warning"
+                  show-icon
+                  :closable="false"
+                >
+                  <div class="appium-activity-lock-alert__details">
+                    <div>
+                      <strong>脚本绑定</strong>
+                      <code>{{ selectedScript?.appActivity || '-' }}</code>
+                    </div>
+                    <div>
+                      <strong>当前 Activity</strong>
+                      <code>{{ currentActivity || '正在获取' }}</code>
+                    </div>
+                    <p>当前仅允许插入“系统返回”或连接与插入点 Activity 匹配的脚本，其他流程编辑已锁定。</p>
+                  </div>
+                </el-alert>
                 <NodeDetail
                   :node="selectedNode"
-                  :disabled="recordingLocked"
+                  :current-activity="currentActivity"
                   :loading="recordingTap"
-                  @add-action="addAction"
                 />
               </section>
 
@@ -816,14 +1118,46 @@ watch(
                 <RecordedSteps
                   :steps="steps"
                   :disabled="recordingLocked"
+                  :allowed-locked-actions="scriptActivityMismatch && !recordingBusy ? ['keyBack', 'runScript', 'launchApp', 'delay'] : []"
                   @remove="removeStep"
                   @add-delay="addDelayStep"
+                  @insert-action="(index, action) => addAction(action, index)"
+                  @insert-branch-action="addBranchAction"
                   @edit-input="editInputStep"
+                  @update-step="updateStep"
                 />
               </section>
 
               <section class="appium-workbench__section">
-                <h3>回放输出</h3>
+                <div class="appium-section-title">
+                  <h3>回放输出</h3>
+                  <div class="appium-section-title__actions">
+                    <el-button
+                      size="small"
+                      :icon="CopyDocument"
+                      :disabled="!replayOutput"
+                      @click="copyReplayOutput"
+                    >
+                      复制
+                    </el-button>
+                    <el-button
+                      size="small"
+                      :icon="FullScreen"
+                      :disabled="!replayOutput"
+                      @click="replayOutputDialogVisible = true"
+                    >
+                      展开查看
+                    </el-button>
+                    <el-button
+                      size="small"
+                      :icon="Delete"
+                      :disabled="!replayOutput"
+                      @click="clearReplayOutput"
+                    >
+                      清除
+                    </el-button>
+                  </div>
+                </div>
                 <pre class="appium-replay-output">{{ visibleReplayOutput }}</pre>
               </section>
             </div>
@@ -864,13 +1198,14 @@ watch(
 
     <el-dialog
       :model-value="Boolean(pendingNavigation)"
-      title="检测到页面变化"
-      width="680px"
+      title="检测到 Activity 跳转"
+      width="560px"
       :close-on-click-modal="false"
-      @close="stayOnCurrentPage"
+      :close-on-press-escape="false"
+      :show-close="false"
     >
       <div class="appium-navigation-dialog">
-        <p>录制点击后检测到页面已变化。</p>
+        <p>当前录制仅支持单个 Activity。检测到 Activity 已跳转，请先保存当前脚本。</p>
         <dl>
           <div>
             <dt>点击前</dt>
@@ -884,11 +1219,56 @@ watch(
       </div>
       <template #footer>
         <div class="appium-navigation-footer">
-          <el-button :disabled="resolvingNavigation" @click="stayOnCurrentPage">留在当前页面继续录制</el-button>
-          <el-button :loading="resolvingNavigation" @click="saveAsBranchScript">保存为新用例</el-button>
-          <el-button type="primary" :loading="resolvingNavigation" @click="returnToPreviousPage">添加返回键继续录制</el-button>
+          <el-button type="primary" :loading="resolvingNavigation" @click="saveOnActivityChange">保存脚本</el-button>
         </div>
       </template>
     </el-dialog>
+
+    <el-dialog
+      v-model="linkedScriptDialogVisible"
+      title="连接脚本"
+      width="520px"
+      align-center
+      @closed="closeLinkedScriptDialog"
+    >
+      <el-form label-position="top">
+        <el-form-item label="插入点 Activity">
+          <code class="appium-linked-script-activity">{{ linkedScriptExpectedActivity || '-' }}</code>
+        </el-form-item>
+        <el-form-item label="选择入口 Activity 匹配的脚本">
+          <el-select
+            v-model="linkedScriptTargetId"
+            filterable
+            placeholder="选择要连接的脚本"
+            class="appium-linked-script-select"
+          >
+            <el-option
+              v-for="script in compatibleLinkableScripts"
+              :key="script.id"
+              :label="`${script.name} · ${script.steps.length} 步`"
+              :value="script.id"
+            />
+          </el-select>
+        </el-form-item>
+      </el-form>
+      <template #footer>
+        <el-button @click="closeLinkedScriptDialog">取消</el-button>
+        <el-button type="primary" @click="addLinkedScriptStep">添加连接</el-button>
+      </template>
+    </el-dialog>
+
+    <el-dialog
+      v-model="replayOutputDialogVisible"
+      title="回放输出"
+      width="82vw"
+      top="6vh"
+    >
+      <pre class="appium-replay-output appium-replay-output--dialog">{{ replayOutput }}</pre>
+      <template #footer>
+        <el-button :icon="CopyDocument" :disabled="!replayOutput" @click="copyReplayOutput">复制</el-button>
+        <el-button :icon="Delete" :disabled="!replayOutput" @click="clearReplayOutput">清除</el-button>
+        <el-button type="primary" @click="replayOutputDialogVisible = false">关闭</el-button>
+      </template>
+    </el-dialog>
   </section>
 </template>