android-midscene-automation 0.1.41 → 0.1.43

package/server/http-api.ts

@@ -1,3 +1,4 @@
+import { resolveReportSummary } from '../src/appium-recorder/report-summary';
 // The Midscene Admin HTTP API — extracted from vite.config.ts so the exact
 // same middleware serves the standalone dev/preview flow AND the DSH plugin.
 // It is a Connect-style handler: (req, res, next). Callers that have no next
@@ -716,9 +717,17 @@ export function createApiMiddleware() {
       return;
     }
 
-    if (req.url === '/api/config' && req.method === 'POST') {
+    if ((req.url === '/api/config' || req.url === '/api/config/appium') && req.method === 'POST') {
       try {
-        const config = await readBody<AppConfig>(req);
+        const parsed = await readBody<Partial<AppConfig>>(req);
+        if (req.url === '/api/config/appium' && (!parsed.appium || typeof parsed.appium !== 'object' || Array.isArray(parsed.appium))) {
+          throw new ConfigValidationError('Appium 配置无效');
+        }
+        const current = loadConfig();
+        const config = req.url === '/api/config/appium'
+          ? { ...current, appium: { ...current.appium, ...parsed.appium, model: current.appium.model, promptOptimizer: current.appium.promptOptimizer,
+            reportSummary: { ...resolveReportSummary(current.appium.reportSummary), ...parsed.appium?.reportSummary } } }
+          : { ...current, runtime: parsed.runtime ?? current.runtime };
         saveConfig(config);
         res.setHeader('Content-Type', 'application/json; charset=utf-8');
         res.end(JSON.stringify({ success: true }));
@@ -1089,9 +1098,10 @@ export function createApiMiddleware() {
     if (req.url === '/api/test-model' && req.method === 'POST') {
       try {
         const parsed = await readBody<{
-          modelKey?: 'midscene' | 'scriptOptimizer' | 'appium';
+          save?: boolean;
+          modelKey?: 'midscene' | 'scriptOptimizer' | 'appium' | 'promptOptimizer';
           model?: {
-            provider?: 'custom' | 'codex';
+            provider?: import('../src/config/midscene-model-presets').MidsceneModelProvider;
             baseUrl?: string;
             apiKey?: string;
             name?: string;
@@ -1100,6 +1110,13 @@ export function createApiMiddleware() {
         }>(req);
         const model = parsed.model || {};
 
+        if (parsed.save && !['midscene', 'scriptOptimizer', 'appium', 'promptOptimizer'].includes(parsed.modelKey || '')) {
+          throw new ConfigValidationError('请选择有效的模型配置');
+        }
+        if (parsed.save && parsed.modelKey === 'midscene' && !model.family?.trim()) {
+          throw new ConfigValidationError('请填写 Model Family');
+        }
+
         const result = await testModelConnection({
           provider: model.provider,
           baseUrl: model.baseUrl || '',
@@ -1107,8 +1124,17 @@ export function createApiMiddleware() {
           name: model.name || '',
           family: model.family || '',
         });
+        if (parsed.save) {
+          if (!result.ok) throw new Error('模型测试失败，未保存配置');
+          const key = parsed.modelKey!;
+          // 测试期间其他配置可能已保存，此时重新读取，只更新已通过测试的模型。
+          const current = loadConfig();
+          if (key === 'promptOptimizer') {
+            saveConfig({ ...current, appium: { ...current.appium, promptOptimizer: { model: { baseUrl: model.baseUrl || '', apiKey: model.apiKey || '', name: model.name || '' } } } });
+          } else saveConfig({ ...current, [key]: { ...current[key], model: { ...current[key].model, ...model } } });
+        }
         res.setHeader('Content-Type', 'application/json; charset=utf-8');
-        res.end(JSON.stringify(result));
+        res.end(JSON.stringify({ ...result, saved: parsed.save === true }));
       } catch (error) {
         res.statusCode = 500;
         res.setHeader('Content-Type', 'application/json; charset=utf-8');

package/server/model-tester.ts

@@ -1,8 +1,9 @@
 import { execFile } from 'node:child_process';
 import OpenAI from 'openai';
+import type { MidsceneModelProvider } from '../src/config/midscene-model-presets';
 
 type ModelInput = {
-  provider?: 'custom' | 'codex';
+  provider?: MidsceneModelProvider;
   baseUrl: string;
   apiKey: string;
   name: string;

package/src/App.vue

@@ -1,5 +1,8 @@
 <script setup lang="ts">
+import { resolveReportSummary } from './appium-recorder/report-summary';
 import { isAiRecognitionModelConfigured } from './appium-recorder/ai-recognition';
+import { resolveAiDeduplication } from './appium-recorder/ai-deduplication';
+import { resolveAiPromptPresets } from './appium-recorder/ai-prompt-presets';
 import { computed, onMounted, onUnmounted, reactive, ref, shallowRef, watch } from 'vue';
 import { ElMessage, ElMessageBox } from 'element-plus';
 import {
@@ -27,13 +30,14 @@ import {
   type ScriptStep,
 } from './script-generator';
 import {
-  codexMidsceneModel,
+  selectMidsceneModelProvider,
   type MidsceneModelProvider,
 } from './config/midscene-model-presets';
 import * as api from './api';
+import { useAppiumAutoSave } from './config/use-appium-auto-save';
 import AutomationPage from './pages/AutomationPage.vue';
 import AppiumPage from './appium-recorder/AppiumPage.vue';
-import { DEFAULT_FLOW_BACKGROUND, isHexColor } from './appium-recorder/flow-appearance';
+import { normalizeFlowBackground, normalizeFlowLineColor } from './appium-recorder/flow-appearance';
 import ConfigPage from './pages/ConfigPage.vue';
 import GeneratorPage from './pages/GeneratorPage.vue';
 import type {
@@ -102,6 +106,7 @@ const modelTestStatus = reactive({
   midscene: '',
   scriptOptimizer: '',
   appium: '',
+  promptOptimizer: '',
 });
 const aiRecognitionModelConfigured = shallowRef(false);
 const actionDialog = reactive({
@@ -153,7 +158,7 @@ const appPresetForm = reactive({
 });
 
 const configForm = reactive<ConfigForm>({
-  appium: { model: { baseUrl: '', apiKey: '', name: '' } },
+  appium: { reportSummary: resolveReportSummary(), model: { baseUrl: '', apiKey: '', name: '' }, promptOptimizer: { model: { baseUrl: '', apiKey: '', name: '' } }, aiDeduplication: resolveAiDeduplication(), screenshotReport: false },
   runtime: {
     androidSdkPath: '',
     reportOutputPath: '',
@@ -183,6 +188,12 @@ const lastCustomMidsceneModel = reactive({
   family: '',
 });
 
+const appiumAutoSave = useAppiumAutoSave(configForm, async value => {
+  await api.saveAppiumConfig(value);
+}, error => {
+  void ElMessageBox.alert(error instanceof Error ? error.message : 'Appium 配置自动保存失败', '自动保存失败', { type: 'error' }).catch(() => {});
+});
+
 const menuItems = [
   { key: 'generator', label: '测试脚本生成', icon: Operation },
   { key: 'automation', label: '自动化测试', icon: Monitor },
@@ -662,6 +673,14 @@ const loadConfig = async () => {
   Object.assign(configForm.midscene.env, payload.midscene.env || {});
   Object.assign(configForm.scriptOptimizer.model, payload.scriptOptimizer.model);
   Object.assign(configForm.appium.model, payload.appium?.model || { baseUrl: '', apiKey: '', name: '' });
+  Object.assign(configForm.appium.promptOptimizer!.model, payload.appium?.promptOptimizer?.model || { baseUrl: '', apiKey: '', name: '' });
+  configForm.appium.screenshotReport = payload.appium?.screenshotReport === true;
+  configForm.appium.reportSummary = resolveReportSummary(payload.appium?.reportSummary);
+  configForm.appium.aiDeduplication = resolveAiDeduplication(payload.appium?.aiDeduplication);
+  configForm.appium.aiPromptPresets = resolveAiPromptPresets(payload.appium?.aiPromptPresets);
+  configForm.appium.flowBackgroundColor = normalizeFlowBackground(payload.appium?.flowBackgroundColor);
+  configForm.appium.flowLineColor = normalizeFlowLineColor(payload.appium?.flowLineColor);
+  appiumAutoSave.initialize();
   aiRecognitionModelConfigured.value = isAiRecognitionModelConfigured(configForm.appium.model);
   if (configForm.midscene.model.provider !== 'codex') {
     rememberCustomMidsceneModel();
@@ -677,15 +696,10 @@ const rememberCustomMidsceneModel = () => {
 };
 
 const updateMidsceneModelProvider = (provider: MidsceneModelProvider) => {
-  if (provider === 'codex') {
+  if (configForm.midscene.model.provider !== 'codex') {
     rememberCustomMidsceneModel();
-    Object.assign(configForm.midscene.model, codexMidsceneModel);
-  } else {
-    Object.assign(configForm.midscene.model, {
-      provider: 'custom',
-      ...lastCustomMidsceneModel,
-    });
   }
+  Object.assign(configForm.midscene.model, selectMidsceneModelProvider(provider, configForm.midscene.model, lastCustomMidsceneModel));
   modelTestStatus.midscene = '';
 };
 
@@ -699,22 +713,15 @@ const getMidsceneModelConfigError = () => {
   if (model.provider !== 'codex' && !model.apiKey.trim()) missing.push('API Key');
 
   if (!missing.length) return '';
-  return `Midscene 模型配置不完整：缺少 ${missing.join('、')}。请在“参数配置 > Midscene配置 > Midscene 模型”中选择“使用 Codex”，或补齐自定义提供方后保存。`;
+  return `Midscene 模型配置不完整：缺少 ${missing.join('、')}。请在“参数配置 > Midscene配置 > Midscene 模型”中选择“使用 Codex”，或补齐自定义提供方后测试并保存。`;
 };
 
 const saveModelConfig = async () => {
-  if (!isHexColor(configForm.appium.flowBackgroundColor ?? DEFAULT_FLOW_BACKGROUND)) {
-    ElMessage.warning('流程背景色格式错误，请输入 #RGB 或 #RRGGBB');
-    return;
-  }
   isSavingModelConfig.value = true;
   errorMessage.value = '';
   openActionDialog('保存参数配置');
   try {
-    // 保存的是本次提交快照，不能把请求期间尚未保存的改动标记为已配置。
-    const snapshot = JSON.parse(JSON.stringify(configForm)) as ConfigForm;
-    await api.saveConfig(snapshot);
-    aiRecognitionModelConfigured.value = isAiRecognitionModelConfigured(snapshot.appium.model);
+    await api.saveConfig({ runtime: { ...configForm.runtime } });
     closeActionDialog();
     ElMessage.success('参数配置已保存');
   } catch (error) {
@@ -744,9 +751,10 @@ const resetAppPresetForm = () => {
 };
 
 const saveAppPreset = async () => {
+  if (isSavingAppPreset.value) return;
+  const editing = Boolean(appPresetForm.id);
   isSavingAppPreset.value = true;
   errorMessage.value = '';
-  openActionDialog('保存 App 配置');
   try {
     const payload = await api.saveAppPreset({
       id: appPresetForm.id || undefined,
@@ -758,11 +766,10 @@ const saveAppPreset = async () => {
       form.appPresetId = payload.app.id;
     }
     resetAppPresetForm();
-    closeActionDialog();
+    ElMessage.success(editing ? 'App 配置已更新' : 'App 已添加');
   } catch (error) {
     const message = error instanceof Error ? error.message : 'App 配置保存失败';
-    errorMessage.value = message;
-    failActionDialog(message);
+    void ElMessageBox.alert(message, 'App 配置保存失败', { type: 'error' }).catch(() => {});
   } finally {
     isSavingAppPreset.value = false;
   }
@@ -785,22 +792,33 @@ const removeAppPreset = async (id: string) => {
     if (form.appPresetId === id) {
       form.appPresetId = '';
     }
+    if (appPresetForm.id === id) resetAppPresetForm();
   } catch (error) {
-    errorMessage.value = error instanceof Error ? error.message : 'App 配置删除失败';
+    void ElMessageBox.alert(error instanceof Error ? error.message : 'App 配置删除失败', '删除失败', { type: 'error' }).catch(() => {});
   }
 };
 
-const testModel = async (key: 'midscene' | 'scriptOptimizer' | 'appium') => {
+const testModel = async (key: 'midscene' | 'scriptOptimizer' | 'appium' | 'promptOptimizer') => {
+  if (testingModelKey.value) return;
   testingModelKey.value = key;
   errorMessage.value = '';
   modelTestStatus[key] = '';
-  const model = configForm[key].model;
+  const model = { ...(key === 'promptOptimizer'
+      ? configForm.appium.promptOptimizer!.model
+      : configForm[key].model) };
 
   try {
-    const payload = await api.testModel({ modelKey: key, model });
-    modelTestStatus[key] = payload.content || '连接成功';
+    const payload = await api.testModel({ modelKey: key, model, save: true });
+    if (!payload.saved) throw new Error('模型未保存，请重试');
+    const successMessage = `测试通过，配置已保存${payload.content ? `：${payload.content}` : ''}`;
+    modelTestStatus[key] = '';
+    if (key === 'appium') aiRecognitionModelConfigured.value = isAiRecognitionModelConfigured(model);
+    void ElMessageBox.alert(successMessage, '模型测试成功', {
+      type: 'success',
+      confirmButtonText: '确定',
+    }).catch(() => {});
   } catch (error) {
-    modelTestStatus[key] = error instanceof Error ? error.message : '测试失败';
+    modelTestStatus[key] = `未保存：${error instanceof Error ? error.message : '测试失败'}`;
   } finally {
     testingModelKey.value = '';
   }
@@ -1485,7 +1503,7 @@ onUnmounted(() => {
           'page-body--appium': activeMenu === 'appium',
         }"
       >
-        <el-alert v-if="activeMenu !== 'appium' && errorMessage" type="error" :closable="false" show-icon class="page-alert">
+        <el-alert v-if="activeMenu !== 'appium' && activeMenu !== 'config' && errorMessage" type="error" :closable="false" show-icon class="page-alert">
           <template #title>{{ errorMessage }}</template>
         </el-alert>
 
@@ -1526,11 +1544,13 @@ onUnmounted(() => {
           :is-saving-model-config="isSavingModelConfig"
           :is-saving-app-preset="isSavingAppPreset"
           :model-test-status="modelTestStatus"
+          :appium-save-status="appiumAutoSave.status.value"
           @test-model="testModel"
           @save-model-config="saveModelConfig"
           @save-app-preset="saveAppPreset"
           @edit-app-preset="editAppPreset"
           @delete-app-preset="removeAppPreset"
+          @cancel-app-preset-edit="resetAppPresetForm"
           @update-midscene-model-provider="updateMidsceneModelProvider"
         />
 
@@ -1569,7 +1589,10 @@ onUnmounted(() => {
           :active="activeMenu === 'appium'"
           :app-presets="appPresets"
           :ai-recognition-model-configured="aiRecognitionModelConfigured"
+          :ai-prompt-presets="configForm.appium.aiPromptPresets"
+          :report-summary="configForm.appium.reportSummary"
           :flow-background-color="configForm.appium.flowBackgroundColor"
+          :flow-line-color="configForm.appium.flowLineColor"
           :device-actions="deviceActions"
           :playground-available="playgroundAvailable"
           :playground-device-id="playgroundDeviceId"

package/src/api.ts

@@ -1,4 +1,5 @@
 import type { ScriptStep } from './script-generator';
+import type { MidsceneModelProvider } from './config/midscene-model-presets';
 import type {
   AndroidDevice,
   AppPreset,
@@ -109,16 +110,21 @@ export async function getConfig() {
   return readJson<ConfigForm>(response);
 }
 
-// 保存模型配置；当前由参数配置页的各模块保存按钮调用。
-export function saveConfig(input: ConfigForm) {
+// 运行配置独立保存，不携带尚未测试的模型草稿。
+export function saveConfig(input: Pick<ConfigForm, 'runtime'>) {
   return postJson<{ success?: boolean } | ConfigForm>(`${APP_BASE}/api/config`, input);
 }
 
+export function saveAppiumConfig(appium: Omit<ConfigForm['appium'], 'model' | 'promptOptimizer'>) {
+  return postJson<{ success: boolean }>(`${APP_BASE}/api/config/appium`, { appium });
+}
+
 // 测试指定模型配置是否可用，通常用于保存前验证 baseUrl/apiKey/model。
 export function testModel(input: {
-  modelKey: 'midscene' | 'scriptOptimizer' | 'appium';
+  save?: boolean;
+  modelKey: 'midscene' | 'scriptOptimizer' | 'appium' | 'promptOptimizer';
   model: {
-    provider?: 'custom' | 'codex';
+    provider?: MidsceneModelProvider;
     baseUrl: string;
     apiKey: string;
     name: string;
@@ -126,6 +132,7 @@ export function testModel(input: {
   };
 }) {
   return postJson<{
+    saved?: boolean;
     content?: string;
     durationMs?: number;
     usage?: {