feat(canvas): 画布工作区 - 整合侧栏与风格预设并修复提示词回填

选择性整合 #547,保留主分支节点与工具条设计。新增默认折叠的节点、资产、任务和历史面板,风格与预设保留在节点内,移除重复入口。

补齐工具权限、提示词解析、资源引用保护及数据库迁移,修复提示词清空和连续编辑后的生成配置同步。

验证:前端全量 1925 项测试、构建、类型检查及 lint 通过;后端 go test ./... 通过。真实模型、PostgreSQL 实库与登录态页面验收仍待进行。

Refs #547

Co-authored-by: bensharp <bensharp@qq.com>
This commit is contained in:
ddCatandbensharp committed 2026-09-20 16:40:08 +08:00
1 parent be5f2733b6
commit e93bf3ca39
66 files changed
+6127 -97

No files matched your search

@@ -24,7 +24,7 @@ func newProjectSettingsTestService(t *testing.T) (*Service, *gorm.DB) {
&model.Shot{}, &model.ShotArtifact{}, &model.VoiceProfile{},
&model.Task{}, &model.TaskLog{}, &model.Result{},
&model.CreationRun{}, &model.CreationSubmission{},
&model.CloudAgentResourceLease{},
&model.CloudAgentResourceLease{}, &model.Tool{},
&model.Announcement{}, &model.AnnouncementImageDraft{},
); err != nil {
t.Fatal(err)
+6
View File
@@ -347,6 +347,12 @@ func (s *Service) processCanvasGenerationTask(ctx context.Context, userID string
if strings.TrimSpace(input.Prompt) == "" {
return nil, errors.New("prompt is required")
}
// 将 @[tool:type:ID:label:icon] 令牌替换为对应工具的提示词文本
resolved, err := s.ResolveToolMentionTokens(userID, input.Mode, input.Prompt)
if err != nil {
return nil, err
}
input.Prompt = resolved
config, err := s.resolveProviderConfig(input.Config)
if err != nil {
return nil, err
+3
View File
@@ -19,6 +19,7 @@ import (
"infinite-canvas/backend/internal/prompts"
"infinite-canvas/backend/internal/repository"
"infinite-canvas/backend/internal/skills"
"infinite-canvas/backend/internal/tools"
)
type Service struct {
@@ -67,6 +68,7 @@ type Service struct {
routeCatalogRetryAt time.Time
routeCatalogRefreshError error
skills *skills.Service
tools *tools.Service
prompts *prompts.Service
auth *auth.Service
canvas *canvas.Service
@@ -116,6 +118,7 @@ func newService(repo *repository.Repository, dataDir string) *Service {
service.taskWorkerCoordinator = newTaskWorkerCoordinator(service)
service.taskLifecycleCoordinator = newTaskLifecycleCoordinator(service)
service.skills = skills.New(service.repo, service.dataDir, service.runWorkerLoop)
service.tools = tools.New(service.repo)
service.prompts = prompts.New(service.repo, promptAdminGate{svc: service})
service.auth = auth.New(service.repo, authHost{svc: service}, nil)
service.canvas = canvas.New(service.repo, canvasHost{svc: service})
+18
View File
@@ -44,6 +44,24 @@ func (s *Service) CreateTask(userID string, req CreateTaskRequest) (*model.Task,
if err != nil {
return nil, err
}
// Fail admission before queueing or charging; the worker validates again in
// case a tool is deleted or its visibility changes while queued.
toolMode, _ := normalizedInput["mode"].(string)
if toolMode == "" {
if strings.HasPrefix(taskType, "video_") || taskType == "canvas_video" {
toolMode = "video"
} else if taskType == "canvas_image" {
toolMode = "image"
}
}
if _, err := s.ResolveToolMentionTokens(userID, toolMode, prompt); err != nil {
return nil, err
}
if inputPrompt, ok := normalizedInput["prompt"].(string); ok && inputPrompt != prompt {
if _, err := s.ResolveToolMentionTokens(userID, toolMode, inputPrompt); err != nil {
return nil, err
}
}
var routed *RoutedModel
logicalModelID := strings.TrimSpace(req.LogicalModelID)
+77
View File
@@ -0,0 +1,77 @@
package app
import (
"infinite-canvas/backend/internal/model"
"infinite-canvas/backend/internal/tools"
"strings"
)
type (
ToolListRequest = tools.ToolListRequest
ToolList = tools.ToolList
ToolItem = tools.ToolItem
ToolSummary = tools.ToolSummary
ToolMutationRequest = tools.ToolMutationRequest
)
func (s *Service) toolDomain() *tools.Service {
if s == nil {
return tools.New(nil)
}
if s.tools != nil {
return s.tools
}
return tools.New(s.repo)
}
func (s *Service) Tools(userID string, req ToolListRequest) (*ToolList, error) {
return s.toolDomain().List(userID, req)
}
func (s *Service) ToolDetail(userID string, toolID int64) (*ToolItem, error) {
return s.toolDomain().Detail(userID, toolID)
}
func (s *Service) SetToolFavorite(userID string, toolID int64, favorite bool) (*ToolItem, error) {
return s.toolDomain().SetFavorite(userID, toolID, favorite)
}
func (s *Service) CreateTool(userID string, req ToolMutationRequest) (*ToolItem, error) {
if strings.TrimSpace(userID) == "" {
return nil, Unauthorized("请先登录")
}
values := append([]string{req.Cover, req.MediaURL}, req.ExtraInfo...)
for _, value := range values {
if strings.TrimSpace(value) == "" {
continue
}
id := resourceIDFromFileURL(value)
if id == "" {
return nil, BadAuthRequest("工具预览仅支持本人上传的资源")
}
resource, err := s.repo.ResourceForUser(userID, id)
if err != nil {
return nil, err
}
if resource.Status != model.ResourceStatusReady {
return nil, BadAuthRequest("预览资源尚未上传完成")
}
if req.Visibility == tools.ToolVisibilityPublic {
return nil, BadAuthRequest("公开工具暂不支持私人预览资源,请移除预览或改为私有")
}
}
return s.toolDomain().Create(userID, req)
}
func (s *Service) DeleteTool(userID string, toolID int64) error {
return s.toolDomain().Delete(userID, toolID)
}
// ResolveToolMentionTokens 将 prompt 中的 @[tool:type:ID:label:icon] 令牌替换为对应工具的提示词文本。
func (s *Service) ResolveToolMentionTokens(userID, mode, prompt string) (string, error) {
return s.toolDomain().ResolveToolMentionTokens(userID, mode, prompt)
}
func (s *Service) EnsureBuiltinTools() error {
return tools.EnsureBuiltinTools(s.repo)
}
+66
View File
@@ -0,0 +1,66 @@
package app
import (
"infinite-canvas/backend/internal/model"
"strings"
"testing"
)
func TestToolPreviewOwnershipAndResourceDeletionGuard(t *testing.T) {
svc, db, _ := newResourceDeletionTestService(t)
resource := model.Resource{ID: "tool-preview", UserID: "alice", Status: model.ResourceStatusReady, Provider: "local", ObjectKey: "preview.png"}
if err := db.Create(&resource).Error; err != nil {
t.Fatal(err)
}
req := ToolMutationRequest{Type: "style", Label: "style", Prompt: "film", Cover: "/api/resources/tool-preview/file", Visibility: "private"}
if _, err := svc.CreateTool("bob", req); err == nil {
t.Fatal("foreign resource accepted")
}
req.Visibility = "public"
if _, err := svc.CreateTool("alice", req); err == nil {
t.Fatal("private resource exposed publicly")
}
req.Visibility = "private"
tool, err := svc.CreateTool("alice", req)
if err != nil {
t.Fatal(err)
}
snapshot, err := svc.repo.ResourceReferenceSnapshot("alice", "", []string{resource.ID})
if err != nil {
t.Fatal(err)
}
found := false
for _, doc := range snapshot.Documents {
if doc.Kind == "工具" && documentReferencesResources(doc.PrimaryJSON, map[string]struct{}{resource.ID: {}}) {
found = true
}
}
if !found {
t.Fatal("tool preview not protected from resource deletion")
}
if err := svc.DeleteTool("alice", tool.ID); err != nil {
t.Fatal(err)
}
var count int64
if err := db.Model(&model.Resource{}).Where("id = ?", resource.ID).Count(&count).Error; err != nil {
t.Fatal(err)
}
if count != 1 {
t.Fatal("deleting tool deleted preview resource")
}
}
func TestToolAdmissionRejectsBeforeQueueing(t *testing.T) {
svc, db, _ := newResourceDeletionTestService(t)
_, err := svc.CreateTask("alice", CreateTaskRequest{Type: "canvas_image", Prompt: "@[tool:style:999:x:X]", Input: map[string]any{"mode": "image", "prompt": "@[tool:style:999:x:X]"}})
if err == nil || !strings.Contains(err.Error(), "工具") {
t.Fatalf("unexpected admission result: %v", err)
}
var count int64
if err := db.Model(&model.Task{}).Count(&count).Error; err != nil {
t.Fatal(err)
}
if count != 0 {
t.Fatal("invalid tool was queued")
}
}