+
Screenwright
AI 原生的数据大屏编辑器
@@ -99,6 +100,13 @@ const handleSubmit = async () => {
box-shadow: 0 12px 40px rgba(0, 0, 0, 0.35);
}
+.login-logo {
+ display: block;
+ margin: 0 auto 16px;
+ border-radius: 12px;
+ object-fit: contain;
+}
+
.login-title {
margin: 0;
font-family: system-ui, -apple-system, "Segoe UI", "PingFang SC", "Microsoft YaHei", sans-serif;
diff --git a/apps/app/src/views/settings/index.vue b/apps/app/src/views/settings/index.vue
index 22c356cf..40ec881a 100644
--- a/apps/app/src/views/settings/index.vue
+++ b/apps/app/src/views/settings/index.vue
@@ -8,6 +8,7 @@
+
{{ meta.title }}
{{ meta.role }}
@@ -106,13 +107,16 @@ const { loading, reindexing, states, save, test, reindex } = useAiModelSettings(
color: $sw-text;
&__body {
- max-width: 760px;
+ display: grid;
+ grid-template-columns: repeat(auto-fit, minmax(min(100%, 300px), 1fr));
+ gap: 20px;
+ max-width: 1600px;
margin: 0 auto;
- padding: 28px 24px 60px;
+ padding: 28px 28px 60px;
}
&__head {
- margin-bottom: 20px;
+ grid-column: 1 / -1;
h1 {
margin: 0 0 8px;
@@ -131,8 +135,10 @@ const { loading, reindexing, states, save, test, reindex } = useAiModelSettings(
}
.sw-card {
+ display: flex;
+ flex-direction: column;
+ min-width: 0;
padding: 18px 20px 16px;
- margin-bottom: 16px;
background-color: $sw-surface-2;
border: 1px solid $sw-border;
border-radius: 10px;
@@ -150,6 +156,12 @@ const { loading, reindexing, states, save, test, reindex } = useAiModelSettings(
}
}
+ &__icon {
+ display: block;
+ flex-shrink: 0;
+ object-fit: contain;
+ }
+
&__role {
padding: 1px 7px;
font-size: 11px;
@@ -159,6 +171,7 @@ const { loading, reindexing, states, save, test, reindex } = useAiModelSettings(
}
&__desc {
+ min-height: 58px;
margin: 8px 0 16px;
font-size: 12px;
line-height: 1.6;
@@ -170,7 +183,8 @@ const { loading, reindexing, states, save, test, reindex } = useAiModelSettings(
align-items: center;
justify-content: space-between;
gap: 12px;
- margin-top: 18px;
+ flex-wrap: wrap;
+ margin-top: auto;
padding-top: 14px;
border-top: 1px solid $sw-border;
}
@@ -180,6 +194,8 @@ const { loading, reindexing, states, save, test, reindex } = useAiModelSettings(
align-items: center;
gap: 5px;
font-size: 12px;
+ min-width: 0;
+ overflow-wrap: anywhere;
color: $sw-text-dim;
.is-err {
@@ -189,8 +205,14 @@ const { loading, reindexing, states, save, test, reindex } = useAiModelSettings(
&__actions {
display: flex;
+ flex-wrap: wrap;
+ justify-content: flex-end;
gap: 8px;
margin-left: auto;
+
+ :deep(.el-button + .el-button) {
+ margin-left: 0;
+ }
}
}
@@ -232,7 +254,7 @@ const { loading, reindexing, states, save, test, reindex } = useAiModelSettings(
}
:deep(.el-input-number) {
- width: 220px;
+ width: 100%;
.el-input__wrapper {
border: none;
@@ -240,6 +262,17 @@ const { loading, reindexing, states, save, test, reindex } = useAiModelSettings(
}
}
+@media (max-width: 600px) {
+ .sw-settings__body {
+ padding: 20px 16px 40px;
+ gap: 16px;
+ }
+
+ .sw-card__desc {
+ min-height: 0;
+ }
+}
+
.sw-btn-primary.el-button {
color: #fff;
border: none;
diff --git a/apps/app/src/views/settings/useAiModelSettings.ts b/apps/app/src/views/settings/useAiModelSettings.ts
index 7c3cb68d..2b9efad7 100644
--- a/apps/app/src/views/settings/useAiModelSettings.ts
+++ b/apps/app/src/views/settings/useAiModelSettings.ts
@@ -2,6 +2,11 @@ import { onMounted, reactive, ref } from "vue";
import { ElMessage } from "element-plus";
+import embeddingImage from "@/assets/image/models/embedding.png";
+import imageImage from "@/assets/image/models/image.png";
+import reasoningImage from "@/assets/image/models/reasoning.png";
+import videoImage from "@/assets/image/models/video.png";
+
import {
type AiModelVo,
getAiModels,
@@ -14,6 +19,7 @@ import {
export interface RoleMeta {
role: ModelRole;
title: string;
+ image: string;
desc: string;
modelPlaceholder: string;
baseUrlPlaceholder?: string;
@@ -23,30 +29,28 @@ export const ROLE_META: RoleMeta[] = [
{
role: "reasoning",
title: "推理模型",
+ image: reasoningImage,
desc: "主 Agent、子 Agent、标题、摘要压缩、编排、截图分析等一切文本推理。OpenAI 兼容端点。",
modelPlaceholder: "deepseek-v4-flash"
},
- {
- role: "vision",
- title: "视觉模型",
- desc: "识图:视觉分析 Agent、语义布局 Agent。需支持图片输入的多模态模型。",
- modelPlaceholder: "gemini-3.1-flash-lite"
- },
{
role: "embedding",
title: "嵌入模型",
+ image: embeddingImage,
desc: "组件检索(RAG)向量化。改动后需「重建索引」才生效。",
modelPlaceholder: "BAAI/bge-large-zh-v1.5"
},
{
role: "image",
title: "生图模型",
+ image: imageImage,
desc: "效果图、装饰素材生成。需支持 images.generations 接口的 OpenAI 兼容端点。",
modelPlaceholder: "留空需先联系模型服务商确认可用的生图模型 id"
},
{
role: "video",
title: "生视频模型",
+ image: videoImage,
desc: "MiniMax V2 文生视频、图生视频。支持填写接口前缀或完整提交地址。测试提交会生成一次 5 秒视频,可能产生费用。",
modelPlaceholder: "MiniMax-H3 或 MiniMax-H3-Max",
baseUrlPlaceholder: "https://llm-api.net/minimax/v2"
@@ -76,7 +80,6 @@ export function useAiModelSettings() {
const reindexing = ref(false);
const states = reactive>({
reasoning: null,
- vision: null,
embedding: null,
image: null,
video: null
diff --git a/apps/app/vite.config.ts b/apps/app/vite.config.ts
index ad805039..0340c931 100644
--- a/apps/app/vite.config.ts
+++ b/apps/app/vite.config.ts
@@ -57,9 +57,9 @@ export default ({ mode }: { mode: string }) => {
start_url: "/",
icons: [
{
- src: "/favicon.ico",
- sizes: "64x64 32x32 24x24 16x16",
- type: "image/x-icon"
+ src: "/logo.png",
+ sizes: "1024x1024",
+ type: "image/png"
}
]
},
diff --git a/docker-compose.yml b/docker-compose.yml
index fac65d5b..6b1152d1 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -146,6 +146,10 @@ services:
<<: *server-env
ROLE: ai
PORT: "4112"
+ NODE_USE_ENV_PROXY: ${AI_USE_ENV_PROXY:-0}
+ HTTP_PROXY: ${AI_OUTBOUND_PROXY:-}
+ HTTPS_PROXY: ${AI_OUTBOUND_PROXY:-}
+ NO_PROXY: ${AI_NO_PROXY:-localhost,127.0.0.1,::1,api,ai:4112,worker,minio}
volumes:
- ai_workspace:/data/agent-workspace
depends_on:
diff --git a/docker/nginx.conf b/docker/nginx.conf
index 75d3deb1..bc846e7b 100644
--- a/docker/nginx.conf
+++ b/docker/nginx.conf
@@ -83,6 +83,25 @@ server {
proxy_read_timeout 300s;
}
+ # 系统素材允许浏览器缓存;缩略图使用内容哈希,原图仍可重新验证更新。
+ location /screenwright/system/ {
+ proxy_pass http://minio:9000;
+ proxy_http_version 1.1;
+ proxy_set_header Host minio:9000;
+ proxy_hide_header Cache-Control;
+ add_header Cache-Control "public, max-age=86400";
+ proxy_buffering on;
+ }
+
+ location /screenwright/system-thumbnails/ {
+ proxy_pass http://minio:9000;
+ proxy_http_version 1.1;
+ proxy_set_header Host minio:9000;
+ proxy_hide_header Cache-Control;
+ add_header Cache-Control "public, max-age=31536000, immutable";
+ proxy_buffering on;
+ }
+
# ── 素材库:MinIO 的公开读桶,同域转发(URL 形如 //)──
location /screenwright/ {
proxy_pass http://minio:9000;
diff --git a/packages/material/src/components/ScreenwrightExtendsComponent/SwMaskLayer/index.vue b/packages/material/src/components/ScreenwrightExtendsComponent/SwMaskLayer/index.vue
deleted file mode 100644
index ddb49cbe..00000000
--- a/packages/material/src/components/ScreenwrightExtendsComponent/SwMaskLayer/index.vue
+++ /dev/null
@@ -1,39 +0,0 @@
-
-
-
-
-
-
-
diff --git a/packages/material/src/components/ScreenwrightExtendsComponent/SwMaskLayer/useMaskLayer.ts b/packages/material/src/components/ScreenwrightExtendsComponent/SwMaskLayer/useMaskLayer.ts
deleted file mode 100644
index b03fb7cd..00000000
--- a/packages/material/src/components/ScreenwrightExtendsComponent/SwMaskLayer/useMaskLayer.ts
+++ /dev/null
@@ -1,113 +0,0 @@
-import { useBaseData } from "@screenwright/composables";
-import type { ComponentType } from "@screenwright/types";
-import type { CSSProperties } from "vue";
-import { computed } from "vue";
-
-export const useMaskLayer = (options: ComponentType) => {
- const { option, height } = useBaseData(options);
- const maskLayerStyle = computed(() => {
- return {
- pointerEvents: option.value.pointerEvents ? "none" : "auto",
- };
- });
-
- const getMarkStyle = computed(() => {
- let returnStyle: CSSProperties = {};
- if (option.value && option.value.markType) {
- switch (option.value.markType) {
- case "linearGradient":
- returnStyle = {
- background: `linear-gradient(${option.value.linearGradient?.markPosition || 0}deg, ${
- option.value.linearGradient?.markColor
- } 0%, ${option.value.linearGradient?.markColor} ${
- option.value.linearGradient?.markRadius || 0
- }%, transparent 100%)`,
- opacity: `${option.value.linearGradient?.markOpacity / 100}`,
- };
- break;
- case "radioactiveGradation":
- {
- let bm = "";
- if (option.value.radioactiveGradation.showLengthWidthRatio) {
- if (option.value.radioactiveGradation.lengthWidthRatio < 0) {
- bm = `radial-gradient(${
- 1 / (1 + option.value.radioactiveGradation.lengthWidthRatio)
- }px 1px, transparent ${
- option.value.radioactiveGradation?.markOpacityRadius
- ? (option.value.radioactiveGradation?.markOpacityRadius /
- 100) *
- height.value
- : 0
- }px, ${option.value.radioactiveGradation?.markColor} ${
- option.value.radioactiveGradation?.markUnOpacityRadius
- ? (option.value.radioactiveGradation?.markUnOpacityRadius /
- 100) *
- height.value
- : 0
- }px)`;
- } else if (
- option.value.radioactiveGradation.lengthWidthRatio === 0
- ) {
- bm = `radial-gradient(1px 1px, transparent ${
- option.value.radioactiveGradation?.markOpacityRadius
- ? (option.value.radioactiveGradation?.markOpacityRadius /
- 100) *
- height.value
- : 0
- }px, ${option.value.radioactiveGradation?.markColor} ${
- option.value.radioactiveGradation?.markUnOpacityRadius
- ? (option.value.radioactiveGradation?.markUnOpacityRadius /
- 100) *
- height.value
- : 0
- }px)`;
- } else {
- bm = `radial-gradient(1px ${
- 1 / (1 - option.value.radioactiveGradation.lengthWidthRatio)
- }px, transparent ${
- option.value.radioactiveGradation?.markOpacityRadius
- ? (option.value.radioactiveGradation?.markOpacityRadius /
- 100) *
- height.value
- : 0
- }px, ${option.value.radioactiveGradation?.markColor} ${
- option.value.radioactiveGradation?.markUnOpacityRadius
- ? (option.value.radioactiveGradation?.markUnOpacityRadius /
- 100) *
- height.value
- : 0
- }px)`;
- }
- } else {
- bm = `radial-gradient(transparent ${
- option.value.radioactiveGradation?.markOpacityRadius
- ? (option.value.radioactiveGradation?.markOpacityRadius /
- 100) *
- height.value
- : 0
- }px, ${option.value.radioactiveGradation?.markColor} ${
- option.value.radioactiveGradation?.markUnOpacityRadius
- ? (option.value.radioactiveGradation?.markUnOpacityRadius /
- 100) *
- height.value
- : 0
- }px)`;
- }
- returnStyle = {
- "background-image": bm,
- opacity: `${option.value.radioactiveGradation?.markOpacity / 100}`,
- };
- }
-
- break;
- }
- }
-
- return returnStyle;
- });
-
- return {
- maskLayerStyle,
- getMarkStyle,
- };
-};
diff --git a/packages/material/src/components/ScreenwrightExtendsComponent/index.ts b/packages/material/src/components/ScreenwrightExtendsComponent/index.ts
index 2f749a6a..721069fb 100644
--- a/packages/material/src/components/ScreenwrightExtendsComponent/index.ts
+++ b/packages/material/src/components/ScreenwrightExtendsComponent/index.ts
@@ -6,7 +6,6 @@ import PageReload from "./PageReload/index.vue";
import SimpleParticle from "./SimpleParticle/index.vue";
import SimpleStar from "./SimpleStar/index.vue";
import SwDataContainer from "./SwDataContainer/index.vue";
-import SwMaskLayer from "./SwMaskLayer/index.vue";
import SwWeather from "./SwWeather/index.vue";
// 已物料化的扩展组件(数字人 FtDigitalHuman 与 UE 串流仍留在 app,故此处为 Partial)
@@ -19,5 +18,4 @@ export const ScreenwrightExtendsComponentMap: Partial<
[ExtendsEnum.SimpleParticle]: SimpleParticle,
[ExtendsEnum.SwDataContainer]: SwDataContainer,
[ExtendsEnum.SwWeather]: SwWeather,
- [ExtendsEnum.SwMaskLayer]: SwMaskLayer,
};
diff --git a/packages/material/src/editor-ui/extendsComponent/ItemComponents/SwMaskLayer/globalOption.vue b/packages/material/src/editor-ui/extendsComponent/ItemComponents/SwMaskLayer/globalOption.vue
deleted file mode 100644
index f80886c2..00000000
--- a/packages/material/src/editor-ui/extendsComponent/ItemComponents/SwMaskLayer/globalOption.vue
+++ /dev/null
@@ -1,89 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/packages/material/src/editor-ui/extendsComponent/extendsFrostedGlass/sw-mask-layerFrostedGlass.vue b/packages/material/src/editor-ui/extendsComponent/extendsFrostedGlass/sw-mask-layerFrostedGlass.vue
deleted file mode 100644
index 6b109dc2..00000000
--- a/packages/material/src/editor-ui/extendsComponent/extendsFrostedGlass/sw-mask-layerFrostedGlass.vue
+++ /dev/null
@@ -1,8 +0,0 @@
-
-
-
-
-
-
diff --git a/packages/material/src/editor-ui/extendsComponent/extendsGlobal/sw-mask-layerGlobal.vue b/packages/material/src/editor-ui/extendsComponent/extendsGlobal/sw-mask-layerGlobal.vue
deleted file mode 100644
index 8c695f82..00000000
--- a/packages/material/src/editor-ui/extendsComponent/extendsGlobal/sw-mask-layerGlobal.vue
+++ /dev/null
@@ -1,7 +0,0 @@
-
-
-
-
-
diff --git a/packages/material/src/editor-ui/extendsComponent/index.ts b/packages/material/src/editor-ui/extendsComponent/index.ts
index 7ef56afb..599acc13 100644
--- a/packages/material/src/editor-ui/extendsComponent/index.ts
+++ b/packages/material/src/editor-ui/extendsComponent/index.ts
@@ -1,13 +1,11 @@
import { ExtendsEnum } from "@screenwright/types";
import type { Component } from "vue";
-import swMaskLayerFrostedGlass from "./extendsFrostedGlass/sw-mask-layerFrostedGlass.vue";
import fullScreenSwitchGlobal from "./extendsGlobal/fullScreenSwitchGlobal.vue";
import pageReloadGlobal from "./extendsGlobal/pageReloadGlobal.vue";
import simpleParticleGlobal from "./extendsGlobal/simple-particleGlobal.vue";
import simpleStarGlobal from "./extendsGlobal/simpleStarGlobal.vue";
import swDataContainerGlobal from "./extendsGlobal/sw-dataContainerGlobal.vue";
-import swMaskLayerGlobal from "./extendsGlobal/sw-mask-layerGlobal.vue";
import swWeatherGlobal from "./extendsGlobal/sw-weatherGlobal.vue";
import simpleParticleParticleStyle from "./extendsParticleStyle/simple-particleParticleStyle.vue";
import swWeatherSeries from "./extendsSeries/sw-weatherSeries.vue";
@@ -19,7 +17,6 @@ export enum optionType {
series = "Series",
newOption = "NewOption",
particleStyle = "ParticleStyle",
- frostedGlass = "FrostedGlass",
pictureList = "PictureList",
}
@@ -72,12 +69,4 @@ export const ExtendsConfigComponent: Partial> =
{ label: "样式", value: optionType.style, component: swWeatherStyle },
{ label: "系列", value: optionType.series, component: swWeatherSeries },
],
- [ExtendsEnum.SwMaskLayer]: [
- { label: "全局", value: optionType.global, component: swMaskLayerGlobal },
- {
- label: "毛玻璃",
- value: optionType.frostedGlass,
- component: swMaskLayerFrostedGlass,
- },
- ],
};
diff --git a/packages/types/src/schemas/components/extends/sw-mask-layer.ts b/packages/types/src/schemas/components/extends/sw-mask-layer.ts
deleted file mode 100644
index bb147b88..00000000
--- a/packages/types/src/schemas/components/extends/sw-mask-layer.ts
+++ /dev/null
@@ -1,43 +0,0 @@
-import { z } from "zod";
-
-/**
- * 线性渐变遮罩层 (ft-mask-layer)
- * 扩展
- *
- * ## 数据结构
- * 数据字段:
- * - `text` - 文本内容
- */
-
-// 单个数据项的 Schema
-const swMaskLayerDataItemSchema = z.object({
- text: z.string().describe("文本内容")
-});
-
-export const swMaskLayerDataSchema = z.array(swMaskLayerDataItemSchema);
-export type ftMaskLayerData = z.infer;
-
-export const swMaskLayerOptionSchema = z.object({
- linearGradient: z.object({
- markColor: z.string().describe("渐变遮罩颜色"),
- markPosition: z.number().describe("渐变位置"),
- markRadius: z.number().describe("渐变半径"),
- markOpacity: z.number().describe("渐变透明度")
- }).describe("线性渐变配置"),
- radioactiveGradation: z.object({
- markColor: z.string().describe("径向遮罩颜色"),
- markOpacityRadius: z.number().describe("透明区域半径"),
- markOpacity: z.number().describe("中心透明度"),
- markUnOpacityRadius: z.number().describe("不透明区域半径"),
- showLengthWidthRatio: z.boolean().describe("是否显示长宽比"),
- lengthWidthRatio: z.number().describe("长宽比值")
- }).describe("径向渐变配置"),
- markType: z.string().describe("遮罩类型(linearGradient/radioactiveGradation)"),
- pointerEvents: z.boolean().describe("是否响应鼠标事件"),
- refresh: z.boolean().describe("是否刷新"),
- backdropFilter: z.boolean().describe("是否启用背景滤镜"),
- backdropFilterBlur: z.number().describe("背景模糊度"),
- backdropFilterSaturate: z.number().describe("背景饱和度")
-});
-
-export type ftMaskLayerOption = z.infer;
diff --git a/packages/types/src/schemas/components/index.ts b/packages/types/src/schemas/components/index.ts
index fd591dea..7f8f000e 100644
--- a/packages/types/src/schemas/components/index.ts
+++ b/packages/types/src/schemas/components/index.ts
@@ -38,7 +38,6 @@ export * from "./extends/simple-particle";
export * from "./extends/simpleStar";
export * from "./extends/sw-dataContainer";
export * from "./extends/sw-digital-human";
-export * from "./extends/sw-mask-layer";
export * from "./extends/sw-unreal-engine";
export * from "./extends/sw-weather";
export * from "./extends/ue-peer-streaming";
diff --git a/packages/types/src/schemas/components/propSchemaMap.ts b/packages/types/src/schemas/components/propSchemaMap.ts
index a4dbaa15..ed110211 100644
--- a/packages/types/src/schemas/components/propSchemaMap.ts
+++ b/packages/types/src/schemas/components/propSchemaMap.ts
@@ -24,7 +24,6 @@ import { simpleParticleDataSchema, simpleParticleOptionSchema } from "./extends/
import { simpleStarDataSchema, simpleStarOptionSchema } from "./extends/simpleStar";
import { swDataContainerDataSchema, swDataContainerOptionSchema } from "./extends/sw-dataContainer";
import { swDigitalHumanDataSchema, swDigitalHumanOptionSchema } from "./extends/sw-digital-human";
-import { swMaskLayerDataSchema, swMaskLayerOptionSchema } from "./extends/sw-mask-layer";
import { swUnrealEngineDataSchema, swUnrealEngineOptionSchema } from "./extends/sw-unreal-engine";
import { swWeatherDataSchema, swWeatherOptionSchema } from "./extends/sw-weather";
import { uePeerStreamingDataSchema, uePeerStreamingOptionSchema } from "./extends/ue-peer-streaming";
@@ -172,7 +171,6 @@ export const componentPropSchemaMap = {
// 扩展组件
"sw-dataContainer": { data: swDataContainerDataSchema, option: swDataContainerOptionSchema },
"sw-digital-human": { data: swDigitalHumanDataSchema, option: swDigitalHumanOptionSchema },
- "sw-mask-layer": { data: swMaskLayerDataSchema, option: swMaskLayerOptionSchema },
"sw-unreal-engine": { data: swUnrealEngineDataSchema, option: swUnrealEngineOptionSchema },
"sw-weather": { data: swWeatherDataSchema, option: swWeatherOptionSchema },
fullScreenSwitch: { data: fullScreenSwitchDataSchema, option: fullScreenSwitchOptionSchema },
diff --git a/packages/types/src/schemas/parsed-components/extends/sw-mask-layer.json b/packages/types/src/schemas/parsed-components/extends/sw-mask-layer.json
deleted file mode 100644
index ece8f99c..00000000
--- a/packages/types/src/schemas/parsed-components/extends/sw-mask-layer.json
+++ /dev/null
@@ -1,94 +0,0 @@
-{
- "meta": {
- "id": 104,
- "name": "线性渐变遮罩层",
- "prop": "sw-mask-layer",
- "componentName": "sw-mask-layer",
- "first_level_menu": "扩展",
- "second_level_menu": "",
- "thumbnail": "/img/maskLayer.ef2b23ee.png"
- },
- "config": {
- "title": "线性渐变遮罩层",
- "name": "线性渐变遮罩层",
- "display": true,
- "icon": "icon-scatter",
- "img": "/img/maskLayer.ef2b23ee.png",
- "callbackArgs": [],
- "events": [],
- "loadAnimation": {
- "type": "none",
- "opacityOpen": false,
- "timingFunction": "linear",
- "direction": "right",
- "duration": 1000,
- "delay": 0
- },
- "dataType": 0,
- "dataSource": {},
- "requestHeader": {},
- "requestBody": {},
- "crossOrigin": false,
- "needCookie": false,
- "autoRefresh": false,
- "dataQuery": "",
- "isLock": false,
- "dataMethod": "get",
- "path": "",
- "time": 30,
- "url": "",
- "data": [
- {
- "text": "线性渐变遮罩层"
- }
- ],
- "dataRemark": [
- {
- "key": "text",
- "map": "text",
- "decription": "文本"
- }
- ],
- "openFilter": false,
- "listenArgs": [],
- "cbArgs": [],
- "dataFormatter": "(data, callbackArgs) => {\r\n return data\r\n}",
- "component": {
- "width": 500,
- "height": 500,
- "name": "sw-mask-layer",
- "prop": "sw-mask-layer"
- },
- "unitPavenType": "",
- "option": {
- "linearGradient": {
- "markColor": "rgba(0,0,0,0.7)",
- "markPosition": 180,
- "markRadius": 40,
- "markOpacity": 90
- },
- "radioactiveGradation": {
- "markColor": "rgba(0,0,0,1)",
- "markOpacityRadius": 40,
- "markOpacity": 100,
- "markUnOpacityRadius": 90,
- "showLengthWidthRatio": false,
- "lengthWidthRatio": 0
- },
- "markType": "linearGradient",
- "pointerEvents": false,
- "refresh": false,
- "backdropFilter": false,
- "backdropFilterBlur": 4,
- "backdropFilterSaturate": 100
- },
- "left": 0,
- "top": 0,
- "showSubComponent": false
- },
- "template": [
- {
- "text": "线性渐变遮罩层"
- }
- ]
-}
\ No newline at end of file
diff --git a/packages/types/src/types/componentProp/extends.ts b/packages/types/src/types/componentProp/extends.ts
index 5394ab08..429798a6 100644
--- a/packages/types/src/types/componentProp/extends.ts
+++ b/packages/types/src/types/componentProp/extends.ts
@@ -30,8 +30,6 @@ export enum ExtendsEnum {
SwDataContainer = "sw-dataContainer",
/** 天气 */
SwWeather = "sw-weather",
- /** 遮罩层 */
- SwMaskLayer = "sw-mask-layer"
}
/**
diff --git a/servers/server/agent-workspace/skills/common/sw-video-understanding/SKILL.md b/servers/server/agent-workspace/skills/common/sw-video-understanding/SKILL.md
new file mode 100644
index 00000000..69d97d8b
--- /dev/null
+++ b/servers/server/agent-workspace/skills/common/sw-video-understanding/SKILL.md
@@ -0,0 +1,58 @@
+---
+name: sw-video-understanding
+description: >
+ 视频理解与创作:下载视频到工作区,每隔 8–12 帧抽帧并拼图,分析镜头、相机运动、主体动作、构图、光色和节奏,
+ 将观察转为分镜、视频生成提示词与成片验证。适用于分析用户上传或联网找到的视频、参考视频创作、实拍续接和视频复刻。
+---
+
+# 视频理解与创作
+
+目标是建立有时间依据的镜头理解,再据此创作。视频 URL、文件名、搜索标题和生成工具的成功结果都不代表已经看过内容。
+
+## 获取与观看
+
+1. 将用户上传或搜索得到的视频下载到当前工作区的 `screen__/assets/` 下,为源视频、抽帧和拼图使用独立目录,保留源文件。使用真实返回的 URL;签名 URL 原样引用并检查有效期,下载后确认得到的是可解码视频而非错误页。已有本地文件可直接使用。
+2. 用 `ffprobe` 记录时长、分辨率、画幅、帧率、旋转信息、是否有音轨;变帧率视频以实际呈现时间戳为准。缺少工具或下载失败时说明具体阻塞,不能编造视频分析。
+3. 默认**每隔 10 帧取一张**,允许在 8–12 帧之间调整。这是源视频帧间隔,不是每秒 8–12 张,也不是整段只取 8–12 张。例如恒定 30 fps 时,每 10 帧约为 0.33 秒;不要先改帧率再声称间隔对应原视频帧。
+4. 按时间顺序拼图,**从左到右、从上到下**。建议每页 4–6 列、最多 24 张,缩略图保持比例、不裁切主体,短边约 240–360 像素。每格标注帧编号和源视频时间戳;无法绘字时提供明确的格子到时间戳的索引文件。长视频按时间窗口分页,保留窗口起点,不能将局部时间误当成全片时间。
+5. 用 `read_file`(前端工具名 `readFileTool`)逐页读取拼图,让图片通过现有中间件进入视觉上下文。**生成了拼图不等于看过拼图**;页面缩放后细节不清晰,就减少每页格数,或另读原始帧。
+6. 初步识别切镜、动作变化和疑点,再对这些区间加密抽帧,必要时逐帧核对。8–12 帧间隔可能漏掉闪切、文字和短动作,不足以证明精确剪辑点或运动轨迹。
+
+命令与时间戳处理见 [references/frame-analysis.md](references/frame-analysis.md),实际执行前只需读取这一份参考。
+
+## 提取哪些信息
+
+先给全片概要(内容、镜头顺序、总体风格、叙事目的),再按镜头记录下列信息。简单问题只输出相关字段,完整分析可写入 `assets/<视频名>/analysis.md`,不要把所有帧的描述塞进聊天。
+
+| 信息 | 需要观察的证据及用途 |
+| --- | --- |
+| 时间与剪辑 | 镜头起止时间、时长、硬切/叠化等转场;抽帧估算的边界注明误差或待精查。用于分镜和节奏复现。 |
+| 场景与主体 | 地点类型、人物/动物/物体、主体数量、发生的动作、动作先后;地名和身份无法确认时不作断言。 |
+| 构图与空间 | 景别、视角、主体位置、前中后景、地平线、遮挡关系、可用留白。用于参考图选择和画幅适配。 |
+| 相机运动 | 固定、水平摇摄、俯仰、横移、推近/拉远、升降、环绕、跟拍;写方向、幅度、快慢、加减速及判断依据。 |
+| 主体与环境运动 | 主体相对背景的运动方向和速度,水流、云、树叶等独立变化;与相机运动分开记录。 |
+| 视觉风格 | 主色、饱和度、明暗对比、光线方向、天气、景深、质感、稳定程度;用于生成时保持一致。 |
+| 连续性锚点 | 可跨帧追踪的树、山峰、建筑、地平线、主体轮廓,以及首尾帧位置和尺度;用于运动判断、接片和查跳变。 |
+| 声音与文字 | 可见字幕、标识及其时间范围;声音只在实际听取/转写后描述。静态拼图无法判断配乐、台词或音画同步。 |
+| 创作可用性 | 哪段满足用户目标、哪些片段应保留、续接点、可作首尾帧的清晰画面、需避免的穿帮或遮挡。 |
+
+### 如何可靠判断运动方向
+
+- 对比同一镜头的前、中、后帧,追踪至少两个不同深度的静态锚点,先描述**画面中的位移**,再推断相机运动。比如“背景整体向左”可能支持相机向右摇摄,但不能把画面方向直接写成相机方向。
+- 区分摇摄与横移:横移通常带来近远景不同的位移、遮挡和视差变化;证据不足时写“向右摇摄或横移,无法区分”,不要强判。
+- 区分推拉、变焦与主体移动:推拉会改变视差与空间关系,变焦主要改变整体尺度;仅凭物体变大不能确认相机前进。单个主体移动而背景稳定时,优先考虑主体自身运动。
+- 不要只看远山或天空。远景移动很小,相机仍可能在动;同时检查近景边缘、地面纹理、遮挡和地平线。画面几乎不变时可写“固定或运动极轻微”,不可无依据断言绝对固定。
+- 每项结论写成“方向/类型 + 证据时间点 + 置信度”。切镜、叠化、手持抖动、电子防抖、裁切都可能干扰判断,疑点用更密的帧复核。
+
+## 将理解用于创作
+
+围绕用户明确的成片目标决定保留、改编、续接或新生成的部分,不强迫用户指定执行步骤。区分原始片段与 AI 生成片段;用户要求“前 10 秒使用找到的视频”时,把这一点作为实际剪辑约束,不能用生成内容冒充。
+
+1. **形成分镜意图**:每段写清时长、主体/场景、构图、主体动作、相机运动、光色及接入/接出方式。复杂目标按镜头生成,避免把多个互相冲突的运镜塞进一个短镜头。
+2. **选择生成条件**:先查看 `createVideoTool` 当前参数与限制。文生视频描述场景和运动;首帧图生视频用画面作外观依据,提示词集中写运动和保持项;首尾帧模式控制接续;多模态参考模式按工具支持传入参考素材。首尾帧不能与多模态参考参数混用。
+3. **准备可访问素材**:图片参考使用工具要求的内部 assetStore URL;参考视频/音频使用服务商可下载的 URL。工作区路径和服务端 `127.0.0.1` 地址不能直接当作外部生成服务能访问的素材。不要把拼图当成首帧,否则可能生成网格画面;应选取单张原始帧。拼图仅用于分析。
+4. **写提示词**:用“场景/主体(文生时)→主体动作→相机类型、方向、速度→光色风格→需保持的构图/外观→必要约束”组织。把“高级、有氛围、动起来”换成可观察动作,如“镜头缓慢向后拉远,近景花海逐渐露出,远山保持在上三分之一”。只要求符合用户目标的约束,避免无关负面词堆叠。
+5. **续接已有视频**:从接点附近选清晰原始帧,匹配画幅、主体位置和尺度、视角、运动方向与速度、色温和曝光。尾帧相同并不保证运动连续,需同时观察接点前后数帧。先判断能否直接接,必要时才用短叠化或其它符合意图的转场,不能靠转场掩盖明显内容错误。
+6. **生成与验证**:遵循工具的费用与确认要求及用户已有授权。后台任务仍在进行时等待结果,不重复提交;失败后根据具体原因修正,避免无依据的付费重试。拿到成片后下载并按同样方法抽帧观看,核对动作、相机方向、主体一致性、时长、接点、闪烁和变形。涉及音乐、台词或音画同步时另外检查音轨。
+
+最终交付可播放的视频 URL/文件,简要说明完成情况。只报告实际检查过的内容,未验证的声音、精确时点或运动必须注明;纯分析任务不触发视频生成。
diff --git a/servers/server/agent-workspace/skills/common/sw-video-understanding/references/frame-analysis.md b/servers/server/agent-workspace/skills/common/sw-video-understanding/references/frame-analysis.md
new file mode 100644
index 00000000..fed2db87
--- /dev/null
+++ b/servers/server/agent-workspace/skills/common/sw-video-understanding/references/frame-analysis.md
@@ -0,0 +1,47 @@
+# 抽帧拼图与时间依据
+
+以下是命令模板,不是固定路径。先创建任务自己的输出目录,替换文件名;根据运行环境正确引用路径和 URL。不要把 signed URL 的 `&` 裸放进 shell。下载应设置超时、检查 HTTP 状态并保留原视频,避免把错误 HTML 当成 mp4。
+
+## 探测
+
+```sh
+ffprobe -v error -show_format -show_streams -of json "source.mp4"
+```
+
+关注 `duration`、`width/height`、`avg_frame_rate/r_frame_rate`、旋转侧数据和音频流。二者帧率相等也不能单独证明恒定帧率;不要把分数字符串当成浮点数直接计算。源视频呈现时间戳(PTS)优先于按帧率估算。
+
+## 每 10 帧抽一张
+
+```sh
+ffmpeg -nostdin -hide_banner -i "source.mp4" -an -vf "select=not(mod(n\,10)),showinfo,scale=480:-2" -fps_mode vfr "frames/frame-%06d.png"
+```
+
+目录 `frames/` 必须预先存在。`n` 从 0 开始,所以采样的是源解码帧 0、10、20……;输出文件通常从 1 编号,不能把输出序号直接当源帧号。8 或 12 帧间隔时替换 `10`。命令不改变采样前的帧率,`-fps_mode vfr` 避免补帧造成重复。
+
+`showinfo` 放在 `select` 后,会输出每张采样帧的 `pts_time`。将 stderr 保存到任务日志,提取采样顺序和时间建立 manifest,例如:
+
+```text
+image,source_frame,source_time_seconds
+frame-000001.png,0,0.000
+frame-000002.png,10,0.333
+```
+
+示例时间只适用于对应素材。变帧率必须取实际 `pts_time`,不能照抄数值。源视频时间起点非零时记录并统一归一化约定;如果分窗口处理或使用 `-ss`,核对输出时间轴是否重置并显式加回窗口偏移。不要重复加偏移。
+
+## 分页拼图
+
+对已抽出的图片,可用 ffmpeg `tile` 或环境已有的图片处理库(例如 sharp)拼图。使用 manifest 驱动排序和标签,可避免按文件名字典顺序错排。
+
+```sh
+ffmpeg -nostdin -hide_banner -framerate 1 -i "frames/frame-%06d.png" -vf "scale=240:-2,tile=6x4:nb_frames=24:padding=4:margin=4" "sheets/sheet-%03d.png"
+```
+
+目录 `sheets/` 必须预先存在。这里 `-framerate 1` 只用于读取已抽好的图片,不代表源视频是 1 fps,也不能拿拼图输入时间作源时间。保留纵横比;最后一页可能有空格,应以实际图片数为准。检查页数和 manifest 覆盖范围,不能只读第一页就声称理解了整段。
+
+此示例不绘制标签。实际分析时补充每格的源时间/帧号,或同时提供按“页号、行、列”索引的 manifest。需要绘字时先检查可用字体与滤镜,避免字体缺失导致整个抽帧流程失败。
+
+## 局部精查
+
+切镜边界、运动方向或接片有疑问时,只对相关短窗口增加采样密度。可先用 ffprobe 读取该窗口附近各帧的 `best_effort_timestamp_time`,再按实际时间选择原始帧。需要精确裁切时核查相邻帧;稀疏拼图只能将切点定位到采样间隔内。
+
+运动分析保留至少首、中、尾帧及其源时间;小锚点使用更大单帧或同位置裁切比较,所有裁切必须使用一致坐标,不能分别重构图后比较。拼图没有运动矢量,也没有声音;它只提供时序视觉证据。
diff --git a/servers/server/agent-workspace/skills/executor/sw-component-schema/references/components/extends/ft-mask-layer.md b/servers/server/agent-workspace/skills/executor/sw-component-schema/references/components/extends/ft-mask-layer.md
deleted file mode 100644
index 318d85e1..00000000
--- a/servers/server/agent-workspace/skills/executor/sw-component-schema/references/components/extends/ft-mask-layer.md
+++ /dev/null
@@ -1,28 +0,0 @@
-# 线性渐变遮罩层 (ft-mask-layer)
-
-## dataChart 数据格式
-
-| 字段 | 类型 | 说明 |
-|------|------|------|
-| text | string | 文本内容 |
-
-## option 字段说明
-
-| 字段 | 类型 | 默认值 | 说明 |
-|------|------|--------|------|
-| linearGradient.markColor | string | "rgba(0,0,0,0.7)" | 渐变遮罩颜色 |
-| linearGradient.markPosition | number | 180 | 渐变位置 |
-| linearGradient.markRadius | number | 40 | 渐变半径 |
-| linearGradient.markOpacity | number | 90 | 渐变透明度 |
-| radioactiveGradation.markColor | string | "rgba(0,0,0,1)" | 径向遮罩颜色 |
-| radioactiveGradation.markOpacityRadius | number | 40 | 透明区域半径 |
-| radioactiveGradation.markOpacity | number | 100 | 中心透明度 |
-| radioactiveGradation.markUnOpacityRadius | number | 90 | 不透明区域半径 |
-| radioactiveGradation.showLengthWidthRatio | boolean | false | 是否显示长宽比 |
-| radioactiveGradation.lengthWidthRatio | number | 0 | 长宽比值 |
-| markType | string | "linearGradient" | 遮罩类型(linearGradient/radioactiveGradation) |
-| pointerEvents | boolean | false | 是否响应鼠标事件 |
-| refresh | boolean | false | 是否刷新 |
-| backdropFilter | boolean | false | 是否启用背景滤镜 |
-| backdropFilterBlur | number | 4 | 背景模糊度 |
-| backdropFilterSaturate | number | 100 | 背景饱和度 |
diff --git a/servers/server/agent-workspace/skills/executor/sw-component-schema/references/components/extends/index.md b/servers/server/agent-workspace/skills/executor/sw-component-schema/references/components/extends/index.md
index 67b4e4d2..978ee9af 100644
--- a/servers/server/agent-workspace/skills/executor/sw-component-schema/references/components/extends/index.md
+++ b/servers/server/agent-workspace/skills/executor/sw-component-schema/references/components/extends/index.md
@@ -6,7 +6,6 @@
| -------------- | -------------- | ------------------- | ----------------------------------------------------- |
| 数据容器 | 数据容器 | ft-dataContainer | [ft-dataContainer.md](ft-dataContainer.md) |
| 数字人beta | 数字人beta | ft-digital-human | [ft-digital-human.md](ft-digital-human.md) |
-| 线性渐变遮罩层 | 线性渐变遮罩层 | ft-mask-layer | [ft-mask-layer.md](ft-mask-layer.md) |
| UE模板 | UE模板 | ft-unreal-engine | [ft-unreal-engine.md](ft-unreal-engine.md) |
| 天气 | 天气 | ft-weather | [ft-weather.md](ft-weather.md) |
| 全屏切换 | 全屏切换 | fullScreenSwitch | [fullScreenSwitch.md](fullScreenSwitch.md) |
diff --git a/servers/server/agent-workspace/types/hooks.d.ts b/servers/server/agent-workspace/types/hooks.d.ts
index 348ecafe..32764bcc 100644
--- a/servers/server/agent-workspace/types/hooks.d.ts
+++ b/servers/server/agent-workspace/types/hooks.d.ts
@@ -174,7 +174,6 @@ declare const ComponentFlatSchema: z.ZodObject<{
"simple-particle": import("..").ExtendsEnum.SimpleParticle;
"sw-dataContainer": import("..").ExtendsEnum.SwDataContainer;
"sw-weather": import("..").ExtendsEnum.SwWeather;
- "sw-mask-layer": import("..").ExtendsEnum.SwMaskLayer;
}>, z.ZodEnum<{
rasterProgressBar: import("..").IndicatorEnum.RasterProgressBar;
iconRatio: import("..").IndicatorEnum.IconRatio;
@@ -3422,35 +3421,6 @@ declare const swDigitalHumanOptionSchema: z.ZodObject<{
}, z.core.$strip>;
type ftDigitalHumanOption = z.infer;
-import { z } from 'zod';
-declare const swMaskLayerDataSchema: z.ZodArray>;
-type ftMaskLayerData = z.infer;
-declare const swMaskLayerOptionSchema: z.ZodObject<{
- linearGradient: z.ZodObject<{
- markColor: z.ZodString;
- markPosition: z.ZodNumber;
- markRadius: z.ZodNumber;
- markOpacity: z.ZodNumber;
- }, z.core.$strip>;
- radioactiveGradation: z.ZodObject<{
- markColor: z.ZodString;
- markOpacityRadius: z.ZodNumber;
- markOpacity: z.ZodNumber;
- markUnOpacityRadius: z.ZodNumber;
- showLengthWidthRatio: z.ZodBoolean;
- lengthWidthRatio: z.ZodNumber;
- }, z.core.$strip>;
- markType: z.ZodString;
- pointerEvents: z.ZodBoolean;
- refresh: z.ZodBoolean;
- backdropFilter: z.ZodBoolean;
- backdropFilterBlur: z.ZodNumber;
- backdropFilterSaturate: z.ZodNumber;
-}, z.core.$strip>;
-type ftMaskLayerOption = z.infer;
-
import { z } from 'zod';
declare const swUnrealEngineDataSchema: z.ZodArray;
};
- readonly "sw-mask-layer": {
- readonly data: z.ZodArray>;
- readonly option: z.ZodObject<{
- linearGradient: z.ZodObject<{
- markColor: z.ZodString;
- markPosition: z.ZodNumber;
- markRadius: z.ZodNumber;
- markOpacity: z.ZodNumber;
- }, z.core.$strip>;
- radioactiveGradation: z.ZodObject<{
- markColor: z.ZodString;
- markOpacityRadius: z.ZodNumber;
- markOpacity: z.ZodNumber;
- markUnOpacityRadius: z.ZodNumber;
- showLengthWidthRatio: z.ZodBoolean;
- lengthWidthRatio: z.ZodNumber;
- }, z.core.$strip>;
- markType: z.ZodString;
- pointerEvents: z.ZodBoolean;
- refresh: z.ZodBoolean;
- backdropFilter: z.ZodBoolean;
- backdropFilterBlur: z.ZodNumber;
- backdropFilterSaturate: z.ZodNumber;
- }, z.core.$strip>;
- };
readonly "sw-unreal-engine": {
readonly data: z.ZodArray;
/** 面板类型枚举 Schema */
declare const PanelEnumSchema: z.ZodEnum<{
@@ -13609,7 +13551,6 @@ declare const allComponentTypeSchema: z.ZodUnion, z.ZodEnum<{
rasterProgressBar: import("..").IndicatorEnum.RasterProgressBar;
iconRatio: import("..").IndicatorEnum.IconRatio;
@@ -15822,7 +15763,6 @@ declare enum ExtendsEnum {
/** 天气 */
SwWeather = "sw-weather",
/** 遮罩层 */
- SwMaskLayer = "sw-mask-layer"
}
/**
* 扩展子组件枚举
diff --git a/servers/server/package.json b/servers/server/package.json
index c9286aac..c4677ef3 100644
--- a/servers/server/package.json
+++ b/servers/server/package.json
@@ -22,6 +22,7 @@
"seed-modules": "dotenvx run -- tsx scripts/seed-modules.ts",
"seed-bi-user": "dotenvx run -- tsx scripts/seed-bi-user.ts",
"import-system-materials": "dotenvx run -- tsx scripts/import-system-materials.ts",
+ "optimize-system-materials": "dotenvx run -- tsx scripts/optimize-system-materials.ts",
"docker:seed-embeddings": "tsx scripts/seed-component-embeddings.ts",
"docker:seed-modules": "tsx scripts/seed-modules.ts",
"mastra:test": "dotenvx run -- vitest run",
diff --git a/servers/server/prisma/schema.prisma b/servers/server/prisma/schema.prisma
index 81f41120..2bd82970 100644
--- a/servers/server/prisma/schema.prisma
+++ b/servers/server/prisma/schema.prisma
@@ -14,10 +14,10 @@ datasource db {
provider = "postgresql"
}
-/// AI 模型配置:5 个角色,主键即角色。runtime 首次读取时若某行缺失,用 env 兜底 seed。
+/// AI 模型配置:4 个角色,主键即角色。runtime 首次读取时若某行缺失,用 env 兜底 seed。
/// 前端「设置」页维护;provider 一律按 OpenAI 兼容端点处理。
model AiModel {
- role String @id // "reasoning" | "vision" | "embedding" | "image" | "video"
+ role String @id // "reasoning" | "embedding" | "image" | "video"
baseUrl String @default("") @map("base_url")
apiKey String @default("") @map("api_key")
modelId String @default("") @map("model_id")
diff --git a/servers/server/scripts/import-system-materials.ts b/servers/server/scripts/import-system-materials.ts
index 2842bbe5..01b5b925 100644
--- a/servers/server/scripts/import-system-materials.ts
+++ b/servers/server/scripts/import-system-materials.ts
@@ -1,14 +1,18 @@
import path from "node:path";
import { importSystemMaterials } from "@/mastra/services/ai-assets/system-material-import";
+import { optimizeSystemMaterialThumbnails } from "@/mastra/services/ai-assets/system-material-thumbnails";
import { prismaClient } from "@/mastra/storage/prisma";
const sourceArg = process.argv.slice(2).find((arg) => !arg.startsWith("--"));
const sourceRoot = sourceArg ? path.resolve(sourceArg) : undefined;
importSystemMaterials(sourceRoot)
- .then((result) => {
+ .then(async (result) => {
console.log("系统素材导入完成:", result);
+ const thumbnails = await optimizeSystemMaterialThumbnails();
+ console.log("系统素材缩略图优化完成:", thumbnails);
+ if (thumbnails.failed) process.exitCode = 1;
})
.catch((error) => {
console.error("系统素材导入失败:", error);
diff --git a/servers/server/scripts/modules-data.json b/servers/server/scripts/modules-data.json
index d4a64732..b947ec3c 100644
--- a/servers/server/scripts/modules-data.json
+++ b/servers/server/scripts/modules-data.json
@@ -1070,23 +1070,7 @@
"template": "[{\"id\":\"1\",\"姓名\":\"张三\",\"性别\":\"男\",\"岗位\":\"保安\",\"电话\":13265555444,\"考勤班组\":\"班组1\",\"状态\":\"正常\"},{\"id\":\"2\",\"姓名\":\"李四\",\"性别\":\"男\",\"岗位\":\"保安组长\",\"电话\":132611112222,\"考勤班组\":\"班组2\",\"状态\":\"正常\"},{\"id\":\"3\",\"姓名\":\"阿珍\",\"性别\":\"女\",\"岗位\":\"保洁\",\"电话\":132622223333,\"考勤班组\":\"班组3\",\"状态\":\"紧急\"},{\"id\":\"4\",\"姓名\":\"阿强\",\"性别\":\"男\",\"岗位\":\"主管\",\"电话\":132666667777,\"考勤班组\":\"班组3\",\"状态\":\"正常\"},{\"id\":\"5\",\"姓名\":\"王五\",\"性别\":\"男\",\"岗位\":\"保安\",\"电话\":13245678978,\"考勤班组\":\"班组4\",\"状态\":\"正常\"},{\"id\":\"6\",\"姓名\":\"赵六\",\"性别\":\"男\",\"岗位\":\"保安\",\"电话\":13267676767,\"考勤班组\":\"班组5\",\"状态\":\"正常\"}]",
"status": 1
},
-{
- "id": 88,
- "user_id": null,
- "type": 0,
- "java_script": "{\"title\":\"放射性渐变遮罩层\",\"name\":\"放射性渐变遮罩层\",\"display\":true,\"icon\":\"icon-scatter\",\"img\":\"/img/maskLayer.93de78c5.png\",\"callbackArgs\":[],\"events\":[],\"loadAnimation\":{\"type\":\"none\",\"opacityOpen\":false,\"timingFunction\":\"linear\",\"direction\":\"right\",\"duration\":1000,\"delay\":0},\"dataType\":0,\"dataSource\":{},\"requestHeader\":{},\"requestBody\":{},\"crossOrigin\":false,\"needCookie\":false,\"autoRefresh\":false,\"dataQuery\":\"\",\"isLock\":false,\"dataMethod\":\"get\",\"path\":\"\",\"time\":30,\"url\":\"\",\"data\":[{\"text\":\"放射性渐变遮罩层\"}],\"dataRemark\":[{\"key\":\"text\",\"map\":\"text\",\"decription\":\"文本\"}],\"openFilter\":false,\"listenArgs\":[],\"cbArgs\":[],\"dataFormatter\":\"(data, callbackArgs) => {\\r\\n return data\\r\\n}\",\"component\":{\"width\":500,\"height\":500,\"name\":\"sw-mask-layer\",\"prop\":\"sw-mask-layer\"},\"unitPavenType\":\"\",\"unitPavenType\":\"\",\"option\":{\"linearGradient\":{\"markColor\":\"rgba(0,0,0,0.7)\",\"markPosition\":180,\"markRadius\":40,\"markOpacity\":90},\"radioactiveGradation\":{\"markColor\":\"rgba(0,0,0,1)\",\"markOpacityRadius\":40,\"markOpacity\":100,\"markUnOpacityRadius\":90,\"showLengthWidthRatio\":false,\"lengthWidthRatio\":0},\"markType\":\"radioactiveGradation\",\"pointerEvents\":false,\"refresh\":false,\"backdropFilter\":false,\"backdropFilterBlur\":4,\"backdropFilterSaturate\":100},\"left\":0,\"top\":0,\"showSubComponent\":false}",
- "level": 1,
- "second_level_menu": "",
- "first_level_menu": "扩展",
- "name": "放射性渐变遮罩层",
- "thumbnail": "/img/maskLayer.93de78c5.png",
- "created_by": "admin",
- "created_time": "2023-05-31T12:34:27.000Z",
- "updated_by": "admin",
- "updated_time": "2024-06-17T10:58:44.000Z",
- "template": "[{\"text\":\"放射性渐变遮罩层\"}]",
- "status": 1
- },
+
{
"id": 89,
"user_id": null,
@@ -1325,23 +1309,7 @@
"template": "[]",
"status": 1
},
-{
- "id": 104,
- "user_id": null,
- "type": 0,
- "java_script": "{\"title\":\"线性渐变遮罩层\",\"name\":\"线性渐变遮罩层\",\"display\":true,\"icon\":\"icon-scatter\",\"img\":\"/img/maskLayer.ef2b23ee.png\",\"callbackArgs\":[],\"events\":[],\"loadAnimation\":{\"type\":\"none\",\"opacityOpen\":false,\"timingFunction\":\"linear\",\"direction\":\"right\",\"duration\":1000,\"delay\":0},\"dataType\":0,\"dataSource\":{},\"requestHeader\":{},\"requestBody\":{},\"crossOrigin\":false,\"needCookie\":false,\"autoRefresh\":false,\"dataQuery\":\"\",\"isLock\":false,\"dataMethod\":\"get\",\"path\":\"\",\"time\":30,\"url\":\"\",\"data\":[{\"text\":\"线性渐变遮罩层\"}],\"dataRemark\":[{\"key\":\"text\",\"map\":\"text\",\"decription\":\"文本\"}],\"openFilter\":false,\"listenArgs\":[],\"cbArgs\":[],\"dataFormatter\":\"(data, callbackArgs) => {\\r\\n return data\\r\\n}\",\"component\":{\"width\":500,\"height\":500,\"name\":\"sw-mask-layer\",\"prop\":\"sw-mask-layer\"},\"unitPavenType\":\"\",\"unitPavenType\":\"\",\"option\":{\"linearGradient\":{\"markColor\":\"rgba(0,0,0,0.7)\",\"markPosition\":180,\"markRadius\":40,\"markOpacity\":90},\"radioactiveGradation\":{\"markColor\":\"rgba(0,0,0,1)\",\"markOpacityRadius\":40,\"markOpacity\":100,\"markUnOpacityRadius\":90,\"showLengthWidthRatio\":false,\"lengthWidthRatio\":0},\"markType\":\"linearGradient\",\"pointerEvents\":false,\"refresh\":false,\"backdropFilter\":false,\"backdropFilterBlur\":4,\"backdropFilterSaturate\":100},\"left\":0,\"top\":0,\"showSubComponent\":false}",
- "level": 1,
- "second_level_menu": "",
- "first_level_menu": "扩展",
- "name": "线性渐变遮罩层",
- "thumbnail": "/img/maskLayer.ef2b23ee.png",
- "created_by": "admin",
- "created_time": "2023-05-31T12:34:27.000Z",
- "updated_by": "admin",
- "updated_time": "2024-06-17T10:58:45.000Z",
- "template": "[{\"text\":\"线性渐变遮罩层\"}]",
- "status": 1
- },
+
{
"id": 105,
"user_id": null,
diff --git a/servers/server/scripts/optimize-system-materials.ts b/servers/server/scripts/optimize-system-materials.ts
new file mode 100644
index 00000000..31ec5a3f
--- /dev/null
+++ b/servers/server/scripts/optimize-system-materials.ts
@@ -0,0 +1,13 @@
+import { optimizeSystemMaterialThumbnails } from "@/mastra/services/ai-assets/system-material-thumbnails";
+import { prismaClient } from "@/mastra/storage/prisma";
+
+optimizeSystemMaterialThumbnails()
+ .then((result) => {
+ console.log("系统素材缩略图优化完成:", result);
+ if (result.failed) process.exitCode = 1;
+ })
+ .catch((error) => {
+ console.error("系统素材缩略图优化失败:", error);
+ process.exitCode = 1;
+ })
+ .finally(() => prismaClient.$disconnect());
diff --git a/servers/server/src/agent-resources/prompts/mastra/asset-completeness.md b/servers/server/src/agent-resources/prompts/mastra/asset-completeness.md
new file mode 100644
index 00000000..83631489
--- /dev/null
+++ b/servers/server/src/agent-resources/prompts/mastra/asset-completeness.md
@@ -0,0 +1,11 @@
+## 素材完整性:清单 → 生成 → 使用 → 核验(强制)
+
+适用于所有主题的设计稿还原、从零搭建、局部修改和素材生成任务。仅清点本次任务范围内的元素;没有参考图时按已确定的设计清点,不凭空追加装饰。以下规则同时适用于默认与 compact 模式;PLAN 模式只规划,不调用生图或写入工具。
+
+1. **先逐区清点,不能只列大图**:检查标题区、每个面板的标题与内容区、每张指标卡、地图/插画区、四周边角与底部。除背景、底板外,必须逐项记录业务图标、标题前图标、指标图标、热点标记、指示符、插画、角花、装饰线与光效;尺寸小、重复出现或处于边角均不是省略理由。只枚举当前设计实际需要的元素,不套用固定主题的图标清单。
+2. **维护可追踪清单**:在现有 todo/任务记录中为每种独立素材分配稳定编号,记录名称、视觉特征、全部使用位置、目标尺寸、实现方式(生成/复用/组件)、状态,以及产出后的真实 URL 和组件 ID。分别统计独立素材数与使用位置数。同形同色同风格可复用一张,但每个使用位置都要落地;不同语义或造型的图标必须分项,不能用同一张图顶替。
+3. **必生成项不得自行降级或删减**:用户已要求生成、已确定需生图或现有组件无法还原的素材,必须实际调用 createImageTool。不得因图标小、数量多、想节省调用或已有背景而跳过;不得用圆点、菱形、emoji、普通字符或同一个通用图标替代不同业务图标。复用必须有可核实的现成资源;改用组件必须能还原该项形状与风格,不能仅凭“都是小图标”就改为占位符。范围变更沿用已有授权与确认流程,不能静默删项。
+4. **清单与生图入参逐项对应**:每种待生成素材对应 images 中的一项,name 带素材编号;不要在一个 prompt 里要求生成整套不同图标,也不要把背景中画过的小图标当作已获得独立素材。每项 prompt 写清唯一主体、轮廓与关键特征、统一风格、配色、留白和背景处理;独立图标要求仅含该图标、主体完整居中、无文字、无卡片、无其他图标。需要参考图时逐项传 seedImages 并说明参考目的。小图标可用 512×512,发光素材按既有纯黑底与 screen 混合规则处理;不要传工具不支持的字段。
+5. **超过批次上限必须继续**:每批最多 8 项,按清单依次分批覆盖全部待生成项,不能把 8 项当作整次任务上限。后台请求已提交只代表“生成中”;记录待处理批次,结果返回后继续剩余批次。按返回的 index/name 对账,只有获得真实 URL 且看图确认主体正确才标记可用;失败、缺项、错图只补对应项,不重生已通过的素材。无法恢复时明确保留未完成状态并报告原因,不能编造 URL 或标记成功。
+6. **逐项接入,委派不丢清单**:搭建前核对每个必需项已有可用产物或明确的组件实现。委派时带上该区域的素材编号、视觉描述、真实 URL、全部使用位置及验收要求;主 Agent 仍负责跨区域完整性。每个使用位置都要有实际组件引用;素材在库中、提示词里提过、任务已派发均不等于已使用。
+7. **完成前双重核验**:素材生成任务逐项对照清单检查产出;搭建任务还须删除临时参考底图后用 capture_canvas 逐区检查,核对每个图标/装饰是否存在、形状是否正确、是否被遮挡或越界,以及所有复用位置是否齐全。以“应有项 → 可用产物/组件实现 → 全部使用位置”对账,数量相同也要检查语义是否一一对应。发现遗漏先补齐再收尾;遵守现有重试与截图轮次限制,仍有缺项时明确列出,不能宣称全部完成。
diff --git a/servers/server/src/agent-resources/prompts/mastra/editor-context.md b/servers/server/src/agent-resources/prompts/mastra/editor-context.md
index 4bc19d94..94f0c911 100644
--- a/servers/server/src/agent-resources/prompts/mastra/editor-context.md
+++ b/servers/server/src/agent-resources/prompts/mastra/editor-context.md
@@ -55,6 +55,8 @@
这标志着用户是**从零创建大屏**的意图(而非修改已有大屏)。没有设计稿、只有 `` 内的文字需求时,先用 `createImageTool` 生成一张符合需求和画布尺寸的整屏概念图,再按「效果图 → 大屏工作流」用组件工具手动搭建并完成大屏。用户明确要应用已有模板时才走模板应用流程。
+欢迎页示例的默认范围是「一张概念图 → 按图完成可编辑大屏」:先生成并查看概念图,再还原布局、配色与视觉层次,文字、数字和图表用独立可编辑组件完成。背景、底板与装饰优先从概念图拆解或用组件还原;不主动调用 `searchMediaAssetsTool` / `importMediaAssetsTool` 搜集素材,也不调用 `createVideoTool` 生成视频。不要因草原、夜景、海洋等主题自行扩展搜索或视频任务,不在概念图生成后停止。用户后续明确提出搜索或视频需求时,再按新的要求处理。
+
`` 中的组件引用格式:
用户 @ 了某组件时,消息正文中会嵌入 `` 标签:
diff --git a/servers/server/src/agent-resources/prompts/mastra/screen-build-workflow.md b/servers/server/src/agent-resources/prompts/mastra/screen-build-workflow.md
index 8aae8b0e..e636b712 100644
--- a/servers/server/src/agent-resources/prompts/mastra/screen-build-workflow.md
+++ b/servers/server/src/agent-resources/prompts/mastra/screen-build-workflow.md
@@ -4,6 +4,8 @@
用户已有整屏设计稿时直接按「效果图 → 大屏工作流」搭建;Figma 设计继续走 figmaToBIV2Workflow。
只有用户明确要应用已有模板时才走模板应用流程,不用套模板跳过从零建屏的概念图步骤。
+**欢迎页示例范围**:`` 任务先生成一张整屏概念图,再按图完成可编辑大屏。背景与装饰优先从概念图拆解或用组件还原;不主动搜索/导入联网素材或生成视频,不因主题联想到实拍、动态背景就追加这些任务。用户后续明确提出相关需求时再处理。概念图完成后继续施工,不能停在展示图片。
+
### Phase 1:生成整屏概念图
1. 从 editor-context 获取当前 screenId,读取 info.json 确认画布尺寸,结合需求确定业务主题、内容、布局、风格和配色。
diff --git a/servers/server/src/agent-resources/prompts/mastra/sw-agent-compact.md b/servers/server/src/agent-resources/prompts/mastra/sw-agent-compact.md
index d6cbd17e..cfa907e6 100644
--- a/servers/server/src/agent-resources/prompts/mastra/sw-agent-compact.md
+++ b/servers/server/src/agent-resources/prompts/mastra/sw-agent-compact.md
@@ -28,7 +28,7 @@
## 能力路由
- 从零建屏必须先 createImageTool 生成一张与画布尺寸一致的整屏概念图(主题、标题、指标、布局、图表、风格和配色),查看结果后按「效果图 → 大屏工作流」准备素材,再用 createComponentTool / edit_files / group_component 手动完成大屏。文字、数字、图表是独立可编辑组件,概念图只当临时定位底图,完成后删除并 capture_canvas 对照自检。不要停在生图或只贴一张整图。无真实数据时用业务演示数据并说明;多区域任务 metadata 带概念图 URL、坐标、内容、配色及素材 URL。已有整屏设计稿直接按图搭建,Figma 继续走 figmaToBIV2Workflow;PLAN 先获批再生图施工。用户已要求完成建屏时继续搭建,不重复等待开始指令;用户明确只要概念图时才在出图后停止。
-- welcome 文字示例按从零建屏流程先生成概念图再搭组件;只有用户明确要求应用已有模板时才使用模板,应用成功后读取 describePath 获取新组件 ID。
+- welcome 文字示例先用 createImageTool 生成一张整屏概念图,查看结果后按图完成独立可编辑组件、背景与装饰,并截图对照;背景与装饰优先从概念图拆解或用组件还原,不主动调用 searchMediaAssetsTool / importMediaAssetsTool 搜集素材,也不调用 createVideoTool 生成视频,不在出图后停止。用户后续明确要求搜索或视频时再处理;只有用户明确要求应用已有模板时才使用模板,应用成功后读取 describePath 获取新组件 ID。
- 用户上传的图片你能直接看到,无需识图工具;图片中的单组件先自己写下描述(类型、坐标轴、系列、配色),再用描述 searchComponentTool 优先匹配专用可配置组件。单图直接创建,多图按图建 Task 并发委派。只有无匹配或调整仍失败才用通用 echart:按描述生成 EChartsOption 类型的 TS 文件,颜色用 #RRGGBB,不编造缺失数据;createEchartOptionTool 落文件,再传给组件。建议 tsc 自检,失败最多修 3 次,不把报错文件直接灌进组件;优先回专用组件,用户坚持才说明错误后确认。落地后用 capture_canvas 截图对照原图,最多两轮。
- 配置状态读 workspace;浏览器当前 API 响应、过滤器实际输出必须在浏览器查询。execute_in_browser 前先加载 sw-bigscreen-hooks,不猜 SDK。语句块显式 return,Ref 取 value,异步结果等待完成。
diff --git a/servers/server/src/lib/http/outbound-proxy.ts b/servers/server/src/lib/http/outbound-proxy.ts
new file mode 100644
index 00000000..8898e71e
--- /dev/null
+++ b/servers/server/src/lib/http/outbound-proxy.ts
@@ -0,0 +1,15 @@
+import { createRequire } from "node:module";
+
+/** Initialize the same Undici instance that the coding-agent dependency installs. */
+export async function configureOutboundProxy(): Promise {
+ if (process.env.NODE_USE_ENV_PROXY !== "1" || !(process.env.HTTPS_PROXY || process.env.HTTP_PROXY)) {
+ return;
+ }
+ const codingAgentUrl = import.meta.resolve("@earendil-works/pi-coding-agent");
+ // Loading this dependency replaces Node's environment-proxy dispatcher.
+ // Load it before installing the environment-aware dispatcher so later imports are cached.
+ await import(codingAgentUrl);
+ const undici = createRequire(codingAgentUrl)("undici") as typeof import("undici");
+ undici.setGlobalDispatcher(new undici.EnvHttpProxyAgent());
+ undici.install();
+}
diff --git a/servers/server/src/mastra/agents/sw-agent.ts b/servers/server/src/mastra/agents/sw-agent.ts
index 9acc400a..8e41d42e 100644
--- a/servers/server/src/mastra/agents/sw-agent.ts
+++ b/servers/server/src/mastra/agents/sw-agent.ts
@@ -85,6 +85,9 @@ const baseInstructions =
const planModePrompt = loadPrompt("mastra/mode-plan.md");
+// 两种提示词模式共用,避免压缩模式遗漏素材完整性约束。
+const assetCompletenessInstructions = loadPrompt("mastra/asset-completeness.md");
+
export interface CreateSwAgentOptions {
/** 已由启动层注入 ArtifactAppService 的前端编码任务委派工具。 */
readonly delegateAppCodeTool: ReturnType;
@@ -105,7 +108,7 @@ export function createSwAgent(options: CreateSwAgentOptions) {
instructions: ({ requestContext }: { requestContext: RequestContext }) => {
const mode = requestContext?.get("mode") ?? AgentMode.ASK_BEFORE_EDIT;
const extra = mode === AgentMode.PLAN ? planModePrompt : "";
- return [baseInstructions, extra].filter(Boolean).join("\n\n");
+ return [baseInstructions, assetCompletenessInstructions, extra].filter(Boolean).join("\n\n");
},
// 模型配置在 ai_model 表(前端「设置」页),每次 run 重新解析以支持热更新
diff --git a/servers/server/src/mastra/provider/model-registry.ts b/servers/server/src/mastra/provider/model-registry.ts
index 63bbb382..76933dc0 100644
--- a/servers/server/src/mastra/provider/model-registry.ts
+++ b/servers/server/src/mastra/provider/model-registry.ts
@@ -9,10 +9,9 @@ import { inlineImagesMiddleware } from "./image-middleware";
import { createGenericFetch, inlineReasoningMiddleware, type WrapLMModel } from "./utils";
/**
- * 模型配置化:5 个角色,配置存 `ai_model` 表(前端「设置」页维护)。
+ * 模型配置化:4 个角色,配置存 `ai_model` 表(前端「设置」页维护)。
*
* - **reasoning**:主 agent + 所有子 agent + 标题 + 摘要压缩 + 编排 + 截图 + subtab + artifact-app Pi
- * - **vision**:识图。主 agent 自己能看图后已没有使用方,角色先保留
* - **embedding**:组件 RAG 向量
* - **image**:生图(效果图、装饰素材重画)。走 `images.generations` 接口,不是 chat 补全,
* 所以 `resolveImageModel` 返回 `ImageModel` 而不是 `WrapLMModel`,见下方单独的 warm/resolve。
@@ -24,9 +23,9 @@ import { createGenericFetch, inlineReasoningMiddleware, type WrapLMModel } from
* 每次 run 重新解析,无需重启。
*/
-export type ModelRole = "reasoning" | "vision" | "embedding" | "image" | "video";
+export type ModelRole = "reasoning" | "embedding" | "image" | "video";
-export const MODEL_ROLES: readonly ModelRole[] = ["reasoning", "vision", "embedding", "image", "video"] as const;
+export const MODEL_ROLES: readonly ModelRole[] = ["reasoning", "embedding", "image", "video"] as const;
export const DEFAULT_VIDEO_MODEL = "MiniMax-H3";
@@ -51,14 +50,6 @@ function envDefault(role: ModelRole, image?: AiModelConfig): Omit {
const cfg = getModelConfigSync("embedding");
diff --git a/servers/server/src/mastra/provider/utils.ts b/servers/server/src/mastra/provider/utils.ts
index 3e61c71f..79179d91 100644
--- a/servers/server/src/mastra/provider/utils.ts
+++ b/servers/server/src/mastra/provider/utils.ts
@@ -118,7 +118,7 @@ export const inlineReasoningMiddleware: LanguageModelMiddleware = {
/**
* 构造一个通用的 OpenAI 兼容 fetch。所有模型角色共用:
* - `thinking` 非 null 时往 chat body 注入 `thinking:{type}`(DeepSeek 风格;非 DeepSeek 端点
- * 一般忽略未知字段,个别端点报错则该模型改用 vision 那套 thinking:null)
+ * 一般忽略未知字段,个别端点报错则传 thinking:null 跳过注入)
* - 把 `…` 前缀(由 inlineReasoningMiddleware 塞的)抽回 `reasoning_content` 字段
* - 回填空的后台委派 tool 结果
* - 响应侧:录制 + SSE reasoning_content → `` 改写(`finalizeReasoningResponse`)
diff --git a/servers/server/src/mastra/services/ai-assets/system-material-thumbnails.ts b/servers/server/src/mastra/services/ai-assets/system-material-thumbnails.ts
new file mode 100644
index 00000000..3efd9227
--- /dev/null
+++ b/servers/server/src/mastra/services/ai-assets/system-material-thumbnails.ts
@@ -0,0 +1,65 @@
+import { createHash } from "node:crypto";
+
+import sharp from "sharp";
+
+import { assetStore } from "@/lib/storage";
+import { prismaClient } from "@/mastra/storage/prisma";
+
+const PREFIX = "system-thumbnails/v1/";
+
+export async function makeSystemMaterialThumbnail(data: Buffer): Promise {
+ return sharp(data)
+ .rotate()
+ .resize(320, 320, { fit: "inside", withoutEnlargement: true })
+ .webp({ quality: 80 })
+ .toBuffer();
+}
+
+/** Only changes list covers. Original URLs and original objects remain intact. */
+export async function optimizeSystemMaterialThumbnails() {
+ const store = assetStore();
+ const rows = await prismaClient.minioFile.findMany({
+ where: { userId: null, fileType: 5 },
+ select: { id: true, blobKey: true, resourceType: true, cover: true },
+ orderBy: { id: "asc" }
+ });
+ const result = { created: 0, skipped: 0, failed: 0, sourceBytes: 0, thumbnailBytes: 0 };
+ for (const row of rows) {
+ // URL.pathname encodes Chinese names; the object store keys use decoded names.
+ const encodedCoverKey = row.cover ? store.keyFromUrl(row.cover) : null;
+ const coverKey = encodedCoverKey ? decodeURIComponent(encodedCoverKey) : null;
+ if (coverKey?.startsWith(PREFIX) && (await store.head(coverKey))) {
+ result.skipped++;
+ continue;
+ }
+ const imageCover = coverKey && /\.(png|jpe?g|gif|webp|svg|apng)$/i.test(coverKey);
+ const sourceKey = imageCover ? coverKey : row.resourceType === 1 ? row.blobKey : null;
+ if (!sourceKey) {
+ result.skipped++;
+ continue;
+ }
+ try {
+ const original = await store.get(sourceKey);
+ const thumbnail = await makeSystemMaterialThumbnail(original);
+ const hash = createHash("sha256").update(thumbnail).digest("hex");
+ const key = `${PREFIX}${hash}.webp`;
+ if (!(await store.head(key))) {
+ await store.put(key, thumbnail, { contentType: "image/webp" });
+ }
+ await prismaClient.minioFile.update({
+ where: { id: row.id },
+ data: { cover: store.publicUrl(key), coverName: `${hash}.webp` }
+ });
+ result.created++;
+ result.sourceBytes += original.length;
+ result.thumbnailBytes += thumbnail.length;
+ if (result.created % 100 === 0) {
+ console.log(`缩略图已生成 ${result.created}/${rows.length}`);
+ }
+ } catch (error) {
+ result.failed++;
+ console.error(`素材 ${row.id} 缩略图生成失败:`, (error as Error).message);
+ }
+ }
+ return result;
+}
diff --git a/servers/server/src/mastra/services/chat/bi-chat-turn-stream.ts b/servers/server/src/mastra/services/chat/bi-chat-turn-stream.ts
index d237e639..7480739e 100644
--- a/servers/server/src/mastra/services/chat/bi-chat-turn-stream.ts
+++ b/servers/server/src/mastra/services/chat/bi-chat-turn-stream.ts
@@ -304,7 +304,13 @@ export async function createBIChatTurnStream(
const aiSdkStream = toAISdkStream(withRenamedBackgroundChunks(mastraStream, bgSubRunIds), {
from: "agent",
- sendReasoning: true
+ sendReasoning: true,
+ onError: (error) => {
+ console.error("[bi-chat] agent stream error", { threadId, resourceId, runId, error });
+ return (
+ (error instanceof Error ? error.message : typeof error === "string" ? error : "") || "请求失败,请稍后重试。"
+ );
+ }
});
return createProcessedStream({
diff --git a/servers/server/src/mastra/services/chat/stream-session.ts b/servers/server/src/mastra/services/chat/stream-session.ts
index ba4da96e..8235a4e6 100644
--- a/servers/server/src/mastra/services/chat/stream-session.ts
+++ b/servers/server/src/mastra/services/chat/stream-session.ts
@@ -25,6 +25,7 @@ interface RunTurnArgs extends Partial {
/** 轮循环只读这几个字段;真实 chunk 是 ChunkType,字段远多于此 */
interface TurnChunk {
type?: string;
+ errorText?: string;
toolCallId?: string;
data?: { taskId?: string; toolCallId?: string };
}
@@ -217,6 +218,9 @@ class BIChatStreamSession {
if (this.closed) {
break;
}
+ if (chunk.type === "error") {
+ throw new Error(chunk.errorText || "请求失败,请稍后重试。");
+ }
if (!this.prepareChunkForForwarding(chunk)) {
continue;
}
@@ -525,17 +529,29 @@ class BIChatStreamSession {
}
}
- /** 出错收尾:让前端 readUIMessageStream 抛错 → 走 handleSendError */
+ /** 出错收尾:记录完整异常,通过 SSE error 帧通知前端后关流。 */
private fail(err: unknown) {
if (this.closed) {
return;
}
this.closed = true;
+ console.error("[bi-chat] session failed", { threadId: this.threadId, resourceId: this.resourceId, error: err });
this.clearIdle();
void this.markPendingToolCallsInterrupted();
this.abort.abort();
- this.writer.abort(err).catch(() => {});
this.onClosed(this);
+ void this.finishWithError(err);
+ }
+
+ private async finishWithError(err: unknown): Promise {
+ const errorText = err instanceof Error ? err.message : typeof err === "string" ? err : "请求失败,请稍后重试。";
+ try {
+ await this.writer.write({ type: "error", errorText } as unknown as ChunkType);
+ await this.writer.close();
+ } catch (error) {
+ console.error("[bi-chat] failed to send error response", { threadId: this.threadId, error });
+ await this.writer.abort(error).catch(() => {});
+ }
}
/**
diff --git a/servers/server/src/mastra/tools/file/edit-files.ts b/servers/server/src/mastra/tools/file/edit-files.ts
index 15c7be1e..ece96d76 100644
--- a/servers/server/src/mastra/tools/file/edit-files.ts
+++ b/servers/server/src/mastra/tools/file/edit-files.ts
@@ -71,7 +71,7 @@ const editFilesInputSchema = z.object({
.boolean()
.optional()
.default(true)
- .describe("编辑组件后返回截图供视觉检查,默认 true;false 时跳过截图和上传。对普通文件无影响。")
+ .describe("整批组件编辑完成后统一返回一张画布截图,默认 true;false 时跳过截图和上传。对普通文件无影响。")
});
const fileEditResultSchema = z.object({
@@ -81,7 +81,6 @@ const fileEditResultSchema = z.object({
message: z.string(),
frontendSynced: z.boolean().optional(),
validationErrors: z.array(z.string()).optional(),
- screenshot: CanvasCaptureResultSchema.optional().describe("编辑完成后的组件截图;截图失败不影响编辑结果"),
change: z.array(ChangeSchema).optional().describe("这个文件改动后的样子,不必再读回来确认")
});
@@ -93,6 +92,7 @@ const editFilesOutputSchema = z.object({
replacements: z.number(),
message: z.string(),
results: z.array(fileEditResultSchema),
+ screenshot: CanvasCaptureResultSchema.optional().describe("整批修改完成后的统一画布截图;截图失败不影响编辑结果"),
change: z.array(ChangeSchema).optional().describe("本批全部改动的汇总,与各 result.change 同源"),
[TOOL_IMAGES_FIELD]: z.array(z.object({ url: z.string(), label: z.string() })).optional()
});
@@ -137,8 +137,13 @@ interface EditFilesBatchState {
batchId: string;
inputSignature: string;
cursor: number;
- approvedIndexes: Set;
+ /** 一次批准覆盖这次工具调用的全部文件,不延续到其他调用。 */
+ approved: boolean;
pending?: PendingOperation;
+ capturePending?: BatchOperationContext;
+ captureRequested?: boolean;
+ hasComponentEdits?: boolean;
+ screenshot?: z.infer;
results: Array;
}
@@ -189,11 +194,10 @@ function buildBatchOutput(state: EditFilesBatchState) {
const succeeded = results.filter((result) => result.success).length;
const failed = results.length - succeeded;
const replacements = results.reduce((sum, result) => sum + result.replacements, 0);
- const images = results.flatMap((result) =>
- result.success && result.screenshot?.ok && result.screenshot.url
- ? [{ url: result.screenshot.url, label: `组件编辑后截图:${result.path}` }]
- : []
- );
+ const images =
+ state.screenshot?.ok && state.screenshot.url
+ ? [{ url: state.screenshot.url, label: "本批文件编辑完成后的画布截图" }]
+ : [];
return {
success: failed === 0 && results.length === state.results.length,
total: state.results.length,
@@ -202,16 +206,13 @@ function buildBatchOutput(state: EditFilesBatchState) {
replacements,
message: `Edited ${succeeded}/${state.results.length} files; ${failed} failed; ${replacements} replacements.`,
results,
+ ...(state.screenshot ? { screenshot: state.screenshot } : {}),
change: capChanges(results.flatMap((result) => result.change ?? [])),
...(images.length ? { [TOOL_IMAGES_FIELD]: images } : {})
};
}
-async function settlePendingOperation(
- state: EditFilesBatchState,
- resumeData: EditFilesResumeData,
- capture: boolean
-): Promise {
+async function settlePendingOperation(state: EditFilesBatchState, resumeData: EditFilesResumeData): Promise {
const pending = state.pending;
if (!pending) {
throw new Error("edit_files received resumeData without a pending operation.");
@@ -239,6 +240,18 @@ async function settlePendingOperation(
state.pending = undefined;
};
+ const rejectRemaining = () => {
+ for (let index = state.cursor; index < state.results.length; index += 1) {
+ state.results[index] = {
+ path: state.results[index]?.path ?? "",
+ success: false,
+ replacements: 0,
+ message: "用户拒绝了本批编辑,工作区未改动"
+ };
+ }
+ state.cursor = state.results.length;
+ };
+
/** 三条前端同步路径只差成败文案,结算流程完全相同。 */
const settleSync = (synced: boolean, kind: SyncKind, error: string | undefined, notice = pending.notice) => {
const [okMessage, failPrefix] = SYNC_MESSAGES[kind];
@@ -254,11 +267,12 @@ async function settlePendingOperation(
if (pending.kind === "approval") {
if ("approved" in resumeData && resumeData.approved) {
- state.approvedIndexes.add(pending.index);
+ state.approved = true;
state.pending = undefined;
return;
}
finish(false, "用户取消了编辑操作");
+ rejectRemaining();
return;
}
@@ -267,6 +281,7 @@ async function settlePendingOperation(
// 不带的(普通文件在函数开头已单独问过一轮)走到这里只是前端同步那一步被取消。
const outcome = pending.commit ? "用户拒绝了本次编辑,工作区未改动" : "用户取消了前端同步";
finish(false, formatSuccessMessage(pending.replacements, pending.absPath, outcome), false);
+ rejectRemaining();
return;
}
@@ -299,11 +314,13 @@ async function settlePendingOperation(
// 三类同步都是一次一个 op:回执只有一项,成败都在这一项里
const reply = readCanvasOpResults(resumeData, 1);
if (reply.status === "done") {
+ // 前端返回执行回执,说明这次载荷的审批已通过;后续文件共享这次批准。
+ state.approved = true;
const receipt = reply.results[0];
await commitThenSettle(receipt.ok, pending.kind, receipt.ok ? undefined : receipt.error);
const result = state.results[pending.index];
- if (capture && pending.kind === "component" && result?.success && receipt.ok && receipt.screenshot) {
- result.screenshot = receipt.screenshot;
+ if (pending.kind === "component" && result?.success) {
+ state.hasComponentEdits = true;
}
return;
}
@@ -315,19 +332,18 @@ async function processFileEdit(
file: FileEditInput,
index: number,
state: EditFilesBatchState,
- mode: AgentMode | undefined,
- capture: boolean
+ mode: AgentMode | undefined
): Promise {
const { path: filePath, edits } = file;
const absPath = resolveFilePath(filePath);
const normalizedPath = absPath.replace(/\\/g, "/");
// 需要跟前端同步的文件由处理器认领;认领不了的就是普通文件
const handler = findSyncHandler(normalizedPath);
- const needsApproval = mode === AgentMode.ASK_BEFORE_EDIT;
+ const needsApproval = mode === AgentMode.ASK_BEFORE_EDIT && !state.approved;
// 会推给前端的那几类自带审批形态(ASK 模式下推的是 AskApprovalXxx),不必在这里先问一轮;
// agent 产物是它自己的中间文件,也不该拿去烦用户。剩下的普通文件才走这一轮纯审批。
- if (needsApproval && !state.approvedIndexes.has(index) && !handler && !isAgentArtifactFilePath(normalizedPath)) {
+ if (needsApproval && !handler && !isAgentArtifactFilePath(normalizedPath)) {
return {
status: "suspend",
kind: "approval",
@@ -377,7 +393,7 @@ async function processFileEdit(
}
if (handler) {
- const prepared = await handler.prepare({ filePath, absPath, result, readRecord, needsApproval, capture });
+ const prepared = await handler.prepare({ filePath, absPath, result, readRecord, needsApproval, capture: false });
if (!prepared.ok) {
return completeFile(filePath, false, 0, prepared.message, {
...(prepared.frontendSynced === undefined ? {} : { frontendSynced: prepared.frontendSynced }),
@@ -413,8 +429,9 @@ Input is files: [{ path, edits }]. Each file owns its edits.
Rules:
- Edits within one file are atomic and applied in order. If one edit fails, that file is not written.
- Files are independent. A failure in one file never stops or rolls back other files.
-- Each component, filter, or screen-info update is suspended and resumed separately so every frontend update is processed.
-- capture defaults to true: successful component edits return a screenshot through imagesForModel for visual inspection. Set capture: false to skip capture and upload for this batch. If capture fails, the edit still succeeds; use capture_canvas to retry when needed.
+- In ask-before-edit mode, one approval covers all files in this call. Rejecting cancels the remaining edits.
+- Each component, filter, or screen-info update is synchronized separately after batch approval.
+- capture defaults to true: after all files finish, capture and upload the canvas once if any component edit succeeded. The shared screenshot is returned through screenshot and imagesForModel. Set capture: false to skip it. Screenshot failure does not fail the edits.
- Do not use this tool on binary or Jupyter (.ipynb) files.
- Never use shell commands to modify workspace component files; use edit_files so validation and frontend synchronization run.`,
@@ -449,7 +466,7 @@ Rules:
batchId: randomUUID(),
inputSignature,
cursor: files.length,
- approvedIndexes: new Set(),
+ approved: false,
results: files.map((file) => ({
path: file.path,
success: false,
@@ -463,8 +480,8 @@ Rules:
batchId: randomUUID(),
inputSignature,
cursor: 0,
- approvedIndexes: new Set(),
- results: new Array(files.length)
+ approved: false,
+ results: files.map((file) => ({ path: file.path, success: false, replacements: 0, message: "Pending" }))
};
batchStates.set(executionKey, state);
} else if (state.inputSignature !== inputSignature) {
@@ -472,7 +489,18 @@ Rules:
}
if (resumeData) {
- await settlePendingOperation(state, resumeData, capture);
+ if (state.capturePending) {
+ if (
+ resumeData.batchId !== state.capturePending.batchId ||
+ resumeData.operationId !== state.capturePending.operationId
+ ) {
+ throw new Error("edit_files capture resume mismatch.");
+ }
+ state.screenshot = CanvasCaptureResultSchema.parse(resumeData);
+ state.capturePending = undefined;
+ } else {
+ await settlePendingOperation(state, resumeData);
+ }
}
while (state.cursor < files.length) {
@@ -486,7 +514,7 @@ Rules:
let outcome: FileProcessOutcome;
try {
- outcome = await processFileEdit(files[index], index, state, mode, capture);
+ outcome = await processFileEdit(files[index], index, state, mode);
} catch (error) {
outcome = completeFile(files[index].path, false, 0, error instanceof Error ? error.message : String(error));
}
@@ -525,7 +553,26 @@ Rules:
continue;
}
- return suspend(outcome.payload) as never;
+ // 首次确认展示整个调用的文件范围;批准后每个文件继续同步,不再弹确认。
+ const payload = outcome.payload;
+ if (files.length > 1) {
+ const purpose = `批量编辑以下 ${files.length} 个文件(一次批准整批修改):\n${files.map((file) => file.path).join("\n")}`;
+ if (payload.type === SuspendType.AskApproval) {
+ payload.purpose = purpose;
+ } else if (payload.type === SuspendType.CanvasOps && payload.approval) {
+ payload.approval.purpose = purpose;
+ }
+ }
+ return suspend(payload) as never;
+ }
+
+ if (capture && state.hasComponentEdits && !state.captureRequested) {
+ state.captureRequested = true;
+ if (suspend) {
+ state.capturePending = { batchId: state.batchId, operationId: `${state.batchId}:capture` };
+ return suspend({ type: SuspendType.CaptureCanvas, ...state.capturePending }) as never;
+ }
+ state.screenshot = { ok: false, error: "当前上下文不支持截图" };
}
const output = buildBatchOutput(state);
diff --git a/servers/server/src/mastra/tools/file/sync-handlers/contract.ts b/servers/server/src/mastra/tools/file/sync-handlers/contract.ts
index dfc5a91d..ae02e6fc 100644
--- a/servers/server/src/mastra/tools/file/sync-handlers/contract.ts
+++ b/servers/server/src/mastra/tools/file/sync-handlers/contract.ts
@@ -10,16 +10,18 @@ import { formatSuccessMessage } from "../utils";
/**
* edit_files 能向前端提出的全部请求:普通文件在 ASK 模式下那一轮纯审批,加上组件 / 过滤器 / 屏幕配置
- * 三类同步——后者统一走 `canvas_ops`(审批与否由载荷里的 `approval` 决定)。
+ * 三类同步——后者统一走 `canvas_ops`(审批与否由载荷里的 `approval` 决定),批次末尾用 capture_canvas 统一截图。
*/
export const editFilesSuspendSchema = z.union([
SuspendDefs[SuspendType.AskApproval].suspend,
- SuspendDefs[SuspendType.CanvasOps].suspend
+ SuspendDefs[SuspendType.CanvasOps].suspend,
+ SuspendDefs[SuspendType.CaptureCanvas].suspend
]);
export const editFilesResumeSchema = z.union([
SuspendDefs[SuspendType.AskApproval].resume,
- SuspendDefs[SuspendType.CanvasOps].resume
+ SuspendDefs[SuspendType.CanvasOps].resume,
+ SuspendDefs[SuspendType.CaptureCanvas].resume
]);
export type EditFilesSuspendPayload = z.infer;
diff --git a/servers/server/src/mastra/tools/search-media-assets.ts b/servers/server/src/mastra/tools/search-media-assets.ts
index 9df3995f..e8714e8f 100644
--- a/servers/server/src/mastra/tools/search-media-assets.ts
+++ b/servers/server/src/mastra/tools/search-media-assets.ts
@@ -1,7 +1,11 @@
import { createTool } from "@mastra/core/tools";
import { z } from "zod";
-import { importMediaAssets, mediaAssetsResultSchema, searchMediaAssets } from "../services/ai-assets/media-assets.server";
+import {
+ importMediaAssets,
+ mediaAssetsResultSchema,
+ searchMediaAssets
+} from "../services/ai-assets/media-assets.server";
const screenId = z
.string()
diff --git a/servers/server/src/mastra/types/suspend.ts b/servers/server/src/mastra/types/suspend.ts
index fd9fc6d2..e7673ae2 100644
--- a/servers/server/src/mastra/types/suspend.ts
+++ b/servers/server/src/mastra/types/suspend.ts
@@ -235,6 +235,7 @@ export const SuspendDefs = {
[SuspendType.CaptureCanvas]: {
suspend: z.object({
type: z.literal(SuspendType.CaptureCanvas),
+ ...batchOperationFields,
componentIds: z.array(z.number()).optional().describe("只截这些组件的并集外框;不传截整个画布"),
region: z
.object({ x: z.number(), y: z.number(), width: z.number().positive(), height: z.number().positive() })
@@ -246,7 +247,7 @@ export const SuspendDefs = {
gridStep: z.number().positive().optional().describe("网格间距(设计稿像素),不传自动"),
snap: z.boolean().optional().describe("只对 region 生效:四条边吸附到附近的边框线上")
}),
- resume: CanvasCaptureResultSchema
+ resume: CanvasCaptureResultSchema.extend(batchOperationFields)
},
[SuspendType.SaveAiTemplate]: {
diff --git a/servers/server/src/mastra/vector/component-data/modules-data.json b/servers/server/src/mastra/vector/component-data/modules-data.json
index 11480415..9e9c1669 100644
--- a/servers/server/src/mastra/vector/component-data/modules-data.json
+++ b/servers/server/src/mastra/vector/component-data/modules-data.json
@@ -1393,23 +1393,7 @@
"template": "[{\"text\":\"UE像素流\"}]",
"status": 0
},
- {
- "id": 88,
- "user_id": null,
- "type": 0,
- "java_script": "{\"title\":\"放射性渐变遮罩层\",\"name\":\"放射性渐变遮罩层\",\"display\":true,\"icon\":\"icon-scatter\",\"img\":\"/img/maskLayer.93de78c5.png\",\"callbackArgs\":[],\"events\":[],\"loadAnimation\":{\"type\":\"none\",\"opacityOpen\":false,\"timingFunction\":\"linear\",\"direction\":\"right\",\"duration\":1000,\"delay\":0},\"dataType\":0,\"dataSource\":{},\"requestHeader\":{},\"requestBody\":{},\"crossOrigin\":false,\"needCookie\":false,\"autoRefresh\":false,\"dataQuery\":\"\",\"isLock\":false,\"dataMethod\":\"get\",\"path\":\"\",\"time\":30,\"url\":\"\",\"data\":[{\"text\":\"放射性渐变遮罩层\"}],\"dataRemark\":[{\"key\":\"text\",\"map\":\"text\",\"decription\":\"文本\"}],\"openFilter\":false,\"listenArgs\":[],\"cbArgs\":[],\"dataFormatter\":\"(data, callbackArgs) => {\\r\\n return data\\r\\n}\",\"component\":{\"width\":500,\"height\":500,\"name\":\"ft-mask-layer\",\"prop\":\"ft-mask-layer\"},\"unitPavenType\":\"\",\"unitPavenType\":\"\",\"option\":{\"linearGradient\":{\"markColor\":\"rgba(0,0,0,0.7)\",\"markPosition\":180,\"markRadius\":40,\"markOpacity\":90},\"radioactiveGradation\":{\"markColor\":\"rgba(0,0,0,1)\",\"markOpacityRadius\":40,\"markOpacity\":100,\"markUnOpacityRadius\":90,\"showLengthWidthRatio\":false,\"lengthWidthRatio\":0},\"markType\":\"radioactiveGradation\",\"pointerEvents\":false,\"refresh\":false,\"backdropFilter\":false,\"backdropFilterBlur\":4,\"backdropFilterSaturate\":100},\"left\":0,\"top\":0,\"showSubComponent\":false}",
- "level": 1,
- "second_level_menu": "",
- "first_level_menu": "扩展",
- "name": "放射性渐变遮罩层",
- "thumbnail": "/img/maskLayer.93de78c5.png",
- "created_by": "admin",
- "created_time": "2023-05-31T12:34:27.000Z",
- "updated_by": "admin",
- "updated_time": "2024-06-17T10:58:44.000Z",
- "template": "[{\"text\":\"放射性渐变遮罩层\"}]",
- "status": 1
- },
+
{
"id": 89,
"user_id": null,
@@ -1648,23 +1632,7 @@
"template": "[]",
"status": 1
},
- {
- "id": 104,
- "user_id": null,
- "type": 0,
- "java_script": "{\"title\":\"线性渐变遮罩层\",\"name\":\"线性渐变遮罩层\",\"display\":true,\"icon\":\"icon-scatter\",\"img\":\"/img/maskLayer.ef2b23ee.png\",\"callbackArgs\":[],\"events\":[],\"loadAnimation\":{\"type\":\"none\",\"opacityOpen\":false,\"timingFunction\":\"linear\",\"direction\":\"right\",\"duration\":1000,\"delay\":0},\"dataType\":0,\"dataSource\":{},\"requestHeader\":{},\"requestBody\":{},\"crossOrigin\":false,\"needCookie\":false,\"autoRefresh\":false,\"dataQuery\":\"\",\"isLock\":false,\"dataMethod\":\"get\",\"path\":\"\",\"time\":30,\"url\":\"\",\"data\":[{\"text\":\"线性渐变遮罩层\"}],\"dataRemark\":[{\"key\":\"text\",\"map\":\"text\",\"decription\":\"文本\"}],\"openFilter\":false,\"listenArgs\":[],\"cbArgs\":[],\"dataFormatter\":\"(data, callbackArgs) => {\\r\\n return data\\r\\n}\",\"component\":{\"width\":500,\"height\":500,\"name\":\"ft-mask-layer\",\"prop\":\"ft-mask-layer\"},\"unitPavenType\":\"\",\"unitPavenType\":\"\",\"option\":{\"linearGradient\":{\"markColor\":\"rgba(0,0,0,0.7)\",\"markPosition\":180,\"markRadius\":40,\"markOpacity\":90},\"radioactiveGradation\":{\"markColor\":\"rgba(0,0,0,1)\",\"markOpacityRadius\":40,\"markOpacity\":100,\"markUnOpacityRadius\":90,\"showLengthWidthRatio\":false,\"lengthWidthRatio\":0},\"markType\":\"linearGradient\",\"pointerEvents\":false,\"refresh\":false,\"backdropFilter\":false,\"backdropFilterBlur\":4,\"backdropFilterSaturate\":100},\"left\":0,\"top\":0,\"showSubComponent\":false}",
- "level": 1,
- "second_level_menu": "",
- "first_level_menu": "扩展",
- "name": "线性渐变遮罩层",
- "thumbnail": "/img/maskLayer.ef2b23ee.png",
- "created_by": "admin",
- "created_time": "2023-05-31T12:34:27.000Z",
- "updated_by": "admin",
- "updated_time": "2024-06-17T10:58:45.000Z",
- "template": "[{\"text\":\"线性渐变遮罩层\"}]",
- "status": 1
- },
+
{
"id": 105,
"user_id": null,
diff --git "a/servers/server/src/mastra/vector/component-docs/\346\213\223\345\261\225/sw-mask-layer.md" "b/servers/server/src/mastra/vector/component-docs/\346\213\223\345\261\225/sw-mask-layer.md"
deleted file mode 100644
index 2fe428e7..00000000
--- "a/servers/server/src/mastra/vector/component-docs/\346\213\223\345\261\225/sw-mask-layer.md"
+++ /dev/null
@@ -1,18 +0,0 @@
-# 线性渐变遮罩层 (sw-mask-layer)
-
-**组件标识**: sw-mask-layer | **中文名**: 线性渐变遮罩层 | **分类**: 扩展
-
-## 描述
-
-用于在大屏上叠加一层渐变遮罩效果,支持线性渐变和径向渐变两种模式。线性渐变模式下遮罩从一侧向另一侧渐变过渡,适合营造边缘渐隐效果;径向渐变模式下遮罩从中心向外扩散,适合突出中心区域内容。还可选配背景滤镜效果实现模糊和饱和度调节。常用于大屏边缘过渡处理、聚焦中心区域、以及视觉层次分离。
-
-**与其他组件的区别**:
-- 区别于上升粒子和闪点组件:本组件为静态渐变遮罩效果,非动态粒子效果
-
-## 别名/同义词
-
-遮罩层 渐变遮罩 线性渐变遮罩 径向渐变遮罩 蒙版 遮罩蒙版 遮罩覆盖
-
-## 适用场景
-
-大屏边缘渐隐 突出中心区域 背景模糊聚焦 拓扑图边缘渐变 多区域层次过渡 视觉层次分离
diff --git a/servers/server/src/server.ts b/servers/server/src/server.ts
index 85328a2d..465d5d42 100644
--- a/servers/server/src/server.ts
+++ b/servers/server/src/server.ts
@@ -1,4 +1,5 @@
-import { parseRole, runsHttp, runsWorker } from "./entry/role";
+import { parseRole, runsAi, runsHttp, runsWorker } from "./entry/role";
+import { configureOutboundProxy } from "./lib/http/outbound-proxy";
import { getQueueMode } from "./queue/config";
/**
@@ -8,6 +9,10 @@ import { getQueueMode } from "./queue/config";
const role = parseRole();
console.log(`[boot] ROLE=${role}`);
+if (runsAi(role)) {
+ await configureOutboundProxy();
+}
+
const stoppables: Array<{ close(): Promise }> = [];
if (runsHttp(role)) {
diff --git a/servers/server/tests/lib/http/outbound-proxy.test.ts b/servers/server/tests/lib/http/outbound-proxy.test.ts
new file mode 100644
index 00000000..7ef74f66
--- /dev/null
+++ b/servers/server/tests/lib/http/outbound-proxy.test.ts
@@ -0,0 +1,61 @@
+import { createServer } from "node:http";
+import { createConnection } from "node:net";
+import { createRequire } from "node:module";
+
+import { expect, it, vi } from "vitest";
+
+import { configureOutboundProxy } from "@/lib/http/outbound-proxy";
+
+it("加载编码依赖后仍通过环境代理访问 .ai 域名,内部健康检查保持直连", async () => {
+ const codingAgentUrl = import.meta.resolve("@earendil-works/pi-coding-agent");
+ await import(codingAgentUrl);
+ const undici = createRequire(codingAgentUrl)("undici") as typeof import("undici");
+ const previousDispatcher = undici.getGlobalDispatcher();
+ const previousFetch = globalThis.fetch;
+ const target = createServer((_request, response) => response.end("ok"));
+ let tunnels = 0;
+ const proxy = createServer((_request, response) => {
+ tunnels++;
+ response.end("ok");
+ });
+ proxy.on("connect", (_request, socket, head) => {
+ tunnels++;
+ const upstream = createConnection({ host: "127.0.0.1", port: (target.address() as { port: number }).port });
+ upstream.on("error", () => socket.destroy());
+ socket.on("error", () => upstream.destroy());
+ upstream.on("connect", () => {
+ socket.write("HTTP/1.1 200 Connection Established\r\n\r\n");
+ upstream.write(head);
+ socket.pipe(upstream);
+ upstream.pipe(socket);
+ });
+ socket.on("close", () => upstream.destroy());
+ });
+ await new Promise((resolve) => target.listen(0, "127.0.0.1", resolve));
+ await new Promise((resolve) => proxy.listen(0, "127.0.0.1", resolve));
+ try {
+ const proxyUrl = `http://127.0.0.1:${(proxy.address() as { port: number }).port}`;
+ for (const key of ["HTTP_PROXY", "HTTPS_PROXY", "http_proxy", "https_proxy"]) vi.stubEnv(key, proxyUrl);
+ for (const key of ["NO_PROXY", "no_proxy"]) vi.stubEnv(key, "localhost,127.0.0.1,api,ai:4112,worker,minio");
+ vi.stubEnv("NODE_USE_ENV_PROXY", "1");
+ await configureOutboundProxy();
+ const port = (target.address() as { port: number }).port;
+ const external = await fetch(`http://api.n1n.ai:${port}/health`, { signal: AbortSignal.timeout(5000) });
+ expect(await external.text()).toBe("ok");
+ expect(tunnels).toBe(1);
+ const internal = await fetch(`http://127.0.0.1:${port}/health`, { signal: AbortSignal.timeout(5000) });
+ expect(await internal.text()).toBe("ok");
+ expect(tunnels).toBe(1);
+ } finally {
+ await undici.getGlobalDispatcher().destroy();
+ undici.setGlobalDispatcher(previousDispatcher);
+ globalThis.fetch = previousFetch;
+ vi.unstubAllEnvs();
+ target.closeAllConnections();
+ proxy.closeAllConnections();
+ await Promise.all([
+ new Promise((resolve) => target.close(() => resolve())),
+ new Promise((resolve) => proxy.close(() => resolve()))
+ ]);
+ }
+}, 20_000);
diff --git a/servers/server/tests/mastra/chat/stream-session-terminate.test.ts b/servers/server/tests/mastra/chat/stream-session-terminate.test.ts
index 6f09faf3..aa0c543c 100644
--- a/servers/server/tests/mastra/chat/stream-session-terminate.test.ts
+++ b/servers/server/tests/mastra/chat/stream-session-terminate.test.ts
@@ -54,6 +54,47 @@ const mockTurnStream = (chunks: unknown[]) => {
};
describe("BIChatStreamSession 的拒绝终止", () => {
+ it("起流失败应记录异常、发送 error 帧并清理会话", async () => {
+ const error = new Error("模型请求失败");
+ const log = vi.spyOn(console, "error").mockImplementation(() => {});
+ try {
+ vi.mocked(createBIChatTurnStream).mockRejectedValue(error);
+ const session = registry.getOrCreate("thread-error", "resource-error");
+ const collected = drain(session.getStream());
+
+ await session.runTurn({});
+
+ expect(await collected).toEqual([{ type: "error", errorText: error.message }]);
+ expect(registry.find("thread-error")).toBeUndefined();
+ expect(log).toHaveBeenCalledWith("[bi-chat] session failed", {
+ threadId: "thread-error",
+ resourceId: "resource-error",
+ error
+ });
+ } finally {
+ log.mockRestore();
+ }
+ });
+
+ it("上游 error 帧应终止生成,并将错误传给前端", async () => {
+ const log = vi.spyOn(console, "error").mockImplementation(() => {});
+ try {
+ mockTurnStream([
+ { type: "error", errorText: "模型限流" },
+ { type: "text-delta", text: "不应继续" }
+ ]);
+ const session = registry.getOrCreate("thread-error-chunk", "resource-error");
+ const collected = drain(session.getStream());
+
+ await session.runTurn({});
+
+ expect(await collected).toEqual([{ type: "error", errorText: "模型限流" }]);
+ expect(capturedAbort?.signal.aborted).toBe(true);
+ } finally {
+ log.mockRestore();
+ }
+ });
+
it("被拒工具的结果帧要先推给前端,之后的帧一律不再推", async () => {
mockTurnStream([
{ type: "text-delta", text: "我来创建组件" },
diff --git a/servers/server/tests/mastra/provider/model-registry.test.ts b/servers/server/tests/mastra/provider/model-registry.test.ts
index 83125395..da2bc559 100644
--- a/servers/server/tests/mastra/provider/model-registry.test.ts
+++ b/servers/server/tests/mastra/provider/model-registry.test.ts
@@ -198,9 +198,9 @@ describe("model-registry", () => {
Promise.resolve(row(where.role))
);
await warmModelConfigs();
- expect(getModelConfigSync("vision").role).toBe("vision");
+ expect(getModelConfigSync("reasoning").role).toBe("reasoning");
invalidateModelConfigs();
- expect(() => getModelConfigSync("vision")).toThrow();
+ expect(() => getModelConfigSync("reasoning")).toThrow();
});
});
diff --git a/servers/server/tests/mastra/services/ai-model.server.test.ts b/servers/server/tests/mastra/services/ai-model.server.test.ts
index ee327077..b2e66f71 100644
--- a/servers/server/tests/mastra/services/ai-model.server.test.ts
+++ b/servers/server/tests/mastra/services/ai-model.server.test.ts
@@ -88,7 +88,7 @@ describe("ai-model.server", () => {
it("listAiModels:不回传 key 明文/片段,只给 hasApiKey", async () => {
const list = await listAiModels();
- expect(list).toHaveLength(5);
+ expect(list.map((model) => model.role)).toEqual(["reasoning", "embedding", "image", "video"]);
expect(list.find((model) => model.role === "video")?.hasApiKey).toBe(true);
expect(list[0].hasApiKey).toBe(true);
const leaked = list[0] as unknown as Record;
@@ -108,8 +108,8 @@ describe("ai-model.server", () => {
});
it("updateAiModel:传了 apiKey 则覆盖", async () => {
- prismaMocks.upsert.mockResolvedValue(row("vision"));
- await updateAiModel("vision", { apiKey: "sk-new" });
+ prismaMocks.upsert.mockResolvedValue(row("reasoning"));
+ await updateAiModel("reasoning", { apiKey: "sk-new" });
expect(prismaMocks.upsert.mock.calls[0][0].update.apiKey).toBe("sk-new");
});
diff --git a/servers/server/tests/services/system-material-thumbnails.test.ts b/servers/server/tests/services/system-material-thumbnails.test.ts
new file mode 100644
index 00000000..8ab4dfdf
--- /dev/null
+++ b/servers/server/tests/services/system-material-thumbnails.test.ts
@@ -0,0 +1,80 @@
+import { beforeEach, describe, expect, it, vi } from "vitest";
+import sharp from "sharp";
+
+const { store, files } = vi.hoisted(() => ({
+ store: { get: vi.fn(), head: vi.fn(), put: vi.fn(), publicUrl: vi.fn(), keyFromUrl: vi.fn() },
+ files: { findMany: vi.fn(), update: vi.fn() }
+}));
+vi.mock("@/lib/storage", () => ({ assetStore: () => store }));
+vi.mock("@/mastra/storage/prisma", () => ({ prismaClient: { minioFile: files } }));
+
+import {
+ makeSystemMaterialThumbnail,
+ optimizeSystemMaterialThumbnails
+} from "@/mastra/services/ai-assets/system-material-thumbnails";
+
+beforeEach(() => {
+ vi.resetAllMocks();
+ store.head.mockResolvedValue(null);
+ store.publicUrl.mockImplementation((key) => `http://assets/${key}`);
+});
+
+describe("系统素材缩略图", () => {
+ it("缩放到列表尺寸且保留透明通道,不改变原始像素文件", async () => {
+ const original = await sharp({
+ create: { width: 1200, height: 600, channels: 4, background: { r: 20, g: 80, b: 200, alpha: 0.5 } }
+ })
+ .png()
+ .toBuffer();
+ const thumbnail = await makeSystemMaterialThumbnail(original);
+ const meta = await sharp(thumbnail).metadata();
+ expect(meta).toMatchObject({ format: "webp", width: 320, height: 160, hasAlpha: true });
+ expect(thumbnail.length).toBeLessThan(original.length);
+ expect(await sharp(original).metadata()).toMatchObject({ width: 1200, height: 600, format: "png" });
+ });
+
+ it("只更新列表封面,原图地址保持不变", async () => {
+ files.findMany.mockResolvedValue([{ id: 1, blobKey: "system/image.png", resourceType: 1, cover: null }]);
+ store.get.mockResolvedValue(
+ await sharp({ create: { width: 20, height: 20, channels: 4, background: "transparent" } })
+ .png()
+ .toBuffer()
+ );
+ const result = await optimizeSystemMaterialThumbnails();
+ expect(result.created).toBe(1);
+ expect(store.put).toHaveBeenCalledWith(
+ expect.stringMatching(/^system-thumbnails\/v1\/.*\.webp$/),
+ expect.any(Buffer),
+ { contentType: "image/webp" }
+ );
+ const data = files.update.mock.calls[0][0].data;
+ expect(data.cover).toContain("/system-thumbnails/v1/");
+ expect(data).not.toHaveProperty("url");
+ expect(data).not.toHaveProperty("blobKey");
+ });
+
+ it("重复执行跳过已存在的缩略图,不修改记录", async () => {
+ files.findMany.mockResolvedValue([
+ { id: 1, blobKey: "system/image.png", resourceType: 1, cover: "http://assets/system-thumbnails/v1/hash.webp" }
+ ]);
+ store.keyFromUrl.mockReturnValue("system-thumbnails/v1/hash.webp");
+ store.head.mockResolvedValue({ size: 200 });
+ expect(await optimizeSystemMaterialThumbnails()).toMatchObject({ created: 0, skipped: 1, failed: 0 });
+ expect(files.update).not.toHaveBeenCalled();
+ expect(store.get).not.toHaveBeenCalled();
+ });
+
+ it("将中文封面 URL 解码为对象存储实际使用的 key", async () => {
+ files.findMany.mockResolvedValue([
+ { id: 2, blobKey: "system/天气/01.png", resourceType: 1, cover: "http://assets/system/天气/cover_01.png" }
+ ]);
+ store.keyFromUrl.mockReturnValue("system/%E5%A4%A9%E6%B0%94/cover_01.png");
+ store.get.mockResolvedValue(
+ await sharp({ create: { width: 10, height: 10, channels: 4, background: "transparent" } })
+ .png()
+ .toBuffer()
+ );
+ expect(await optimizeSystemMaterialThumbnails()).toMatchObject({ created: 1, failed: 0 });
+ expect(store.get).toHaveBeenCalledWith("system/天气/cover_01.png");
+ });
+});
diff --git a/servers/server/tests/tools/file/edit-files-sync.test.ts b/servers/server/tests/tools/file/edit-files-sync.test.ts
index 4314c37b..28cc0439 100644
--- a/servers/server/tests/tools/file/edit-files-sync.test.ts
+++ b/servers/server/tests/tools/file/edit-files-sync.test.ts
@@ -61,7 +61,8 @@ async function executeEditFiles(
) => Promise;
return execute(
- { files, capture: options.capture },
+ // 与截图无关的同步用例显式关闭截图,截图用例单独覆盖默认值与开关。
+ { files, capture: "capture" in options ? options.capture : false },
{
requestContext: {
get: (key: string) => (key === "mode" ? (options.mode ?? AgentMode.AUTO_EDIT) : undefined)
@@ -285,25 +286,39 @@ describe("edit_files 前端同步路径", () => {
await expect(fsp.readFile(path.join(screenRoot, "statusAnimation.json"), "utf8")).resolves.not.toBe("");
});
- it.each([undefined, true, false])("组件截图开关传给前端,默认开启(capture=%s)", async (capture) => {
+ it.each([undefined, true, false])("单文件同步不截图,批次末尾按开关截图(capture=%s)", async (capture) => {
const filePath = await componentTree();
const payloads: Array> = [];
- await executeEditFiles(
- [{ path: filePath, edits: [{ old_string: '"zIndex": "a0"', new_string: '"zIndex": "a9"' }] }],
- {
- toolCallId: `component-capture-${String(capture)}`,
- capture,
- onSuspend: (payload) => payloads.push(payload)
- }
- );
+ const files = [{ path: filePath, edits: [{ old_string: '"zIndex": "a0"', new_string: '"zIndex": "a9"' }] }];
+ const options = {
+ toolCallId: `component-capture-${String(capture)}`,
+ capture,
+ onSuspend: (payload: Record) => payloads.push(payload)
+ };
+ await executeEditFiles(files, options);
expect(payloads).toHaveLength(1);
expect(payloads[0]).toMatchObject({
type: SuspendType.CanvasOps,
- ops: [{ op: "update_component", component: { id: FIXTURE_COMPONENT_ID, zIndex: "a9" }, capture: capture ?? true }]
+ ops: [{ op: "update_component", component: { id: FIXTURE_COMPONENT_ID, zIndex: "a9" }, capture: false }]
});
expect(payloads[0].approval).toBeUndefined();
+ await executeEditFiles(files, { ...options, resumeData: opReply(payloads[0]) });
+ expect(payloads).toHaveLength(capture === false ? 1 : 2);
+ if (capture !== false) {
+ expect(payloads[1]).toMatchObject({ type: SuspendType.CaptureCanvas });
+ await executeEditFiles(files, {
+ ...options,
+ resumeData: {
+ ok: true,
+ url: "http://platform/batch.jpg",
+ batchId: payloads[1].batchId,
+ operationId: payloads[1].operationId
+ }
+ });
+ expect(payloads).toHaveLength(2);
+ }
});
it("组件校验失败时不挂起,直接返回 validationErrors 且不落盘", async () => {
@@ -359,12 +374,14 @@ describe("edit_files resume 结算", () => {
filePath: string,
edit: { old_string: string; new_string: string },
toolCallId: string,
- mode: AgentMode = AgentMode.AUTO_EDIT
+ mode: AgentMode = AgentMode.AUTO_EDIT,
+ capture = false
) {
const payloads: Array> = [];
const files: EditInput[] = [{ path: filePath, edits: [edit] }];
const initialResult = await executeEditFiles(files, {
mode,
+ capture,
toolCallId,
onSuspend: (payload) => payloads.push(payload)
});
@@ -421,7 +438,9 @@ describe("edit_files resume 结算", () => {
const { payload, files } = await suspendOnce(
filePath,
{ old_string: '"zIndex": "a0"', new_string: '"zIndex": "a9"' },
- toolCallId
+ toolCallId,
+ AgentMode.AUTO_EDIT,
+ true
);
const screenshot = captured
? {
@@ -434,8 +453,22 @@ describe("edit_files resume 结算", () => {
}
: { ok: false, error: "组件当前不可见" };
// 经过真实的协议 schema,防止 Zod 将截图字段静默丢掉。
- const resumeData = SuspendDefs[SuspendType.CanvasOps].resume.parse(opReply(payload, { ok: true, screenshot }));
- const raw = await executeEditFiles(files, { toolCallId, resumeData });
+ let capturePayload: Record = {};
+ await executeEditFiles(files, {
+ toolCallId,
+ capture: true,
+ resumeData: opReply(payload),
+ onSuspend: (value) => {
+ capturePayload = value;
+ }
+ });
+ expect(capturePayload.type).toBe(SuspendType.CaptureCanvas);
+ const resumeData = SuspendDefs[SuspendType.CaptureCanvas].resume.parse({
+ ...screenshot,
+ batchId: capturePayload.batchId,
+ operationId: capturePayload.operationId
+ });
+ const raw = await executeEditFiles(files, { toolCallId, capture: true, resumeData });
const validated = await editFilesTool.outputSchema!["~standard"].validate(raw);
expect(validated.issues).toBeUndefined();
if (validated.issues) {
@@ -444,42 +477,111 @@ describe("edit_files resume 结算", () => {
const result = validated.value as {
success: boolean;
results: Array<{ screenshot?: unknown }>;
+ screenshot?: unknown;
imagesForModel?: Array<{ url: string; label: string }>;
};
expect(result.success).toBe(true);
- expect(result.results[0].screenshot).toEqual(screenshot);
+ expect(result.screenshot).toEqual(screenshot);
+ expect(result.results[0].screenshot).toBeUndefined();
expect(result.imagesForModel).toEqual(
- captured ? [{ url: screenshot.url, label: `组件编辑后截图:${filePath}` }] : undefined
+ captured ? [{ url: screenshot.url, label: "本批文件编辑完成后的画布截图" }] : undefined
);
await expect(fsp.readFile(filePath, "utf8")).resolves.toContain('"zIndex": "a9"');
});
- it("批次中多个组件截图全部保留,按各文件的回执对应", async () => {
- const filePath = await componentTree();
- const toolCallId = "resume-component-shots-batch";
- const files = ["a8", "a9"].map((value, index) => ({
- path: filePath,
- edits: [{ old_string: `"zIndex": "${index ? "a8" : "a0"}"`, new_string: `"zIndex": "${value}"` }]
- }));
- let payload: Record = {};
- const onSuspend = (value: Record) => {
- payload = value;
+ it.each([AgentMode.AUTO_EDIT, AgentMode.ASK_BEFORE_EDIT])(
+ "%s 批次只审批一次,全部修改落盘后只截图一次",
+ async (mode) => {
+ const filePath = await componentTree();
+ const toolCallId = "resume-component-shots-batch";
+ const files = ["a8", "a9"].map((value, index) => ({
+ path: filePath,
+ edits: [{ old_string: `"zIndex": "${index ? "a8" : "a0"}"`, new_string: `"zIndex": "${value}"` }]
+ }));
+ let payload: Record = {};
+ const onSuspend = (value: Record) => {
+ payload = value;
+ };
+ await executeEditFiles(files, { mode, toolCallId, onSuspend, capture: true });
+ expect(firstOp(payload).capture).toBe(false);
+ expect(payload.approval !== undefined).toBe(mode === AgentMode.ASK_BEFORE_EDIT);
+ await executeEditFiles(files, {
+ mode,
+ capture: true,
+ toolCallId,
+ onSuspend,
+ resumeData: opReply(payload, { ok: true, screenshot: { ok: true, url: "http://platform/first.jpg" } })
+ });
+ expect(payload.approval).toBeUndefined();
+ expect(firstOp(payload).capture).toBe(false);
+ await executeEditFiles(files, {
+ mode,
+ capture: true,
+ toolCallId,
+ onSuspend,
+ resumeData: opReply(payload, { ok: true, screenshot: { ok: true, url: "http://platform/second.jpg" } })
+ });
+ expect(payload.type).toBe(SuspendType.CaptureCanvas);
+ await expect(fsp.readFile(filePath, "utf8")).resolves.toContain('"zIndex": "a9"');
+ let extraCaptures = 0;
+ const result = (await executeEditFiles(files, {
+ mode,
+ capture: true,
+ toolCallId,
+ onSuspend: () => {
+ extraCaptures += 1;
+ },
+ resumeData: {
+ ok: true,
+ url: "http://platform/batch.jpg",
+ batchId: payload.batchId,
+ operationId: payload.operationId
+ }
+ })) as { success: boolean; imagesForModel: Array<{ url: string }> };
+ expect(result.success).toBe(true);
+ expect(extraCaptures).toBe(0);
+ expect(result.imagesForModel.map((image) => image.url)).toEqual(["http://platform/batch.jpg"]);
+ }
+ );
+
+ it.each([true, false])("组件和普通文件一起审批,组件在前=%s", async (componentFirst) => {
+ const componentPath = await componentTree();
+ const plainPath = path.join(path.dirname(componentPath), "notes.txt");
+ await fsp.writeFile(plainPath, "before", "utf8");
+ const files = [
+ { path: componentPath, edits: [{ old_string: '"zIndex": "a0"', new_string: '"zIndex": "a9"' }] },
+ { path: plainPath, edits: [{ old_string: "before", new_string: "after" }] }
+ ];
+ if (!componentFirst) {
+ files.reverse();
+ }
+ const payloads: Array> = [];
+ const options = {
+ mode: AgentMode.ASK_BEFORE_EDIT,
+ toolCallId: `mixed-approval-${componentFirst}`,
+ onSuspend: (payload: Record) => payloads.push(payload)
};
- await executeEditFiles(files, { toolCallId, onSuspend });
- await executeEditFiles(files, {
- toolCallId,
- onSuspend,
- resumeData: opReply(payload, { ok: true, screenshot: { ok: true, url: "http://platform/first.jpg" } })
+ await executeEditFiles(files, options);
+ const first = payloads[0];
+ const purpose =
+ first.type === SuspendType.AskApproval ? first.purpose : (first.approval as { purpose: string }).purpose;
+ expect(purpose).toContain(componentPath);
+ expect(purpose).toContain(plainPath);
+ let result = await executeEditFiles(files, {
+ ...options,
+ resumeData:
+ first.type === SuspendType.AskApproval
+ ? { approved: true, batchId: first.batchId, operationId: first.operationId }
+ : opReply(first)
});
- const result = (await executeEditFiles(files, {
- toolCallId,
- resumeData: opReply(payload, { ok: true, screenshot: { ok: true, url: "http://platform/second.jpg" } })
- })) as { success: boolean; imagesForModel: Array<{ url: string }> };
- expect(result.success).toBe(true);
- expect(result.imagesForModel.map((image) => image.url)).toEqual([
- "http://platform/first.jpg",
- "http://platform/second.jpg"
- ]);
+ if (!componentFirst) {
+ expect(payloads[1].type).toBe(SuspendType.CanvasOps);
+ expect(payloads[1].approval).toBeUndefined();
+ result = await executeEditFiles(files, { ...options, resumeData: opReply(payloads[1]) });
+ }
+ expect(result).toMatchObject({ success: true, succeeded: 2 });
+ await expect(fsp.readFile(plainPath, "utf8")).resolves.toBe("after");
+ await expect(fsp.readFile(componentPath, "utf8")).resolves.toContain('"zIndex": "a9"');
});
it("回执条数不是 1 时报协议错误,不落盘", async () => {
@@ -696,7 +798,7 @@ describe("edit_files resume 结算", () => {
);
const pushedComponent = firstOp(payload).component as { option: { js: string } };
- expect(firstOp(payload).capture).toBe(true);
+ expect(firstOp(payload).capture).toBe(false);
expect(pushedComponent.option.js).toContain('name: "fun-card-updated"');
await expect(fsp.readFile(filePath, "utf8")).resolves.toContain('name: "fun-card"');
diff --git a/servers/server/tests/tools/file/edit-files.test.ts b/servers/server/tests/tools/file/edit-files.test.ts
index 9a78c1c8..eff865c7 100644
--- a/servers/server/tests/tools/file/edit-files.test.ts
+++ b/servers/server/tests/tools/file/edit-files.test.ts
@@ -94,7 +94,7 @@ describe("edit_files", () => {
await expect(fsp.readFile(thirdPath, "utf8")).resolves.toBe("three");
});
- it("suspends and resumes once for every file in ask-before-edit mode", async () => {
+ it("approves all files once in ask-before-edit mode", async () => {
const firstPath = await createTempFile("first.txt", "alpha");
const secondPath = await createTempFile("second.txt", "beta");
const files = [
@@ -116,27 +116,9 @@ describe("edit_files", () => {
type: SuspendType.AskApproval,
filePath: firstPath
});
+ expect(suspendedPayloads[0].purpose).toContain(firstPath);
+ expect(suspendedPayloads[0].purpose).toContain(secondPath);
await expect(fsp.readFile(firstPath, "utf8")).resolves.toBe("alpha");
-
- await executeEditFiles(files, {
- mode: AgentMode.ASK_BEFORE_EDIT,
- toolCallId,
- resumeData: {
- approved: true,
- batchId: suspendedPayloads[0].batchId,
- operationId: suspendedPayloads[0].operationId
- },
- onSuspend
- });
-
- expect(suspendedPayloads).toHaveLength(2);
- expect(suspendedPayloads[1]).toMatchObject({
- type: SuspendType.AskApproval,
- filePath: secondPath,
- batchId: suspendedPayloads[0].batchId
- });
- expect(suspendedPayloads[1].operationId).not.toBe(suspendedPayloads[0].operationId);
- await expect(fsp.readFile(firstPath, "utf8")).resolves.toBe("one");
await expect(fsp.readFile(secondPath, "utf8")).resolves.toBe("beta");
const result = (await executeEditFiles(files, {
@@ -144,8 +126,8 @@ describe("edit_files", () => {
toolCallId,
resumeData: {
approved: true,
- batchId: suspendedPayloads[1].batchId,
- operationId: suspendedPayloads[1].operationId
+ batchId: suspendedPayloads[0].batchId,
+ operationId: suspendedPayloads[0].operationId
},
onSuspend
})) as {
@@ -155,8 +137,42 @@ describe("edit_files", () => {
failed: number;
};
- expect(suspendedPayloads).toHaveLength(2);
+ expect(suspendedPayloads).toHaveLength(1);
expect(result).toMatchObject({ success: true, total: 2, succeeded: 2, failed: 0 });
+ await expect(fsp.readFile(firstPath, "utf8")).resolves.toBe("one");
await expect(fsp.readFile(secondPath, "utf8")).resolves.toBe("two");
});
+
+ it("rejecting batch approval cancels every file without further approvals", async () => {
+ const firstPath = await createTempFile("first.txt", "alpha");
+ const secondPath = await createTempFile("second.txt", "beta");
+ const files = [
+ { path: firstPath, edits: [{ old_string: "alpha", new_string: "one" }] },
+ { path: secondPath, edits: [{ old_string: "beta", new_string: "two" }] }
+ ];
+ const payloads: Array> = [];
+ const options = {
+ mode: AgentMode.ASK_BEFORE_EDIT,
+ toolCallId: "reject-batch",
+ onSuspend: (payload: Record) => payloads.push(payload)
+ };
+ await executeEditFiles(files, options);
+ const result = await executeEditFiles(files, {
+ ...options,
+ resumeData: { approved: false, batchId: payloads[0].batchId, operationId: payloads[0].operationId }
+ });
+
+ expect(payloads).toHaveLength(1);
+ expect(result).toMatchObject({
+ success: false,
+ total: 2,
+ failed: 2,
+ results: [
+ { path: firstPath, success: false },
+ { path: secondPath, success: false }
+ ]
+ });
+ await expect(fsp.readFile(firstPath, "utf8")).resolves.toBe("alpha");
+ await expect(fsp.readFile(secondPath, "utf8")).resolves.toBe("beta");
+ });
});
diff --git "a/\345\233\276\345\261\202\346\213\206\345\210\206\344\270\216\347\264\240\346\235\220\350\241\200\347\274\230\350\277\275\350\270\252\345\272\224\347\224\250\346\226\271\346\241\210.md" "b/\345\233\276\345\261\202\346\213\206\345\210\206\344\270\216\347\264\240\346\235\220\350\241\200\347\274\230\350\277\275\350\270\252\345\272\224\347\224\250\346\226\271\346\241\210.md"
deleted file mode 100644
index c963f0f3..00000000
--- "a/\345\233\276\345\261\202\346\213\206\345\210\206\344\270\216\347\264\240\346\235\220\350\241\200\347\274\230\350\277\275\350\270\252\345\272\224\347\224\250\346\226\271\346\241\210.md"
+++ /dev/null
@@ -1,331 +0,0 @@
-# 图层拆分与素材血缘追踪应用方案
-
-> 版本:讨论整理稿 v1.0
-> 整理日期:2026-10-21
-> 适用场景:科技大屏、展项界面及相近的平面 UI 图片。
-> 本文汇总前期讨论,并补充实现建议;未对示例原图执行拆层、生图或 OCR。模型能力参考官方资料,不代表已通过该场景实测。
-
-## 1. 产品目标与边界
-
-将一张已合并的界面图片,整理为独立素材、可编辑文字及部分可复用组件,同时记录每个产物的来源、加工过程与使用位置。
-
-应用需要回答三个问题:
-
-1. 这张图可以拆出哪些元素?
-2. 哪些元素能够原样保留,哪些需要补全或重建?
-3. 每个素材来自哪里,经历了什么处理,又被用于哪里?
-
-单张 PNG/JPG 不包含原始设计文件的完整图层信息。被遮挡的内容、原字体、图表原始数据通常不能直接恢复。自动分层模型生成的 RGBA 图层也需要检查,不能视为原始设计图层的还原。
-
-### 1.1 三种处理方式
-
-| 方式 | 处理内容 | 典型产物 | 必须说明的边界 |
-| --- | --- | --- | --- |
-| 原样提取 | 裁切、蒙版分离、边缘透明度处理 | 边框、图标、文字像素素材 | 复杂光晕与半透明叠加可能无法精确分离 |
-| 补全提取 | 去掉文字、补齐遮挡、修复底板 | 空面板、完整圆环、干净背景 | 补全区域包含推测内容 |
-| 可编辑重建 | 识别后重新排版或绘制 | 文字、SVG 几何图形、数据组件 | 外观需要校准,原始数据需另行提供或核实 |
-
-三种方式均保留来源记录。补全与重建需有明确标识,并允许回看原图。
-
-## 2. 示例大屏的拆分与复用
-
-以下依据前期对示例大屏的讨论整理,实际范围和数量以导入原图后的分析为准。
-
-| 模块 | 建议拆分 | 可复用用途 |
-| --- | --- | --- |
-| 深色背景 | 底色、网格、光点 | 同系列界面背景 |
-| 全屏外框 | 外围细线、四角装饰、底部装饰 | 统一大屏视觉框架 |
-| 顶部标题 | 标题底框、斜纹、独立文字 | 更换页面名称 |
-| 中央圆环 | 外圈、刻度、虚线圈、定位线 | 旋转、扫描、设备状态动画 |
-| 连接线 | 折线、端点、光效 | 信息节点连接 |
-| 信息面板 | 底板、边框、标题装饰、内容组 | 通用空面板模板 |
-| 数字卡片 | 卡片底板、数字、单位、说明、状态条 | 不同指标展示 |
-| 预警进度条 | 底槽、填充、标签 | 完成率、容量、风险提示 |
-| 图表 | 坐标网格、曲线或柱子、文字 | 复用视觉样式;数据独立处理 |
-
-优先建立八类基础资产:背景、全屏外框、顶部标题框、空面板、数字卡片、进度条、连接线、分层圆环。
-
-重复面板可归纳为模板,但不同尺寸、装饰和光效应先比较。模板拉伸需保护边角;不能简单缩放导致线宽和切角变形。
-
-### 2.1 左上“实时负荷”面板示例
-
-建议层级:面板组 → 底板、边框、标题装饰、标题文字、数字卡片组、状态条。
-
-数字卡片再拆为:底板、数值、单位、说明文字。按动画和数据绑定需求选择粒度,避免把所有装饰拆成大量难以管理的细碎图层。
-
-## 3. 整体工作流
-
-**上传原图 → 自动分析 → 用户确认方案 → 分路处理 → 叠加检查 → 保存与导出。**
-
-```mermaid
-flowchart TD
- A["上传原图"] --> B["布局分析与 OCR"]
- B --> C["预览并调整拆分方案"]
- C --> D["确认处理范围"]
- D --> E["图片与装饰提取"]
- D --> F["文字识别与重建"]
- D --> G["图表与几何组件处理"]
- E --> H["组装与叠加校验"]
- F --> H
- G --> H
- H --> I["保存素材与血缘并导出"]
- H --> J["局部修正"]
- J --> H
-```
-
-| 阶段 | 系统工作 | 用户操作与结果 |
-| --- | --- | --- |
-| 上传 | 保存原图、尺寸、文件摘要与版本 | 查看原图 |
-| 分析 | 检测布局、文字、重复结构,提出图层建议 | 查看区域框与初步图层树 |
-| 方案确认 | 为区域列出处理方式与预期产物 | 调整选区、粒度与命名,确认需要生成的部分 |
-| 执行 | 按类型调用图像处理、OCR、拆层或编辑能力 | 查看各任务进度与结果,重试失败项 |
-| 校验 | 按坐标组装,对照原图、透明边缘和文字 | 修正选区、文字或补全区域 |
-| 保存导出 | 保存版本、图层树、模板与操作血缘 | 下载素材包与结构文件 |
-
-**分析与生成分成两个阶段。** 用户可只分析,不生成图片;补全、去字和重建的执行范围应先展示。
-
-血缘在每次处理发生时写入。失败任务保留失败状态,不能产生被误标为成功的资产。
-
-## 4. 三条处理路径
-
-### 4.1 图片与装饰
-
-1. 优先用裁切与蒙版保留原有像素。
-2. 对复杂结构测试自动拆层,再由用户检查。
-3. 需要去字、补遮挡或扩展背景时调用编辑模型。
-4. 保留裁切范围、蒙版、坐标变换和处理参数。
-5. 在棋盘格、深色底、浅色底上检查透明边缘。
-
-青色光晕不能直接“去黑底”:它与深色背景已混合,简单删色会损伤细线,产生暗边。分割蒙版确定区域,精细透明度仍可能需要抠图与边缘校正。无法从单张合成图唯一确定的前景颜色与透明度,应保留不确定性说明。
-
-### 4.2 文字与数字
-
-提供两种输出:
-
-| 模式 | 优点 | 局限 |
-| --- | --- | --- |
-| 原样文字素材 | 保留现有外观,适合动画 | 不能直接改内容,透明提取也可能需修边 |
-| 可编辑文字 | 可更改文本、字号和样式 | 字体与字距需匹配,重建外观存在差异 |
-
-可编辑路径:
-
-**OCR 检测与识别 → 校正内容 → 分析样式 → 生成去字蒙版 → 修复底板 → 重建文字 → 对照检查。**
-
-OCR 主要提供内容和位置;字体、字重、字距、描边、阴影与发光效果需要另外估计并人工校准。文字框不是像素级字形蒙版,直接扩大矩形去字可能损伤附近边框。
-
-数字、单位、说明和状态条分别成层,便于绑定数据。原始识别内容与用户校正内容分开保存,禁止覆盖原记录。
-
-模糊、变形、无法辨认的字标为“待确认”,允许用户输入或保留原样,不让模型自动编造正确内容。
-
-### 4.3 图表与几何组件
-
-- 只需展示或动画时,可保留图表图片或局部视觉元素。
-- 需要修改尺寸和样式时,可重建网格、圆环、直线等矢量元素。
-- 需要更新数据时,重建图表组件,并单独获取数据来源。
-- 从曲线位置估算的数据应明确标为估算,不能当作原始业务数据。
-
-## 5. OCR 方案
-
-对于此应用,OCR 必须返回可用的位置和识别分数,不能只返回整段文本。
-
-| 方案 | 官方能力与接入形式 | 本应用中的候选定位 |
-| --- | --- | --- |
-| PaddleOCR | 开源文字检测与识别;官方已发布 PP-OCRv6 [S1] | 自部署主候选,便于控制流程 |
-| RapidOCR | 提供 ONNX Runtime 等多种推理后端 [S2] | 本地工具或桌面应用候选 |
-| 腾讯云通用文字识别高精度版 | API 返回文字内容、位置及置信度等信息 [S3] | 快速验证产品流程 |
-| Azure Document Intelligence Read | 返回文本、位置多边形及词级置信度等 [S4] | 已使用微软云或兼顾文档处理时评估 |
-| Tesseract.js | 支持浏览器与 Node.js 的 OCR [S5] | 浏览器本地识别候选,需测试中文小字 |
-
-以上定位为方案建议,不构成识别效果排名。部署方式、成本、速度和准确率通过真实样例决定。
-
-### 5.1 推荐识别流程
-
-1. 全图识别,建立标题、数值、刻度等位置索引。
-2. 按面板裁切,对小字适度放大、调整对比度后再次识别。
-3. 将子图坐标映射回原图坐标,合并重复框与文本。
-4. 把文字归入对应面板,对结果冲突、关键数字和低分区域发起人工检查。
-5. 保存引擎、模型版本、预处理方式、原始结果与校正记录。
-
-全图与局部识别的结果可能不同。识别分数也不等于真实正确概率,不同引擎的分数不可直接比较,阈值应由标注样例校准。
-
-### 5.2 第一版选型建议
-
-先用腾讯云高精度 OCR 跑通接口和校正流程,同时用 PaddleOCR 对同一批样例做对比。如果明确要求图片留在本地,直接以 PaddleOCR 或 RapidOCR 建立本地方案。
-
-比较内容:中文标题、小字、青色文字、数字与单位、坐标刻度、漏检率、位置偏差、耗时及人工修改量。不要用厂商总体指标替代本场景测试。
-
-## 6. 图层模型与图片编辑模型
-
-| 能力角色 | 候选 | 应用中的用途与限制 |
-| --- | --- | --- |
-| 自动图层分解 | Qwen-Image-Layered | 官方支持将图片分解成多个 RGBA 图层 [S6];适合初拆实验,需检查细线、文字和合成误差 |
-| 指令图片编辑 | Qwen-Image-Edit 系列 | 官方提供图片编辑能力 [S7];测试去内容、补底板和制作变体 |
-| 图片生成与编辑 | OpenAI GPT Image 系列 | 官方文档提供编辑、蒙版及透明背景相关能力 [S8];按具体模型与接口确认支持 |
-| 参考图生成与编辑 | FLUX.2 | 官方提供多参考图编辑等能力 [S9];评估同风格装饰与衍生素材 |
-| 对话式生成与编辑 | Gemini 图片模型 | 官方提供图片生成与编辑接口 [S10];用于交互式修改候选 |
-| 区域分割 | SAM 类模型 | 提供分割能力 [S11];辅助选区,不负责恢复遮挡或精确分离光晕 |
-
-**第一版建议组合:普通图像处理+一个 OCR 引擎+Qwen-Image-Layered 试验接入+一个编辑模型。**
-
-编辑模型先在 Qwen-Image-Edit 与 GPT Image 中进行同样例对比,无需一次接入全部候选。选择时核对具体版本的许可、硬件需求、输入输出格式与接口限制;本文不提供未经测试的显存、价格和耗时承诺。
-
-蒙版引导也不应默认等于严格只改蒙版内部。对于要求保留原像素的工作,应用需明确合成策略,保存模型完整输出及实际采用区域,并检查选区外变化。
-
-## 7. 图层树、血缘图与模板关系
-
-### 7.1 三种关系
-
-| 结构 | 回答的问题 | 示例 |
-| --- | --- | --- |
-| 图层树 | 画面由哪些元素组成,如何叠放? | 面板组包含底板、标题和图表 |
-| 加工血缘 | 素材来自哪里,经过哪些操作? | 原图区域经过蒙版提取形成边框 |
-| 复用关系 | 哪些组件或页面引用此素材? | 通用面板模板被多个页面实例引用 |
-
-血缘由真实操作记录建立。AI 可以建议名称或分组,但不能事后猜测来源作为正式记录。
-
-### 7.2 血缘示例
-
-```mermaid
-flowchart TD
- A["原始大屏"] --> B["左上面板来源区域"]
- B --> C["蒙版提取操作"]
- C --> D["面板边框"]
- B --> E["去内容并补全操作"]
- E --> F["空面板底板"]
- D --> G["通用面板模板 v1"]
- F --> G
- G --> H["负荷趋势面板实例"]
- G --> I["容量面板实例"]
-```
-
-文字保留两个分支:
-
-- 原图文字区域 → 蒙版提取 → 原样文字素材。
-- 原图文字区域 → OCR → 用户校正 → 文字重建 → 可编辑文字层。
-
-### 7.3 版本与引用规则
-
-- 资产 ID 不随重命名改变;每次加工产生新版本或新资产。
-- 加工血缘引用精确版本,使历史可回溯。
-- 模板实例保存引用版本与局部覆盖项。
-- 模板更新后提示影响范围,由用户决定升级哪些实例。
-- 导出的独立副本不自动同步;若需要追踪其被外部使用的位置,需额外建立导入或使用登记机制。
-- 同一素材可有多个来源输入,不能只用一个“父图层 ID”代替完整血缘。
-
-## 8. 数据记录建议
-
-| 对象 | 关键字段 |
-| --- | --- |
-| 原图 Source | ID、版本、文件路径、摘要、宽高、色彩信息 |
-| 区域 Region | 来源版本、多边形或矩形、蒙版、坐标系 |
-| 操作 Operation | 类型、输入输出版本、模型及版本、提示词、参数、执行状态、时间 |
-| 素材 Asset | ID、版本、文件、尺寸、透明通道、生成方式、来源操作 |
-| 图层 Layer | 素材引用、所属组、位置、变换、层序、透明度、混合模式、显隐与锁定 |
-| 文字 Text | OCR 原文、校正内容、位置、多边形、分数、字体与样式、确认状态 |
-| 模板 Template | 资产引用、版本、可编辑参数与默认值 |
-| 实例 Instance | 模板版本、覆盖参数、所在页面或组件 |
-| 审核 Review | 待确认项、确认对象及版本、确认结果 |
-
-统一以原图左上角为原点,记录像素尺寸;裁切、缩放、旋转后的坐标变换必须保存。来源区域与新图层的位置是不同概念,需要分别记录。
-
-建议将加工血缘表示为“资产版本 → 操作 → 资产版本”的有向无环图;图层的组成与模板的引用另行表达。
-
-## 9. 界面布局
-
-采用三个主要区域:
-
-- **左侧图层树**:分组、命名、排序、显隐、锁定与模板标记。
-- **中央画布**:原图、区域框、蒙版编辑、透明素材和重新叠加。
-- **右侧属性与来源**:位置、尺寸、文字、处理方式、版本、来源与待确认项。
-
-血缘较复杂时进入完整关系图。点击素材可定位原图区域;点击区域可列出对应产物。
-
-建议提供原图/结果切换、叠加透明度、局部放大、差异预览和补全区域标识。生成任务单独展示状态,支持取消、失败重试与保留旧版本。
-
-## 10. 第一版开发范围
-
-### 10.1 必做功能
-
-1. 上传原图并保存版本。
-2. 自动提出区域和文字建议,允许手动修正。
-3. 为区域选择原样提取、补全或重建,并在执行前确认范围。
-4. 裁切、蒙版提取、基础图层组装与显隐。
-5. OCR 内容校正与基础文字层重建;字体先支持人工选择。
-6. 接入一种图片编辑能力,支持局部去内容与补全。
-7. 自动记录操作血缘,并联动画布定位。
-8. 将资产标记为模板并创建简单实例。
-9. 导出 PNG、图层结构、OCR 记录和血缘文件。
-
-Qwen-Image-Layered 可作为试验功能接入;自动拆分失败时仍应允许通过选区和蒙版完成主流程。
-
-### 10.2 后续扩展
-
-自动字体匹配、参数化图表、业务数据绑定、复杂模板同步、批量处理、团队协作及专业设计工具格式导出。
-
-PSD 等格式涉及图层与文字兼容性,第一版不默认承诺完整还原。
-
-## 11. 实现结构与交付文件
-
-建议由画布与图层编辑界面、业务与版本服务、异步任务队列、模型适配器和文件存储组成。任务步骤独立保存输出,以便只重试失败环节。
-
-模型适配器统一输入图片、区域、蒙版与参数,输出文件及元数据;不同模型未支持的能力需明确返回,不用猜测填充。
-
-导出包建议包含:
-
-| 路径 | 内容 |
-| --- | --- |
-| source/original.png | 原始图及对应元数据 |
-| assets/ | 透明 PNG 与其他素材 |
-| masks/ | 提取、去字和补全使用的蒙版 |
-| project.json | 画布、图层树、素材及版本引用 |
-| text/ocr.json | 原始 OCR、校正结果与文字样式 |
-| lineage/lineage.json | 资产、操作及关系 |
-| lineage/lineage.mmd | 可阅读的 Mermaid 血缘图 |
-| previews/composite.png | 当前图层合成预览 |
-| README.md | 使用说明及待确认、补全和重建项 |
-
-这是推荐结构,不要求第一版一次支持所有文件类型。正式导出前检查文件引用是否完整。
-
-## 12. 验收与样例测试
-
-| 检查项 | 方法 | 通过依据 |
-| --- | --- | --- |
-| 原样提取 | 在来源区域叠加对照 | 位置、细线、颜色和边缘符合确认结果 |
-| 透明边缘 | 棋盘格与深浅底查看 | 无明显暗边、光晕截断或多余背景 |
-| 可编辑文字 | 内容核对并检查样式 | 内容已确认,位置和字体差异可接受 |
-| 补全 | 标出补画区域并人工检查 | 无明显接缝,未误改需要保留的结构 |
-| 图层合成 | 切换原图和合成图、查看差异 | 误差有定位,不能用整体低误差掩盖局部文字错误 |
-| 血缘 | 任取素材回溯输入与操作 | 来源坐标、输入输出版本和处理方式完整 |
-| 模板 | 修改模板并检查实例 | 影响范围明确,版本升级由用户选择 |
-| 导出 | 从导出包重新加载 | 文件引用可解析,画布与记录一致 |
-
-分开验收两种目标:保真拆层重点看原图一致性;模板提炼和去字重建允许预期变化,重点检查指定区域、几何结构与标识。两者不能共用“必须与原图完全一致”的要求。
-
-先准备一批经人工标注的代表性样例,覆盖中文小字、青色发光字、数字、细线圆环、重复面板和重叠遮挡。记录识别修改量、拆层可用率、局部误差、耗时及调用成本,再确定上线阈值。
-
-## 13. 建议的落地顺序
-
-1. 先完成原图、手动区域、图层树与血缘数据结构。
-2. 接入 OCR,完成文字校正、坐标映射和基础重建。
-3. 完成蒙版提取、组装检查和导出。
-4. 增加自动布局建议、拆层模型和局部编辑。
-5. 用真实样例收敛模型选择,再扩展模板复用与自动化。
-
-产品首先应保证每个结果可检查、可修正、可追溯;自动化程度随着样例验证逐步提高。
-
-## 14. 官方参考资料
-
-资料核对日期:2026-10-21。模型、接口与版本持续变化,开发时以选定版本的官方文档为准。下列资料支持能力说明;产品流程、架构和选型优先级为本文建议。
-
-- [S1:PaddleOCR 官方仓库与版本说明](https://github.com/PaddlePaddle/PaddleOCR)
-- [S2:RapidOCR 官方仓库](https://github.com/RapidAI/RapidOCR)
-- [S3:腾讯云通用文字识别高精度版 API](https://cloud.tencent.com/document/api/866/34937)
-- [S4:Azure Document Intelligence Read](https://learn.microsoft.com/en-us/azure/ai-services/document-intelligence/prebuilt/read?view=doc-intel-4.0.0)
-- [S5:Tesseract.js 官方仓库](https://github.com/naptha/tesseract.js)
-- [S6:Qwen-Image-Layered 官方仓库](https://github.com/QwenLM/Qwen-Image-Layered)
-- [S7:Qwen-Image / Qwen-Image-Edit 官方仓库](https://github.com/QwenLM/Qwen-Image)
-- [S8:OpenAI 图片生成与编辑指南](https://developers.openai.com/api/docs/guides/image-generation)
-- [S9:Black Forest Labs FLUX.2 文档](https://docs.bfl.ai/flux_2/flux2_overview)
-- [S10:Gemini 图片生成与编辑指南](https://ai.google.dev/gemini-api/docs/image-generation)
-- [S11:Meta Segment Anything 官方仓库](https://github.com/facebookresearch/segment-anything)
-