android-midscene-automation 0.1.42 → 0.2.1

package/src/appium-recorder/bounded-loop.ts

@@ -42,8 +42,15 @@ export function breakLoopTarget(steps: readonly AppiumRecordedStep[], step: Appi
   return target;
 }
 
+export function continueLoopTarget(steps: readonly AppiumRecordedStep[], step: AppiumRecordedStep) {
+  const loops = enclosingLoops(steps, step);
+  const target = step.continueLoopTargetId ? loops.find((loop) => loop.id === step.continueLoopTargetId) : loops[0];
+  if (!target) throw new Error('继续循环目标必须是当前节点所属的循环体，目标可能已删除或不在当前分支');
+  return target;
+}
+
 export function validateLoopSteps(steps: readonly AppiumRecordedStep[]) {
-  if (!steps.some((step) => step.type === 'loop' || step.type === 'breakLoop')) return;
+  if (!steps.some((step) => ['loop', 'breakLoop', 'continueLoop'].includes(step.type))) return;
   const byId = new Map(steps.map((step) => [step.id, step]));
   if (byId.size !== steps.length) throw new Error('流程节点 ID 重复');
   for (const step of steps) {
@@ -58,6 +65,7 @@ export function validateLoopSteps(steps: readonly AppiumRecordedStep[]) {
     }
     if (step.type === 'loop') validateLoop(step);
     if (step.type === 'breakLoop') breakLoopTarget(steps, step);
+    if (step.type === 'continueLoop') continueLoopTarget(steps, step);
     if (step.type === 'loop' && step.flow?.yesTargetId) {
       const target = byId.get(step.flow.yesTargetId);
       if (!target || target.flow?.parentConditionId !== step.id || target.flow.parentBranch !== 'yes') throw new Error('循环入口必须指向所属循环体');

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

@@ -1,8 +1,9 @@
 <script setup lang="ts">
-import { computed, inject, onBeforeUnmount, ref, watch } from 'vue';
+import { computed, inject, onBeforeUnmount, ref, shallowRef, watch } from 'vue';
 import { Loading, QuestionFilled } from '@element-plus/icons-vue';
 import { isAiBranchEnabled, validateAiRecognitionPrompt, DEFAULT_AI_OBSERVATION, validateAiObservation, type AiObservationConfig } from '../ai-recognition';
-import { validateAiBranchQuestion } from '../api';
+import { optimizeAppiumPrompt, validateAiBranchQuestion } from '../api';
+import { flowBranchLabel } from '../flow-labels';
 import type { AppiumRecordedStep } from '../types';
 import { aiPromptPresetsKey, DEFAULT_AI_PROMPT_PRESETS } from '../ai-prompt-presets';
 import AiRecognitionPromptInput from './AiRecognitionPromptInput.vue';
@@ -12,14 +13,18 @@ const emit = defineEmits<{ update: [patch: Partial<AppiumRecordedStep>] }>();
 const prompt = ref(props.step.value || '');
 const promptPresets = inject(aiPromptPresetsKey, ref(DEFAULT_AI_PROMPT_PRESETS));
 const busy = ref(false);
+const optimizingPrompt = shallowRef(false);
 const error = ref('');
 const branch = computed(() => isAiBranchEnabled(props.step));
 const untilMatch = computed(() => props.step.aiObservation?.mode === 'untilMatch');
 const branchChoice = ref(branch.value);
+const fallbackEnabled = shallowRef(Boolean(props.step.aiInvalidResultBranch));
 watch(branch, value => { branchChoice.value = value; });
+watch(() => props.step.aiInvalidResultBranch, value => { fallbackEnabled.value = Boolean(value); });
 let controller: AbortController | undefined;
+let optimizeController: AbortController | undefined;
 watch(() => props.step.value, value => { prompt.value = value || ''; });
-onBeforeUnmount(() => controller?.abort());
+onBeforeUnmount(() => { controller?.abort(); optimizeController?.abort(); });
 
 function updateObservation(patch: Partial<AiObservationConfig>) {
   try {
@@ -35,6 +40,33 @@ async function toggleBranch(enabled: boolean) {
   branchChoice.value = branch.value;
 }
 
+function toggleFallback(enabled: boolean) {
+  fallbackEnabled.value = enabled;
+  error.value = '';
+  if (!enabled) emit('update', { aiInvalidResultBranch: undefined });
+}
+
+async function optimizePrompt() {
+  if (busy.value || optimizingPrompt.value || props.disabled) return;
+  error.value = '';
+  optimizeController = new AbortController();
+  optimizingPrompt.value = true;
+  let optimized = '';
+  try {
+    optimized = (await optimizeAppiumPrompt({
+      kind: 'aiRecognition',
+      prompt: prompt.value,
+      condition: branch.value || untilMatch.value,
+    }, optimizeController.signal)).prompt;
+    prompt.value = optimized;
+  } catch (cause) {
+    if (!optimizeController.signal.aborted) error.value = cause instanceof Error ? cause.message : '提示词优化失败';
+  } finally {
+    optimizingPrompt.value = false;
+  }
+  if (optimized) await save(branch.value);
+}
+
 async function save(enabled: boolean, observation?: AiObservationConfig) {
   if (busy.value || props.disabled) return;
   error.value = '';
@@ -112,9 +144,10 @@ async function save(enabled: boolean, observation?: AiObservationConfig) {
         </el-tooltip>
       </span>
     </template>
-    <AiRecognitionPromptInput v-model="prompt" :presets="promptPresets" :placeholder="untilMatch ? '例如：当前画面是否出现广告弹窗？' : ''" :disabled="disabled || busy" @change="error = ''; !branch && !untilMatch && save(false)" />
-    <div v-if="(branch || untilMatch) && prompt !== step.value" class="recognition-prompt-actions">
-      <el-button :disabled="disabled || busy" @click="save(branch)">验证并保存问题</el-button>
+    <AiRecognitionPromptInput v-model="prompt" :presets="promptPresets" :placeholder="untilMatch ? '例如：当前画面是否出现广告弹窗？' : ''" :disabled="disabled || busy || optimizingPrompt" @change="error = ''; !branch && !untilMatch && save(false)" />
+    <div class="recognition-prompt-actions">
+      <el-button :loading="optimizingPrompt" :disabled="disabled || busy || !prompt.trim()" @click="optimizePrompt">优化提示词</el-button>
+      <el-button v-if="(branch || untilMatch) && prompt !== step.value" :disabled="disabled || busy || optimizingPrompt" @click="save(branch)">验证并保存问题</el-button>
     </div>
   </el-form-item>
   <el-form-item>
@@ -124,6 +157,24 @@ async function save(enabled: boolean, observation?: AiObservationConfig) {
       正在验证…
     </span>
   </el-form-item>
+  <el-form-item v-if="branch">
+    <el-checkbox :model-value="fallbackEnabled" :disabled="disabled || busy" @update:model-value="toggleFallback($event === true)">启用兜底</el-checkbox>
+    <el-tooltip placement="top" :show-after="200">
+      <template #content><div class="recognition-help-content">仅在模型返回空内容、无效格式、无法判断或没有返回 true/false 时生效。正常返回布尔结果时仍按识别结果进入分支；请求失败和超时不使用此兜底。</div></template>
+      <el-button class="recognition-help" text :icon="QuestionFilled" aria-label="AI 识别兜底说明" @click.prevent />
+    </el-tooltip>
+  </el-form-item>
+  <el-form-item v-if="branch && fallbackEnabled" label="兜底分支">
+    <el-select
+      :model-value="step.aiInvalidResultBranch || ''"
+      :disabled="disabled || busy"
+      placeholder="请选择左右分支"
+      @update:model-value="emit('update', { aiInvalidResultBranch: $event })"
+    >
+      <el-option :label="`进入左侧分支（${flowBranchLabel(step, 'yes')}）`" value="yes" />
+      <el-option :label="`进入右侧分支（${flowBranchLabel(step, 'no')}）`" value="no" />
+    </el-select>
+  </el-form-item>
   <el-alert v-if="error" :title="error" type="warning" :closable="false" show-icon />
 </template>
 

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

@@ -3,14 +3,30 @@ import { computed } from 'vue';
 import type { AppiumRecordedStep } from '../types';
 import { enclosingLoops } from '../bounded-loop';
 
-const props = defineProps<{ step: AppiumRecordedStep; steps: AppiumRecordedStep[]; disabled?: boolean }>();
+const props = defineProps<{
+  step: AppiumRecordedStep;
+  steps: AppiumRecordedStep[];
+  disabled?: boolean;
+  mode?: 'break' | 'continue';
+}>();
 const emit = defineEmits<{ update: [patch: Partial<AppiumRecordedStep>] }>();
 const loops = computed(() => enclosingLoops(props.steps, props.step));
+const isContinue = computed(() => props.mode === 'continue');
+const fieldLabel = computed(() => isContinue.value ? '继续目标循环' : '退出目标循环');
+const targetId = computed(() => (
+  isContinue.value ? props.step.continueLoopTargetId : props.step.breakLoopTargetId
+) || loops.value[0]?.id);
+
+function updateTarget(value: string) {
+  emit('update', isContinue.value
+    ? { continueLoopTargetId: value }
+    : { breakLoopTargetId: value });
+}
 </script>
 
 <template>
-  <el-form-item label="退出目标循环">
-    <el-select class="break-loop-target" popper-class="break-loop-target-popper" :model-value="step.breakLoopTargetId || loops[0]?.id" :disabled="disabled" aria-label="退出目标循环" @update:model-value="emit('update', { breakLoopTargetId: $event })">
+  <el-form-item :label="fieldLabel">
+    <el-select class="break-loop-target" popper-class="break-loop-target-popper" :model-value="targetId" :disabled="disabled" :aria-label="fieldLabel" @update:model-value="updateTarget">
       <el-option class="break-loop-target-option" v-for="(loop, index) in loops" :key="loop.id" :value="loop.id" :label="`${loop.label}（${index === 0 ? '当前循环' : `外层 ${index}`} · 节点 ${steps.findIndex(item => item.id === loop.id) + 1}）`" />
     </el-select>
   </el-form-item>

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

@@ -69,9 +69,9 @@ watch(
 </template>
 
 <style scoped>
-.appium-tree-container { display: flex; flex-direction: column; gap: 8px; min-height: 0; }
-.appium-tree { flex: 1; height: auto; overflow-x: hidden; }
-.appium-tree :deep(.el-tree) { min-width: 0; }
-.appium-tree-node { flex: 1; min-width: 0; overflow: hidden; }
-.appium-tree-node__label { overflow: hidden; text-overflow: ellipsis; white-space: nowrap; }
+.appium-tree-container { display: flex; flex-direction: column; gap: 8px; min-width: 0; min-height: 0; }
+.appium-tree { flex: 1; height: auto; overflow: auto; }
+.appium-tree :deep(.el-tree) { width: max-content; min-width: 100%; }
+.appium-tree-node { flex: 1 0 auto; }
+.appium-tree-node__label { white-space: nowrap; }
 </style>

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

@@ -0,0 +1,23 @@
+<script setup lang="ts">
+import { computed, inject, onBeforeUnmount, watch } from 'vue';
+import { Aim } from '@element-plus/icons-vue';
+import { coordinatePreviewKey } from '../coordinate-preview';
+
+const props = defineProps<{ disabled?: boolean }>();
+const emit = defineEmits<{ select: [point: { x: number; y: number }] }>();
+const picker = inject(coordinatePreviewKey, undefined);
+const owner = Symbol('coordinate-editor');
+const picking = computed(() => picker?.owner.value === owner);
+function cancel() { picker?.cancel(owner); }
+watch(() => props.disabled, (disabled) => { if (disabled) cancel(); });
+onBeforeUnmount(cancel);
+</script>
+
+<template>
+  <el-form-item>
+    <el-button :icon="Aim" :disabled="disabled || !picker?.enabled.value" @click="picker?.start(owner, point => emit('select', point))">
+      {{ picking ? '请在左侧设备预览点击' : '获取点击坐标' }}
+    </el-button>
+    <el-button v-if="picking" text @click="cancel">取消取点</el-button>
+  </el-form-item>
+</template>

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

@@ -1,7 +1,7 @@
 <script setup lang="ts">
 import { nextTick, shallowRef } from 'vue';
 import type { MenuInstance, PopoverInstance } from 'element-plus';
-import { PASTE_COMMAND, type FlowActionGroup, type InsertAction } from '../flow-graph';
+import { PASTE_COMMAND, type FlowActionGroup, type FlowActionSubgroup, type InsertAction } from '../flow-graph';
 import { actionDescriptions } from '../action-descriptions';
 
 const props = defineProps<{
@@ -21,6 +21,10 @@ const menuRef = shallowRef<HTMLElement>();
 const menuControlRef = shallowRef<MenuInstance>();
 const menuMounted = shallowRef(false);
 
+function isSubgroup(item: FlowActionGroup['actions'][number]): item is FlowActionSubgroup {
+  return 'actions' in item;
+}
+
 async function openMenu() {
   // 每次打开重新创建面板，避免上次选中的操作被当成当前值而无法重复添加。
   menuMounted.value = true;
@@ -55,7 +59,7 @@ async function handleMenuKeydown(event: KeyboardEvent) {
   } else if (group) {
     menuControlRef.value?.open(group);
     await nextTick();
-    target.querySelector<HTMLElement>('.el-menu-item:not(.is-disabled)')?.focus();
+    target.querySelector<HTMLElement>('[role="menuitem"]:not(.is-disabled)')?.focus();
   } else if (event.key !== 'ArrowRight') {
     target.click();
   }
@@ -119,25 +123,51 @@ function selectAction(value: string) {
             @click="openGroupOnClick($event, group.title)"
           >
             <template #title>{{ group.title }}</template>
-            <el-tooltip
-              v-for="action in group.actions"
-              :key="action.type"
-              :content="actionDescriptions[action.type]"
-              placement="right"
-              effect="dark"
-              :show-after="350"
-              :hide-after="0"
-              :enterable="false"
-              :popper-options="{ modifiers: [{ name: 'preventOverflow', options: { altAxis: true, padding: 8 } }] }"
-              popper-class="appium-action-description"
-            >
-              <el-menu-item
-                :index="action.type"
-                :disabled="isActionDisabled(action.type)"
+            <template v-for="item in group.actions" :key="isSubgroup(item) ? item.label : item.type">
+              <el-sub-menu
+                v-if="isSubgroup(item)"
+                :index="`${group.title}/${item.label}`"
+                :data-group="`${group.title}/${item.label}`"
+                :aria-label="item.label"
+                tabindex="-1"
+                :teleported="true"
+                popper-class="appium-action-submenu appium-action-submenu--third"
+                @click.stop="openGroupOnClick($event, `${group.title}/${item.label}`)"
+              >
+                <template #title>{{ item.label }}</template>
+                <el-tooltip
+                  v-for="action in item.actions"
+                  :key="action.type"
+                  :content="actionDescriptions[action.type]"
+                  placement="right"
+                  effect="dark"
+                  :show-after="350"
+                  :hide-after="0"
+                  :enterable="false"
+                  :popper-options="{ modifiers: [{ name: 'preventOverflow', options: { altAxis: true, padding: 8 } }] }"
+                  popper-class="appium-action-description"
+                >
+                  <el-menu-item :index="action.type" :disabled="isActionDisabled(action.type)">
+                    {{ action.label }}
+                  </el-menu-item>
+                </el-tooltip>
+              </el-sub-menu>
+              <el-tooltip
+                v-else
+                :content="actionDescriptions[item.type]"
+                placement="right"
+                effect="dark"
+                :show-after="350"
+                :hide-after="0"
+                :enterable="false"
+                :popper-options="{ modifiers: [{ name: 'preventOverflow', options: { altAxis: true, padding: 8 } }] }"
+                popper-class="appium-action-description"
               >
-                {{ action.label }}
-              </el-menu-item>
-            </el-tooltip>
+                <el-menu-item :index="item.type" :disabled="isActionDisabled(item.type)">
+                  {{ item.label }}
+                </el-menu-item>
+              </el-tooltip>
+            </template>
           </el-sub-menu>
           <el-menu-item v-if="clipboardCount" :index="PASTE_COMMAND" class="appium-action-paste">
             粘贴 {{ clipboardCount }} 个节点

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

@@ -1,5 +1,6 @@
 <script setup lang="ts">
 import { computed } from 'vue';
+import CoordinatePointPicker from './CoordinatePointPicker.vue';
 import type { AppiumRecordedStep, AppiumSelector } from '../types';
 import { normalizeVisualChangeConfig } from '../visual-change';
 import { longPressMode } from '../long-press';
@@ -99,6 +100,12 @@ function patchTapCoordinate(axis: 'centerX' | 'centerY', value: number | undefin
     ? { label: `点击坐标 ${fallback.centerX},${fallback.centerY}` } : {}) });
 }
 
+function applyTapPoint(point: { x: number; y: number }) {
+  const fallback = { ...props.step.fallback, strategy: 'bounds' as const, centerX: point.x, centerY: point.y };
+  patchStep({ fallback, ...(/^点击坐标 \d+,\d+$/.test(props.step.label)
+    ? { label: `点击坐标 ${point.x},${point.y}` } : {}) });
+}
+
 function patchVisualChange(patch: Partial<VisualChangeConfig>) {
   patchStep({
     visualChange: normalizeVisualChangeConfig({
@@ -158,7 +165,7 @@ function patchSelector(patch: Partial<AppiumSelector>) {
         <el-form-item v-if="step.type === 'aiRecognition'">
           <el-checkbox :model-value="step.aiTimeoutEnabled === true" :disabled="disabled" @update:model-value="patchStep({ aiTimeoutEnabled: $event === true })">启用超时</el-checkbox>
         </el-form-item>
-        <el-form-item v-if="!['longPress', 'stopApp', 'log', 'openGallery', 'endFlow', 'loop', 'breakLoop'].includes(step.type) && (step.type !== 'aiRecognition' || step.aiTimeoutEnabled === true)" :label="step.type === 'aiRecognition' && step.aiObservation ? '模型请求超时 ms' : '超时时间 ms'">
+        <el-form-item v-if="!['longPress', 'stopApp', 'log', 'openGallery', 'endFlow', 'loop', 'breakLoop', 'continueLoop'].includes(step.type) && (step.type !== 'aiRecognition' || step.aiTimeoutEnabled === true)" :label="step.type === 'aiRecognition' && step.aiObservation ? '模型请求超时 ms' : '超时时间 ms'">
           <el-input-number
             :model-value="step.timeoutMs ?? (step.type === 'delay' ? 1000 : DEFAULT_NODE_TIMEOUT_MS)"
             :disabled="disabled"
@@ -196,11 +203,12 @@ function patchSelector(patch: Partial<AppiumSelector>) {
           <el-input-number :model-value="step.fallback?.centerY ?? 0" :disabled="disabled" :min="0" :max="99999" :precision="0" controls-position="right" aria-label="坐标 Y" @update:model-value="patchTapCoordinate('centerY', $event)" />
         </el-form-item>
       </div>
+      <CoordinatePointPicker v-if="step.type === 'coordinateTap'" :disabled="disabled" @select="applyTapPoint" />
       <StageLogSettings v-if="step.type === 'log'" :step="step" :disabled="disabled" @update="patchStep" />
       <VariableExtractionSettings v-if="step.type === 'extractVariable'" :step="step" :disabled="disabled" @update="patchStep" />
       <ScriptParameterSettings v-if="step.type === 'runScript'" :step="step" :disabled="disabled" @update="patchStep" />
       <LoopSettings v-if="step.type === 'loop'" :step="step" :disabled="disabled" @update="patchStep" />
-      <BreakLoopSettings v-if="step.type === 'breakLoop'" :step="step" :steps="steps" :disabled="disabled" @update="patchStep" />
+      <BreakLoopSettings v-if="step.type === 'breakLoop' || step.type === 'continueLoop'" :step="step" :steps="steps" :disabled="disabled" :mode="step.type === 'continueLoop' ? 'continue' : 'break'" @update="patchStep" />
       <TextClickSettings v-if="step.type === 'textClick'" :step="step" :disabled="disabled" @update="patchStep" />
       <AiRecognitionSettings v-if="step.type === 'aiRecognition'" :step="step" :steps="steps" :disabled="disabled" @update="patchStep" />
       <el-form-item

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

@@ -6,53 +6,10 @@ import type { AppiumRecordedStep } from '../types';
 import { buildConditionLayouts, FLOW_BRANCH_GAP, FLOW_NODE_WIDTH } from '../flow-layout';
 import FlowStepEditor from './FlowStepEditor.vue';
 import FlowActionMenu from './FlowActionMenu.vue';
+import type { FlowActionGroup, InsertAction } from '../flow-graph';
 
 type BranchName = 'yes' | 'no';
 type FlowKind = 'action' | 'condition' | 'assertion';
-type InsertAction =
-  | 'delay'
-  | 'tap'
-  | 'input'
-  | 'clearInput'
-  | 'coordinateTap'
-  | 'longPress'
-  | 'keyBack'
-  | 'keyHome'
-  | 'keyRecent'
-  | 'keyPower'
-  | 'swipe'
-  | 'pinch'
-  | 'launchApp'
-  | 'stopApp'
-  | 'openGallery'
-  | 'endFlow'
-  | 'loop'
-  | 'breakLoop'
-  | 'clearAppData'
-  | 'popupCondition'
-  | 'checkboxState'
-  | 'checkedState'
-  | 'radioButtonState'
-  | 'aiRecognition'
-  | 'imageCheck'
-  | 'textClick'
-  | 'tapIfExists'
-  | 'inputIfExists'
-  | 'clearIfExists'
-  | 'backIfExists'
-  | 'waitFor'
-  | 'assertExists'
-  | 'assertText'
-  | 'waitDisappear'
-  | 'waitActivity'
-  | 'runScript'
-  | 'extractVariable'
-  | 'noop'
-  | 'log'
-  | 'visualChangeStart'
-  | 'visualChangeEnd'
-  | 'visualChange';
-
 const PASTE_COMMAND = '__paste_flow_nodes__';
 
 const props = defineProps<{
@@ -86,7 +43,7 @@ const layout = computed(() => buildConditionLayouts(props.steps).get(props.condi
   yesAxis: 25,
   noAxis: 75,
 });
-const actionGroups: Array<{ title: string; actions: Array<{ type: InsertAction; label: string }> }> = [
+const actionGroups: FlowActionGroup[] = [
   {
     title: '组件操作',
     actions: [
@@ -126,8 +83,13 @@ const actionGroups: Array<{ title: string; actions: Array<{ type: InsertAction;
       { type: 'waitFor', label: '等待出现' },
       { type: 'waitDisappear', label: '等待元素消失' },
       { type: 'waitActivity', label: '等待 Activity' },
-      { type: 'visualChangeStart', label: '检测画面变化开始' },
-      { type: 'visualChangeEnd', label: '检测画面变化结束' },
+      {
+        label: '检测画面变化',
+        actions: [
+          { type: 'visualChangeStart', label: '开始检测' },
+          { type: 'visualChangeEnd', label: '结束检测' },
+        ],
+      },
     ],
   },
   {
@@ -142,8 +104,14 @@ const actionGroups: Array<{ title: string; actions: Array<{ type: InsertAction;
     actions: [
       { type: 'noop', label: '空节点' },
       { type: 'endFlow', label: '终止流程' },
-      { type: 'loop', label: '有界循环' },
-      { type: 'breakLoop', label: '退出循环' },
+      {
+        label: '循环',
+        actions: [
+          { type: 'loop', label: '有界循环' },
+          { type: 'continueLoop', label: '继续下一次循环' },
+          { type: 'breakLoop', label: '退出循环' },
+        ],
+      },
       { type: 'log', label: '输出日志' },
       { type: 'runScript', label: '连接脚本' },
     ],
@@ -166,6 +134,7 @@ function typeLabel(step: AppiumRecordedStep) {
     endFlow: '终止流程',
     loop: '有界循环',
     breakLoop: '退出循环',
+    continueLoop: '继续下一次循环',
     log: '输出日志',
     checkboxState: 'Checkbox 状态',
     checkedState: '判断勾选',

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

@@ -96,8 +96,13 @@ const insertActionGroups: FlowActionGroup[] = [
       { type: 'waitFor', label: '等待出现' },
       { type: 'waitDisappear', label: '等待元素消失' },
       { type: 'waitActivity', label: '等待 Activity' },
-      { type: 'visualChangeStart', label: '检测画面变化开始节点' },
-      { type: 'visualChangeEnd', label: '检测画面变化结束节点' },
+      {
+        label: '检测画面变化',
+        actions: [
+          { type: 'visualChangeStart', label: '开始检测' },
+          { type: 'visualChangeEnd', label: '结束检测' },
+        ],
+      },
     ],
   },
   {
@@ -112,8 +117,14 @@ const insertActionGroups: FlowActionGroup[] = [
     actions: [
       { type: 'noop', label: '空节点' },
       { type: 'endFlow', label: '终止流程' },
-      { type: 'loop', label: '有界循环' },
-      { type: 'breakLoop', label: '退出循环' },
+      {
+        label: '循环',
+        actions: [
+          { type: 'loop', label: '有界循环' },
+          { type: 'continueLoop', label: '继续下一次循环' },
+          { type: 'breakLoop', label: '退出循环' },
+        ],
+      },
       { type: 'log', label: '输出日志' },
       { type: 'runScript', label: '连接脚本' },
     ],
@@ -122,7 +133,7 @@ const insertActionGroups: FlowActionGroup[] = [
 
 const mainActionGroups = insertActionGroups.map((group) => ({
   ...group,
-  actions: group.actions.filter((action) => action.type !== 'clearAppData'),
+  actions: group.actions.filter((action) => !('type' in action) || action.type !== 'clearAppData'),
 }));
 const startActionGroups = insertActionGroups;
 const hasClearAppDataStep = computed(() => props.steps.some((step) => step.type === 'clearAppData'));

package/src/appium-recorder/coordinate-preview.ts

@@ -0,0 +1,37 @@
+import { computed, provide, shallowRef, watch, type InjectionKey, type Ref } from 'vue';
+
+type Point = { x: number; y: number };
+interface CoordinatePicker {
+  enabled: Readonly<Ref<boolean>>;
+  owner: Readonly<Ref<symbol | undefined>>;
+  start: (owner: symbol, select: (point: Point) => void) => void;
+  cancel: (owner?: symbol) => void;
+}
+export const coordinatePreviewKey: InjectionKey<CoordinatePicker> = Symbol('coordinate-preview');
+
+export function useCoordinatePicker(enabled: Readonly<Ref<boolean>>, showPreview: () => void) {
+  const session = shallowRef<{ owner: symbol; select: (point: Point) => void }>();
+  function cancel(owner?: symbol) {
+    if (!owner || session.value?.owner === owner) session.value = undefined;
+  }
+  provide(coordinatePreviewKey, {
+    enabled,
+    owner: computed(() => session.value?.owner),
+    start(owner, select) {
+      if (!enabled.value) return;
+      session.value = { owner, select };
+      showPreview();
+    },
+    cancel,
+  });
+  watch(enabled, (value) => { if (!value) cancel(); });
+  return {
+    picking: computed(() => Boolean(session.value)),
+    cancel,
+    select(point: Point) {
+      const current = session.value;
+      cancel();
+      if (enabled.value) current?.select(point);
+    },
+  };
+}

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

@@ -184,6 +184,7 @@ export function pasteFlowClipboard(
     delete step.mergeUndo;
     step.id = idMap.get(source.id) || createId();
     if (step.breakLoopTargetId) step.breakLoopTargetId = idMap.get(step.breakLoopTargetId) || step.breakLoopTargetId;
+    if (step.continueLoopTargetId) step.continueLoopTargetId = idMap.get(step.continueLoopTargetId) || step.continueLoopTargetId;
     const flow = { ...(step.flow || {}) };
     for (const key of targetKeys) {
       const mappedId = flow[key] ? idMap.get(flow[key] || '') : '';

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

@@ -29,6 +29,7 @@ export type InsertAction =
   | 'endFlow'
   | 'loop'
   | 'breakLoop'
+  | 'continueLoop'
   | 'clearAppData'
   | 'popupCondition'
   | 'checkboxState'
@@ -70,9 +71,11 @@ const FLOW_BRANCH_LABEL_GAP = 58;
 const FLOW_BRANCH_MIN_SPREAD = 260;
 const FLOW_BRANCH_SUBTREE_GAP = 80;
 
+export type FlowAction = { type: InsertAction; label: string };
+export type FlowActionSubgroup = { label: string; actions: FlowAction[] };
 export type FlowActionGroup = {
   title: string;
-  actions: Array<{ type: InsertAction; label: string }>;
+  actions: Array<FlowAction | FlowActionSubgroup>;
 };
 
 export type FlowGraphNodeData =
@@ -283,7 +286,7 @@ function estimateStepNodeHeight(label: { title: string; meta: string; note?: str
 }
 
 function withLaunchAppAction(groups: FlowActionGroup[]) {
-  if (groups.some((group) => group.actions.some((action) => action.type === 'launchApp'))) return groups;
+  if (groups.some((group) => group.actions.some((action) => 'type' in action && action.type === 'launchApp'))) return groups;
   const launchAction = { type: 'launchApp' as const, label: '启动 App' };
   let added = false;
   const nextGroups = groups.map((group) => {

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

@@ -15,7 +15,7 @@ export function defaultFlowKind(step: AppiumRecordedStep): FlowKind {
   if (step.type === 'aiRecognition') return isAiBranchEnabled(step) ? 'condition' : 'action';
   if (step.type === 'extractVariable') return 'action';
   if (step.type === 'loop') return 'condition';
-  if (step.type === 'breakLoop') return 'action';
+  if (step.type === 'breakLoop' || step.type === 'continueLoop') return 'action';
   if (step.type === 'log' || step.type === 'openGallery' || step.type === 'endFlow') return 'action';
   if (isBooleanCondition(step)) return 'condition';
   if (step.flow?.nodeKind) return step.flow.nodeKind;
@@ -65,6 +65,7 @@ export function flowTypeLabel(step: AppiumRecordedStep) {
     endFlow: '终止流程',
     loop: '有界循环',
     breakLoop: '退出循环',
+    continueLoop: '继续下一次循环',
     clearAppData: '清理 APP 缓存',
     longPress: '长按',
     pinch: '双指缩放',
@@ -82,8 +83,9 @@ export function flowStepMeta(step: AppiumRecordedStep) {
   if (step.type === 'extractVariable') return `${step.extractVariable?.attribute || 'text'} → ${step.extractVariable?.name || '未设置变量名'}`;
   if (step.type === 'loop') return `最多 ${step.loop?.maxIterations ?? '?'} 次 · ${step.loop?.exitWhen === 'exists' ? '元素出现时退出' : step.loop?.exitWhen === 'notExists' ? '元素消失时退出' : '固定次数'}${step.loop?.exitWhen !== 'never' ? ` ${step.selector?.value || ''}` : ''}`;
   if (step.type === 'breakLoop') return step.breakLoopTargetId ? '退出指定循环，继续循环结束后的流程' : '退出当前循环，继续循环结束后的流程';
+  if (step.type === 'continueLoop') return step.continueLoopTargetId ? '结束本轮，进入指定循环的下一轮' : '结束本轮，进入当前循环的下一轮';
   if (step.type === 'log') return `${step.logPrefix ?? DEFAULT_LOG_PREFIX}:${step.value || ''}`;
-  if (step.type === 'aiRecognition') return `AI ${step.aiObservation?.mode === 'untilMatch' ? '命中即结束' : step.aiObservation ? '持续观察' : '识别'} · ${step.value || '未填写识别内容'}`;
+  if (step.type === 'aiRecognition') return `AI ${step.aiObservation?.mode === 'untilMatch' ? '命中即结束' : step.aiObservation ? '持续观察' : '识别'} · ${step.value || '未填写识别内容'}${step.aiInvalidResultBranch ? ` · 无有效结果→${step.aiInvalidResultBranch === 'yes' ? 'true' : 'false'}` : ''}`;
   if (step.type === 'longPress') {
     const target = longPressMode(step) === 'element'
       ? `元素 ${step.selector?.strategy || ''} ${step.selector?.value || ''}`

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

@@ -63,7 +63,7 @@ export function mergeBranches(steps: AppiumRecordedStep[], conditionId: string,
     }
   }
   function connectEnd(step: typeof next[number]) {
-    if (step.type === 'endFlow' || step.type === 'breakLoop') return;
+    if (step.type === 'endFlow' || step.type === 'breakLoop' || step.type === 'continueLoop') return;
     step.flow.successTargetId = commonId;
     if (defaultFlowKind(step) === 'condition') {
       for (const branch of (step.type === 'loop' ? ['no'] : ['yes', 'no']) as Branch[]) {

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

@@ -28,7 +28,7 @@ export function unmergeBranches(steps: AppiumRecordedStep[], conditionId: string
   const shared = new Set([...common, ...added.map(step => step.id)]);
   // 普通新增操作可分配到任一侧；控制节点和跨节点配对不做猜测性复制。
   if (added.some(step => defaultFlowKind(step) === 'condition'
-    || ['visualChange', 'breakLoop', 'endFlow'].includes(step.type) || step.mergeUndo)) {
+    || ['visualChange', 'breakLoop', 'continueLoop', 'endFlow'].includes(step.type) || step.mergeUndo)) {
     throw new Error('公共流程新增了判断、循环、终止或配对节点，请先移出这些节点再取消合并');
   }
   if (added.some(step => edges.some(key => step.flow?.[key]
@@ -98,7 +98,7 @@ export function unmergeBranches(steps: AppiumRecordedStep[], conditionId: string
     const siblings = branchSteps(next, conditionId, other);
     const appended = siblings.slice(-added.length);
     const previous = siblings[siblings.length - appended.length - 1];
-    if (previous && (defaultFlowKind(previous) === 'condition' || ['endFlow', 'breakLoop'].includes(previous.type))) {
+    if (previous && (defaultFlowKind(previous) === 'condition' || ['endFlow', 'breakLoop', 'continueLoop'].includes(previous.type))) {
       throw new Error('另一侧末尾是判断、循环或终止操作，新增节点不能安全追加，请仅保留在原来源分支');
     }
     if (previous?.flow?.successTargetId) {