android-midscene-automation 0.1.24 → 0.1.26

package/src/appium-recorder/AppiumPage.vue

@@ -1,6 +1,6 @@
 <script setup lang="ts">
-import { computed, onMounted, onUnmounted, reactive, shallowRef, watch } from 'vue';
-import { ElMessage, ElMessageBox } from 'element-plus';
+import { computed, h, onMounted, onUnmounted, reactive, shallowRef, watch } from 'vue';
+import { ElForm, ElFormItem, ElInputNumber, ElMessage, ElMessageBox, ElOption, ElSelect } from 'element-plus';
 import { Check, CircleClose, CopyDocument, Delete, Document, Download, Refresh, Upload, VideoPlay, View } from '@element-plus/icons-vue';
 import type { AndroidDevice, AppPreset, DeviceAction } from '../types';
 import DevicePreviewPanel from '../components/device/DevicePreviewPanel.vue';
@@ -34,6 +34,8 @@ import type { AppiumNode, AppiumRecordedScript, AppiumRecordedStep } from './typ
 type NodeStepType = 'tap' | 'input' | 'assertExists' | 'waitFor';
 type BranchName = 'yes' | 'no';
 type LegacyFlow = NonNullable<AppiumRecordedStep['flow']> & { scope?: string };
+type SwipeGesture = NonNullable<AppiumRecordedStep['swipe']>;
+type SwipeForm = SwipeGesture & { direction: string };
 type BranchTarget = {
   stepId: string;
   branch: BranchName;
@@ -112,7 +114,7 @@ const props = defineProps<{
   deviceHeight: number;
   switchAndroidDevice: (deviceId: string) => Promise<void>;
   triggerDeviceKey: (keyCode: number) => Promise<void>;
-  refreshDevicePreview: () => void;
+  refreshDevicePreview: () => void | Promise<void>;
   swipeDevice: (
     startX: number,
     startY: number,
@@ -332,11 +334,24 @@ function attachStepToBranch(stepId: string, conditionId: string, branch: BranchN
   ));
 }
 
-function branchInsertIndex(conditionId: string, branch: BranchName, fallbackIndex: number) {
-  const ownedIndexes = steps.value.flatMap((step, index) => (
-    step.flow?.parentConditionId === conditionId && step.flow?.parentBranch === branch ? [index] : []
+function branchContextForInsert(index: number, branch: BranchName) {
+  const anchor = steps.value[index];
+  if (!anchor) return undefined;
+  if (anchor.flow?.parentConditionId && anchor.flow.parentBranch === branch) {
+    const conditionIndex = steps.value.findIndex((step) => step.id === anchor.flow?.parentConditionId);
+    const condition = conditionIndex >= 0 ? steps.value[conditionIndex] : undefined;
+    return condition ? { condition, conditionIndex } : undefined;
+  }
+  if (anchor.flow?.nodeKind === 'condition') {
+    return { condition: anchor, conditionIndex: index };
+  }
+  return undefined;
+}
+
+function nextBranchStepAfter(conditionId: string, branch: BranchName, index: number) {
+  return steps.value.slice(index + 1).find((step) => (
+    step.flow?.parentConditionId === conditionId && step.flow.parentBranch === branch
   ));
-  return ownedIndexes.length ? ownedIndexes[ownedIndexes.length - 1] : fallbackIndex;
 }
 
 function createStep(type: NodeStepType, node: AppiumNode): AppiumRecordedStep {
@@ -423,7 +438,7 @@ function createKeyStep(keyCode: number, label = '按返回键'): AppiumRecordedS
   };
 }
 
-function createSwipeStep(direction: string): AppiumRecordedStep {
+function swipePreset(direction: string): { direction: string; label: string; swipe: SwipeGesture } {
   const normalizedDirection = ({ 上: 'up', 下: 'down', 左: 'left', 右: 'right' } as Record<string, string>)[direction] || direction;
   const width = props.deviceWidth || 1080;
   const height = props.deviceHeight || 1920;
@@ -431,7 +446,7 @@ function createSwipeStep(direction: string): AppiumRecordedStep {
   const centerY = Math.round(height * 0.5);
   const distanceX = Math.round(width * 0.35);
   const distanceY = Math.round(height * 0.35);
-  const swipeMap: Record<string, AppiumRecordedStep['swipe']> = {
+  const swipeMap: Record<string, SwipeGesture> = {
     up: { startX: centerX, startY: centerY + distanceY, endX: centerX, endY: centerY - distanceY, duration: 500 },
     down: { startX: centerX, startY: centerY - distanceY, endX: centerX, endY: centerY + distanceY, duration: 500 },
     left: { startX: centerX + distanceX, startY: centerY, endX: centerX - distanceX, endY: centerY, duration: 500 },
@@ -439,13 +454,21 @@ function createSwipeStep(direction: string): AppiumRecordedStep {
   };
   const labelMap: Record<string, string> = { up: '上滑', down: '下滑', left: '左滑', right: '右滑' };
   return {
-    id: `step_${Date.now().toString(36)}_${Math.random().toString(36).slice(2, 8)}`,
-    type: 'swipe',
+    direction: normalizedDirection,
     label: labelMap[normalizedDirection] || '滑动',
     swipe: swipeMap[normalizedDirection] || swipeMap.up,
   };
 }
 
+function createSwipeStep(input: { label: string; swipe: SwipeGesture }): AppiumRecordedStep {
+  return {
+    id: `step_${Date.now().toString(36)}_${Math.random().toString(36).slice(2, 8)}`,
+    type: 'swipe',
+    label: input.label,
+    swipe: input.swipe,
+  };
+}
+
 function createWaitActivityStep(activity: string): AppiumRecordedStep {
   return {
     id: `step_${Date.now().toString(36)}_${Math.random().toString(36).slice(2, 8)}`,
@@ -818,6 +841,77 @@ async function addDelayStep(index?: number) {
   return insertStep(step, index);
 }
 
+function toSwipeNumber(value: unknown, fallback: number) {
+  const number = Number(value);
+  return Number.isFinite(number) ? Math.round(number) : fallback;
+}
+
+function patchSwipeForm(form: SwipeForm, key: keyof SwipeGesture, value: unknown) {
+  form[key] = toSwipeNumber(value, form[key]);
+}
+
+function renderSwipeForm(form: SwipeForm) {
+  const coordinateInput = (label: string, key: keyof SwipeGesture, min = 0) => h(ElFormItem, { label }, () => h(ElInputNumber, {
+    modelValue: form[key],
+    min,
+    max: 99999,
+    precision: 0,
+    controlsPosition: 'right',
+    'onUpdate:modelValue': (value: number | undefined) => patchSwipeForm(form, key, value),
+  }));
+
+  return h(ElForm, { labelPosition: 'top', size: 'small', class: 'appium-swipe-dialog-form' }, () => [
+    h(ElFormItem, { label: '滑动方向' }, () => h(ElSelect, {
+      modelValue: form.direction,
+      'onUpdate:modelValue': (value: string) => {
+        const preset = swipePreset(value);
+        form.direction = preset.direction;
+        Object.assign(form, preset.swipe);
+      },
+    }, () => [
+      h(ElOption, { label: '上滑', value: 'up' }),
+      h(ElOption, { label: '下滑', value: 'down' }),
+      h(ElOption, { label: '左滑', value: 'left' }),
+      h(ElOption, { label: '右滑', value: 'right' }),
+    ])),
+    h('div', { class: 'appium-swipe-dialog-grid' }, () => [
+      coordinateInput('起点 X', 'startX'),
+      coordinateInput('起点 Y', 'startY'),
+      coordinateInput('终点 X', 'endX'),
+      coordinateInput('终点 Y', 'endY'),
+      coordinateInput('时长 ms', 'duration', 80),
+    ]),
+  ]);
+}
+
+async function addSwipeStep(index?: number) {
+  const preset = swipePreset('up');
+  const form = reactive<SwipeForm>({
+    direction: preset.direction,
+    ...preset.swipe,
+  });
+  const result = await ElMessageBox({
+    title: '添加滑动',
+    message: renderSwipeForm(form),
+    showCancelButton: true,
+    confirmButtonText: '添加',
+    cancelButtonText: '取消',
+    customClass: 'appium-swipe-message-box',
+  }).catch(() => null);
+  if (!result) return;
+  const finalPreset = swipePreset(form.direction);
+  return insertStep(createSwipeStep({
+    label: finalPreset.label,
+    swipe: {
+      startX: toSwipeNumber(form.startX, finalPreset.swipe.startX),
+      startY: toSwipeNumber(form.startY, finalPreset.swipe.startY),
+      endX: toSwipeNumber(form.endX, finalPreset.swipe.endX),
+      endY: toSwipeNumber(form.endY, finalPreset.swipe.endY),
+      duration: Math.max(80, toSwipeNumber(form.duration, finalPreset.swipe.duration)),
+    },
+  }), index);
+}
+
 function openLinkedScriptDialog(index?: number, branchTarget?: BranchTarget) {
   if (!linkableScripts.value.length) {
     ElMessage.warning('暂无可连接的已保存脚本');
@@ -987,15 +1081,7 @@ async function addAction(
     return;
   }
   if (action === 'swipe') {
-    const input = await ElMessageBox.prompt('请输入滑动方向：上 / 下 / 左 / 右', '添加滑动', {
-      inputValue: '上',
-      inputPattern: /^(上|下|左|右|up|down|left|right)$/,
-      inputErrorMessage: '只能输入 上、下、左、右',
-      confirmButtonText: '添加',
-      cancelButtonText: '取消',
-    }).catch(() => null);
-    if (input?.value) return insertStep(createSwipeStep(input.value), index);
-    return;
+    return addSwipeStep(index);
   }
   if (action === 'pinch') {
     const input = await ElMessageBox.prompt('请输入缩放方向：放大 / 缩小', '添加双指缩放', {
@@ -1083,12 +1169,21 @@ async function addAction(
       ElMessage.warning('当前组件没有可长按坐标');
       return;
     }
+    const input = await ElMessageBox.prompt('请输入长按时间（毫秒）', '添加长按', {
+      inputValue: '800',
+      inputPattern: /^[1-9]\d*$/,
+      inputErrorMessage: '请输入大于 0 的整数',
+      confirmButtonText: '添加',
+      cancelButtonText: '取消',
+    }).catch(() => null);
+    if (!input?.value) return;
+    const duration = Math.max(80, Math.round(Number(input.value) || 800));
     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,
+      timeoutMs: duration,
     }, index);
   }
   if (action === 'waitDisappear') {
@@ -1105,36 +1200,42 @@ async function addAction(
 }
 
 async function addBranchAction(index: number, branch: BranchName, action: RecorderAction) {
-  const source = steps.value[index];
-  if (!source) return;
+  const context = branchContextForInsert(index, branch);
+  if (!context) return;
+  const { condition, conditionIndex } = context;
   const existingBranchSteps = steps.value.filter((step) => (
-    step.flow?.parentConditionId === source.id
-    && step.flow.parentBranch === branch
+    step.flow?.parentConditionId === condition.id && step.flow.parentBranch === branch
   ));
-  const currentTargetId = branch === 'yes' ? source.flow?.yesTargetId : source.flow?.noTargetId;
+  const currentTargetId = branch === 'yes' ? condition.flow?.yesTargetId : condition.flow?.noTargetId;
   const currentTarget = steps.value.find((step) => step.id === currentTargetId);
-  const targetIsBranchStep = currentTarget?.flow?.parentConditionId === source.id
+  const targetIsBranchStep = currentTarget?.flow?.parentConditionId === condition.id
     && currentTarget.flow.parentBranch === branch;
-  const insertIndex = branchInsertIndex(source.id, branch, index);
+  const insertAtBranchEntry = index === conditionIndex;
+  const insertIndex = insertAtBranchEntry ? conditionIndex : index;
+  const nextTargetId = insertAtBranchEntry
+    ? nextBranchStepAfter(condition.id, branch, index)?.id || (!targetIsBranchStep ? currentTargetId : undefined)
+    : undefined;
   const inserted = await addAction(action, insertIndex, {
-    stepId: source.id,
+    stepId: condition.id,
     branch,
-    updateTarget: !currentTargetId || !targetIsBranchStep,
-    entryTargetId: existingBranchSteps[0]?.id,
-    nextTargetId: !targetIsBranchStep ? currentTargetId : undefined,
+    updateTarget: insertAtBranchEntry || !currentTargetId || !targetIsBranchStep,
+    entryTargetId: insertAtBranchEntry ? undefined : existingBranchSteps[0]?.id,
+    nextTargetId,
   });
   if (!inserted) return;
-  attachStepToBranch(inserted.id, source.id, branch);
-  if (!currentTargetId || !targetIsBranchStep) {
+  attachStepToBranch(inserted.id, condition.id, branch);
+  if (nextTargetId) {
     steps.value = steps.value.map((step) => (
-      step.id === inserted.id && currentTargetId
+      step.id === inserted.id
         ? {
             ...step,
-            flow: { ...(step.flow || {}), successTargetId: currentTargetId },
+            flow: { ...(step.flow || {}), successTargetId: nextTargetId },
           }
         : step
     ));
-    updateBranchTarget(source.id, branch, existingBranchSteps[0]?.id || inserted.id);
+  }
+  if (insertAtBranchEntry || !currentTargetId || !targetIsBranchStep) {
+    updateBranchTarget(condition.id, branch, insertAtBranchEntry ? inserted.id : existingBranchSteps[0]?.id || inserted.id);
   }
 }
 
@@ -1470,24 +1571,6 @@ watch(
     </div>
 
     <div class="appium-recorder-layout">
-      <el-card shadow="never" class="appium-recorder-card">
-        <template #header>
-          <div class="panel-header">
-            <span>App 组件树</span>
-            <el-button :icon="Refresh" :loading="loadingTree" :disabled="replaying" @click="refreshTree">
-              刷新组件树
-            </el-button>
-          </div>
-        </template>
-        <div class="appium-tree-panel">
-          <ComponentTree :tree="tree" :selected-id="selectedNode?.id || ''" @select="selectedNode = $event" />
-          <div class="appium-current-activity">
-            <span>当前 Activity</span>
-            <code>{{ currentActivity || '-' }}</code>
-          </div>
-        </div>
-      </el-card>
-
       <DevicePreviewPanel
         :available="playgroundAvailable"
         :devices="androidDevices"
@@ -1507,6 +1590,24 @@ watch(
         @swipe="swipePreview"
       />
 
+      <el-card shadow="never" class="appium-recorder-card">
+        <template #header>
+          <div class="panel-header">
+            <span>App 组件树</span>
+            <el-button :icon="Refresh" :loading="loadingTree" :disabled="replaying" @click="refreshTree">
+              刷新组件树
+            </el-button>
+          </div>
+        </template>
+        <div class="appium-tree-panel">
+          <ComponentTree :tree="tree" :selected-id="selectedNode?.id || ''" @select="selectedNode = $event" />
+          <div class="appium-current-activity">
+            <span>当前 Activity</span>
+            <code>{{ currentActivity || '-' }}</code>
+          </div>
+        </div>
+      </el-card>
+
       <el-card shadow="never" class="appium-recorder-card appium-recorder-card--workbench">
         <template #header>录制与脚本</template>
         <el-tabs

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

@@ -144,11 +144,11 @@ function handleInsert(payload: {
   conditionIndex?: number;
 }) {
   if (payload.action === PASTE_COMMAND) {
-    emit('paste', payload.conditionIndex ?? payload.afterIndex, payload.branch);
+    emit('paste', payload.afterIndex, payload.branch);
     return;
   }
   if (payload.branch && payload.conditionIndex !== undefined) {
-    emit('insertBranchAction', payload.conditionIndex, payload.branch, payload.action);
+    emit('insertBranchAction', payload.afterIndex, payload.branch, payload.action);
     return;
   }
   emit('insertAction', payload.afterIndex, payload.action);

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

@@ -2,6 +2,7 @@
 import type { AppiumRecordedStep, AppiumSelector } from '../types';
 
 type FlowKind = 'action' | 'condition' | 'assertion';
+type SwipeGesture = NonNullable<AppiumRecordedStep['swipe']>;
 
 const props = defineProps<{
   step: AppiumRecordedStep;
@@ -34,6 +35,38 @@ function patchFlow(patch: NonNullable<AppiumRecordedStep['flow']>) {
     },
   });
 }
+
+function toInteger(value: unknown, fallback = 0) {
+  const number = Number(value);
+  return Number.isFinite(number) ? Math.round(number) : fallback;
+}
+
+function patchSwipe(patch: Partial<SwipeGesture>) {
+  patchStep({
+    swipe: {
+      startX: 0,
+      startY: 0,
+      endX: 0,
+      endY: 0,
+      duration: 500,
+      ...(props.step.swipe || {}),
+      ...patch,
+    },
+  });
+}
+
+function timeoutLabel() {
+  return props.step.type === 'longPress' ? '长按时间 ms' : '超时时间 ms';
+}
+
+function timeoutMin() {
+  return props.step.type === 'longPress' ? 80 : 0;
+}
+
+function patchTimeout(value: unknown) {
+  const timeout = Math.max(timeoutMin(), toInteger(value, props.step.timeoutMs || 0));
+  patchStep({ timeoutMs: timeout || undefined });
+}
 </script>
 
 <template>
@@ -67,14 +100,14 @@ function patchFlow(patch: NonNullable<AppiumRecordedStep['flow']>) {
             <el-option label="校验" value="assertion" />
           </el-select>
         </el-form-item>
-        <el-form-item label="超时时间 ms">
+        <el-form-item :label="timeoutLabel()">
           <el-input-number
             :model-value="step.timeoutMs || undefined"
             :disabled="disabled"
-            :min="0"
+            :min="timeoutMin()"
             :max="999999"
             controls-position="right"
-            @update:model-value="patchStep({ timeoutMs: Number($event || 0) || undefined })"
+            @update:model-value="patchTimeout($event)"
           />
         </el-form-item>
       </div>
@@ -88,6 +121,63 @@ function patchFlow(patch: NonNullable<AppiumRecordedStep['flow']>) {
           @update:model-value="patchStep({ value: String($event) })"
         />
       </el-form-item>
+      <div v-if="step.type === 'swipe'" class="appium-flow-editor__grid appium-flow-editor__grid--swipe">
+        <el-form-item label="起点 X">
+          <el-input-number
+            :model-value="step.swipe?.startX ?? 0"
+            :disabled="disabled"
+            :min="0"
+            :max="99999"
+            :precision="0"
+            controls-position="right"
+            @update:model-value="patchSwipe({ startX: toInteger($event, step.swipe?.startX ?? 0) })"
+          />
+        </el-form-item>
+        <el-form-item label="起点 Y">
+          <el-input-number
+            :model-value="step.swipe?.startY ?? 0"
+            :disabled="disabled"
+            :min="0"
+            :max="99999"
+            :precision="0"
+            controls-position="right"
+            @update:model-value="patchSwipe({ startY: toInteger($event, step.swipe?.startY ?? 0) })"
+          />
+        </el-form-item>
+        <el-form-item label="终点 X">
+          <el-input-number
+            :model-value="step.swipe?.endX ?? 0"
+            :disabled="disabled"
+            :min="0"
+            :max="99999"
+            :precision="0"
+            controls-position="right"
+            @update:model-value="patchSwipe({ endX: toInteger($event, step.swipe?.endX ?? 0) })"
+          />
+        </el-form-item>
+        <el-form-item label="终点 Y">
+          <el-input-number
+            :model-value="step.swipe?.endY ?? 0"
+            :disabled="disabled"
+            :min="0"
+            :max="99999"
+            :precision="0"
+            controls-position="right"
+            @update:model-value="patchSwipe({ endY: toInteger($event, step.swipe?.endY ?? 0) })"
+          />
+        </el-form-item>
+        <el-form-item label="时长 ms">
+          <el-input-number
+            :model-value="step.swipe?.duration ?? 500"
+            :disabled="disabled"
+            :min="80"
+            :max="99999"
+            :precision="0"
+            controls-position="right"
+            @update:model-value="patchSwipe({ duration: Math.max(80, toInteger($event, step.swipe?.duration ?? 500)) })"
+          />
+        </el-form-item>
+      </div>
       <div v-if="step.selector" class="appium-flow-editor__grid">
         <el-form-item label="Selector 类型">
           <el-select

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

@@ -133,6 +133,12 @@ function typeLabel(step: AppiumRecordedStep) {
 function stepMeta(step: AppiumRecordedStep) {
   if (step.type === 'delay') return `${step.timeoutMs || 1000}ms`;
   if (step.type === 'input' || step.type === 'inputIfExists') return `输入内容：${step.value || '空'}`;
+  if (step.type === 'longPress') return `${step.fallback?.centerX || ''},${step.fallback?.centerY || ''} · ${step.timeoutMs || 800}ms`;
+  if (step.type === 'coordinateTap') return `${step.fallback?.centerX || ''},${step.fallback?.centerY || ''}`;
+  if (step.type === 'swipe') {
+    const swipe = step.swipe;
+    return swipe ? `[${swipe.startX},${swipe.startY}] -> [${swipe.endX},${swipe.endY}]` : '';
+  }
   if (defaultKind(step) === 'condition' && step.value) {
     return `${step.flow?.textMatch === 'exact' ? '精准匹配' : '模糊匹配'}：${step.value}`;
   }

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

@@ -20,7 +20,7 @@ const targetKeys = [
 ] as const;
 
 function clone<T>(value: T): T {
-  return structuredClone(value);
+  return JSON.parse(JSON.stringify(value)) as T;
 }
 
 function scopeKey(step: AppiumRecordedStep) {
@@ -58,6 +58,38 @@ function wireContinuation(step: AppiumRecordedStep, targetId: string) {
   if (!step.flow.noTargetId) setFlowTarget(step, 'noTargetId', targetId);
 }
 
+function branchConditionForTarget(
+  steps: AppiumRecordedStep[],
+  target: PasteTarget,
+) {
+  if (!target.branch) return undefined;
+  const anchor = steps[target.afterIndex];
+  if (!anchor) return undefined;
+  if (anchor.flow?.parentConditionId && anchor.flow.parentBranch === target.branch) {
+    return steps.find((step) => step.id === anchor.flow?.parentConditionId);
+  }
+  if (anchor.flow?.nodeKind === 'condition') return anchor;
+  return undefined;
+}
+
+function nextSiblingInScope(steps: AppiumRecordedStep[], index: number) {
+  const anchor = steps[index];
+  if (!anchor) return undefined;
+  const key = scopeKey(anchor);
+  return steps.slice(index + 1).find((step) => scopeKey(step) === key);
+}
+
+function nextBranchStepAfter(
+  steps: AppiumRecordedStep[],
+  conditionId: string,
+  branch: FlowBranch,
+  index: number,
+) {
+  return steps.slice(index + 1).find((step) => (
+    step.flow?.parentConditionId === conditionId && step.flow.parentBranch === branch
+  ));
+}
+
 export function createFlowClipboard(steps: AppiumRecordedStep[], indexes: number[]): FlowClipboard {
   const selectedIndexes = [...new Set(indexes)].sort((left, right) => left - right);
   const selectedSteps = selectedIndexes.map((index) => steps[index]).filter(Boolean);
@@ -104,7 +136,7 @@ export function pasteFlowClipboard(
 
   const idMap = new Map(clipboard.steps.map((step) => [step.id, createId()]));
   const rootIdSet = new Set(clipboard.rootIds);
-  const condition = target.branch ? steps[target.afterIndex] : undefined;
+  const condition = branchConditionForTarget(steps, target);
   if (target.branch && (!condition || condition.flow?.nodeKind !== 'condition')) {
     throw new Error('目标分支不存在');
   }
@@ -152,29 +184,28 @@ export function pasteFlowClipboard(
   let continuationId = '';
 
   if (target.branch && condition) {
-    const branchRoots = steps.filter((step) => (
-      step.flow?.parentConditionId === condition.id
-      && step.flow.parentBranch === target.branch
-    ));
-    if (branchRoots.length) {
-      const ownedIds = collectDescendantIds(steps, branchRoots.map((step) => step.id));
-      insertAfterIndex = Math.max(...steps.flatMap((step, index) => (ownedIds.has(step.id) ? [index] : [])));
-      const lastExistingRoot = branchRoots[branchRoots.length - 1];
-      continuationId = lastExistingRoot.flow?.successTargetId || condition.flow?.successTargetId || '';
-      const lastExistingIndex = nextSteps.findIndex((step) => step.id === lastExistingRoot.id);
-      const updatedLastExisting = clone(nextSteps[lastExistingIndex]);
-      setFlowTarget(updatedLastExisting, 'successTargetId', firstRoot.id);
-      nextSteps[lastExistingIndex] = updatedLastExisting;
-    } else {
+    const anchor = steps[target.afterIndex];
+    const isBranchEntry = anchor?.id === condition.id;
+    if (isBranchEntry) {
       const targetKey = target.branch === 'yes' ? 'yesTargetId' : 'noTargetId';
       const currentTargetId = condition.flow?.[targetKey] || '';
       const currentTarget = steps.find((step) => step.id === currentTargetId);
-      continuationId = currentTarget && !currentTarget.flow?.parentConditionId
+      continuationId = nextBranchStepAfter(steps, condition.id, target.branch, target.afterIndex)?.id
+        || (currentTarget && !currentTarget.flow?.parentConditionId
         ? currentTargetId
-        : condition.flow?.successTargetId || '';
+        : condition.flow?.successTargetId || '');
       const updatedCondition = clone(nextSteps[target.afterIndex]);
       setFlowTarget(updatedCondition, targetKey, firstRoot.id);
       nextSteps[target.afterIndex] = updatedCondition;
+    } else {
+      const previous = nextSteps[target.afterIndex];
+      const nextSibling = nextSiblingInScope(steps, target.afterIndex);
+      continuationId = previous?.flow?.successTargetId || nextSibling?.id || condition.flow?.successTargetId || '';
+      if (previous?.flow?.successTargetId) {
+        const updatedPrevious = clone(previous);
+        setFlowTarget(updatedPrevious, 'successTargetId', firstRoot.id);
+        nextSteps[target.afterIndex] = updatedPrevious;
+      }
     }
   } else {
     const previous = target.afterIndex >= 0 ? nextSteps[target.afterIndex] : undefined;

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

@@ -402,11 +402,12 @@ export function buildFlowGraph(
     const directItems = directBranchItems(items, condition.step.id, branch);
     const connectedTargetId = branchConnectionTargetId(items, condition.step, branch);
     const targetStep = connectedTargetId ? stepById.get(connectedTargetId) : undefined;
+    const entryInsertId = addInsertNode(condition.index, branch, condition);
     addVisibleLink(splitId, labelId, branch);
     if (directItems[0]) {
-      addVisibleLink(labelId, nodeIdForStep(directItems[0].step), branch);
+      addVisibleLink(labelId, entryInsertId, branch);
+      addVisibleLink(entryInsertId, nodeIdForStep(directItems[0].step), branch);
     } else {
-      const entryInsertId = addInsertNode(condition.index, branch, condition);
       addVisibleLink(labelId, entryInsertId, branch);
       if (targetStep) {
         addVisibleLink(entryInsertId, nodeIdForStep(targetStep.step), branch);

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

@@ -59,7 +59,10 @@ export function flowStepMeta(step: AppiumRecordedStep) {
     return swipe ? `[${swipe.startX},${swipe.startY}] -> [${swipe.endX},${swipe.endY}]` : '';
   }
   if (step.type === 'pinch') return step.pinch?.direction === 'out' ? '放大' : '缩小';
-  if (step.type === 'longPress' || step.type === 'coordinateTap') {
+  if (step.type === 'longPress') {
+    return `${step.fallback?.centerX || ''},${step.fallback?.centerY || ''} · ${step.timeoutMs || 800}ms`;
+  }
+  if (step.type === 'coordinateTap') {
     return `${step.fallback?.centerX || ''},${step.fallback?.centerY || ''}`;
   }
   if (step.type === 'assertText') return step.value || '';

package/src/config/prompt-example.ts

@@ -3,4 +3,8 @@ export const promptDocument = `# 示例 App 登录测试
 进入目标 App 后，按以下规则处理启动阶段弹窗，这一步必须执行点击动作，不要只判断弹窗是否存在：若弹出位置、存储、相机、麦克风、通知等权限申请弹窗，点击允许；若弹出“声明与条款”、用户协议、隐私政策、服务协议弹窗，点击同意、接受或我已阅读并同意；若弹出广告、活动、版本更新、评分、通知引导等与登录无关的弹窗，点击关闭、跳过、稍后再说或取消。
 
 弹窗处理完成后，确认页面已经稳定停留在目标 App 的登录页、手机号登录页、账号密码登录页，或显示可进入登录流程的入口。页面上不应存在遮挡登录操作的权限、协议、广告、更新或活动弹窗；如果仍存在遮挡弹窗，脚本应失败而不是显示执行完成。
+
+提交登录后，再处理一次登录后的遮挡弹窗：若出现版本升级、广告、活动、评分、通知引导、登录后协议或权限弹窗，点击关闭、跳过、稍后再说、取消、同意或允许；如果没有弹窗则保持当前状态。不要点击首页业务内容、添加设备入口、底部导航或退出登录；如果是强制升级且没有关闭、取消或稍后按钮，不要点击立即更新。
+
+最后等待首页或主界面稳定显示，页面应出现设备列表、添加设备入口、底部导航、用户头像或我的页面入口等首页核心元素之一，并且没有版本升级、广告、活动、评分或通知引导弹窗遮挡首页。
 `;