android-midscene-automation 0.1.28 → 0.1.29

package/CHANGELOG.md

@@ -1,7 +1,16 @@
 # 更新记录
 
+## v0.1.29
+
+- 判断节点新增“合并分支”，支持选择一侧公共流程起点，将两侧后续汇入同一段居中流程；另一侧可保留独有操作或确认删除重复后缀，支持嵌套判断及各类分支，公共节点只执行一次且不随单侧节点删除。
+- 将 Checkbox、RadioButton 判断入口合并为“判断勾选”，新增 Switch 支持；添加和回放时自动校验组件类型及可勾选属性，读取实时 checked 状态进入 true / false 分支，不改变控件状态，兼容已有独立判断节点。
+- “流程控制”新增终止流程节点，执行到该节点时主动结束本次回放，不再执行后续节点或连接脚本；子脚本触发时也结束整个流程，保留执行日志和报告，不作为执行失败。
+- “设备操作”新增启动相册顺序节点，优先解析系统相册入口，必要时查找已安装的常见相册应用；仅打开相册，不选择照片，日志记录实际启动应用，找不到或启动失败时明确报错。
+- Appium 配置新增流程背景色设置，默认沿用浅绿色，支持预选颜色、颜色选择器、#RGB / #RRGGBB 输入校验和恢复默认；保存后持久化，普通画布、放大视图和连接脚本预览统一应用。
+
 ## v0.1.28
 
+- Appium 配置中的流程背景色独立成区，与节点模型配置分开展示，保留预选颜色、自定义颜色及保存入口。
 - “组件操作”新增文字点击分支节点，无需预选元素，支持精准匹配和模糊匹配原生组件文字；匹配并点击后进入“匹配到文字”，等待超时未找到则进入“未匹配到文字”。支持编辑文字和超时，多元素匹配及点击异常明确报错，日志和报告保留分支结果。
 - “流程控制”新增输出日志节点，支持设置日志内容和自定义关键字，默认按 `stageLog:内容` 输出；支持添加后编辑，回放实时输出、日志文件及报告均保留日志内容，多行内容逐行添加关键字。
 - 新增 AI 识别判断节点，可输入按钮可用、画面黑屏等识别要求，通过当前设备截图返回 `true / false` 并进入对应分支；Appium配置支持独立设置 Base URL、API Key、Model Name 和测试模型，模型需支持图片输入。

package/README.md

@@ -1229,8 +1229,17 @@ Linux: ~/.local/share/android-midscene-automation
 
 # 项目更新记录
 
+## v0.1.29
+
+- 判断节点新增“合并分支”，支持选择一侧公共流程起点，将两侧后续汇入同一段居中流程；另一侧可保留独有操作或确认删除重复后缀，支持嵌套判断及各类分支，公共节点只执行一次且不随单侧节点删除。
+- 将 Checkbox、RadioButton 判断入口合并为“判断勾选”，新增 Switch 支持；添加和回放时自动校验组件类型及可勾选属性，读取实时 checked 状态进入 true / false 分支，不改变控件状态，兼容已有独立判断节点。
+- “流程控制”新增终止流程节点，执行到该节点时主动结束本次回放，不再执行后续节点或连接脚本；子脚本触发时也结束整个流程，保留执行日志和报告，不作为执行失败。
+- “设备操作”新增启动相册顺序节点，优先解析系统相册入口，必要时查找已安装的常见相册应用；仅打开相册，不选择照片，日志记录实际启动应用，找不到或启动失败时明确报错。
+- Appium 配置新增流程背景色设置，默认沿用浅绿色，支持预选颜色、颜色选择器、#RGB / #RRGGBB 输入校验和恢复默认；保存后持久化，普通画布、放大视图和连接脚本预览统一应用。
+
 ## v0.1.28
 
