android-midscene-automation 0.1.24 → 0.1.26

package/src/style.css

@@ -120,6 +120,52 @@ select {
   padding: 6px 16px 14px;
 }
 
+.action-dialog__footer-actions {
+  display: flex;
+  justify-content: flex-end;
+  gap: 8px;
+  width: 100%;
+}
+
+.action-dialog__footer-button.el-button {
+  min-width: 88px;
+  height: 34px;
+  padding: 0 16px;
+  border-radius: 7px;
+  font-size: 14px;
+  font-weight: 700;
+}
+
+.action-dialog__footer-button.el-button + .action-dialog__footer-button.el-button {
+  margin-left: 0;
+}
+
+.action-dialog__footer-button--secondary.el-button {
+  border-color: #e5e7eb;
+  background: #fff;
+  color: #8b95a5;
+}
+
+.action-dialog__footer-button--secondary.el-button:hover,
+.action-dialog__footer-button--secondary.el-button:focus {
+  border-color: #d7dce5;
+  background: #f8fafc;
+  color: #6b7280;
+}
+
+.action-dialog__footer-button--primary.el-button {
+  border-color: #ffd436;
+  background: #ffd436;
+  color: #111827;
+}
+
+.action-dialog__footer-button--primary.el-button:hover,
+.action-dialog__footer-button--primary.el-button:focus {
+  border-color: #ffca1f;
+  background: #ffca1f;
+  color: #111827;
+}
+
 @keyframes action-dialog-spin {
   from {
     transform: rotate(0deg);
@@ -149,6 +195,10 @@ select {
   gap: 12px;
 }
 
+.layout-header__button--loading .el-icon {
+  animation: action-dialog-spin 1s linear infinite;
+}
+
 .page-body {
   height: 100%;
   min-height: 0;
@@ -192,7 +242,7 @@ select {
 .appium-recorder-layout {
   display: grid;
   flex: 1 1 auto;
-  grid-template-columns: minmax(0, 3fr) minmax(320px, 2.8fr) minmax(0, 4.2fr);
+  grid-template-columns: minmax(320px, 2.8fr) minmax(0, 3fr) minmax(0, 4.2fr);
   gap: 12px;
   align-items: stretch;
   height: auto;
@@ -1197,6 +1247,20 @@ select {
   gap: 8px;
 }
 
+.appium-flow-editor__grid--swipe {
+  grid-template-columns: repeat(3, minmax(0, 1fr));
+}
+
+.appium-swipe-message-box {
+  width: min(560px, calc(100vw - 32px));
+}
+
+.appium-swipe-dialog-grid {
+  display: grid;
+  grid-template-columns: repeat(2, minmax(0, 1fr));
+  gap: 10px 12px;
+}
+
 .appium-flow-insert {
   position: relative;
   z-index: 1;
@@ -1609,137 +1673,6 @@ select {
   gap: 18px;
 }
 
-.model-usage-chart {
-  margin-top: 20px;
-  padding-top: 18px;
-  border-top: 1px solid #ebeef5;
-}
-
-.model-usage-chart__body {
-  display: grid;
-  gap: 10px;
-}
-
-.model-usage-chart__summary,
-.model-usage-chart__legend,
-.model-usage-chart__record {
-  display: flex;
-  align-items: center;
-  gap: 12px;
-  min-width: 0;
-  color: #64748b;
-  font-size: 12px;
-}
-
-.model-usage-chart__summary {
-  flex-wrap: wrap;
-}
-
-.model-usage-chart__svg {
-  width: 100%;
-  height: 180px;
-  display: block;
-  border: 1px solid #ebeef5;
-  border-radius: 6px;
-  background: #fbfdff;
-}
-
-.model-usage-chart__axis {
-  stroke: #d8dee9;
-  stroke-width: 1;
-}
-
-.model-usage-chart__line {
-  fill: none;
-  stroke-linecap: round;
-  stroke-linejoin: round;
-  stroke-width: 2.5;
-}
-
-.model-usage-chart__line--prompt,
-.model-usage-chart__point--prompt {
-  stroke: #2563eb;
-}
-
-.model-usage-chart__line--completion,
-.model-usage-chart__point--completion {
-  stroke: #d97706;
-}
-
-.model-usage-chart__line--duration,
-.model-usage-chart__point--duration {
-  stroke: #16a34a;
-}
-
-.model-usage-chart__point {
-  fill: #fff;
-  stroke-width: 2;
-}
-
-.model-usage-chart__legend {
-  flex-wrap: wrap;
-}
-
-.model-usage-chart__legend span {
-  display: inline-flex;
-  align-items: center;
-  gap: 6px;
-}
-
-.model-usage-chart__swatch {
-  width: 18px;
-  height: 3px;
-  border-radius: 999px;
-}
-
-.model-usage-chart__swatch--prompt {
-  background: #2563eb;
-}
-
-.model-usage-chart__swatch--completion {
-  background: #d97706;
-}
-
-.model-usage-chart__swatch--duration {
-  background: #16a34a;
-}
-
-.model-usage-chart__records {
-  display: grid;
-  gap: 6px;
-  height: 220px;
-  align-content: start;
-  overflow-y: auto;
-  padding-right: 4px;
-}
-
-.model-usage-chart__record {
-  display: grid;
-  grid-template-columns: 86px 64px minmax(120px, 1fr) 84px 84px 84px 72px;
-  justify-content: initial;
-  min-height: 38px;
-  padding: 6px 8px;
-  border-radius: 6px;
-  background: #f8fafc;
-}
-
-.model-usage-chart__record--head {
-  position: sticky;
-  top: 0;
-  z-index: 1;
-  min-height: 30px;
-  background: #eef2f7;
-  color: #475569;
-  font-weight: 700;
-}
-
-.model-usage-chart__record span {
-  min-width: 0;
-  overflow: hidden;
-  text-overflow: ellipsis;
-  white-space: nowrap;
-}
-
 .app-preset-list {
   display: grid;
   gap: 8px;
@@ -2101,6 +2034,7 @@ select {
   display: grid;
   grid-template-columns: 420px minmax(0, 1fr);
   gap: 16px;
+  height: 100%;
   min-height: 0;
 }
 
@@ -2126,12 +2060,19 @@ select {
 
 .execution-card > .el-card__body {
   display: flex;
+  flex: 1 1 auto;
+  min-height: 0;
+}
+
+.execution-card.el-card {
+  height: 100%;
 }
 
 .execution-card .el-form {
   display: flex;
   flex: 1;
   width: 100%;
+  height: 100%;
   min-width: 0;
   min-height: 0;
   flex-direction: column;
@@ -2141,12 +2082,17 @@ select {
   flex: 0 0 auto;
 }
 
+.execution-card .execution-script-item {
+  margin-bottom: 12px;
+}
+
 .execution-card .execution-output-item {
   display: flex;
   flex-direction: column;
   align-items: stretch;
   flex: 1 1 auto;
   min-height: 0;
+  margin-bottom: 0;
 }
 
 .execution-card .execution-output-item .el-form-item__content {
@@ -2574,11 +2520,13 @@ select {
   flex: 1 1 auto;
   width: 100%;
   min-width: 0;
-  height: auto;
+  height: 100%;
+  min-height: 0;
   padding: 0;
-  border: 1px solid #e4e7ed;
+  border: 1px solid #263244;
   border-radius: 6px;
-  background: #fff;
+  background: #101722;
+  scrollbar-color: #526174 #101722;
 }
 
 .execution-output-header {
@@ -2623,15 +2571,30 @@ select {
   border: 0;
   outline: 0;
   resize: none;
-  background: #fff;
-  color: #475569;
+  background: #101722;
+  color: #d7e0ea;
   font-family: ui-monospace, SFMono-Regular, Menlo, Monaco, Consolas, "Liberation Mono", "Courier New", monospace;
   font-size: 12px;
   line-height: 1.6;
   overflow: auto;
-  white-space: pre;
+  white-space: pre-wrap;
   overflow-wrap: normal;
-  word-break: normal;
+  word-break: break-word;
+}
+
+.execution-log__output::-webkit-scrollbar {
+  width: 10px;
+  height: 10px;
+}
+
+.execution-log__output::-webkit-scrollbar-track {
+  background: #101722;
+}
+
+.execution-log__output::-webkit-scrollbar-thumb {
+  border: 2px solid #101722;
+  border-radius: 6px;
+  background: #526174;
 }
 
 .execution-process {
@@ -2745,12 +2708,18 @@ select {
 
   .automation-layout {
     height: auto;
+    min-height: calc(100vh - 108px);
   }
 
   .automation-stage {
     grid-template-columns: 1fr;
   }
 
+  .execution-card.el-card {
+    height: min(760px, calc(100vh - 120px));
+    min-height: 560px;
+  }
+
   .appium-recorder-layout {
     grid-template-columns: 1fr;
     height: auto;

package/src/types.ts

@@ -34,20 +34,6 @@ export type ConfigForm = {
   };
 };
 
-export type ModelUsageRecord = {
-  id: string;
-  modelKey: 'midscene' | 'scriptOptimizer';
-  provider: string;
-  modelName: string;
-  family: string;
-  success: boolean;
-  durationMs: number;
-  promptTokens?: number;
-  completionTokens?: number;
-  totalTokens?: number;
-  createdAt: string;
-};
-
 export type SavedScript = {
   id: string;
   name: string;

package/server/model-call-usage-importer.ts

@@ -1,108 +0,0 @@
-import fs from 'node:fs';
-import path from 'node:path';
-import { appDataPath } from './paths';
-import { saveModelUsageRecord } from './model-usage-repository';
-
-type MidsceneModelConfig = {
-  provider?: string;
-  name?: string;
-  family?: string;
-};
-
-type ModelCallUsage = {
-  prompt_tokens?: number;
-  completion_tokens?: number;
-  total_tokens?: number;
-  time_cost?: number;
-  model_name?: string;
-  response_model_name?: string;
-  model_description?: string;
-};
-
-type ModelCallRecord = {
-  timestamp?: string;
-  type?: string;
-  modelFamily?: string;
-  provider?: string;
-  final?: {
-    usage?: ModelCallUsage;
-    timeCost?: number;
-  };
-};
-
-function modelRequestDir() {
-  return appDataPath('midscene_run', 'model-requests');
-}
-
-function numberValue(value: unknown) {
-  return typeof value === 'number' && Number.isFinite(value) ? Math.max(0, Math.floor(value)) : undefined;
-}
-
-function listModelRequestFilesSince(sinceMs: number) {
-  const dir = modelRequestDir();
-  if (!fs.existsSync(dir)) return [];
-
-  return fs
-    .readdirSync(dir)
-    .filter((name) => name.endsWith('.jsonl'))
-    .map((name) => path.join(dir, name))
-    .filter((filePath) => {
-      const stat = fs.statSync(filePath);
-      return stat.mtimeMs >= sinceMs - 1_000;
-    });
-}
-
-function recordsFromFile(filePath: string) {
-  return fs
-    .readFileSync(filePath, 'utf8')
-    .split(/\r?\n/)
-    .map((line) => line.trim())
-    .filter(Boolean)
-    .flatMap((line) => {
-      try {
-        return [JSON.parse(line) as ModelCallRecord];
-      } catch {
-        return [];
-      }
-    });
-}
-
-export function importMidsceneModelUsage(input: {
-  sinceMs: number;
-  model: MidsceneModelConfig;
-  success: boolean;
-}) {
-  let imported = 0;
-  const files = listModelRequestFilesSince(input.sinceMs);
-
-  for (const filePath of files) {
-    for (const record of recordsFromFile(filePath)) {
-      if (record.type !== 'response') continue;
-      const usage = record.final?.usage;
-      if (!usage) continue;
-
-      const promptTokens = numberValue(usage.prompt_tokens);
-      const completionTokens = numberValue(usage.completion_tokens);
-      const totalTokens = numberValue(usage.total_tokens) ?? numberValue((promptTokens || 0) + (completionTokens || 0));
-
-      saveModelUsageRecord({
-        modelKey: 'midscene',
-        provider: input.model.provider || (record.provider === 'codex-app-server' ? 'codex' : 'custom'),
-        modelName: usage.model_name || usage.response_model_name || input.model.name || '',
-        family: input.model.family || record.modelFamily || '',
-        success: input.success,
-        durationMs: numberValue(usage.time_cost) ?? numberValue(record.final?.timeCost) ?? 0,
-        promptTokens,
-        completionTokens,
-        totalTokens,
-        createdAt: record.timestamp,
-      });
-      imported += 1;
-    }
-  }
-
-  return {
-    imported,
-    files,
-  };
-}

package/server/model-usage-repository.ts

@@ -1,131 +0,0 @@
-import {
-  createId,
-  querySql,
-  runSql,
-  sqlNullableString,
-  sqlString,
-} from './storage/sqlite';
-
-export type ModelUsageRecord = {
-  id: string;
-  modelKey: 'midscene' | 'scriptOptimizer';
-  provider: string;
-  modelName: string;
-  family: string;
-  success: boolean;
-  durationMs: number;
-  promptTokens?: number;
-  completionTokens?: number;
-  totalTokens?: number;
-  errorMessage?: string;
-  createdAt: string;
-};
-
-type ModelUsageRow = {
-  id: string;
-  model_key: 'midscene' | 'scriptOptimizer';
-  provider: string;
-  model_name: string;
-  family: string | null;
-  success: 0 | 1;
-  duration_ms: number;
-  prompt_tokens: number | null;
-  completion_tokens: number | null;
-  total_tokens: number | null;
-  error_message: string | null;
-  created_at: string;
-};
-
-let initialized = false;
-
-function sqlNullableNumber(value: number | null | undefined) {
-  return typeof value === 'number' && Number.isFinite(value) ? String(Math.max(0, Math.floor(value))) : 'NULL';
-}
-
-function rowToRecord(row: ModelUsageRow): ModelUsageRecord {
-  return {
-    id: row.id,
-    modelKey: row.model_key,
-    provider: row.provider,
-    modelName: row.model_name,
-    family: row.family || '',
-    success: row.success === 1,
-    durationMs: row.duration_ms,
-    promptTokens: row.prompt_tokens ?? undefined,
-    completionTokens: row.completion_tokens ?? undefined,
-    totalTokens: row.total_tokens ?? undefined,
-    errorMessage: row.error_message || undefined,
-    createdAt: row.created_at,
-  };
-}
-
-export function initModelUsageRepository() {
-  if (initialized) return;
-  initialized = true;
-  runSql(`
-    PRAGMA journal_mode = WAL;
-    CREATE TABLE IF NOT EXISTS model_usage_records (
-      id TEXT PRIMARY KEY,
-      model_key TEXT NOT NULL,
-      provider TEXT NOT NULL,
-      model_name TEXT NOT NULL,
-      family TEXT NULL,
-      success INTEGER NOT NULL,
-      duration_ms INTEGER NOT NULL,
-      prompt_tokens INTEGER NULL,
-      completion_tokens INTEGER NULL,
-      total_tokens INTEGER NULL,
-      error_message TEXT NULL,
-      created_at TEXT NOT NULL
-    );
-    CREATE INDEX IF NOT EXISTS idx_model_usage_records_created_at ON model_usage_records(created_at DESC);
-  `);
-}
-
-export function saveModelUsageRecord(input: Omit<ModelUsageRecord, 'id' | 'createdAt'> & { createdAt?: string }) {
-  initModelUsageRepository();
-  const id = createId('usage');
-  const createdAt = input.createdAt || new Date().toISOString();
-  runSql(`
-    INSERT INTO model_usage_records (
-      id,
-      model_key,
-      provider,
-      model_name,
-      family,
-      success,
-      duration_ms,
-      prompt_tokens,
-      completion_tokens,
-      total_tokens,
-      error_message,
-      created_at
-    )
-    VALUES (
-      ${sqlString(id)},
-      ${sqlString(input.modelKey)},
-      ${sqlString(input.provider || 'custom')},
-      ${sqlString(input.modelName || '')},
-      ${sqlNullableString(input.family)},
-      ${input.success ? 1 : 0},
-      ${sqlNullableNumber(input.durationMs)},
-      ${sqlNullableNumber(input.promptTokens)},
-      ${sqlNullableNumber(input.completionTokens)},
-      ${sqlNullableNumber(input.totalTokens)},
-      ${sqlNullableString(input.errorMessage)},
-      ${sqlString(createdAt)}
-    );
-  `);
-  return listModelUsageRecords(1)[0];
-}
-
-export function listModelUsageRecords(limit = 50) {
-  initModelUsageRepository();
-  const boundedLimit = Math.max(1, Math.min(200, Math.floor(limit)));
-  return querySql<ModelUsageRow>(`
-    SELECT *
-    FROM model_usage_records
-    ORDER BY datetime(created_at) DESC
-    LIMIT ${boundedLimit};
-  `).map(rowToRecord).reverse();
-}