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

@@ -7,7 +7,7 @@ import type { Skill } from "@/services/api/skills";
import type { Asset, AssetCategory } from "@/stores/use-asset-store";
import { CanvasNodeType, type CanvasConnection, type CanvasNodeData, type CanvasNodeTypeId } from "@/types/canvas";
export type CanvasResourceKind = "image" | "video" | "audio" | "text" | "skill" | "character";
export type CanvasResourceKind = "image" | "video" | "audio" | "text" | "skill" | "character" | "tool";
export type CanvasResourceReference = {
id: string;
@@ -31,26 +31,89 @@ export type CanvasResourceReference = {
assetId?: string;
category?: AssetCategory;
mentionToken?: string;
/** 仅 kind === "tool" 时使用,对应后端工具 ID。 */
toolId?: number;
/** 仅 kind === "tool" 时使用,对应工具类型(style/nine_grid/effect/motion)。 */
toolType?: string;
/** 仅 kind === "tool" 时使用,lucide 图标名称。 */
toolIcon?: string;
};
export function canvasSkillMentionToken(skillId: string) {
return `@[skill:${skillId}]`;
}
export function canvasToolMentionToken(toolId: number, label: string, type: string, icon: string) {
return `@[tool:${type}:${toolId}:${encodeURIComponent(label)}:${icon}]`;
}
const TOOL_REF_PATTERN = /@\[tool:(\w+):(\d+):([^:\]]+):([^\]]+)\]/g;
/** 从文本中解析所有 @[tool:type:ID:label:icon] 令牌,返回去重的工具引用。 */
export function parseToolMentionTokens(text: string): { type: string; toolId: number; label: string; icon: string }[] {
const results: { type: string; toolId: number; label: string; icon: string }[] = [];
const seen = new Set<number>();
for (const match of text.matchAll(TOOL_REF_PATTERN)) {
const toolId = Number(match[2]);
if (seen.has(toolId)) continue;
seen.add(toolId);
let label = match[3];
try { label = decodeURIComponent(label); } catch { /* Keep readable text for malformed imported labels. */ }
results.push({ type: match[1], toolId, label, icon: match[4] });
}
return results;
}
export function removeToolMentions(prompt: string, type: string) {
return prompt.replace(new RegExp(`@\\[tool:${escapeRegExp(type)}:\\d+:[^\\]]*\\]`, "gu"), "").trim();
}
export function applyToolMention(prompt: string, tool: { id: number; type: string; label: string }, icon = "Wrench") {
const reference = buildToolMentionReference(tool.id, tool.label, tool.type, icon);
const replaced = overwriteSameTypeToolMention(prompt, reference);
if (replaced != null) return replaced;
if (parseToolMentionTokens(prompt).some((item) => item.type === tool.type && item.toolId === tool.id)) return prompt;
return [prompt.trim(), reference.mentionToken].filter(Boolean).join(" ");
}
export function canvasNodeMentionToken(nodeId: string) {
return `@[node:${nodeId}]`;
}
/** 这些工具类型的标签在提示词中唯一,再次选择时直接覆盖旧标签而不是追加。 */
const UNIQUE_TOOL_MENTION_TYPES = new Set(["style", "nine_grid", "effect"]);
/**
* 用新工具标签覆盖提示词中已有的同类型(style/nine_grid/effect)标签:
* 第一处原位替换,多余同类型标签连同其后一个空白一并清理。
* 没有同类型旧标签时返回 null,由调用方走普通插入。
*/
export function overwriteSameTypeToolMention(prompt: string, reference: CanvasResourceReference): string | null {
if (reference.kind !== "tool" || reference.toolId == null) return null;
const toolType = reference.toolType ?? "nine_grid";
if (!UNIQUE_TOOL_MENTION_TYPES.has(toolType)) return null;
const token = canvasResourceMentionToken(reference);
const pattern = new RegExp(`@\\[tool:${escapeRegExp(toolType)}:\\d+:[^\\]]*\\]`, "gu");
const segments = prompt.split(pattern);
if (segments.length === 1) return null;
let result = `${segments[0]}${token}${segments[1]}`;
for (let index = 2; index < segments.length; index += 1) {
result += segments[index].replace(/^\s/, "");
}
return result;
}
export function canvasResourceMentionToken(reference: CanvasResourceReference) {
if (reference.mentionToken) return reference.mentionToken;
if (reference.kind === "skill" && reference.skill?.skillId) return canvasSkillMentionToken(reference.skill.skillId);
if (reference.kind === "tool" && reference.toolId != null) return canvasToolMentionToken(reference.toolId, reference.label, reference.toolType ?? "nine_grid", reference.toolIcon ?? "Grid3x3");
if (reference.assetId) return `@[asset:${reference.assetId}]`;
return `@${reference.label}`;
}
export function normalizeCanvasNodeMentionTokens(prompt: string, references: CanvasResourceReference[]) {
return references.reduce((value, reference) => {
if (!reference.nodeId || reference.assetId || reference.kind === "skill") return value;
if (!reference.nodeId || reference.assetId || reference.kind === "skill" || reference.kind === "tool") return value;
return value.split(canvasNodeMentionToken(reference.nodeId)).join(`@${reference.label}`);
}, prompt);
}
@@ -59,7 +122,7 @@ export function normalizeCanvasNodeMentionTokens(prompt: string, references: Can
export function autoMentionCanvasResourceReferences(prompt: string, references: CanvasResourceReference[]) {
const referenceByName = new Map<string, CanvasResourceReference | null>();
references
.filter((reference) => reference.active && !reference.assetId && reference.kind !== "skill")
.filter((reference) => reference.active && !reference.assetId && reference.kind !== "skill" && reference.kind !== "tool")
.forEach((reference, index) => {
canvasResourceMentionNames(reference, index, true).forEach((name) => {
if (!referenceByName.has(name)) {
@@ -103,7 +166,7 @@ export function findCanvasResourceAutoLinkMatch(prompt: string, cursor: number,
if (/@(?:\[[^\]]*|[^\s@,.;:!?,。;:!?、)\]}】)]*)$/u.test(prefix)) return null;
const aliases = new Map<string, CanvasResourceReference | null>();
references
.filter((reference) => reference.active && !reference.assetId && reference.kind !== "skill")
.filter((reference) => reference.active && !reference.assetId && reference.kind !== "skill" && reference.kind !== "tool")
.forEach((reference, index) => {
canvasResourceMentionNames(reference, index, true).forEach((name) => {
if (!aliases.has(name)) aliases.set(name, reference);
@@ -158,7 +221,7 @@ const CANVAS_RESOURCE_MENTION_BOUNDARY = /(?:$|\s|[,.!?;:,。!?;:、)\
function canvasResourceReferenceMentionTokens(reference: CanvasResourceReference) {
const tokens = [canvasResourceMentionToken(reference), `@${reference.label}`];
if (reference.nodeId && !reference.assetId && reference.kind !== "skill") tokens.push(canvasNodeMentionToken(reference.nodeId));
if (reference.nodeId && !reference.assetId && reference.kind !== "skill" && reference.kind !== "tool") tokens.push(canvasNodeMentionToken(reference.nodeId));
return [...new Set(tokens.filter(Boolean))];
}
@@ -207,7 +270,7 @@ export function applyCanvasConnectionPromptSync(previousNodes: CanvasNodeData[],
}
function canvasNodeBoundReferences(references: CanvasResourceReference[]) {
return references.filter((reference) => reference.nodeId && !reference.assetId && reference.kind !== "skill");
return references.filter((reference) => reference.nodeId && !reference.assetId && reference.kind !== "skill" && reference.kind !== "tool");
}
function canvasReferenceIdentityChanged(previousReferences: CanvasResourceReference[], nextReferences: CanvasResourceReference[]) {
@@ -461,7 +524,7 @@ function getConnectedConfigResourceNodes(nodeId: string, nodes: CanvasNodeData[]
}
function labelResourceNodes(nodes: CanvasNodeData[], active: boolean) {
const counts: Record<CanvasResourceKind, number> = { image: 0, video: 0, audio: 0, text: 0, skill: 0, character: 0 };
const counts: Record<CanvasResourceKind, number> = { image: 0, video: 0, audio: 0, text: 0, skill: 0, character: 0, tool: 0 };
let drawingCount = 0;
return nodes.flatMap((node): CanvasResourceReference[] => {
const kind = resourceKind(node);
@@ -500,6 +563,7 @@ function labelForKind(kind: CanvasResourceKind, index: number) {
if (kind === "video") return seedanceReferenceLabel("video", index);
if (kind === "audio") return seedanceReferenceLabel("audio", index);
if (kind === "skill") return `技能${index + 1}`;
if (kind === "tool") return `工具${index + 1}`;
return `文本${index + 1}`;
}
@@ -518,3 +582,18 @@ function skillResourceText(node: CanvasNodeData) {
if (!skill) return node.metadata?.content || "";
return [skill.name, skill.description, skill.template, skill.outputContract].filter(Boolean).join("\n\n");
}
export function buildToolMentionReference(toolId: number, label: string, type: string, icon: string): CanvasResourceReference {
return {
id: `tool:${toolId}`,
nodeId: `tool:${toolId}`,
kind: "tool",
label,
title: label,
active: true,
toolId,
toolType: type,
toolIcon: icon,
mentionToken: canvasToolMentionToken(toolId, label, type, icon),
};
}