+- Appium 配置中的流程背景色独立成区，与节点模型配置分开展示，保留预选颜色、自定义颜色及保存入口。
 - “组件操作”新增文字点击分支节点，无需预选元素，支持精准匹配和模糊匹配原生组件文字；匹配并点击后进入“匹配到文字”，等待超时未找到则进入“未匹配到文字”。支持编辑文字和超时，多元素匹配及点击异常明确报错，日志和报告保留分支结果。
 - “流程控制”新增输出日志节点，支持设置日志内容和自定义关键字，默认按 `stageLog:内容` 输出；支持添加后编辑，回放实时输出、日志文件及报告均保留日志内容，多行内容逐行添加关键字。
 - 新增 AI 识别判断节点，可输入按钮可用、画面黑屏等识别要求，通过当前设备截图返回 `true / false` 并进入对应分支；Appium配置支持独立设置 Base URL、API Key、Model Name 和测试模型，模型需支持图片输入。

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "android-midscene-automation",
-  "version": "0.1.28",
+  "version": "0.1.29",
   "repository": {
     "type": "git",
     "url": "git+https://github.com/oooooooko/android-midscene-automation.git"

package/server/appium-recorder/appium-runner.ts

@@ -2,6 +2,7 @@ import { execFile } from 'node:child_process';
 import { adbScreenshotBase64 } from './screenshot';
 import { recognizeDeviceScreen } from './ai-recognition';
 import { formatStageLog } from '../../src/appium-recorder/stage-log';
+import { openGalleryOnDevice } from './open-gallery';
 import { textClickSelector } from '../../src/appium-recorder/text-click';
 import { AsyncLocalStorage } from 'node:async_hooks';
 import { mkdir, writeFile } from 'node:fs/promises';
@@ -14,7 +15,7 @@ import { startManagedAppiumServer, usesManagedAppiumServer } from './managed-app
 import { compareVisualChangeFrames, type VisualChangeRegion } from './visual-change';
 import { longPressMode, validateLongPress } from '../../src/appium-recorder/long-press';
 import { defaultFlowKind, flowBranchLabel } from '../../src/appium-recorder/flow-labels';
-import { isNativeStateCondition, nativeControlName, nativeControlType, parseNativeBoolean } from '../../src/appium-recorder/native-control-state';
+import { isNativeStateCondition, nativeControlName, matchesNativeControl, parseNativeBoolean } from '../../src/appium-recorder/native-control-state';
 
 type AppiumSessionResponse = {
   value?: {
@@ -57,6 +58,7 @@ const replayContext = new AsyncLocalStorage<{
   visualChecks: AppiumReplayVisualCheck[];
   pendingVisualChecks: PendingVisualChangeCheck[];
   softFailureCount: number;
+  flowEnded?: boolean;
 }>();
 
 const appiumServerUrl = () => replayContext.getStore()?.serverUrl || configuredAppiumServerUrl();
@@ -523,6 +525,7 @@ type RunStepResult = string | {
 };
 
 function completedStepStatus(step: AppiumRecordedStepRecord, softFailed: boolean) {
+  if (step.type === 'endFlow') return '流程已结束';
   if (step.type === 'visualChange') {
     if (step.visualChange?.role === 'start') return '已记录基准帧';
     if (step.visualChange?.role === 'end') return '已记录对比帧';
@@ -729,6 +732,13 @@ async function runStep(
     return;
   }
   if (step.type === 'log') return formatStageLog(step);
+  if (step.type === 'openGallery') return openGalleryOnDevice(deviceId, replayContext.getStore()?.signal);
+  if (step.type === 'endFlow') {
+    // 同一次回放的主脚本和连接脚本共享结束状态，不影响下一次回放。
+    const context = replayContext.getStore();
+    if (context) context.flowEnded = true;
+    return '流程已主动结束，后续节点不再执行';
+  }
 
   if (step.type === 'coordinateTap') {
     await tapFallback(deviceId, step);
@@ -894,7 +904,7 @@ async function readNativeControlState(sessionId: string, step: AppiumRecordedSte
     await appiumRequest<AppiumValueResponse<unknown>>(`/session/${sessionId}/element/${elementId}/attribute/${name}`)
   ).value;
   const className = await attribute('className');
-  if (nativeControlType(className) !== step.type) {
+  if (!matchesNativeControl(step.type, className)) {
     throw new Error(`${step.label} 目标不是原生 ${nativeControlName(step.type)}，实际类型：${String(className ?? '未知')}`);
   }
   if (parseNativeBoolean(await attribute('checkable')) !== true) {
@@ -1067,6 +1077,7 @@ async function replayLinearSteps(
   options: ReplayStepOptions = {},
 ) {
   for (const [index, step] of steps.entries()) {
+    if (replayContext.getStore()?.flowEnded) return;
     throwIfReplayStopped();
     if (shouldSkipLinkedScriptInitStep(options, step)) {
       lines.push(`[节点 ${index + 1}] 跳过：${step.label}（${linkedScriptInitSkipReason(step)}）`);
@@ -1133,6 +1144,7 @@ async function replayFlowSteps(
   const maxVisits = Math.max(steps.length * 4, 20);
 
   while (typeof index === 'number' && index >= 0 && index < steps.length) {
+    if (replayContext.getStore()?.flowEnded) return;
     throwIfReplayStopped();
     guard += 1;
     if (guard > maxVisits) throw new Error('流程图可能存在循环，已终止回放');
@@ -1261,6 +1273,7 @@ async function replayScriptSteps(
   await replayStepGroup(sessionId, deviceId, mainSteps, lines, stack, options);
 
   for (const [offset, step] of trailingLinkedSteps.entries()) {
+    if (replayContext.getStore()?.flowEnded) return;
     const nodeNumber = trailingLinkIndex + offset + 1;
     lines.push(`当前脚本步骤完成，开始执行：${step.label}`);
     lines.push(`[节点 ${nodeNumber}] 开始：${step.label}`);

package/server/appium-recorder/open-gallery.ts

@@ -0,0 +1,52 @@
+import { execFile } from 'node:child_process';
+import { getAdbCommand } from '../android-sdk';
+
+const MAIN = 'android.intent.action.MAIN';
+const GALLERY = 'android.intent.category.APP_GALLERY';
+const LAUNCHER = 'android.intent.category.LAUNCHER';
+// 仅检查已安装的相册应用，不安装应用，也不打开照片选择器。
+const galleryPackages = [
+  'com.android.gallery3d', 'com.miui.gallery', 'com.sec.android.gallery3d',
+  'com.huawei.photos', 'com.hihonor.photos', 'com.coloros.gallery3d',
+  'com.oplus.gallery', 'com.vivo.gallery', 'com.google.android.apps.photos',
+];
+
+function components(output: string) {
+  return output.split(/\r?\n/).map((line) => line.trim()).filter((line) => (
+    /^[\w.]+\/[\w.$]+$/.test(line) && !/(?:Resolver|Chooser)Activity/.test(line)
+  ));
+}
+
+export async function openGalleryOnDevice(deviceId: string, signal?: AbortSignal) {
+  const run = (args: string[]) => new Promise<string>((resolve, reject) => {
+    execFile(getAdbCommand(), ['-s', deviceId, 'shell', ...args], {
+      timeout: 20000, maxBuffer: 4 * 1024 * 1024, signal,
+    }, (error, stdout, stderr) => {
+      if (error) { reject(error); return; }
+      resolve(`${stdout}\n${stderr}`.trim());
+    });
+  });
+  const query = (command: string, category: string, packageName?: string) => run([
+    'cmd', 'package', command, '--brief', '--user', 'current', '-a', MAIN, '-c', category,
+    ...(packageName ? ['-p', packageName] : []),
+  ]);
+  let component = components(await query('resolve-activity', GALLERY))[0];
+  if (!component) component = components(await query('query-activities', GALLERY))[0];
+  if (!component) {
+    const installed = new Set((await run(['pm', 'list', 'packages', '--user', 'current']))
+      .split(/\r?\n/).map((line) => line.trim().replace(/^package:/, '')));
+    for (const packageName of galleryPackages) {
+      if (!installed.has(packageName)) continue;
+      component = components(await query('resolve-activity', LAUNCHER, packageName))
+        .find((item) => item.startsWith(`${packageName}/`));
+      if (component) break;
+    }
+  }
+  if (!component) throw new Error('未找到可启动的相册应用，请检查手机是否安装并启用了相册');
+  const output = await run(['am', 'start', '-W', '--user', 'current', '-a', MAIN, '-n', component]);
+  // am start 某些错误仍返回 0，不能只检查进程退出码。
+  if (!/^Status:\s*ok\s*$/im.test(output) || /Error:|Exception|Permission Denial/i.test(output)) {
+    throw new Error(`启动相册失败：${output || component}`);
+  }
+  return `已启动相册：${component}`;
+}

package/server/appium-recorder/repository.ts

@@ -20,6 +20,7 @@ export type AppiumRecordedStepRecord = {
     | 'waitFor'
     | 'assertExists'
     | 'checkboxState'
+    | 'checkedState'
     | 'radioButtonState'
     | 'aiRecognition'
     | 'textClick'
@@ -31,6 +32,8 @@ export type AppiumRecordedStepRecord = {
     | 'swipe'
     | 'screenshot'
     | 'launchApp'
+    | 'openGallery'
+    | 'endFlow'
     | 'clearAppData'
     | 'waitDisappear'
     | 'assertText'

package/server/config.ts

@@ -1,4 +1,5 @@
 import fs from 'node:fs';
+import { isHexColor, normalizeFlowBackground } from '../src/appium-recorder/flow-appearance';
 import os from 'node:os';
 import path from 'node:path';
 import YAML from 'yaml';
@@ -7,7 +8,7 @@ import { loadModelConfigFromDb, saveModelConfigToDb } from './config-store';
 import type { AiRecognitionModel } from '../src/appium-recorder/ai-recognition';
 
 export type AppConfig = {
-  appium: { model: AiRecognitionModel };
+  appium: { model: AiRecognitionModel; flowBackgroundColor?: string };
   runtime: {
     androidSdkPath: string;
     reportOutputPath: string;
@@ -83,6 +84,7 @@ function normalizeConfig(config: Partial<AppConfig> | null | undefined): AppConf
   return {
     // 旧配置没有 Appium 模型时保留空值，不借用其他模型或改变已有配置。
     appium: {
+      flowBackgroundColor: normalizeFlowBackground(config?.appium?.flowBackgroundColor),
       model: Object.fromEntries(['baseUrl', 'apiKey', 'name'].map((key) => {
         const value = config?.appium?.model?.[key as keyof AiRecognitionModel];
         return [key, typeof value === 'string' ? value.trim() : ''];
@@ -204,6 +206,9 @@ export function loadConfig(): AppConfig {
 }
 
 export function saveConfig(config: AppConfig) {
+  if (config.appium?.flowBackgroundColor !== undefined && !isHexColor(config.appium.flowBackgroundColor)) {
+    throw new ConfigValidationError('流程背景色必须是有效的十六进制颜色（#RGB 或 #RRGGBB）');
+  }
   const normalized = normalizeConfig(config);
   validateRuntimeConfig(normalized);
   cachedConfig = normalized;

package/src/App.vue

@@ -33,6 +33,7 @@ import {
 import * as api from './api';
 import AutomationPage from './pages/AutomationPage.vue';
 import AppiumPage from './appium-recorder/AppiumPage.vue';
+import { DEFAULT_FLOW_BACKGROUND, isHexColor } from './appium-recorder/flow-appearance';
 import ConfigPage from './pages/ConfigPage.vue';
 import GeneratorPage from './pages/GeneratorPage.vue';
 import type {
@@ -702,6 +703,10 @@ const getMidsceneModelConfigError = () => {
 };
 
 const saveModelConfig = async () => {
+  if (!isHexColor(configForm.appium.flowBackgroundColor ?? DEFAULT_FLOW_BACKGROUND)) {
+    ElMessage.warning('流程背景色格式错误，请输入 #RGB 或 #RRGGBB');
+    return;
+  }
   isSavingModelConfig.value = true;
   errorMessage.value = '';
   openActionDialog('保存参数配置');
@@ -1564,6 +1569,7 @@ onUnmounted(() => {
           :active="activeMenu === 'appium'"
           :app-presets="appPresets"
           :ai-recognition-model-configured="aiRecognitionModelConfigured"
+          :flow-background-color="configForm.appium.flowBackgroundColor"
           :device-actions="deviceActions"
           :playground-available="playgroundAvailable"
           :playground-device-id="playgroundDeviceId"

package/src/appium-recorder/AppiumPage.vue

@@ -1,5 +1,6 @@
 <script setup lang="ts">
-import { computed, h, onMounted, onUnmounted, reactive, shallowRef, watch } from 'vue';
+import { computed, h, onMounted, onUnmounted, provide, reactive, shallowRef, watch } from 'vue';
+import { flowBackgroundKey, normalizeFlowBackground } from './flow-appearance';
 import { ElForm, ElFormItem, ElInputNumber, ElMessage, ElMessageBox, ElOption, ElSelect } from 'element-plus';
 import { Check, CircleClose, CopyDocument, Delete, Document, Download, Edit, Plus, Refresh, Upload, VideoPlay, View } from '@element-plus/icons-vue';
 import type { AndroidDevice, AppPreset, DeviceAction } from '../types';
@@ -37,7 +38,7 @@ import {
 } from './flow-copy';
 import { labelFlowStep } from './flow-labels';
 import { validateLongPress } from './long-press';
-import { nativeControlName, nativeControlType } from './native-control-state';
+import { nativeControlName, matchesNativeControl } from './native-control-state';
 import { normalizeLegacyNestedConditionBranches } from './flow-normalize';
 import { removeFlowStep } from './flow-remove';
 import type { FlowActionGroup, InsertAction } from './flow-graph';
@@ -89,6 +90,7 @@ const insertableRecorderActions: RecorderAction[] = [
   'backIfExists',
   'popupCondition',
   'checkboxState',
+  'checkedState',
   'radioButtonState',
   'aiRecognition',
   'textClick',
@@ -102,6 +104,8 @@ const insertableRecorderActions: RecorderAction[] = [
   'clearInput',
   'coordinateTap',
   'launchApp',
+  'openGallery',
+  'endFlow',
   'clearAppData',
   'waitDisappear',
   'assertText',
@@ -117,6 +121,7 @@ const readonlyFlowSelectedIndexes: number[] = [];
 
 const props = defineProps<{
   aiRecognitionModelConfigured?: boolean;
+  flowBackgroundColor?: string;
   active: boolean;
   appPresets: AppPreset[];
   deviceActions: readonly DeviceAction[];
@@ -140,6 +145,8 @@ const props = defineProps<{
   ) => Promise<void>;
 }>();
 
+// provide/inject 随组件关系传递，放大弹窗 teleport 后也能使用同一颜色。
+provide(flowBackgroundKey, computed(() => normalizeFlowBackground(props.flowBackgroundColor)));
 const selectedDeviceId = computed(() => props.playgroundDeviceId);
 const tree = shallowRef<AppiumNode | null>(null);
 const selectedNode = shallowRef<AppiumNode | null>(null);
@@ -1273,6 +1280,12 @@ async function addAction(
   if (action === 'delay') {
     return addDelayStep(index, branchTarget);
   }
+  if (action === 'openGallery') {
+    return insertStep({ id: createStepId(), type: 'openGallery', label: '启动相册', flow: { nodeKind: 'action' } }, index, branchTarget);
+  }
+  if (action === 'endFlow') {
+    return insertStep({ id: createStepId(), type: 'endFlow', label: '终止流程', flow: { nodeKind: 'action' } }, index, branchTarget);
+  }
   if (action === 'aiRecognition') {
     const input = await ElMessageBox.prompt('识别内容', '添加 AI 识别', {
       inputType: 'textarea',
@@ -1416,13 +1429,13 @@ async function addAction(
   }
   const node = getSelectedNode();
   if (!node) return;
-  if (action === 'checkboxState' || action === 'radioButtonState') {
+  if (action === 'checkboxState' || action === 'radioButtonState' || action === 'checkedState') {
     const controlName = nativeControlName(action);
-    if (nativeControlType(node.className) !== action || node.checkable !== true) {
+    if (!matchesNativeControl(action, node.className) || node.checkable !== true) {
       ElMessage.warning(`请选择原生 ${controlName} 元素，当前选中：${node.className || '未知类型'}`);
       return;
     }
-    const step = createNodeActionStep(action, `判断 ${controlName} 状态`, node, { timeoutMs: 2000 });
+    const step = createNodeActionStep(action, action === 'checkedState' ? '判断勾选' : `判断 ${controlName} 状态`, node, { timeoutMs: 2000 });
     if ((!step.selector?.value || step.selector.strategy === 'bounds') && node.xpath) {
       step.selector = { strategy: 'xpath', value: node.xpath };
       step.contextSelector = undefined;
@@ -2118,6 +2131,7 @@ watch(
                   :clipboard-count="flowClipboardCount"
                   :disabled="recordingLocked"
                   :remove-disabled="recordingBusy"
+                  :merge-disabled="recordingBusy || replaying || saving"
                   :allowed-locked-actions="scriptActivityMismatch && !recordingBusy ? insertableRecorderActions : []"
                   :launching-step-id="executingAppStepId"
                   @remove="removeStep"
@@ -2130,6 +2144,7 @@ watch(
                   @preview-linked-script="previewLinkedScriptStep"
                   @execute-step="executeFlowStep"
                   @update-step="updateStep"
+                  @replace-steps="!recordingBusy && !replaying && !saving && (steps = $event)"
                 />
               </section>
 

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

@@ -1,5 +1,6 @@
 <script setup lang="ts">
-import { computed, nextTick, onBeforeUnmount, shallowRef, watch } from 'vue';
+import { computed, inject, nextTick, onBeforeUnmount, shallowRef, watch } from 'vue';
+import { DEFAULT_FLOW_BACKGROUND, flowBackgroundKey } from '../flow-appearance';
 import { useVueFlow, VueFlow } from '@vue-flow/core';
 import FlowNodeCard from './FlowNodeCard.vue';
 import FlowRoundedEdge from './FlowRoundedEdge.vue';
@@ -12,6 +13,8 @@ import {
 } from '../flow-graph';
 import type { AppiumRecordedStep } from '../types';
 
+const flowBackground = inject(flowBackgroundKey, computed(() => DEFAULT_FLOW_BACKGROUND));
+
 const props = defineProps<{
   aiRecognitionModelConfigured?: boolean;
   id: string;
@@ -21,6 +24,7 @@ const props = defineProps<{
   selectedCopyIndexes: number[];
   disabled?: boolean;
   removeDisabled?: boolean;
+  mergeDisabled?: boolean;
   readonly?: boolean;
   launchingStepId?: string;
   clipboardCount?: number;
@@ -37,6 +41,7 @@ const props = defineProps<{
 
 const emit = defineEmits<{
   nodeClick: [index: number];
+  merge: [index: number];
   copy: [indexes: number[]];
   paste: [index: number, branch?: FlowBranch];
   remove: [index: number];
@@ -56,6 +61,7 @@ let resetViewFrame = 0;
 let pendingResetView = false;
 
 const graph = computed(() => buildFlowGraph(props.steps, {
+  mergeDisabled: props.mergeDisabled,
   aiRecognitionModelConfigured: props.aiRecognitionModelConfigured,
   expandedStepIndex: props.expandedStepIndex,
   selectedCopyIndexes: props.selectedCopyIndexes,
@@ -170,7 +176,7 @@ function handleInsert(payload: {
 </script>
 
 <template>
-  <div class="appium-flow-canvas appium-flow-canvas--vue">
+  <div class="appium-flow-canvas appium-flow-canvas--vue" :style="{ '--flow-background': flowBackground }">
     <VueFlow
       :id="id"
       class="appium-vue-flow"
@@ -204,6 +210,7 @@ function handleInsert(payload: {
           @execute="emit('executeStep', $event)"
           @insert="handleInsert"
           @update-step="emit('updateStep', $event.index, $event.step)"
+          @merge="emit('merge', $event)"
           @preview-linked-script="emit('previewLinkedScript', $event)"
           @resize="handleNodeResize"
         />

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

@@ -1,7 +1,7 @@
 <script setup lang="ts">
 import { computed, nextTick, onBeforeUnmount, onMounted, shallowRef, watch } from 'vue';
 import { Handle, Position } from '@vue-flow/core';
-import { CopyDocument, Delete, Edit, Plus, VideoPlay, View, WarningFilled } from '@element-plus/icons-vue';
+import { CopyDocument, Delete, Edit, Plus, VideoPlay, View, WarningFilled, Connection } from '@element-plus/icons-vue';
 import { AI_MODEL_CONFIG_HINT } from '../ai-recognition';
 import type { AppiumRecordedStep } from '../types';
 import {
@@ -22,6 +22,7 @@ const props = defineProps<{
 const emit = defineEmits<{
   nodeClick: [index: number];
   copy: [index: number];
+  merge: [index: number];
   remove: [index: number];
   editInput: [index: number];
   previewLinkedScript: [index: number];
@@ -181,16 +182,24 @@ watch(() => props.data, () => {
         </span>
       </button>
       <span v-if="!props.readonly" class="appium-flow-step-card__actions nodrag nopan" @click.stop>
+        <el-tooltip v-if="data.flowKind === 'condition' && !data.copyMode" content="合并分支：将两侧后续节点汇入公共流程" placement="top" :show-after="200">
+        <span class="appium-node-action-tooltip"><el-button text size="small" :icon="Connection"
+          title="合并分支" aria-label="合并分支" :disabled="data.mergeDisabled || Boolean(data.step.flow?.successTargetId)"
+          @click="emit('merge', data.index)" />
+        </span></el-tooltip>
+        <el-tooltip v-if="!data.copyMode && data.canCopy" content="复制节点：复制后可在插入位置粘贴" placement="top" :show-after="200">
+        <span class="appium-node-action-tooltip">
         <el-button
-          v-if="!data.copyMode && data.canCopy"
           text
           size="small"
           :icon="CopyDocument"
           title="复制节点"
           @click="emit('copy', data.index)"
         />
+        </span></el-tooltip>
+        <el-tooltip v-if="data.canExecute" :content="data.step.type === 'aiRecognition' ? '测试 AI 识别：使用当前设备画面测试识别结果' : '立即执行：在当前设备上执行此操作'" placement="top" :show-after="200">
+        <span class="appium-node-action-tooltip">
         <el-button
-          v-if="data.canExecute"
           text
           size="small"
           :icon="VideoPlay"
@@ -200,8 +209,10 @@ watch(() => props.data, () => {
           :aria-label="data.step.type === 'aiRecognition' ? '测试 AI 识别' : '立即执行'"
           @click="emit('execute', data.index)"
         />
+        </span></el-tooltip>
+        <el-tooltip v-if="data.canEditInput" content="修改输入内容：编辑此节点要输入的文字" placement="top" :show-after="200">
+        <span class="appium-node-action-tooltip">
         <el-button
-          v-if="data.canEditInput"
           text
           size="small"
           :icon="Edit"
@@ -209,14 +220,19 @@ watch(() => props.data, () => {
           title="修改输入内容"
           @click="emit('editInput', data.index)"
         />
+        </span></el-tooltip>
+        <el-tooltip v-if="data.step.type === 'runScript'" content="预览连接脚本：查看关联脚本的流程" placement="top" :show-after="200">
+        <span class="appium-node-action-tooltip">
         <el-button
-          v-if="data.step.type === 'runScript'"
           text
           size="small"
           :icon="View"
           title="预览连接脚本"
           @click="emit('previewLinkedScript', data.index)"
         />
+        </span></el-tooltip>
+        <el-tooltip :content="data.flowKind === 'condition' ? '删除节点：同时删除所属分支子节点，保留公共流程' : '删除节点：移除此操作并连接前后节点'" placement="top" :show-after="200">
+        <span class="appium-node-action-tooltip">
         <el-button
           text
           size="small"
@@ -225,6 +241,7 @@ watch(() => props.data, () => {
           title="删除节点"
           @click="emit('remove', data.index)"
         />
+        </span></el-tooltip>
       </span>
       <FlowStepEditor
         v-if="!props.readonly && data.expanded"
@@ -246,5 +263,6 @@ watch(() => props.data, () => {
 </template>
 
 <style scoped>
+.appium-node-action-tooltip { display: inline-flex; }
 .appium-ai-model-warning { float: left; margin: 2px 6px 0 0; font-size: 16px; }
 </style>

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

@@ -27,6 +27,12 @@ const path = computed(() => {
   const deltaX = target.x - source.x;
   const deltaY = target.y - source.y;
 
+  if (props.data?.merge && deltaY > 0) {
+    // 同一公共节点的入边共用横线高度，不能随各分支的长度变化。
+    const joinY = target.y - 24;
+    return linePath([source, { x: source.x, y: joinY }, { x: target.x, y: joinY }, target]);
+  }
+
   if (targetData.value?.kind === 'branch') {
     const direction = deltaY >= 0 ? 1 : -1;
     const branchY = source.y + direction * Math.min(Math.max(Math.abs(deltaY) * 0.45, 18), 34);

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

@@ -134,7 +134,7 @@ function patchSelector(patch: Partial<AppiumSelector>) {
         <el-form-item label="节点类型">
           <el-select
             :model-value="defaultKind()"
-            :disabled="disabled || isBooleanCondition(step) || step.type === 'log'"
+            :disabled="disabled || isBooleanCondition(step) || step.type === 'log' || step.type === 'openGallery' || step.type === 'endFlow'"
             @update:model-value="patchFlow({ nodeKind: $event as FlowKind })"
           >
             <el-option label="操作" value="action" />
@@ -142,7 +142,7 @@ function patchSelector(patch: Partial<AppiumSelector>) {
             <el-option label="校验" value="assertion" />
           </el-select>
         </el-form-item>
-        <el-form-item v-if="step.type !== 'longPress' && step.type !== 'log'" label="超时时间 ms">
+        <el-form-item v-if="step.type !== 'longPress' && step.type !== 'log' && step.type !== 'openGallery' && step.type !== 'endFlow'" label="超时时间 ms">
           <el-input-number
             :model-value="step.timeoutMs || undefined"
             :disabled="disabled"

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

@@ -0,0 +1,74 @@
+<script setup lang="ts">
+import { computed, ref, watch } from 'vue';
+import { ElMessage } from 'element-plus';
+import type { AppiumRecordedStep } from '../types';
+import { branchSteps, mergeBranches } from '../flow-merge';
+import { flowBranchLabel } from '../flow-labels';
+
+const props = defineProps<{ steps: AppiumRecordedStep[]; conditionId: string; disabled?: boolean }>();
+const emit = defineEmits<{ close: []; confirm: [steps: AppiumRecordedStep[]] }>();
+const commonId = ref('');
+const duplicateId = ref('');
+const confirmed = ref(false);
+const retainedSide = ref<'yes' | 'no'>('yes');
+const condition = computed(() => props.steps.find((step) => step.id === props.conditionId));
+const candidates = computed(() => branchSteps(props.steps, props.conditionId, retainedSide.value));
+const duplicates = computed(() => branchSteps(props.steps, props.conditionId, retainedSide.value === 'yes' ? 'no' : 'yes'));
+const preview = computed(() => {
+  if (!commonId.value) return undefined;
+  try { return mergeBranches(props.steps, props.conditionId, commonId.value, duplicateId.value); }
+  catch (error) { return error instanceof Error ? error.message : String(error); }
+});
+watch(() => props.conditionId, () => {
+  retainedSide.value = branchSteps(props.steps, props.conditionId, 'yes').length ? 'yes' : 'no';
+  commonId.value = ''; duplicateId.value = ''; confirmed.value = false;
+});
+// 切换方向时清空此前的选择和删除确认，避免误删新方向下的节点。
+watch(retainedSide, () => { commonId.value = ''; duplicateId.value = ''; confirmed.value = false; });
+watch(commonId, () => { duplicateId.value = ''; confirmed.value = false; });
+watch(duplicateId, () => { confirmed.value = false; });
+function submit() {
+  if (props.disabled || !preview.value || typeof preview.value === 'string') return;
+  if (preview.value.removedCount && !confirmed.value) return;
+  try {
+    emit('confirm', mergeBranches(props.steps, props.conditionId, commonId.value, duplicateId.value).steps);
+    emit('close');
+  } catch (error) { ElMessage.error(String(error)); }
+}
+</script>
+
+<template>
+  <el-dialog :model-value="Boolean(conditionId)" title="合并分支" width="min(520px, 94vw)" append-to-body :close-on-click-modal="false" @close="emit('close')">
+    <el-form label-position="top">
+      <el-form-item label="合并方向">
+        <el-radio-group v-model="retainedSide" aria-label="合并方向">
+          <el-radio-button value="yes">保留左侧流程</el-radio-button>
+          <el-radio-button value="no">保留右侧流程</el-radio-button>
+        </el-radio-group>
+      </el-form-item>
+      <el-form-item label="保留的公共流程起点">
+        <el-select v-model="commonId" aria-label="保留的公共流程起点" style="width: 100%">
+          <el-option v-for="step in candidates" :key="step.id" :value="step.id"
+            :label="`${condition ? flowBranchLabel(condition, step.flow!.parentBranch!) : ''} · ${step.label}`" />
+        </el-select>
+      </el-form-item>
+      <el-form-item :label="retainedSide === 'yes' ? '右侧重复部分起点' : '左侧重复部分起点'">
+        <el-select v-model="duplicateId" :disabled="!commonId" aria-label="另一侧重复部分起点" style="width: 100%">
+          <el-option value="" label="不删除，保留另一侧全部操作后接入" />
+          <el-option v-for="step in duplicates" :key="step.id" :value="step.id" :label="step.label" />
+        </el-select>
+      </el-form-item>
+      <el-alert v-if="typeof preview === 'string'" :title="preview" type="error" :closable="false" />
+      <el-checkbox v-else-if="preview?.removedCount" v-model="confirmed">确认删除另一侧从所选起点开始的 {{ preview.removedCount }} 个节点</el-checkbox>
+    </el-form>
+    <template #footer>
+      <el-button @click="emit('close')">取消</el-button>
+      <el-button type="primary" :disabled="disabled || !preview || typeof preview === 'string' || Boolean(preview.removedCount && !confirmed)" @click="submit">合并分支</el-button>
+    </template>
+  </el-dialog>
+</template>
+
+<style scoped>
+:deep(.el-checkbox) { height: auto; white-space: normal; }
+:deep(.el-checkbox__label) { white-space: normal; overflow-wrap: anywhere; }
+</style>

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

@@ -23,9 +23,12 @@ type InsertAction =
   | 'swipe'
   | 'pinch'
   | 'launchApp'
+  | 'openGallery'
+  | 'endFlow'
   | 'clearAppData'
   | 'popupCondition'
   | 'checkboxState'
+  | 'checkedState'
   | 'radioButtonState'
   | 'aiRecognition'
   | 'textClick'
@@ -87,9 +90,8 @@ const actionGroups: Array<{ title: string; actions: Array<{ type: InsertAction;
       { type: 'clearInput', label: '清空输入' },
       { type: 'coordinateTap', label: '点击坐标' },
       { type: 'longPress', label: '长按' },
-      { type: 'checkboxState', label: '判断 Checkbox 状态' },
+      { type: 'checkedState', label: '判断勾选' },
       { type: 'textClick', label: '文字点击' },
-      { type: 'radioButtonState', label: '判断 RadioButton 状态' },
     ],
   },
   {
@@ -97,6 +99,7 @@ const actionGroups: Array<{ title: string; actions: Array<{ type: InsertAction;
     actions: [
       { type: 'keyBack', label: '系统返回' },
       { type: 'keyHome', label: 'Home 键' },
+      { type: 'openGallery', label: '启动相册' },
       { type: 'keyRecent', label: '最近任务' },
       { type: 'keyPower', label: '电源键' },
       { type: 'swipe', label: '滑动' },
@@ -126,6 +129,7 @@ const actionGroups: Array<{ title: string; actions: Array<{ type: InsertAction;
     title: '流程控制',
     actions: [
       { type: 'noop', label: '空节点' },
+      { type: 'endFlow', label: '终止流程' },
       { type: 'log', label: '输出日志' },
       { type: 'runScript', label: '连接脚本' },
     ],
@@ -145,10 +149,13 @@ function typeLabel(step: AppiumRecordedStep) {
     coordinateTap: '坐标点击', swipe: '滑动', launchApp: '启动 APP', clearAppData: '清理 APP 缓存', longPress: '长按',
     pinch: '双指缩放', runScript: '连接脚本', screenshot: '截图', visualChange: '检测画面变化',
     noop: '空节点',
+    endFlow: '终止流程',
     log: '输出日志',
     checkboxState: 'Checkbox 状态',
+    checkedState: '判断勾选',
     radioButtonState: 'RadioButton 状态',
     aiRecognition: 'AI 识别',
+    openGallery: '启动相册',
     textClick: '文字点击',
   };
   return labels[step.type] || step.type;
@@ -312,16 +319,19 @@ function branchSplitPath() {
                 </span>
               </button>
               <span class="appium-flow-node__actions" @click.stop>
+                <el-tooltip v-if="!copyMode && canCopyStep(item.step)" content="复制节点：复制后可在插入位置粘贴" placement="top" :show-after="200">
+                <span style="display: inline-flex">
                 <el-button
-                  v-if="!copyMode && canCopyStep(item.step)"
                   text
                   size="small"
                   :icon="CopyDocument"
                   title="复制节点"
                   @click="$emit('copy', [item.index])"
                 />
+                </span></el-tooltip>
+                <el-tooltip v-if="item.step.type === 'input' || item.step.type === 'inputIfExists'" content="修改输入内容：编辑此节点要输入的文字" placement="top" :show-after="200">
+                <span style="display: inline-flex">
                 <el-button
-                  v-if="item.step.type === 'input' || item.step.type === 'inputIfExists'"
                   text
                   size="small"
                   :icon="Edit"
@@ -329,6 +339,9 @@ function branchSplitPath() {
                   title="修改输入内容"
                   @click="$emit('editInput', item.index)"
                 />
+                </span></el-tooltip>
+                <el-tooltip content="删除节点：移除此操作；判断节点同时删除所属分支子节点" placement="top" :show-after="200">
+                <span style="display: inline-flex">
                 <el-button
                   text
                   size="small"
@@ -337,6 +350,7 @@ function branchSplitPath() {
                   title="删除节点"
                   @click="$emit('remove', item.index)"
                 />
+                </span></el-tooltip>
               </span>
             </div>
             <FlowStepEditor

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

@@ -5,6 +5,7 @@ import { Aim, CopyDocument, FullScreen } from '@element-plus/icons-vue';
 import type { AppiumRecordedStep } from '../types';
 import { createFlowClipboard } from '../flow-copy';
 import FlowCanvas from './FlowCanvas.vue';
+import MergeBranchesDialog from './MergeBranchesDialog.vue';
 import { labelFlowStep } from '../flow-labels';
 import type { FlowActionGroup, FlowBranch, InsertAction } from '../flow-graph';
 
@@ -13,6 +14,7 @@ const props = defineProps<{
   steps: AppiumRecordedStep[];
   disabled?: boolean;
   removeDisabled?: boolean;
+  mergeDisabled?: boolean;
   allowedLockedActions?: InsertAction[];
   launchingStepId?: string;
   clipboardCount?: number;
@@ -29,9 +31,11 @@ const emit = defineEmits<{
   previewLinkedScript: [index: number];
   executeStep: [index: number];
   updateStep: [index: number, step: AppiumRecordedStep];
+  replaceSteps: [steps: AppiumRecordedStep[]];
 }>();
 
 const expandedStepIndex = shallowRef<number | null>(null);
+const mergeConditionId = shallowRef('');
 const copyMode = shallowRef(false);
 const selectedCopyIndexes = shallowRef<number[]>([]);
 const flowDialogVisible = shallowRef(false);
@@ -47,9 +51,8 @@ const insertActionGroups: FlowActionGroup[] = [
       { type: 'clearInput', label: '清空输入' },
       { type: 'coordinateTap', label: '点击坐标' },
       { type: 'longPress', label: '长按' },
-      { type: 'checkboxState', label: '判断 Checkbox 状态' },
+      { type: 'checkedState', label: '判断勾选' },
       { type: 'textClick', label: '文字点击' },
-      { type: 'radioButtonState', label: '判断 RadioButton 状态' },
     ],
   },
   {
@@ -63,6 +66,7 @@ const insertActionGroups: FlowActionGroup[] = [
       { type: 'pinch', label: '双指缩放' },
       { type: 'clearAppData', label: '清理 App 缓存' },
       { type: 'launchApp', label: '启动 App' },
+      { type: 'openGallery', label: '启动相册' },
     ],
   },
   {
@@ -88,6 +92,7 @@ const insertActionGroups: FlowActionGroup[] = [
     title: '流程控制',
     actions: [
       { type: 'noop', label: '空节点' },
+      { type: 'endFlow', label: '终止流程' },
       { type: 'log', label: '输出日志' },
       { type: 'runScript', label: '连接脚本' },
     ],
@@ -260,6 +265,7 @@ function updateStep(index: number, step: AppiumRecordedStep) {
       :selected-copy-indexes="selectedCopyIndexes"
       :disabled="disabled"
       :remove-disabled="removeDisabled"
+      :merge-disabled="mergeDisabled"
       :launching-step-id="launchingStepId"
       :ai-recognition-model-configured="aiRecognitionModelConfigured"
       :clipboard-count="clipboardCount"
@@ -282,6 +288,7 @@ function updateStep(index: number, step: AppiumRecordedStep) {
       @preview-linked-script="(index) => emit('previewLinkedScript', index)"
       @execute-step="(index) => emit('executeStep', index)"
       @update-step="(index, step) => updateStep(index, step)"
+      @merge="mergeConditionId = steps[$event]?.id || ''"
     />
 
     <el-dialog
@@ -324,6 +331,7 @@ function updateStep(index: number, step: AppiumRecordedStep) {
         :selected-copy-indexes="selectedCopyIndexes"
         :disabled="disabled"
         :remove-disabled="removeDisabled"
+        :merge-disabled="mergeDisabled"
         :launching-step-id="launchingStepId"
         :ai-recognition-model-configured="aiRecognitionModelConfigured"
         :clipboard-count="clipboardCount"
@@ -346,7 +354,10 @@ function updateStep(index: number, step: AppiumRecordedStep) {
         @preview-linked-script="(index) => emit('previewLinkedScript', index)"
         @execute-step="(index) => emit('executeStep', index)"
         @update-step="(index, step) => updateStep(index, step)"
+        @merge="mergeConditionId = steps[$event]?.id || ''"
       />
     </el-dialog>
+    <MergeBranchesDialog :steps="steps" :condition-id="mergeConditionId" :disabled="mergeDisabled"
+      @close="mergeConditionId = ''" @confirm="expandedStepIndex = null; emit('replaceSteps', $event)" />
   </div>
 </template>

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

@@ -0,0 +1,15 @@
+import type { InjectionKey, Ref } from 'vue';
+
+export const DEFAULT_FLOW_BACKGROUND = '#d4e8dd';
+export const FLOW_BACKGROUND_PRESETS = ['#d4e8dd', '#d5e6f5', '#e4dcf2', '#f2dedc', '#d5eae9', '#e8e4cc'];
+export const flowBackgroundKey: InjectionKey<Readonly<Ref<string>>> = Symbol('flowBackground');
+
+export function isHexColor(value: unknown): value is string {
+  return typeof value === 'string' && /^#(?:[\da-f]{3}|[\da-f]{6})$/i.test(value.trim());
+}
+
+export function normalizeFlowBackground(value: unknown) {
+  if (!isHexColor(value)) return DEFAULT_FLOW_BACKGROUND;
+  const color = value.trim().toLowerCase();
+  return color.length === 4 ? '#' + [...color.slice(1)].map((char) => char + char).join('') : color;
+}

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

@@ -24,9 +24,12 @@ export type InsertAction =
   | 'swipe'
   | 'pinch'
   | 'launchApp'
+  | 'openGallery'
+  | 'endFlow'
   | 'clearAppData'
   | 'popupCondition'
   | 'checkboxState'
+  | 'checkedState'
   | 'radioButtonState'
   | 'aiRecognition'
   | 'textClick'
@@ -89,6 +92,7 @@ export type FlowGraphNodeData =
       copyMode: boolean;
       disabled?: boolean;
       removeDisabled?: boolean;
+      mergeDisabled?: boolean;
       launching?: boolean;
       canCopy: boolean;
       canEditInput: boolean;
@@ -132,6 +136,7 @@ type BuildFlowGraphOptions = {
   copyMode: boolean;
   disabled?: boolean;
   removeDisabled?: boolean;
+  mergeDisabled?: boolean;
   launchingStepId?: string;
   clipboardCount?: number;
   canOpenInsertMenu: boolean;
@@ -231,7 +236,7 @@ function branchConnectionTargetId(items: StepItem[], condition: AppiumRecordedSt
   }
   const targetId = branch === 'yes' ? condition.flow?.yesTargetId : condition.flow?.noTargetId;
   const target = items.find(({ step }) => step.id === targetId)?.step;
-  return target && !target.flow?.parentConditionId ? target.id : '';
+  return target && target.flow?.parentConditionId === condition.flow?.parentConditionId ? target.id : '';
 }
 
 function estimateTextLines(text: string | undefined, charsPerLine: number) {
@@ -425,6 +430,7 @@ export function buildFlowGraph(
           ? options.isAppExecutionDisabled(item.step.type)
           : item.step.type === 'aiRecognition' ? options.isInsertActionDisabled('aiRecognition') : options.disabled,
         removeDisabled: options.removeDisabled,
+        mergeDisabled: options.mergeDisabled,
         launching: options.launchingStepId === item.step.id,
         canCopy: item.step.type !== 'launchApp'
           && item.step.type !== 'clearAppData'
@@ -542,7 +548,8 @@ export function buildFlowGraph(
 
     const targetId = item.step.flow?.successTargetId;
     const explicitTarget = targetId ? stepById.get(targetId) : undefined;
-    const explicitMainTarget = explicitTarget && !explicitTarget.step.flow?.parentConditionId
+    const explicitMainTarget = explicitTarget && (!explicitTarget.step.flow?.parentConditionId
+      || explicitTarget.step.flow.parentConditionId !== item.step.flow?.parentConditionId)
       ? explicitTarget
       : undefined;
     const target = explicitMainTarget || nextSibling;
@@ -733,11 +740,29 @@ export function buildFlowGraph(
   const orderedLinks = [...links].sort((a, b) => (
     (nodeOrder.get(a.source) || 0) - (nodeOrder.get(b.source) || 0)
   ));
+  // 公共起点从两侧汇入，不能被最后一条分支连线拉到左列或右列。
+  const joins = new Map<string, string>();
+  items.forEach(({ step }) => {
+    const target = step.flow?.successTargetId && stepById.get(step.flow.successTargetId);
+    if (defaultKind(step) === 'condition' && target && !joins.has(nodeIdForStep(target.step))) {
+      joins.set(nodeIdForStep(target.step), nodeIdForStep(step));
+    }
+  });
   const alignVisibleChainGeometry = () => {
     orderedLinks.forEach((link) => {
       const source = nodeById.get(link.source);
       const target = nodeById.get(link.target);
       if (!source || !target?.data) return;
+      const joinOwner = joins.get(target.id);
+      if (joinOwner && target.id !== joinOwner) {
+        const incoming = links.filter((edge) => edge.target === target.id).map((edge) => nodeById.get(edge.source)!).filter(Boolean);
+        const owner = nodeById.get(joinOwner);
+        if (owner && incoming.length) {
+          target.position.y = Math.round(Math.max(...incoming.map((node) => node.position.y + nodeHeight(node))) + FLOW_STANDARD_LINE_GAP * 2);
+          setCenterX(target, centerX(owner));
+        }
+        return;
+      }
       const kind = target.data.kind;
       if (!['branch', 'split', 'insert'].includes(kind) && !canAlignStepAfterFlowPoint(source, target)) return;
 
@@ -777,7 +802,7 @@ export function buildFlowGraph(
     selectable: false,
     focusable: false,
     class: 'appium-vue-flow-edge',
-    data: { branch: link.branch },
+    data: { branch: link.branch, merge: joins.has(link.target) },
   }));
 
   return { nodes: positionedNodes, edges };

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

@@ -10,7 +10,7 @@ export function isBooleanCondition(step: Pick<AppiumRecordedStep, 'type'>) {
 }
 
 export function defaultFlowKind(step: AppiumRecordedStep): FlowKind {
-  if (step.type === 'log') 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;
   if (step.type === 'assertExists' || step.type === 'assertText' || step.type === 'visualChange') return 'assertion';
@@ -40,6 +40,7 @@ export function flowTypeLabel(step: AppiumRecordedStep) {
     waitDisappear: '等待消失',
     assertExists: '断言存在',
     checkboxState: 'Checkbox 状态',
+    checkedState: '判断勾选',
     radioButtonState: 'RadioButton 状态',
     aiRecognition: 'AI 识别',
     textClick: '文字点击',
@@ -51,6 +52,8 @@ export function flowTypeLabel(step: AppiumRecordedStep) {
     swipe: '滑动',
     screenshot: '截图',
     launchApp: '启动 APP',
+    openGallery: '启动相册',
+    endFlow: '终止流程',
     clearAppData: '清理 APP 缓存',
     longPress: '长按',
     pinch: '双指缩放',

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

@@ -0,0 +1,110 @@
+import type { AppiumRecordedStep } from './types';
+import { defaultFlowKind } from './flow-labels';
+
+type Branch = 'yes' | 'no';
+export function branchSteps(steps: AppiumRecordedStep[], conditionId: string, branch: Branch) {
+  return steps.filter((step) => step.flow?.parentConditionId === conditionId && step.flow.parentBranch === branch);
+}
+
+function descendants(steps: AppiumRecordedStep[], roots: string[]) {
+  const ids = new Set(roots);
+  for (let changed = true; changed;) {
+    changed = false;
+    for (const step of steps) {
+      if (step.flow?.parentConditionId && ids.has(step.flow.parentConditionId) && !ids.has(step.id)) {
+        ids.add(step.id);
+        changed = true;
+      }
+    }
+  }
+  return ids;
+}
+
+// 合流仅提升明确选中的分支后缀，不按名称猜测重复节点，也不改写其他判断的分支。
+export function mergeBranches(steps: AppiumRecordedStep[], conditionId: string, commonId: string, duplicateId = '') {
+  const condition = steps.find((step) => step.id === conditionId);
+  const common = steps.find((step) => step.id === commonId);
+  if (!condition || defaultFlowKind(condition) !== 'condition') throw new Error('请选择判断节点');
+  if (condition.flow?.successTargetId) throw new Error('该判断已有后续公共流程，不能重复合流');
+  if (!common || common.flow?.parentConditionId !== conditionId || !common.flow.parentBranch) throw new Error('公共起点必须属于当前判断的直接分支');
+  const side = common.flow.parentBranch;
+  const otherSide = side === 'yes' ? 'no' : 'yes';
+  const source = branchSteps(steps, conditionId, side);
+  const other = branchSteps(steps, conditionId, otherSide);
+  const commonRoots = source.slice(source.findIndex((step) => step.id === commonId));
+  const commonIds = descendants(steps, commonRoots.map((step) => step.id));
+  const duplicateIndex = other.findIndex((step) => step.id === duplicateId);
+  if (duplicateId && duplicateIndex < 0) throw new Error('重复部分必须属于另一侧直接分支');
+  const removedIds = descendants(steps, duplicateId ? other.slice(duplicateIndex).map((step) => step.id) : []);
+  const ownedIds = descendants(steps, [conditionId]);
+  const keys = ['yesTargetId', 'noTargetId', 'successTargetId', 'failureTargetId'] as const;
+  for (const step of steps) {
+    for (const key of keys) {
+      const target = step.flow?.[key];
+      if (!target) continue;
+      if (commonIds.has(step.id) && ownedIds.has(target) && !commonIds.has(target)) throw new Error('公共流程存在返回分支的连接，合流会形成循环');
+      if (!ownedIds.has(step.id) && removedIds.has(target)) throw new Error('待删除节点被其他流程引用，不能合并');
+      if (ownedIds.has(step.id) && !commonIds.has(step.id) && !removedIds.has(step.id) && !ownedIds.has(target)) throw new Error('分支已有外部连接，请先处理该连接');
+    }
+  }
+  const next = steps.filter((step) => !removedIds.has(step.id)).map((step) => ({ ...step, flow: { ...step.flow } }));
+  const byId = new Map(next.map((step) => [step.id, step]));
+  const mergedCondition = byId.get(conditionId)!;
+  mergedCondition.flow.successTargetId = commonId;
+  // 只改变公共后缀的直接归属；后缀内部的嵌套判断仍拥有自己的子节点。
+  for (const root of commonRoots) {
+    const flow = byId.get(root.id)!.flow;
+    delete flow.parentConditionId;
+    delete flow.parentBranch;
+    if (condition.flow?.parentConditionId) {
+      flow.parentConditionId = condition.flow.parentConditionId;
+      flow.parentBranch = condition.flow.parentBranch;
+    }
+  }
+  function connectEnd(step: typeof next[number]) {
+    if (step.type === 'endFlow') return;
+    step.flow.successTargetId = commonId;
+    if (defaultFlowKind(step) === 'condition') {
+      for (const branch of ['yes', 'no'] as const) {
+        const children = branchSteps(next, step.id, branch);
+        if (children.length) connectEnd(byId.get(children[children.length - 1]!.id)!);
+        else step.flow[branch === 'yes' ? 'yesTargetId' : 'noTargetId'] = commonId;
+      }
+    }
+  }
+  for (const branch of ['yes', 'no'] as const) {
+    const remaining = branchSteps(next, conditionId, branch);
+    mergedCondition.flow[branch === 'yes' ? 'yesTargetId' : 'noTargetId'] = remaining[0]?.id || commonId;
+    if (remaining.length) connectEnd(byId.get(remaining[remaining.length - 1]!.id)!);
+  }
+  // 公共节点排在整个分支子树之后，保存和顺序回放不会插入到另一侧分支中。
+  const commonBlock = next.filter((step) => commonIds.has(step.id));
+  const rest = next.filter((step) => !commonIds.has(step.id));
+  let after = rest.findIndex((step) => step.id === conditionId);
+  rest.forEach((step, index) => { if (ownedIds.has(step.id)) after = Math.max(after, index); });
+  rest.splice(after + 1, 0, ...commonBlock);
+  for (const step of rest) {
+    for (const key of keys) {
+      if (step.flow[key] && removedIds.has(step.flow[key]!)) step.flow[key] = commonId;
+    }
+  }
+  // 校验完整执行图，包含隐式顺序边，拒绝回边及跨分支错误连接。
+  const visiting = new Set<string>();
+  const visited = new Set<string>();
+  function visit(step: typeof next[number]) {
+    if (visiting.has(step.id)) throw new Error('合流会形成循环，请检查节点连接');
+    if (visited.has(step.id)) return;
+    visiting.add(step.id);
+    const index = rest.indexOf(step);
+    const targets = keys.map((key) => step.flow[key]).filter(Boolean) as string[];
+    if (defaultFlowKind(step) !== 'condition' && step.type !== 'endFlow' && !step.flow.successTargetId) {
+      const sibling = rest.slice(index + 1).find((item) => item.flow.parentConditionId === step.flow.parentConditionId && item.flow.parentBranch === step.flow.parentBranch);
+      if (sibling) targets.push(sibling.id);
+    }
+    for (const id of targets) { const target = byId.get(id); if (target) visit(target); }
+    visiting.delete(step.id);
+    visited.add(step.id);
+  }
+  rest.forEach(visit);
+  return { steps: rest, removedCount: removedIds.size };
+}

package/src/appium-recorder/native-control-state.ts

@@ -1,13 +1,13 @@
 import type { AppiumRecordedStep } from './types';
 
-export type NativeStateType = 'checkboxState' | 'radioButtonState';
+export type NativeStateType = 'checkboxState' | 'radioButtonState' | 'checkedState';
 
 export function isNativeStateCondition(step: Pick<AppiumRecordedStep, 'type'>): step is { type: NativeStateType } {
-  return step.type === 'checkboxState' || step.type === 'radioButtonState';
+  return step.type === 'checkboxState' || step.type === 'radioButtonState' || step.type === 'checkedState';
 }
 
 export function nativeControlName(type: NativeStateType) {
-  return type === 'checkboxState' ? 'Checkbox' : 'RadioButton';
+  return type === 'checkedState' ? '勾选组件（Checkbox / RadioButton / Switch）' : type === 'checkboxState' ? 'Checkbox' : 'RadioButton';
 }
 
 export function nativeControlType(className: unknown): NativeStateType | undefined {
@@ -15,9 +15,16 @@ export function nativeControlType(className: unknown): NativeStateType | undefin
   // 识别原生、AppCompat 和 Material 控件；仅有 checkable 的 View 不能证明控件类型。
   if (/(?:^|\.)(?:AppCompat|Material)?CheckBox$/.test(className)) return 'checkboxState';
   if (/(?:^|\.)(?:AppCompat|Material)?RadioButton$/.test(className)) return 'radioButtonState';
+  if (/(?:^|\.)(?:Switch|SwitchCompat|SwitchMaterial|MaterialSwitch)$/.test(className)) return 'checkedState';
   return undefined;
 }
 
+export function matchesNativeControl(type: NativeStateType, className: unknown) {
+  const detected = nativeControlType(className);
+  // 新节点自动识别三类控件，旧节点仍保留原有的类型约束。
+  return type === 'checkedState' ? detected !== undefined : detected === type;
+}
+
 // UIAutomator XML 使用字符串，Appium 属性响应也可能返回布尔值；缺失值不能视为 false。
 export function parseNativeBoolean(value: unknown): boolean | undefined {
   if (value === true || value === 'true') return true;

package/src/appium-recorder/types.ts

@@ -76,6 +76,7 @@ export type AppiumRecordedStep = {
     | 'waitFor'
     | 'assertExists'
     | 'checkboxState'
+    | 'checkedState'
     | 'radioButtonState'
     | 'aiRecognition'
     | 'textClick'
@@ -87,6 +88,8 @@ export type AppiumRecordedStep = {
     | 'swipe'
     | 'screenshot'
     | 'launchApp'
+    | 'openGallery'
+    | 'endFlow'
     | 'clearAppData'
     | 'waitDisappear'
     | 'assertText'

package/src/components/config/AppiumConfigPanel.vue

@@ -1,5 +1,7 @@
 <script setup lang="ts">
 import type { ConfigForm } from '../../types';
+import FlowAppearanceSettings from './FlowAppearanceSettings.vue';
+import { DEFAULT_FLOW_BACKGROUND, isHexColor } from '../../appium-recorder/flow-appearance';
 
 defineProps<{
   configForm: ConfigForm;
@@ -15,7 +17,7 @@ defineEmits<{ testModel: []; saveModelConfig: [] }>();
     <template #header>
       <div class="panel-header">
         <span>节点模型配置</span>
-        <el-button type="primary" :loading="isSavingModelConfig" @click="$emit('saveModelConfig')">
+        <el-button type="primary" :loading="isSavingModelConfig" :disabled="!isHexColor(configForm.appium.flowBackgroundColor ?? DEFAULT_FLOW_BACKGROUND)" @click="$emit('saveModelConfig')">
           保存模型配置
         </el-button>
       </div>
@@ -41,6 +43,7 @@ defineEmits<{ testModel: []; saveModelConfig: [] }>();
       </el-form>
     </section>
   </el-card>
+  <FlowAppearanceSettings v-model="configForm.appium.flowBackgroundColor" :saving="isSavingModelConfig" @save="$emit('saveModelConfig')" />
 </template>
 
 <style scoped>

package/src/components/config/FlowAppearanceSettings.vue

@@ -0,0 +1,51 @@
+<script setup lang="ts">
+import { computed } from 'vue';
+import { RefreshLeft } from '@element-plus/icons-vue';
+import { DEFAULT_FLOW_BACKGROUND, FLOW_BACKGROUND_PRESETS, isHexColor, normalizeFlowBackground } from '../../appium-recorder/flow-appearance';
+
+const props = defineProps<{ modelValue?: string; saving: boolean }>();
+const emit = defineEmits<{ 'update:modelValue': [color: string]; save: [] }>();
+const color = computed(() => props.modelValue ?? DEFAULT_FLOW_BACKGROUND);
+const error = computed(() => isHexColor(color.value) ? '' : '请输入有效的十六进制颜色，如 #ABC 或 #AABBCC');
+</script>
+
+<template>
+  <el-card shadow="never" class="config-module-card config-appium-card flow-appearance-settings">
+    <template #header>
+      <div class="panel-header">
+        <span>流程背景色</span>
+        <el-button type="primary" :loading="saving" :disabled="Boolean(error)" @click="emit('save')">保存背景色</el-button>
+      </div>
+    </template>
+    <el-form label-position="top">
+      <el-form-item label="预选颜色">
+        <div class="flow-color-presets">
+          <button v-for="preset in FLOW_BACKGROUND_PRESETS" :key="preset" type="button"
+            :style="{ backgroundColor: preset }" :aria-label="`选择颜色 ${preset}`" :title="preset"
+            :aria-pressed="normalizeFlowBackground(color) === preset && !error"
+            @click="emit('update:modelValue', preset)" />
+        </div>
+      </el-form-item>
+      <el-form-item label="自定义颜色" :error="error">
+        <div class="flow-color-input">
+          <el-color-picker :model-value="normalizeFlowBackground(color)" color-format="hex" :predefine="FLOW_BACKGROUND_PRESETS"
+            aria-label="选择流程背景色" @update:model-value="emit('update:modelValue', $event || DEFAULT_FLOW_BACKGROUND)" />
+          <el-input :model-value="color" aria-label="十六进制背景色" placeholder="#D4E8DD"
+            @update:model-value="emit('update:modelValue', String($event))" />
+          <el-button :icon="RefreshLeft" title="恢复默认颜色" aria-label="恢复默认颜色" @click="emit('update:modelValue', DEFAULT_FLOW_BACKGROUND)" />
+        </div>
+      </el-form-item>
+    </el-form>
+  </el-card>
+</template>
+
+<style scoped>
+.flow-appearance-settings { margin-top: 20px; }
+.flow-appearance-settings .el-form { max-width: 640px; }
+.flow-color-presets, .flow-color-input { display: flex; align-items: center; gap: 10px; }
+.flow-color-presets { flex-wrap: wrap; }
+.flow-color-presets button { width: 32px; height: 32px; border: 1px solid var(--el-border-color-darker); border-radius: 4px; cursor: pointer; }
+.flow-color-presets button[aria-pressed="true"] { outline: 2px solid var(--el-color-primary); outline-offset: 2px; }
+.flow-color-input { width: 100%; }
+.flow-color-input .el-input { flex: 1; min-width: 0; }
+</style>

package/src/style.css

@@ -2814,7 +2814,7 @@ select {
   overflow: hidden;
   border: 1px solid #e6edf5;
   border-radius: 12px;
-  background: #d4e8dd;
+  background: var(--flow-background, #d4e8dd);
 }
 
 .appium-flow-canvas--dialog.appium-flow-canvas--vue {
@@ -2827,7 +2827,7 @@ select {
   height: 100%;
   background:
     radial-gradient(circle at 1px 1px, #aecfbd 1px, transparent 0) 0 0 / 22px 22px,
-    #d4e8dd;
+    var(--flow-background, #d4e8dd);
 }
 
 .appium-vue-flow .vue-flow__pane {

package/src/types.ts

@@ -12,7 +12,7 @@ export type GeneratorForm = {
 };
 
 export type ConfigForm = {
-  appium: { model: AiRecognitionModel };
+  appium: { model: AiRecognitionModel; flowBackgroundColor?: string };
   runtime: {
     androidSdkPath: string;
     reportOutputPath: string;