feat: 完善创作工作台与用户诊断支持 (#295)

* feat(canvas): 参考素材 - 增加移除按钮并删除对应连线

* feat(canvas): 完善节点面板交互与拖拽反馈

* fix(canvas): 画布交互与小地图 - 统一浮层层级并完善节点识别

* feat(prompt-optimizer): 增加 AI 提示词优化器及宿主接入

* feat(canvas): 画布 - 增加自动整理节点按钮并补充文档

* chore(web): 前端 - 修正提示词优化器格式

* chore(backend): 后端 - 修正 Go 格式检查

* feat(workspace): 完善诊断导出与本地排障支持

* chore(web): 格式化诊断导出文件

* fix(web-test): 兼容 Bun 测试运行时

* fix(web-test): 对齐模型目录协议断言
This commit is contained in:
QAyong authored and GitHub committed 2026-08-25 13:49:15 +08:00
1 parent 625a97560b
commit cf6c78d540
70 files changed
+6863 -1708

No files matched your search

+1413 -1396
View File
File diff suppressed because it is too large. Load diff
+1
View File
@@ -14,6 +14,7 @@
},
"dependencies": {
"@ant-design/icons": "^6.3.2",
"@ant-design/x": "^2.9.0",
"@codemirror/lang-json": "^6.0.2",
"@excalidraw/excalidraw": "0.18.1",
"@ffmpeg/core": "0.12.10",
@@ -4,6 +4,7 @@ import { Crosshair, FolderOpen, ImageIcon, Images, PanelLeftClose, Plus, Search,
import { FloatingDock, type FloatingDockEntry } from "@/components/ui/aceternity/floating-dock";
import { CachedResourceImage } from "@/components/cached-resource-image";
import { useCanvasOverlayLayer } from "@/components/canvas/canvas-overlay-layer";
import { aceternityMotion } from "@/lib/aceternity-motion";
import { canvasDockStyle } from "@/lib/canvas/canvas-aceternity-style";
import { canvasThemes } from "@/lib/canvas-theme";
@@ -52,6 +53,7 @@ type CanvasAssetTrayProps = {
export function CanvasAssetTray({ assetImages, canvasImages, showLibrary = true, activeNodeId, onInsertAssetImage, onFocusCanvasImage }: CanvasAssetTrayProps) {
const theme = canvasThemes[useThemeStore((state) => state.theme)];
const reducedMotion = useReducedMotion();
const { bringToFront, zIndex } = useCanvasOverlayLayer("asset-tray", "var(--z-panel)");
const rootRef = useRef<HTMLDivElement>(null);
const [open, setOpen] = useState(false);
const [tab, setTab] = useState<TrayTab>(() => showLibrary ? "library" : "canvas");
@@ -151,18 +153,11 @@ export function CanvasAssetTray({ assetImages, canvasImages, showLibrary = true,
useEffect(() => {
if (!open) return;
const closeTray = (event: PointerEvent) => {
const target = event.target instanceof Node ? event.target : null;
if (target && rootRef.current?.contains(target)) return;
setOpen(false);
};
const closeOnEscape = (event: KeyboardEvent) => {
if (event.key === "Escape") setOpen(false);
};
document.addEventListener("pointerdown", closeTray, true);
document.addEventListener("keydown", closeOnEscape);
return () => {
document.removeEventListener("pointerdown", closeTray, true);
document.removeEventListener("keydown", closeOnEscape);
};
}, [open]);
@@ -173,12 +168,15 @@ export function CanvasAssetTray({ assetImages, canvasImages, showLibrary = true,
label: open ? "收起素材空间" : `打开素材空间,共 ${(showLibrary ? assetImages.length : 0) + canvasImages.length} 项`,
icon: <span className="relative"><Images /><span className="absolute -right-1.5 -top-1.5 min-w-3 rounded-full px-0.5 text-center text-[var(--fs-nano)] font-bold leading-3" style={{ background: theme.accent.primary, color: theme.accent.onPrimary }}>{(showLibrary ? assetImages.length : 0) + canvasImages.length}</span></span>,
active: open,
onClick: () => setOpen((value) => !value),
onClick: () => {
bringToFront();
setOpen((value) => !value);
},
},
];
return (
<div ref={rootRef} data-canvas-no-zoom className="relative z-[var(--z-panel)]" onPointerDown={(event) => event.stopPropagation()} onMouseDown={(event) => event.stopPropagation()} onWheel={(event) => event.stopPropagation()}>
<div ref={rootRef} data-canvas-no-zoom className="relative" style={{ zIndex }} onPointerDownCapture={bringToFront} onFocusCapture={bringToFront} onPointerDown={(event) => event.stopPropagation()} onMouseDown={(event) => event.stopPropagation()} onWheel={(event) => event.stopPropagation()}>
<AnimatePresence>
{open ? (
<motion.aside
@@ -1,9 +1,10 @@
import { AnimatePresence, motion, useReducedMotion } from "motion/react";
import { useEffect, useLayoutEffect, useRef, useState, type PointerEvent as ReactPointerEvent, type ReactNode, type RefObject } from "react";
import { useEffect, useLayoutEffect, useRef, useState, type PointerEvent as ReactPointerEvent, type RefObject } from "react";
import { createPortal } from "react-dom";
import { LoaderCircle, ScanFace, SquareDashedMousePointer, X } from "lucide-react";
import { CanvasNodeEmotionPanel, type CanvasEmotionCharacter, type CanvasImageEmotionPayload } from "@/components/canvas/canvas-node-emotion-panel";
import { CanvasNodePanelOverlay } from "@/components/canvas/canvas-workspace-overlays";
import { SpotlightSurface } from "@/components/ui/aceternity/spotlight-surface";
import { aceternityMotion } from "@/lib/aceternity-motion";
import { canvasThemes } from "@/lib/canvas-theme";
@@ -11,7 +12,7 @@ import { buildEmotionImageArtifacts, buildEmotionPrompt, neutralEmotionPreset, t
import { detectCanvasFaces } from "@/lib/canvas/canvas-face-detection";
import { subscribeCanvasViewportPreview } from "@/lib/canvas/canvas-live-viewport";
import { useThemeStore } from "@/stores/use-theme-store";
import type { CanvasNodeData, ViewportTransform } from "@/types/canvas";
import type { CanvasNodeData, Position, ViewportTransform } from "@/types/canvas";
type WorkspaceStatus = "detecting" | "selecting" | "manual" | "editing" | "generating" | "error";
@@ -19,11 +20,13 @@ type CanvasEmotionWorkspaceProps = {
node: CanvasNodeData;
viewport: ViewportTransform;
containerRef: RefObject<HTMLDivElement | null>;
dragOffset?: Position | null;
isDragging?: boolean;
onClose: () => void;
onConfirm: (payload: CanvasImageEmotionPayload) => void;
};
export function CanvasEmotionWorkspace({ node, viewport, containerRef, onClose, onConfirm }: CanvasEmotionWorkspaceProps) {
export function CanvasEmotionWorkspace({ node, viewport, containerRef, dragOffset, isDragging = false, onClose, onConfirm }: CanvasEmotionWorkspaceProps) {
const dataUrl = node.metadata?.content || "";
const [status, setStatus] = useState<WorkspaceStatus>("detecting");
const [faces, setFaces] = useState<CanvasFaceBox[]>([]);
@@ -134,7 +137,7 @@ export function CanvasEmotionWorkspace({ node, viewport, containerRef, onClose,
<SelectionToolbar node={node} viewport={viewport} containerRef={containerRef} status={status} faceCount={faces.length} error={error} onManualSelect={beginManualSelection} onClose={onClose} />
<AnimatePresence>
{activeCharacter && (status === "editing" || status === "generating") ? (
<EmotionPanelOverlay node={node} viewport={viewport} containerRef={containerRef}>
<CanvasNodePanelOverlay node={node} viewport={viewport} containerRef={containerRef} panelWidth={580} panelHeight={303} dragOffset={dragOffset} isDragging={isDragging}>
<CanvasNodeEmotionPanel
dataUrl={dataUrl}
imageWidth={imageSize.width}
@@ -153,7 +156,7 @@ export function CanvasEmotionWorkspace({ node, viewport, containerRef, onClose,
onClose={onClose}
onConfirm={() => void confirmGeneration()}
/>
</EmotionPanelOverlay>
</CanvasNodePanelOverlay>
) : null}
</AnimatePresence>
</>,
@@ -391,16 +394,6 @@ function SelectionToolbar({
);
}
function EmotionPanelOverlay({ node, viewport, containerRef, children }: { node: CanvasNodeData; viewport: ViewportTransform; containerRef: RefObject<HTMLDivElement | null>; children: ReactNode }) {
const panelRef = useRef<HTMLDivElement>(null);
useScreenAnchor(panelRef, node, viewport, containerRef, (next, container) => panelScreenRect(node, next, container, panelRef.current));
return (
<div ref={panelRef} data-canvas-no-zoom className="absolute z-[var(--z-modal-overlay)] w-[580px] max-w-[calc(100%_-_24px)]" style={{ left: 12, top: 76 }} onPointerDown={(event) => event.stopPropagation()}>
{children}
</div>
);
}
function useScreenAnchor(
ref: RefObject<HTMLElement | null>,
node: CanvasNodeData,
@@ -457,19 +450,6 @@ function toolbarScreenRect(node: CanvasNodeData, viewport: ViewportTransform, co
return { left, top };
}
function panelScreenRect(node: CanvasNodeData, viewport: ViewportTransform, container: HTMLDivElement, element: HTMLElement | null) {
const width = Math.min(element?.offsetWidth || 580, Math.max(320, container.clientWidth - 24));
const height = element?.offsetHeight || 303;
const nodeRect = imageScreenRect(node, viewport, node.metadata?.naturalWidth || node.width, node.metadata?.naturalHeight || node.height);
const viewportLeft = container.scrollLeft;
const viewportTop = container.scrollTop;
const left = clamp(nodeRect.left + nodeRect.width / 2 - width / 2, viewportLeft + 12, Math.max(viewportLeft + 12, viewportLeft + container.clientWidth - width - 12));
const below = nodeRect.top + nodeRect.height + 10;
const above = nodeRect.top - height - 10;
const top = below + height <= viewportTop + container.clientHeight - 12 ? below : above;
return { left, top: clamp(top, viewportTop + 72, Math.max(viewportTop + 72, viewportTop + container.clientHeight - height - 12)) };
}
function sameFace(left: CanvasFaceBox, right: CanvasFaceBox) {
return left.id === right.id || (Math.abs(left.x - right.x) < 1 && Math.abs(left.y - right.y) < 1 && Math.abs(left.width - right.width) < 1 && Math.abs(left.height - right.height) < 1);
}
+42 -3
View File
@@ -1,20 +1,28 @@
import { useCallback, useEffect, useMemo, useRef, useState, type RefObject } from "react";
import { CachedResourceImage } from "@/components/cached-resource-image";
import { canvasThemes } from "@/lib/canvas-theme";
import { isFrameNode, isNodeHiddenByCollapsedFrame } from "@/lib/canvas/canvas-frame";
import { buildLibTVImagePreviewUrl } from "@/lib/canvas/libtv-import";
import { getNodeLabel } from "@/lib/canvas/node-registry/node-registry";
import { subscribeCanvasViewportPreview } from "@/lib/canvas/canvas-live-viewport";
import { useThemeStore } from "@/stores/use-theme-store";
import { CanvasNodeType, type CanvasNodeData, type ViewportTransform } from "@/types/canvas";
const MINIMAP_WIDTH = 240;
const MINIMAP_HEIGHT = 160;
const MINIMAP_IMAGE_PREVIEW_LIMIT = 24;
export function Minimap({ nodes, viewport, viewportSize, canvasContainerRef, onViewportPreviewChange, onViewportChange }: { nodes: CanvasNodeData[]; viewport: ViewportTransform; viewportSize: { width: number; height: number }; canvasContainerRef?: RefObject<HTMLDivElement | null>; onViewportPreviewChange?: (viewport: ViewportTransform) => void; onViewportChange: (viewport: ViewportTransform) => void }) {
const theme = canvasThemes[useThemeStore((state) => state.theme)];
const containerRef = useRef<HTMLDivElement>(null);
const viewportRectRef = useRef<HTMLDivElement>(null);
const liveViewportRef = useRef(viewport);
const [isDragging, setIsDragging] = useState(false);
const width = 240;
const height = 160;
const width = MINIMAP_WIDTH;
const height = MINIMAP_HEIGHT;
const displayNodes = useMemo(() => nodes.filter((node) => !isNodeHiddenByCollapsedFrame(node, nodes)), [nodes]);
const showImagePreviews = useMemo(() => displayNodes.filter((node) => node.type === CanvasNodeType.Image && Boolean(getImagePreviewSource(node) || node.metadata?.storageKey)).length <= MINIMAP_IMAGE_PREVIEW_LIMIT, [displayNodes]);
const { worldBounds, scale, offset } = useMemo(() => {
if (!displayNodes.length) {
@@ -151,6 +159,8 @@ export function Minimap({ nodes, viewport, viewportSize, canvasContainerRef, onV
const pos = toMinimap(node.position.x, node.position.y);
const frame = isFrameNode(node);
const color = node.type === CanvasNodeType.Image ? "#10b981" : node.type === CanvasNodeType.Video ? "#f97316" : node.type === CanvasNodeType.Audio ? "#a855f7" : node.type === CanvasNodeType.Config ? "#60a5fa" : node.type === CanvasNodeType.Skill ? "#818cf8" : frame ? theme.frame.stroke : theme.node.muted;
const imagePreviewSource = showImagePreviews && node.type === CanvasNodeType.Image ? getImagePreviewSource(node) : "";
const nodeLabel = node.title?.trim() || getNodeLabel(node.type);
return (
<div
key={node.id}
@@ -164,7 +174,30 @@ export function Minimap({ nodes, viewport, viewportSize, canvasContainerRef, onV
border: frame ? `1px solid ${color}` : undefined,
opacity: frame ? 0.95 : 0.8,
}}
/>
>
<div className="absolute inset-0 overflow-hidden rounded-[1px]">
{imagePreviewSource || (showImagePreviews && node.type === CanvasNodeType.Image && node.metadata?.storageKey) ? (
<CachedResourceImage
storageKey={node.metadata?.storageKey}
src={imagePreviewSource}
alt=""
loading="lazy"
decoding="async"
draggable={false}
className="size-full object-cover"
fallback={null}
/>
) : null}
</div>
<span
title={nodeLabel}
aria-label={nodeLabel}
className="pointer-events-none absolute left-0 top-0 z-[1] max-w-[7.5rem] -translate-y-1/2 truncate whitespace-nowrap rounded-[2px] border px-1 py-px text-[9px] font-medium leading-[1.15] shadow-sm"
style={{ color: theme.node.text, background: theme.toolbar.panel, borderColor: theme.toolbar.border }}
>
{nodeLabel}
</span>
</div>
);
})}
<div ref={viewportRectRef} className="pointer-events-none absolute rounded-[var(--r-xs)]" style={{ left: viewportRect.x, top: viewportRect.y, width: viewportRect.w, height: viewportRect.h, background: `${theme.node.activeStroke}12`, boxShadow: `inset 0 0 0 1px ${theme.node.activeStroke}66` }} />
@@ -172,3 +205,9 @@ export function Minimap({ nodes, viewport, viewportSize, canvasContainerRef, onV
</div>
);
}
function getImagePreviewSource(node: CanvasNodeData) {
if (node.type !== CanvasNodeType.Image) return "";
const content = node.metadata?.content || "";
return node.metadata?.previewContent || (node.metadata?.importSource?.provider === "libtv" ? buildLibTVImagePreviewUrl(content) : content);
}
@@ -1,5 +1,5 @@
import { useEffect, useMemo, useRef, useState, type CSSProperties, type KeyboardEvent as ReactKeyboardEvent, type PointerEvent as ReactPointerEvent, type ReactNode } from "react";
import { ArrowUp, AtSign, Boxes, ChevronDown, FileText, ImageIcon, ImagePlus, Maximize2, Music2, Pencil, SlidersHorizontal, UserRound, Video } from "lucide-react";
import { ArrowUp, AtSign, Boxes, ChevronDown, FileText, ImageIcon, ImagePlus, Maximize2, Music2, Pencil, SlidersHorizontal, UserRound, Video, WandSparkles, X } from "lucide-react";
import { Button, Image as AntImage, InputNumber, Modal, Tooltip } from "antd";
import { ModelPicker } from "@/components/model-picker";
@@ -19,8 +19,12 @@ import { CanvasVideoSettingsPopover } from "./canvas-video-settings-popover";
import { CanvasVideoPromptTools } from "./canvas-video-prompt-tools";
import { CanvasPresetPicker, type CanvasPromptPreset } from "./canvas-preset-picker";
import { CanvasPortraitTexturePopover } from "./canvas-portrait-texture-popover";
import { CanvasPromptOptimizerDrawer } from "./canvas-prompt-optimizer-drawer";
import { CanvasNodeType, type CanvasGenerationMode, type CanvasNodeData, type CanvasNodeMetadata, type CanvasWorkspaceMode } from "@/types/canvas";
import { canvasResourceMentionToken, type CanvasResourceReference } from "@/lib/canvas/canvas-resource-references";
import { promptOptimizerPlugin, PROMPT_OPTIMIZER_PLUGIN_ID } from "@/lib/plugins/builtin/prompt-optimizer";
import { createPluginHostContext } from "@/services/plugin-host";
import { usePluginStore } from "@/stores/use-plugin-store";
export type CanvasNodeGenerationMode = CanvasGenerationMode;
@@ -31,6 +35,9 @@ type CanvasNodePromptPanelProps = {
onConfigChange: (nodeId: string, patch: Partial<CanvasNodeMetadata>) => void;
onGenerate: (nodeId: string, mode: CanvasNodeGenerationMode, prompt: string) => void;
mentionReferences?: CanvasResourceReference[];
onRemoveReference?: (nodeId: string, reference: CanvasResourceReference) => void;
onClose?: () => void;
onNodeMouseDown?: (event: ReactPointerEvent, nodeId: string) => void;
onImageSettingsOpenChange?: (open: boolean) => void;
workspaceMode?: CanvasWorkspaceMode;
};
@@ -46,11 +53,12 @@ const PROMPT_EDITOR_VERTICAL_PADDING = 12;
const PROMPT_EDITOR_EXPANDED_VERTICAL_PADDING = 20;
const PROMPT_EDITOR_MAX_LINES = 8;
export function CanvasNodePromptPanel({ node, isRunning, onPromptChange, onConfigChange, onGenerate, mentionReferences = [], onImageSettingsOpenChange, workspaceMode = "professional" }: CanvasNodePromptPanelProps) {
export function CanvasNodePromptPanel({ node, isRunning, onPromptChange, onConfigChange, onGenerate, mentionReferences = [], onRemoveReference, onClose, onNodeMouseDown, onImageSettingsOpenChange, workspaceMode = "professional" }: CanvasNodePromptPanelProps) {
const globalConfig = useEffectiveConfig();
const themeName = useThemeStore((state) => state.theme);
const theme = canvasThemes[themeName];
const creditsEnabled = useUserStore((state) => state.features.creditsEnabled);
const promptOptimizerInstallation = usePluginStore((state) => state.installations.find((item) => item.manifest.id === PROMPT_OPTIMIZER_PLUGIN_ID));
const simpleMode = workspaceMode === "simple";
const mode = defaultMode(node.type);
const hasTextContent = node.type === CanvasNodeType.Text && Boolean(node.metadata?.content?.trim());
@@ -65,6 +73,7 @@ export function CanvasNodePromptPanel({ node, isRunning, onPromptChange, onConfi
const [manualPromptHeight, setManualPromptHeight] = useState<number | null>(null);
const [manualExpandedPromptHeight, setManualExpandedPromptHeight] = useState<number | null>(null);
const [paramsExpanded, setParamsExpanded] = useState(false); // #98 决策2:B区参数区折叠状态(手风琴)
const [promptOptimizerOpen, setPromptOptimizerOpen] = useState(false);
const activeReferences = mentionReferences.filter((item) => item.active && item.kind !== "skill");
const requirements: ModelRequirements = {
capability: mode,
@@ -92,6 +101,10 @@ export function CanvasNodePromptPanel({ node, isRunning, onPromptChange, onConfi
}, mode),
};
const config = buildNodeConfig(globalConfig, node, mode, requirements);
const promptOptimizerProvider = useMemo(() => {
if (!promptOptimizerInstallation?.enabled || !promptOptimizerPlugin.createPromptOptimizer) return null;
return promptOptimizerPlugin.createPromptOptimizer(createPluginHostContext(promptOptimizerPlugin, promptOptimizerInstallation, globalConfig));
}, [globalConfig, promptOptimizerInstallation]);
const generationCount = Math.max(1, Math.min(15, Math.floor(Math.abs(Number(config.count)) || 1)));
const priceChannel = resolveModelChannel(config, config.model);
const credits = requestCreditCost({
@@ -125,6 +138,7 @@ export function CanvasNodePromptPanel({ node, isRunning, onPromptChange, onConfi
const expandedComposerHeight = clampPromptHeight(manualExpandedPromptHeight ?? expandedPromptContentHeight + (activeReferenceCount ? PROMPT_REFERENCE_SHELF_HEIGHT : 0), expandedPromptBounds);
const isSubmitDisabled = !isRunning && !prompt.trim();
const canExpandPrompt = mode === "image" || mode === "video";
const canOptimizePrompt = Boolean(promptOptimizerProvider) && canExpandPrompt;
const isPortraitTexture = mode === "image" && Boolean(node.metadata?.portraitTexture);
useEffect(() => {
@@ -183,7 +197,15 @@ export function CanvasNodePromptPanel({ node, isRunning, onPromptChange, onConfi
};
const renderComposerHeader = (expanded: boolean) => (
<div className="canvas-node-composer-header">
<div
className="canvas-node-composer-header cursor-grab select-none active:cursor-grabbing"
data-canvas-node-drag-handle
title="拖动节点"
onPointerDown={(event) => {
const target = event.target instanceof Element ? event.target : null;
if (!target?.closest("button, input, textarea, select, a, [contenteditable=\"true\"], [data-canvas-no-drag]")) onNodeMouseDown?.(event, node.id);
}}
>
{isPortraitTexture ? (
<CanvasPortraitTexturePopover value={node.metadata?.portraitTexture} placement={expanded ? "topRight" : "topLeft"} onChange={(portraitTexture) => onConfigChange(node.id, { portraitTexture })} />
) : (
@@ -195,6 +217,20 @@ export function CanvasNodePromptPanel({ node, isRunning, onPromptChange, onConfi
</div>
)}
{!simpleMode ? <CanvasPresetPicker mode={mode} skillReferences={skillReferences} open={expanded ? expandedPresetOpen : presetOpen} onOpenChange={expanded ? setExpandedPresetOpen : setPresetOpen} onSelect={applyPreset} dense /> : null}
{canOptimizePrompt ? (
<Tooltip title="用 AI 优化提示词">
<button
type="button"
className="canvas-node-composer-icon-button inline-flex h-6 shrink-0 items-center gap-1 rounded-md px-1.5 transition-[background-color,filter] hover:brightness-125 focus-visible:outline focus-visible:outline-1 focus-visible:outline-offset-1 motion-reduce:hover:translate-y-0"
style={{ background: controlSurface, color: theme.node.text, outlineColor: monochromeAccent }}
onClick={() => setPromptOptimizerOpen(true)}
aria-label="优化提示词"
>
<WandSparkles className="size-3" />
<span className="hidden text-[var(--fs-micro)] font-medium sm:inline">优化</span>
</button>
</Tooltip>
) : null}
<div className="ml-auto flex shrink-0 items-center justify-end gap-1">
{activeReferenceCount ? <ComposerPill theme={theme} icon={<Boxes className="size-2.5" />} label={`参考 ${activeReferenceCount}`} /> : null}
{!expanded && canExpandPrompt ? (
@@ -210,6 +246,19 @@ export function CanvasNodePromptPanel({ node, isRunning, onPromptChange, onConfi
</button>
</Tooltip>
) : null}
{!expanded && onClose ? (
<Tooltip title="关闭">
<button
type="button"
className="canvas-node-composer-icon-button grid size-6 shrink-0 place-items-center rounded-md transition-[background-color,filter] hover:brightness-125 focus-visible:outline focus-visible:outline-1 focus-visible:outline-offset-1 motion-reduce:hover:translate-y-0"
style={{ background: controlSurface, color: theme.node.text, outlineColor: monochromeAccent }}
onClick={onClose}
aria-label="关闭创作面板"
>
<X className="size-3" />
</button>
</Tooltip>
) : null}
</div>
</div>
);
@@ -318,7 +367,7 @@ export function CanvasNodePromptPanel({ node, isRunning, onPromptChange, onConfi
return (
<>
<div className="canvas-node-composer-editor" style={{ height }}>
<ConnectedReferenceShelf references={mentionReferences} theme={theme} onInsert={insertPromptReference} />
<ConnectedReferenceShelf references={mentionReferences} theme={theme} onInsert={insertPromptReference} onRemove={(reference) => onRemoveReference?.(node.id, reference)} />
<CanvasResourceMentionTextarea
value={prompt}
references={mentionReferences}
@@ -345,13 +394,26 @@ export function CanvasNodePromptPanel({ node, isRunning, onPromptChange, onConfi
};
return (
<div
className="canvas-node-composer"
style={composerSurfaceStyle}
onMouseDown={(event) => event.stopPropagation()}
onPointerDown={(event) => event.stopPropagation()}
onWheel={(event) => event.stopPropagation()}
<CanvasPromptOptimizerDrawer
open={promptOptimizerOpen}
prompt={prompt}
generationMode={mode === "image" || mode === "video" ? mode : "image"}
targetModel={modelOptionName(config.model) || config.model}
targetProtocol={priceChannel.modelCosts?.find((item) => item.model === modelOptionName(config.model))?.protocol || priceChannel.interfaceType}
config={globalConfig}
optimizerModel={globalConfig.textModel}
references={activeReferences}
provider={promptOptimizerProvider}
onClose={() => setPromptOptimizerOpen(false)}
onApply={(nextPrompt) => updatePrompt(nextPrompt)}
>
<div
className="canvas-node-composer"
style={composerSurfaceStyle}
onMouseDown={(event) => event.stopPropagation()}
onPointerDown={(event) => event.stopPropagation()}
onWheel={(event) => event.stopPropagation()}
>
{renderComposerHeader(false)}
{renderPromptEditor(false)}
@@ -409,7 +471,9 @@ export function CanvasNodePromptPanel({ node, isRunning, onPromptChange, onConfi
<div className="shrink-0">{renderComposerControls(true)}</div>
</div>
</Modal>
</div>
</div>
</CanvasPromptOptimizerDrawer>
);
}
@@ -436,7 +500,7 @@ function modeDisplayName(mode: CanvasNodeGenerationMode) {
return "文本";
}
function ConnectedReferenceShelf({ references, theme, onInsert }: { references: CanvasResourceReference[]; theme: CanvasTheme; onInsert: (reference: CanvasResourceReference) => void }) {
function ConnectedReferenceShelf({ references, theme, onInsert, onRemove }: { references: CanvasResourceReference[]; theme: CanvasTheme; onInsert: (reference: CanvasResourceReference) => void; onRemove?: (reference: CanvasResourceReference) => void }) {
const activeReferences = references.filter((item) => item.active && item.kind !== "skill");
const [imagePreview, setImagePreview] = useState<CanvasResourceReference | null>(null);
if (!activeReferences.length) return null;
@@ -462,6 +526,22 @@ function ConnectedReferenceShelf({ references, theme, onInsert }: { references:
<AtSign className="size-2.5" />
<span>{reference.label}</span>
</button>
{onRemove ? (
<button
type="button"
className="canvas-node-reference-remove"
style={{ background: theme.toolbar.panel, borderColor: theme.node.stroke, color: theme.node.text }}
title="移除参考并删除连接"
aria-label={`移除参考 ${reference.label}`}
onClick={(event) => {
event.stopPropagation();
onRemove(reference);
}}
onPointerDown={(event) => event.stopPropagation()}
>
<X className="size-3" />
</button>
) : null}
</span>
);
})}
@@ -0,0 +1,53 @@
import { createContext, useCallback, useContext, useMemo, useState, type MouseEventHandler, type PointerEventHandler, type ReactNode, type WheelEventHandler } from "react";
type CanvasOverlayLayerContextValue = {
activeOverlayId: string | null;
bringToFront: (overlayId: string) => void;
};
const CanvasOverlayLayerContext = createContext<CanvasOverlayLayerContextValue | null>(null);
export function CanvasOverlayLayerProvider({ children }: { children: ReactNode }) {
const [activeOverlayId, setActiveOverlayId] = useState<string | null>(null);
const bringToFront = useCallback((overlayId: string) => {
setActiveOverlayId((current) => (current === overlayId ? current : overlayId));
}, []);
const value = useMemo(() => ({ activeOverlayId, bringToFront }), [activeOverlayId, bringToFront]);
return <CanvasOverlayLayerContext.Provider value={value}>{children}</CanvasOverlayLayerContext.Provider>;
}
export function useCanvasOverlayLayer(overlayId: string, fallbackZIndex: string) {
const context = useContext(CanvasOverlayLayerContext);
const bringToFrontFromContext = context?.bringToFront;
const bringToFront = useCallback(() => bringToFrontFromContext?.(overlayId), [bringToFrontFromContext, overlayId]);
const zIndex = context?.activeOverlayId === overlayId ? "var(--z-canvas-overlay-active)" : fallbackZIndex;
return { bringToFront, zIndex };
}
export function CanvasOverlayLayerContainer({
overlayId,
fallbackZIndex,
className,
children,
onMouseDown,
onPointerDown,
onWheel,
}: {
overlayId: string;
fallbackZIndex: string;
className?: string;
children: ReactNode;
onMouseDown?: MouseEventHandler<HTMLDivElement>;
onPointerDown?: PointerEventHandler<HTMLDivElement>;
onWheel?: WheelEventHandler<HTMLDivElement>;
}) {
const { bringToFront, zIndex } = useCanvasOverlayLayer(overlayId, fallbackZIndex);
return (
<div data-canvas-no-zoom className={className} style={{ zIndex }} onPointerDownCapture={bringToFront} onFocusCapture={bringToFront} onMouseDown={onMouseDown} onPointerDown={onPointerDown} onWheel={onWheel}>
{children}
</div>
);
}
@@ -0,0 +1,824 @@
import { useCallback, useEffect, useLayoutEffect, useMemo, useRef, useState, type CSSProperties, type KeyboardEvent as ReactKeyboardEvent, type PointerEvent as ReactPointerEvent, type ReactNode } from "react";
import { Alert, App, Button, Dropdown, Input, Popover, Tag, Typography } from "antd";
import { Bubble, Sender, type BubbleItemType } from "@ant-design/x";
import { ArrowUp, Check, ChevronDown, FileText, Image as ImageIcon, LoaderCircle, Music2, Sparkles, UserRound, Video, X } from "lucide-react";
import { ModelPicker } from "@/components/model-picker";
import type { CanvasResourceReference } from "@/lib/canvas/canvas-resource-references";
import type { PromptOptimizationMode, PromptOptimizationResult, PromptOptimizerProvider } from "@/lib/plugins/plugin-types";
import type { AiConfig } from "@/stores/use-config-store";
type CanvasPromptOptimizerDrawerProps = {
open: boolean;
children: ReactNode;
prompt: string;
generationMode: "image" | "video";
targetModel: string;
targetProtocol?: string;
config: AiConfig;
optimizerModel: string;
references: CanvasResourceReference[];
provider: PromptOptimizerProvider | null;
onClose: () => void;
onApply: (prompt: string) => void;
};
const modeOptions: Array<{ label: string; value: PromptOptimizationMode }> = [
{ label: "扩展想法", value: "expand" },
{ label: "精修已有", value: "refine" },
{ label: "强化风格", value: "style" },
{ label: "适配模型", value: "model-adapt" },
{ label: "结合参考", value: "reference" },
];
const modeDescriptions: Record<PromptOptimizationMode, string> = {
expand: "从一句模糊想法补齐主体、场景、构图、光线和镜头等可执行细节。",
refine: "尽量保留原意,只修正表达并补充必要细节,适合已经有初稿的提示词。",
style: "保留主体和动作,重点强化电影感、材质、色彩、光影或指定艺术风格。",
"model-adapt": "根据当前生成模型的习惯调整提示词结构和描述重点,减少模型不易理解的表达。",
reference: "结合已连接的参考图或文本,补充一致性、外观、构图和关联关系。",
};
type PanelSize = { width: number; height: number };
type PanelOffset = { x: number; y: number };
type PanelPosition = { left: number; top: number };
type ResizeEdges = { top?: boolean; right?: boolean; bottom?: boolean; left?: boolean };
const PANEL_MARGIN = 12;
const PANEL_MIN_WIDTH = 300;
const PANEL_MIN_HEIGHT = 360;
const PANEL_MAX_WIDTH = 760;
const PANEL_MAX_HEIGHT = 780;
function clampPanelValue(value: number, min: number, max: number) {
return Math.min(Math.max(value, min), Math.max(min, max));
}
function getPanelResizeBounds() {
const viewportWidth = typeof window === "undefined" ? 1024 : window.innerWidth;
const viewportHeight = typeof window === "undefined" ? 768 : window.innerHeight;
const maxWidth = Math.min(PANEL_MAX_WIDTH, Math.max(0, viewportWidth - PANEL_MARGIN * 2));
const maxHeight = Math.min(PANEL_MAX_HEIGHT, Math.max(0, viewportHeight - PANEL_MARGIN * 2));
return {
minWidth: Math.min(PANEL_MIN_WIDTH, maxWidth),
maxWidth,
minHeight: Math.min(PANEL_MIN_HEIGHT, maxHeight),
maxHeight,
};
}
function getInitialPanelSize(): PanelSize {
const bounds = getPanelResizeBounds();
return {
width: clampPanelValue(420, bounds.minWidth, bounds.maxWidth),
height: clampPanelValue(620, bounds.minHeight, bounds.maxHeight),
};
}
function getInitialPanelPosition(panelSize: PanelSize): PanelPosition {
if (typeof window === "undefined") return { left: PANEL_MARGIN, top: PANEL_MARGIN };
const anchor = [...document.querySelectorAll<HTMLElement>(".canvas-node-composer, .creation-chat-composer")]
.map((element) => ({ element, rect: element.getBoundingClientRect() }))
.find(({ element, rect }) => rect.width > 0 && rect.height > 0 && getComputedStyle(element).visibility !== "hidden");
if (!anchor) return { left: PANEL_MARGIN, top: PANEL_MARGIN };
const { rect } = anchor;
const left = clampPanelValue(rect.left + (rect.width - panelSize.width) / 2, PANEL_MARGIN, window.innerWidth - PANEL_MARGIN - panelSize.width);
const aboveTop = rect.top - panelSize.height - PANEL_MARGIN;
const belowTop = rect.bottom + PANEL_MARGIN;
const hasRoomBelow = belowTop + panelSize.height <= window.innerHeight - PANEL_MARGIN;
const top = aboveTop >= PANEL_MARGIN ? aboveTop : hasRoomBelow ? belowTop : aboveTop;
return {
left,
top: clampPanelValue(top, PANEL_MARGIN, window.innerHeight - PANEL_MARGIN - panelSize.height),
};
}
export function CanvasPromptOptimizerDrawer({ open, children, prompt, generationMode, targetModel, targetProtocol, config, optimizerModel, references, provider, onClose, onApply }: CanvasPromptOptimizerDrawerProps) {
const { message } = App.useApp();
const abortRef = useRef<AbortController | null>(null);
const chatRef = useRef<HTMLDivElement | null>(null);
const [mode, setMode] = useState<PromptOptimizationMode>("expand");
const [activeOptimizerModel, setActiveOptimizerModel] = useState("");
const [draftPrompt, setDraftPrompt] = useState(prompt);
const [submittedPrompt, setSubmittedPrompt] = useState("");
const [selectedReferenceIds, setSelectedReferenceIds] = useState<string[]>([]);
const [result, setResult] = useState<PromptOptimizationResult | null>(null);
const [selectedPrompt, setSelectedPrompt] = useState("");
const [working, setWorking] = useState(false);
const [error, setError] = useState("");
const [streaming, setStreaming] = useState(false);
const [panelSize, setPanelSize] = useState<PanelSize>(getInitialPanelSize);
const [panelOffset, setPanelOffset] = useState<PanelOffset>({ x: 0, y: 0 });
const [panelInteracting, setPanelInteracting] = useState(false);
const panelOffsetRef = useRef(panelOffset);
const panelPositionRef = useRef<PanelPosition | null>(null);
const wasOpenRef = useRef(false);
const interactionCleanupRef = useRef<(() => void) | null>(null);
panelOffsetRef.current = panelOffset;
const activeReferences = useMemo(() => references.filter((reference) => reference.active), [references]);
const selectedReferences = useMemo(() => activeReferences.filter((reference) => selectedReferenceIds.includes(reference.id)), [activeReferences, selectedReferenceIds]);
const optimizationReferences = mode === "reference" ? selectedReferences : activeReferences;
const referenceCount = mode === "reference" ? selectedReferences.length : activeReferences.length;
const textContext = useMemo(
() => optimizationReferences.filter((reference) => (reference.kind === "text" || reference.kind === "character") && reference.text?.trim()).map((reference) => ({ title: reference.title || reference.label, text: reference.text!.trim() })),
[optimizationReferences],
);
const imageContext = useMemo(
() =>
optimizationReferences
.filter((reference) => (reference.kind === "image" || reference.kind === "character") && reference.previewUrl && /^(data:|https?:\/\/)/i.test(reference.previewUrl))
.map((reference) => ({ title: reference.title || reference.label, url: reference.previewUrl! })),
[optimizationReferences],
);
useEffect(() => {
if (!open) return;
abortRef.current?.abort();
setDraftPrompt(prompt);
setSubmittedPrompt(prompt.trim());
setActiveOptimizerModel(optimizerModel);
setSelectedReferenceIds(references.filter((reference) => reference.active).map((reference) => reference.id));
setResult(null);
setSelectedPrompt("");
setError("");
setWorking(false);
setStreaming(false);
}, [open, optimizerModel, prompt]);
useLayoutEffect(() => {
if (open && !wasOpenRef.current) {
panelPositionRef.current = null;
const initialPosition = getInitialPanelPosition(panelSize);
panelPositionRef.current = initialPosition;
const initialOffset = { x: initialPosition.left, y: initialPosition.top };
panelOffsetRef.current = initialOffset;
setPanelOffset(initialOffset);
}
wasOpenRef.current = open;
}, [open, panelSize]);
useEffect(
() => () => {
abortRef.current?.abort();
interactionCleanupRef.current?.();
},
[],
);
useEffect(() => {
if (open) return;
interactionCleanupRef.current?.();
}, [open]);
const syncPanelPositionToViewport = useCallback(() => {
const popoverRoot = document.querySelector<HTMLElement>(".canvas-prompt-optimizer-popover");
if (!popoverRoot) return;
const rect = popoverRoot.getBoundingClientRect();
const currentOffset = panelOffsetRef.current;
const baseLeft = rect.left - currentOffset.x;
const baseTop = rect.top - currentOffset.y;
const currentPosition = panelPositionRef.current ?? { left: rect.left, top: rect.top };
const nextPosition = {
left: clampPanelValue(currentPosition.left, PANEL_MARGIN, window.innerWidth - PANEL_MARGIN - rect.width),
top: clampPanelValue(currentPosition.top, PANEL_MARGIN, window.innerHeight - PANEL_MARGIN - rect.height),
};
panelPositionRef.current = nextPosition;
const nextOffset = {
x: nextPosition.left - baseLeft,
y: nextPosition.top - baseTop,
};
setPanelOffset((current) => {
panelOffsetRef.current = nextOffset;
return nextOffset.x === current.x && nextOffset.y === current.y ? current : nextOffset;
});
}, []);
useEffect(() => {
if (!open) return;
const handleViewportResize = () => {
const bounds = getPanelResizeBounds();
setPanelSize((current) => ({
width: clampPanelValue(current.width, bounds.minWidth, bounds.maxWidth),
height: clampPanelValue(current.height, bounds.minHeight, bounds.maxHeight),
}));
requestAnimationFrame(syncPanelPositionToViewport);
};
window.addEventListener("resize", handleViewportResize);
return () => window.removeEventListener("resize", handleViewportResize);
}, [open, syncPanelPositionToViewport]);
useEffect(() => {
if (!open || panelInteracting) return;
let frame = requestAnimationFrame(() => {
frame = requestAnimationFrame(syncPanelPositionToViewport);
});
return () => cancelAnimationFrame(frame);
}, [open, panelInteracting, panelSize.height, panelSize.width, syncPanelPositionToViewport]);
useEffect(() => {
if (!open) return;
const frame = requestAnimationFrame(() => {
const scrollBox = chatRef.current?.querySelector<HTMLElement>(".ant-bubble-list-scroll-box");
if (scrollBox) scrollBox.scrollTop = scrollBox.scrollHeight;
});
return () => cancelAnimationFrame(frame);
}, [open, submittedPrompt, working, result, error]);
const beginPanelInteraction = (event: ReactPointerEvent<HTMLElement>, kind: "drag" | "resize", edges: ResizeEdges = {}) => {
if (event.button !== 0) return;
const popoverRoot = event.currentTarget.closest<HTMLElement>(".canvas-prompt-optimizer-popover");
if (!popoverRoot) return;
event.preventDefault();
event.stopPropagation();
interactionCleanupRef.current?.();
const startX = event.clientX;
const startY = event.clientY;
const startSize = panelSize;
const startRect = popoverRoot.getBoundingClientRect();
const startPosition = panelPositionRef.current ?? { left: startRect.left, top: startRect.top };
panelPositionRef.current = startPosition;
const basePosition = {
left: startRect.left - panelOffsetRef.current.x,
top: startRect.top - panelOffsetRef.current.y,
};
const interactionTarget = event.currentTarget;
const pointerId = event.pointerId;
const previousUserSelect = document.body.style.userSelect;
const previousCursor = document.body.style.cursor;
const horizontalResize = Boolean(edges.left || edges.right);
const verticalResize = Boolean(edges.top || edges.bottom);
const cursor = kind === "drag" ? "grabbing" : horizontalResize && verticalResize ? (edges.top === edges.left ? "nwse-resize" : "nesw-resize") : horizontalResize ? "ew-resize" : "ns-resize";
let frameId: number | null = null;
let pendingPosition: PanelPosition | null = null;
let pendingSize: PanelSize | null = null;
let latestSize = startSize;
const commitPanelLayout = (position: PanelPosition, size?: PanelSize) => {
const nextOffset = {
x: position.left - basePosition.left,
y: position.top - basePosition.top,
};
panelPositionRef.current = position;
panelOffsetRef.current = nextOffset;
popoverRoot.style.setProperty("translate", `${nextOffset.x}px ${nextOffset.y}px`);
if (size) {
latestSize = size;
popoverRoot.style.setProperty("--canvas-prompt-optimizer-width", `${size.width}px`);
popoverRoot.style.setProperty("--canvas-prompt-optimizer-height", `${size.height}px`);
}
};
const flushPendingLayout = () => {
if (frameId !== null) {
cancelAnimationFrame(frameId);
frameId = null;
}
if (!pendingPosition && !pendingSize) return;
const nextPosition = pendingPosition ?? panelPositionRef.current ?? startPosition;
const nextSize = pendingSize;
pendingPosition = null;
pendingSize = null;
commitPanelLayout(nextPosition, nextSize || undefined);
};
const schedulePanelLayout = (position: PanelPosition, size?: PanelSize) => {
pendingPosition = position;
pendingSize = size || pendingSize;
if (frameId !== null) return;
frameId = requestAnimationFrame(() => {
frameId = null;
if (!pendingPosition && !pendingSize) return;
const nextPosition = pendingPosition ?? panelPositionRef.current ?? startPosition;
const nextSize = pendingSize;
pendingPosition = null;
pendingSize = null;
commitPanelLayout(nextPosition, nextSize || undefined);
});
};
document.body.style.userSelect = "none";
document.body.style.cursor = cursor;
try {
interactionTarget.setPointerCapture(pointerId);
} catch {
// 某些浏览器在指针已被外层捕获时会拒绝重复捕获,窗口级监听仍可继续完成拖动。
}
setPanelInteracting(true);
const handleMove = (moveEvent: PointerEvent) => {
if (moveEvent.pointerId !== pointerId) return;
moveEvent.preventDefault();
const deltaX = moveEvent.clientX - startX;
const deltaY = moveEvent.clientY - startY;
if (kind === "drag") {
schedulePanelLayout({
left: clampPanelValue(startPosition.left + deltaX, PANEL_MARGIN, window.innerWidth - PANEL_MARGIN - startRect.width),
top: clampPanelValue(startPosition.top + deltaY, PANEL_MARGIN, window.innerHeight - PANEL_MARGIN - startRect.height),
});
return;
}
const bounds = getPanelResizeBounds();
let nextWidth = startSize.width;
let nextHeight = startSize.height;
if (edges.right) {
nextWidth = clampPanelValue(startSize.width + deltaX, bounds.minWidth, Math.min(bounds.maxWidth, window.innerWidth - PANEL_MARGIN - startPosition.left));
}
if (edges.left) {
nextWidth = clampPanelValue(startSize.width - deltaX, bounds.minWidth, Math.min(bounds.maxWidth, startPosition.left + startSize.width - PANEL_MARGIN));
}
if (edges.bottom) {
nextHeight = clampPanelValue(startSize.height + deltaY, bounds.minHeight, Math.min(bounds.maxHeight, window.innerHeight - PANEL_MARGIN - startPosition.top));
}
if (edges.top) {
nextHeight = clampPanelValue(startSize.height - deltaY, bounds.minHeight, Math.min(bounds.maxHeight, startPosition.top + startSize.height - PANEL_MARGIN));
}
const nextPosition = {
left: clampPanelValue(edges.left ? startPosition.left + startSize.width - nextWidth : startPosition.left, PANEL_MARGIN, window.innerWidth - PANEL_MARGIN - nextWidth),
top: clampPanelValue(edges.top ? startPosition.top + startSize.height - nextHeight : startPosition.top, PANEL_MARGIN, window.innerHeight - PANEL_MARGIN - nextHeight),
};
schedulePanelLayout(nextPosition, { width: nextWidth, height: nextHeight });
};
const cleanup = () => {
window.removeEventListener("pointermove", handleMove);
window.removeEventListener("pointerup", cleanup);
window.removeEventListener("pointercancel", cleanup);
flushPendingLayout();
try {
if (interactionTarget.hasPointerCapture(pointerId)) interactionTarget.releasePointerCapture(pointerId);
} catch {
// 指针已由浏览器释放时无需再次释放。
}
document.body.style.userSelect = previousUserSelect;
document.body.style.cursor = previousCursor;
setPanelOffset((current) => {
const next = panelOffsetRef.current;
return current.x === next.x && current.y === next.y ? current : { ...next };
});
if (kind === "resize") setPanelSize(latestSize);
setPanelInteracting(false);
if (interactionCleanupRef.current === cleanup) interactionCleanupRef.current = null;
};
interactionCleanupRef.current = cleanup;
window.addEventListener("pointermove", handleMove, { passive: false });
window.addEventListener("pointerup", cleanup);
window.addEventListener("pointercancel", cleanup);
};
const nudgePanel = (deltaX: number, deltaY: number) => {
const popoverRoot = document.querySelector<HTMLElement>(".canvas-prompt-optimizer-popover");
if (!popoverRoot) {
setPanelOffset((current) => ({ x: current.x + deltaX, y: current.y + deltaY }));
return;
}
const rect = popoverRoot.getBoundingClientRect();
const currentPosition = panelPositionRef.current ?? { left: rect.left, top: rect.top };
const currentOffset = panelOffsetRef.current;
const baseLeft = rect.left - currentOffset.x;
const baseTop = rect.top - currentOffset.y;
const nextPosition = {
left: clampPanelValue(currentPosition.left + deltaX, PANEL_MARGIN, window.innerWidth - PANEL_MARGIN - rect.width),
top: clampPanelValue(currentPosition.top + deltaY, PANEL_MARGIN, window.innerHeight - PANEL_MARGIN - rect.height),
};
const nextOffset = {
x: nextPosition.left - baseLeft,
y: nextPosition.top - baseTop,
};
panelPositionRef.current = nextPosition;
panelOffsetRef.current = nextOffset;
setPanelOffset(nextOffset);
};
const handlePanelMoveKeyDown = (event: ReactKeyboardEvent<HTMLDivElement>) => {
const step = event.shiftKey ? 48 : 16;
if (event.key === "ArrowLeft") nudgePanel(-step, 0);
else if (event.key === "ArrowRight") nudgePanel(step, 0);
else if (event.key === "ArrowUp") nudgePanel(0, -step);
else if (event.key === "ArrowDown") nudgePanel(0, step);
else return;
event.preventDefault();
};
const runOptimization = async (requestedPrompt = draftPrompt) => {
const promptValue = requestedPrompt.trim();
if (!provider || working || !promptValue || (mode === "reference" && !selectedReferences.length)) return;
const controller = new AbortController();
abortRef.current?.abort();
abortRef.current = controller;
setWorking(true);
setStreaming(false);
setError("");
setSubmittedPrompt(promptValue);
setDraftPrompt("");
setResult(null);
setSelectedPrompt("");
try {
const optimized = await provider.optimize(
{
prompt: promptValue,
mode,
generationMode,
targetModel,
targetProtocol,
optimizerModel: activeOptimizerModel || undefined,
context: { texts: textContext, images: imageContext },
},
{
signal: controller.signal,
onDelta: () => setStreaming(true),
},
);
if (controller.signal.aborted) return;
setResult(optimized);
setSelectedPrompt(optimized.optimizedPrompt);
} catch (reason) {
if (controller.signal.aborted) return;
setDraftPrompt(promptValue);
setError(reason instanceof Error ? reason.message : "提示词优化失败,请稍后重试");
} finally {
if (!controller.signal.aborted) {
setWorking(false);
setStreaming(false);
}
}
};
const applyPrompt = () => {
const value = selectedPrompt.trim();
if (!value) return;
onApply(value);
onClose();
message.success("提示词已采用并回填到当前输入框");
};
const modeMenuItems = modeOptions.map((option) => ({
key: option.value,
label: (
<span className="canvas-prompt-optimizer-mode-option">
<span>{option.label}</span>
<small>{modeDescriptions[option.value]}</small>
</span>
),
}));
const bubbleItems: BubbleItemType[] = [
{
key: "assistant-intro",
role: "ai",
content: (
<div className="canvas-prompt-optimizer-bubble is-assistant-bubble">
<div className="canvas-prompt-optimizer-message-meta">
<span>提示词助手</span>
<span>当前模式:{modeOptions.find((option) => option.value === mode)?.label}</span>
</div>
<p>{modeDescriptions[mode]}</p>
{mode === "reference" ? (
<ReferenceSelection
references={activeReferences}
selectedReferences={selectedReferences}
onToggle={(referenceId) => setSelectedReferenceIds((current) => (current.includes(referenceId) ? current.filter((id) => id !== referenceId) : [...current, referenceId]))}
/>
) : activeReferences.length ? (
<div className="canvas-prompt-optimizer-chat-reference">
<span>将结合参考</span>
<div className="flex min-w-0 flex-wrap gap-1.5">
{activeReferences.map((reference) => (
<Tag key={reference.id}>{reference.title || reference.label}</Tag>
))}
</div>
</div>
) : null}
</div>
),
},
];
if (submittedPrompt) {
bubbleItems.push({
key: "user-prompt",
role: "user",
content: (
<div className="canvas-prompt-optimizer-user-content">
<div className="canvas-prompt-optimizer-message-meta">
<span>你</span>
<span>{submittedPrompt.length} 字</span>
</div>
<div className="canvas-prompt-optimizer-bubble is-user-bubble">{submittedPrompt}</div>
</div>
),
});
}
if (working) {
bubbleItems.push({
key: "working",
role: "ai",
content: (
<div className="canvas-prompt-optimizer-bubble is-assistant-bubble is-working" role="status">
<LoaderCircle className="size-3.5 animate-spin motion-reduce:animate-none" />
<span>{streaming ? "正在接收优化结果…" : "正在整理你的想法…"}</span>
</div>
),
});
}
if (error) {
bubbleItems.push({
key: "error",
role: "system",
content: <Alert className="canvas-prompt-optimizer-alert" type="error" showIcon message="优化失败" description={error} />,
});
}
if (result) {
bubbleItems.push({
key: "result",
role: "ai",
content: (
<div className="canvas-prompt-optimizer-bubble is-assistant-bubble is-result-bubble">
<div className="canvas-prompt-optimizer-message-meta">
<span>提示词助手</span>
{result.modelProfile ? (
<Tag color="blue" bordered={false}>
已按 {result.modelProfile.label} 适配
</Tag>
) : null}
</div>
<div className="canvas-prompt-optimizer-result-heading">
<span>我建议这样写</span>
<Button type="primary" size="small" icon={<Check className="size-3.5" />} onClick={applyPrompt} disabled={!selectedPrompt.trim()} aria-label="采用优化后的提示词">
采用
</Button>
</div>
<Input.TextArea
className="canvas-prompt-optimizer-textarea canvas-prompt-optimizer-result-textarea"
value={selectedPrompt}
onChange={(event) => setSelectedPrompt(event.target.value)}
autoSize={{ minRows: 4, maxRows: 10 }}
aria-label="优化后的提示词"
/>
{result.negativePrompt ? (
<div className="canvas-prompt-optimizer-chat-detail">
<span>建议规避</span>
<p>{result.negativePrompt}</p>
</div>
) : null}
{result.changes.length ? <ResultList title="我做了什么" items={result.changes} /> : null}
{result.assumptions.length ? <ResultList title="需要你确认" items={result.assumptions} warning /> : null}
{result.variants.length ? (
<div className="canvas-prompt-optimizer-subsection">
<div className="canvas-prompt-optimizer-field-label">
<span>备选版本</span>
</div>
<div className="space-y-2">
{result.variants.map((variant) => {
const selected = selectedPrompt === variant.prompt;
return (
<button
key={`${variant.label}-${variant.prompt}`}
type="button"
className={`canvas-prompt-optimizer-variant ${selected ? "is-selected" : ""}`}
onClick={() => setSelectedPrompt(variant.prompt)}
aria-pressed={selected}
>
<span className="mb-1 flex items-center gap-1.5 text-[var(--fs-micro)] font-medium text-foreground/72">
{selected ? <Check className="size-3.5 text-primary" /> : null}
{variant.label}
</span>
<span className="line-clamp-3 text-[var(--fs-body)] leading-5 text-foreground/70">{variant.prompt}</span>
</button>
);
})}
</div>
</div>
) : null}
</div>
),
});
}
const popoverRootStyle = {
"--canvas-prompt-optimizer-width": `${panelSize.width}px`,
"--canvas-prompt-optimizer-height": `${panelSize.height}px`,
translate: `${panelOffset.x}px ${panelOffset.y}px`,
} as CSSProperties;
const content = (
<div className={`canvas-prompt-optimizer-panel${panelInteracting ? " is-interacting" : ""}`} data-canvas-no-zoom>
<div
className="canvas-prompt-optimizer-header"
onPointerDown={(event) => {
if ((event.target as Element | null)?.closest("button")) return;
beginPanelInteraction(event, "drag");
}}
>
<div className="canvas-prompt-optimizer-header-main canvas-prompt-optimizer-drag-region" role="button" tabIndex={0} aria-label="移动提示词优化面板" title="拖动移动面板,方向键也可以移动" onKeyDown={handlePanelMoveKeyDown}>
<span className="canvas-prompt-optimizer-icon">
<Sparkles className="size-4" aria-hidden="true" />
</span>
<div className="canvas-prompt-optimizer-header-title">
<div className="canvas-prompt-optimizer-header-title-row">
<Typography.Text strong>AI 提示词优化</Typography.Text>
<span className="canvas-prompt-optimizer-mode-badge">{generationMode === "image" ? "图片" : "视频"}</span>
<span className="canvas-prompt-optimizer-context" title={targetModel || "未配置模型"}>
· {targetModel || "未配置模型"}
{referenceCount ? ` · 参考 ${referenceCount}` : ""}
</span>
</div>
</div>
</div>
<button type="button" className="canvas-prompt-optimizer-close" onPointerDown={(event) => event.stopPropagation()} onClick={onClose} aria-label="关闭提示词优化">
<X className="size-4" aria-hidden="true" />
</button>
</div>
<div ref={chatRef} className="canvas-prompt-optimizer-chat-shell">
<Bubble.List
className="canvas-prompt-optimizer-chat thin-scrollbar"
items={bubbleItems}
autoScroll={false}
aria-live="polite"
role={{
ai: {
placement: "start",
variant: "borderless",
avatar: (
<span className="canvas-prompt-optimizer-message-avatar">
<Sparkles className="size-3.5" aria-hidden="true" />
</span>
),
},
user: { placement: "end", variant: "borderless" },
system: { placement: "start", variant: "borderless" },
}}
/>
</div>
<div className="canvas-prompt-optimizer-composer">
<Sender
className="canvas-prompt-optimizer-sender"
value={draftPrompt}
onChange={(value) => setDraftPrompt(value)}
onSubmit={(value) => void runOptimization(value)}
placeholder="继续描述你的画面想法,Enter 发送"
autoSize={{ minRows: 2, maxRows: 6 }}
disabled={working}
suffix={false}
submitType="enter"
footer={
<div className="canvas-prompt-optimizer-composer-toolbar">
<div className="canvas-prompt-optimizer-composer-leading">
<Dropdown
trigger={["click"]}
placement="topLeft"
classNames={{ root: "canvas-prompt-optimizer-mode-dropdown" }}
menu={{
items: modeMenuItems,
selectedKeys: [mode],
onClick: ({ key }) => setMode(key as PromptOptimizationMode),
}}
>
<button type="button" className="canvas-prompt-optimizer-mode-trigger" aria-label="选择优化方式" aria-haspopup="menu">
<span>{modeOptions.find((option) => option.value === mode)?.label}</span>
<ChevronDown className="size-3" aria-hidden="true" />
</button>
</Dropdown>
</div>
<div className="flex min-w-0 items-center gap-2">
<ModelPicker
config={config}
value={activeOptimizerModel}
onChange={setActiveOptimizerModel}
capability="text"
placeholder="选择优化模型"
showSelectedPrice={false}
variant="creation"
className="canvas-prompt-optimizer-model-picker"
popoverClassName="canvas-prompt-optimizer-model-popover"
/>
<button
type="button"
className="canvas-prompt-optimizer-send"
onClick={() => void runOptimization()}
disabled={!provider || working || !draftPrompt.trim() || (mode === "reference" && !selectedReferences.length)}
aria-label={working ? "正在优化" : "发送优化请求"}
>
{working ? <LoaderCircle className="size-3.5 animate-spin motion-reduce:animate-none" /> : <ArrowUp className="size-4" strokeWidth={2.35} aria-hidden="true" />}
</button>
</div>
</div>
}
aria-label="输入提示词优化请求"
/>
</div>
<div className="canvas-prompt-optimizer-resize-handle is-edge-top" aria-hidden="true" onPointerDown={(event) => beginPanelInteraction(event, "resize", { top: true })} />
<div className="canvas-prompt-optimizer-resize-handle is-edge-right" aria-hidden="true" onPointerDown={(event) => beginPanelInteraction(event, "resize", { right: true })} />
<div className="canvas-prompt-optimizer-resize-handle is-edge-bottom" aria-hidden="true" onPointerDown={(event) => beginPanelInteraction(event, "resize", { bottom: true })} />
<div className="canvas-prompt-optimizer-resize-handle is-edge-left" aria-hidden="true" onPointerDown={(event) => beginPanelInteraction(event, "resize", { left: true })} />
<div className="canvas-prompt-optimizer-resize-handle is-corner-top-left" aria-hidden="true" onPointerDown={(event) => beginPanelInteraction(event, "resize", { top: true, left: true })} />
<div className="canvas-prompt-optimizer-resize-handle is-corner-top-right" aria-hidden="true" onPointerDown={(event) => beginPanelInteraction(event, "resize", { top: true, right: true })} />
<div className="canvas-prompt-optimizer-resize-handle is-corner-bottom-left" aria-hidden="true" onPointerDown={(event) => beginPanelInteraction(event, "resize", { bottom: true, left: true })} />
</div>
);
return (
<Popover
open={open}
onOpenChange={(nextOpen) => {
if (!nextOpen) onClose();
}}
trigger={[]}
placement="top"
arrow={false}
autoAdjustOverflow
motion={{ motionName: "" }}
styles={{ root: popoverRootStyle }}
content={content}
classNames={{ root: "canvas-prompt-optimizer-popover", container: "canvas-prompt-optimizer-popover-surface", content: "canvas-prompt-optimizer-popover-content" }}
>
{children}
</Popover>
);
}
function ResultList({ title, items, warning = false }: { title: string; items: string[]; warning?: boolean }) {
return (
<div className="canvas-prompt-optimizer-subsection">
<div className="canvas-prompt-optimizer-field-label">
<span>{title}</span>
</div>
<ul className={`canvas-prompt-optimizer-list ${warning ? "is-warning" : ""}`}>
{items.map((item) => (
<li key={item} className="list-disc pl-1 marker:text-foreground/35">
{item}
</li>
))}
</ul>
</div>
);
}
function ReferenceSelection({ references, selectedReferences, onToggle }: { references: CanvasResourceReference[]; selectedReferences: CanvasResourceReference[]; onToggle: (referenceId: string) => void }) {
return (
<div className="canvas-prompt-optimizer-reference-selection">
<div className="canvas-prompt-optimizer-reference-heading">
<span>参考内容</span>
<span>{references.length ? `已选 ${selectedReferences.length}/${references.length}` : "当前上下文未连接参考"}</span>
</div>
{references.length ? (
<div className="canvas-prompt-optimizer-reference-list" role="group" aria-label="本次优化使用的参考内容">
{references.map((reference) => {
const selected = selectedReferences.some((item) => item.id === reference.id);
return (
<button
key={reference.id}
type="button"
className={`canvas-prompt-optimizer-reference-chip ${selected ? "is-selected" : ""}`}
aria-pressed={selected}
onClick={() => onToggle(reference.id)}
title={`${selected ? "取消使用" : "使用"} ${reference.title || reference.label}`}
>
<ReferencePreview reference={reference} />
<span className="canvas-prompt-optimizer-reference-chip-label">{reference.title || reference.label}</span>
{selected ? <Check className="size-3.5" aria-hidden="true" /> : null}
</button>
);
})}
</div>
) : (
<p className="canvas-prompt-optimizer-reference-empty">请先添加参考图、角色或文本,再使用此模式。</p>
)}
</div>
);
}
function ReferencePreview({ reference }: { reference: CanvasResourceReference }) {
if ((reference.kind === "image" || reference.kind === "character") && reference.previewUrl) {
return <img className="canvas-prompt-optimizer-reference-chip-preview" src={reference.previewUrl} alt="" />;
}
const Icon = reference.kind === "text" ? FileText : reference.kind === "video" ? Video : reference.kind === "audio" ? Music2 : reference.kind === "character" ? UserRound : ImageIcon;
return (
<span className="canvas-prompt-optimizer-reference-chip-icon">
<Icon className="size-3.5" aria-hidden="true" />
</span>
);
}
@@ -3,6 +3,7 @@ import { useLayoutEffect, useRef, useState, type CSSProperties, type ReactNode,
import { ChevronRight, Clapperboard, Image as ImageIcon, List, Music2, Pencil, Video, WandSparkles, X } from "lucide-react";
import { SpotlightSurface } from "@/components/ui/aceternity/spotlight-surface";
import { useCanvasOverlayLayer } from "@/components/canvas/canvas-overlay-layer";
import { canvasThemes } from "@/lib/canvas-theme";
import { aceternityMotion } from "@/lib/aceternity-motion";
import { subscribeCanvasViewportPreview } from "@/lib/canvas/canvas-live-viewport";
@@ -87,10 +88,21 @@ export function CanvasSelectionToolbar({ anchorRef, containerRef, count, childre
);
}
export function CanvasNodePanelOverlay({ node, viewport, containerRef, panelWidth, panelHeight = 190, children }: { node: CanvasNodeData; viewport: ViewportTransform; containerRef: RefObject<HTMLDivElement | null>; panelWidth?: number; panelHeight?: number; children: ReactNode }) {
type NodePanelPlacement = "above" | "below";
// 拖动时保留当前上下方向,并允许短暂越过安全边界,避免面板在临界位置反复翻转。
const NODE_PANEL_PLACEMENT_BUFFER = 32;
export function CanvasNodePanelOverlay({ node, viewport, containerRef, panelWidth, panelHeight = 190, dragOffset, isDragging = false, children }: { node: CanvasNodeData; viewport: ViewportTransform; containerRef: RefObject<HTMLDivElement | null>; panelWidth?: number; panelHeight?: number; dragOffset?: Position | null; isDragging?: boolean; children: ReactNode }) {
const panelRef = useRef<HTMLDivElement>(null);
const placementRef = useRef<NodePanelPlacement | null>(null);
const { bringToFront, zIndex } = useCanvasOverlayLayer(`node-panel:${node.id}`, "var(--z-modal-overlay)");
const initialWidth = resolveNodePanelWidth(node, viewport, panelWidth);
const initialPosition = getNodePanelPosition(node, viewport, { width: containerRef.current?.clientWidth || 0, height: containerRef.current?.clientHeight || 0 }, initialWidth, panelHeight);
const initialPosition = getNodePanelPosition(node, viewport, { width: containerRef.current?.clientWidth || 0, height: containerRef.current?.clientHeight || 0 }, initialWidth, panelHeight, dragOffset);
useLayoutEffect(() => {
bringToFront();
}, [bringToFront]);
useLayoutEffect(() => {
const container = containerRef.current;
@@ -98,8 +110,26 @@ export function CanvasNodePanelOverlay({ node, viewport, containerRef, panelWidt
if (!container || !panel) return;
const update = (nextViewport: ViewportTransform) => {
const nextWidth = resolveNodePanelWidth(node, nextViewport, panelWidth);
const nextHeight = panel.offsetHeight || panelHeight;
panel.style.width = `${nextWidth}px`;
const position = getNodePanelPosition(node, nextViewport, { width: container.clientWidth, height: container.clientHeight }, nextWidth, panel.offsetHeight || panelHeight);
panel.style.removeProperty("height");
const position = getNodePanelPosition(
node,
nextViewport,
{ width: container.clientWidth, height: container.clientHeight },
nextWidth,
nextHeight,
dragOffset,
isDragging ? placementRef.current : null,
isDragging ? NODE_PANEL_PLACEMENT_BUFFER : 0,
);
if (isDragging && placementRef.current && placementRef.current !== position.placement) {
panel.classList.remove("canvas-node-panel-placement-change");
// 强制重排后重新加 class,确保每次上下翻转都能重新播放虚化动画。
void panel.offsetWidth;
panel.classList.add("canvas-node-panel-placement-change");
}
placementRef.current = isDragging ? position.placement : null;
panel.style.left = `${position.left}px`;
panel.style.top = `${position.top}px`;
};
@@ -112,15 +142,17 @@ export function CanvasNodePanelOverlay({ node, viewport, containerRef, panelWidt
resizeObserver.disconnect();
unsubscribeViewport();
};
}, [containerRef, node.height, node.id, node.position.x, node.position.y, node.width, panelHeight, panelWidth, viewport]);
}, [containerRef, dragOffset?.x, dragOffset?.y, isDragging, node.height, node.id, node.position.x, node.position.y, node.width, panelHeight, panelWidth, viewport]);
return (
<div
ref={panelRef}
data-canvas-no-zoom
className="thin-scrollbar absolute z-[var(--z-modal-overlay)] max-w-[calc(100%_-_24px)] overflow-y-auto"
style={{ left: initialPosition.left, top: initialPosition.top, width: initialWidth, maxHeight: "calc(100% - 84px)" }}
className="thin-scrollbar absolute max-w-[calc(100%_-_24px)] overflow-y-auto"
style={{ left: initialPosition.left, top: initialPosition.top, width: initialWidth, maxHeight: "calc(100% - 84px)", zIndex }}
onMouseDown={(event) => event.stopPropagation()}
onPointerDownCapture={bringToFront}
onFocusCapture={bringToFront}
onPointerDown={(event) => event.stopPropagation()}
>
{children}
@@ -137,11 +169,16 @@ export function CanvasConnectionCreateMenu({ pending, viewport, viewportSize, co
const theme = canvasThemes[useThemeStore((state) => state.theme)];
const reducedMotion = useReducedMotion();
const menuRef = useRef<HTMLDivElement>(null);
const { bringToFront, zIndex } = useCanvasOverlayLayer("connection-create-menu", "var(--z-modal-overlay)");
const menuWidth = 248;
const menuHeight = canCreateDrawing ? 420 : 376;
const gap = 12;
const initialPosition = getConnectionMenuPosition(pending.position, viewport, viewportSize, menuWidth, menuHeight, gap);
useLayoutEffect(() => {
bringToFront();
}, [bringToFront]);
useLayoutEffect(() => {
const container = containerRef.current;
const menu = menuRef.current;
@@ -163,11 +200,13 @@ export function CanvasConnectionCreateMenu({ pending, viewport, viewportSize, co
initial={reducedMotion ? { opacity: 0 } : { opacity: 0, y: 6, scale: 0.97, rotateX: 2 }}
animate={{ opacity: 1, y: 0, scale: 1, rotateX: 0 }}
transition={{ duration: aceternityMotion.duration.instant, ease: aceternityMotion.easing.enter }}
className="aceternity-floating-panel absolute z-[var(--z-modal-overlay)] w-[248px] origin-top-left overflow-hidden rounded-[var(--r-2xl)] border p-2 backdrop-blur-2xl"
className="aceternity-floating-panel absolute w-[248px] origin-top-left overflow-hidden rounded-[var(--r-2xl)] border p-2 backdrop-blur-2xl"
data-canvas-no-zoom
data-connection-create-menu
style={{ left: initialPosition.left, top: initialPosition.top, background: theme.spatial.elevated, borderColor: theme.toolbar.border, color: theme.node.text }}
style={{ left: initialPosition.left, top: initialPosition.top, zIndex, background: theme.spatial.elevated, borderColor: theme.toolbar.border, color: theme.node.text }}
onMouseDown={(event) => event.stopPropagation()}
onPointerDownCapture={bringToFront}
onFocusCapture={bringToFront}
onPointerDown={(event) => event.stopPropagation()}
>
<div className="absolute inset-x-8 top-0 h-px" style={{ background: `linear-gradient(90deg, transparent, ${theme.toolbar.border}, transparent)` }} />
@@ -217,20 +256,33 @@ function getConnectionMenuPosition(position: Position, viewport: ViewportTransfo
};
}
function getNodePanelPosition(node: CanvasNodeData, viewport: ViewportTransform, viewportSize: { width: number; height: number }, panelWidth: number, panelHeight: number) {
function getNodePanelPosition(node: CanvasNodeData, viewport: ViewportTransform, viewportSize: { width: number; height: number }, panelWidth: number, panelHeight: number, dragOffset?: Position | null, lockedPlacement?: NodePanelPlacement | null, placementBuffer = 0) {
const gap = 10;
const margin = 12;
const topBoundary = 72;
const nodeCenterX = viewport.x + (node.position.x + node.width / 2) * viewport.k;
const nodeTop = viewport.y + node.position.y * viewport.k;
const nodeBottom = viewport.y + (node.position.y + node.height) * viewport.k;
const offsetX = dragOffset?.x || 0;
const offsetY = dragOffset?.y || 0;
const nodeCenterX = viewport.x + (node.position.x + offsetX + node.width / 2) * viewport.k;
const nodeTop = viewport.y + (node.position.y + offsetY) * viewport.k;
const nodeBottom = viewport.y + (node.position.y + offsetY + node.height) * viewport.k;
const maxLeft = Math.max(margin, viewportSize.width - panelWidth - margin);
const left = clamp(nodeCenterX - panelWidth / 2, margin, maxLeft);
const belowTop = nodeBottom + gap;
const aboveTop = nodeTop - panelHeight - gap;
const preferredTop = belowTop + panelHeight <= viewportSize.height - margin ? belowTop : aboveTop;
const canFitBelow = belowTop + panelHeight <= viewportSize.height - margin;
const canFitAbove = aboveTop >= topBoundary;
let placement: NodePanelPlacement;
if (lockedPlacement === "below") {
placement = !canFitBelow && belowTop + panelHeight > viewportSize.height - margin + placementBuffer && canFitAbove ? "above" : "below";
} else if (lockedPlacement === "above") {
placement = !canFitAbove && aboveTop < topBoundary - placementBuffer && canFitBelow ? "below" : "above";
} else {
placement = canFitBelow ? "below" : "above";
}
const preferredTop = placement === "below" ? belowTop : aboveTop;
return {
left,
top: clamp(preferredTop, topBoundary, Math.max(topBoundary, viewportSize.height - panelHeight - margin)),
placement,
};
}
@@ -1,6 +1,6 @@
import { AnimatePresence, motion } from "motion/react";
import { useEffect, useRef, useState, type RefObject } from "react";
import { Compass, Focus, HelpCircle, Minus, Plus } from "lucide-react";
import { Compass, Focus, HelpCircle, LayoutTemplate, Minus, Plus } from "lucide-react";
import { FloatingDock, type FloatingDockEntry } from "@/components/ui/aceternity/floating-dock";
import { aceternityMotion } from "@/lib/aceternity-motion";
@@ -12,7 +12,8 @@ import { useThemeStore } from "@/stores/use-theme-store";
type CanvasZoomControlsProps = {
scale: number;
onScaleChange: (scale: number) => void;
onReset: () => void;
onFitContent: () => void;
onAutoArrange?: () => void;
isMiniMapOpen: boolean;
onToggleMiniMap: () => void;
onOpenShortcuts: () => void;
@@ -21,7 +22,7 @@ type CanvasZoomControlsProps = {
const QUICK_ZOOM_LEVELS = [0.25, 0.5, 1, 2] as const;
export function CanvasZoomControls({ scale, onScaleChange, onReset, isMiniMapOpen, onToggleMiniMap, onOpenShortcuts, containerRef }: CanvasZoomControlsProps) {
export function CanvasZoomControls({ scale, onScaleChange, onFitContent, onAutoArrange, isMiniMapOpen, onToggleMiniMap, onOpenShortcuts, containerRef }: CanvasZoomControlsProps) {
const theme = canvasThemes[useThemeStore((state) => state.theme)];
const rootRef = useRef<HTMLDivElement>(null);
const liveScaleRef = useRef(scale);
@@ -70,7 +71,8 @@ export function CanvasZoomControls({ scale, onScaleChange, onReset, isMiniMapOpe
const items: FloatingDockEntry[] = [
{ id: "zoom-minimap", label: isMiniMapOpen ? "关闭小地图" : "打开小地图", icon: <Compass />, active: isMiniMapOpen, onClick: onToggleMiniMap },
{ id: "zoom-fit", label: "适应全部内容", icon: <Focus />, onClick: onReset },
{ id: "zoom-fit", label: "适应画布", icon: <Focus />, onClick: onFitContent },
...(onAutoArrange ? [{ id: "zoom-auto-arrange", label: "自动整理节点", icon: <LayoutTemplate />, onClick: onAutoArrange }] : []),
{ kind: "separator", id: "zoom-separator" },
{ id: "zoom-out", label: "缩小画布", icon: <Minus />, onClick: () => commitScale(liveScaleRef.current - 0.1) },
{
@@ -6,9 +6,12 @@ import { createModelChannel, useConfigStore } from "@/stores/use-config-store";
import { navigateToSettings } from "@/lib/settings-navigation";
import { useLocalDreaminaModelBootstrap } from "@/stores/use-local-dreamina-model-store";
import { useLocalRuntimeBootstrap } from "@/stores/use-local-runtime-store";
import { initializeClientDiagnostics, setDiagnosticUserScope } from "@/services/diagnostics/client-diagnostics";
import { useUserStore } from "@/stores/use-user-store";
export function ClientRootInit({ children }: { children: ReactNode }) {
const config = useConfigStore((state) => state.config);
const userId = useUserStore((state) => state.user?.id || "");
const localRuntimeConfigured = config.channels.some((channel) => channel.transport === "local-runtime" && channel.enabled !== false);
useLocalRuntimeBootstrap(localRuntimeConfigured);
useLocalDreaminaModelBootstrap();
@@ -16,6 +19,14 @@ export function ClientRootInit({ children }: { children: ReactNode }) {
const handledConfigParams = useRef(false);
const updateConfig = useConfigStore((state) => state.updateConfig);
useEffect(() => {
initializeClientDiagnostics();
}, []);
useEffect(() => {
setDiagnosticUserScope(userId);
}, [userId]);
useEffect(() => {
const interactiveSelector = 'button, [role="button"], a, [class*="card"], [class*="Card"]';
const blurPointerFocus = (event: PointerEvent) => {
+6 -3
View File
@@ -10,7 +10,7 @@ type LobeIconComponent = ComponentType<SVGProps<SVGSVGElement> & { size?: number
// 只允许按需加载 Mono 组件。这里不能使用 eager glob:模型 Logo 目录有数百个 provider 模块,
// eager 会让每次进入工作区都发起数百个开发模块请求,即使用户从未打开 Logo 选择器。
const iconModules = import.meta.glob("../../node_modules/@lobehub/icons/es/*/components/Mono.js", { import: "default" });
const iconModules = import.meta.glob?.("../../node_modules/@lobehub/icons/es/*/components/Mono.js", { import: "default" }) || {};
const iconLoaders = Object.fromEntries(
Object.entries(iconModules)
.map(([path, loader]) => [path.match(/\/([^/]+)\/components\/Mono\.js$/)?.[1], loader])
@@ -43,11 +43,14 @@ function loadIcon(icon?: string) {
}
export function ModelLogo({ icon, size = 18, className }: { icon?: string; size?: number; className?: string }) {
const [Icon, setIcon] = useState<LobeIconComponent | undefined>(() => icon ? iconRegistry.get(icon) : undefined);
const [Icon, setIcon] = useState<LobeIconComponent | undefined>(() => (icon ? iconRegistry.get(icon) : undefined));
useEffect(() => {
let cancelled = false;
setIcon(icon ? iconRegistry.get(icon) : undefined);
if (!icon || !iconLoaders[icon]) return () => { cancelled = true; };
if (!icon || !iconLoaders[icon])
return () => {
cancelled = true;
};
void loadIcon(icon).then((loaded) => {
if (!cancelled) setIcon(loaded);
});
+20 -4
View File
@@ -1,4 +1,4 @@
import { useEffect, useId, useMemo, useRef, useState, type KeyboardEvent } from "react";
import { useEffect, useId, useLayoutEffect, useMemo, useRef, useState, type CSSProperties, type KeyboardEvent } from "react";
import { Check, ChevronDown, Coins } from "lucide-react";
import { Popover } from "antd";
@@ -19,6 +19,7 @@ type ModelPickerProps = {
onChange: (model: string) => void;
capability?: ModelCapability;
className?: string;
popoverClassName?: string;
fullWidth?: boolean;
placeholder?: string;
onMissingConfig?: () => void;
@@ -28,13 +29,14 @@ type ModelPickerProps = {
showConfiguredModelName?: boolean;
};
export function ModelPicker({ config, value, onChange, capability, className, fullWidth = false, placeholder = "选择模型", onMissingConfig, showSelectedPrice = true, variant = "default", requirements, showConfiguredModelName = false }: ModelPickerProps) {
export function ModelPicker({ config, value, onChange, capability, className, popoverClassName, fullWidth = false, placeholder = "选择模型", onMissingConfig, showSelectedPrice = true, variant = "default", requirements, showConfiguredModelName = false }: ModelPickerProps) {
const creditsEnabled = useUserStore((state) => state.features.creditsEnabled);
const pickerId = useId();
// 双保险:即使 store merge 写出非法 theme,这里也兜底到 dark,避免 "reading 'node'" 崩溃
const rawTheme = useThemeStore((state) => state.theme);
const theme = (canvasThemes[rawTheme as keyof typeof canvasThemes] ?? canvasThemes.dark) as CanvasTheme;
const [open, setOpen] = useState(false);
const [triggerWidth, setTriggerWidth] = useState<number | null>(null);
const menuRef = useRef<HTMLDivElement>(null);
const triggerRef = useRef<HTMLButtonElement>(null);
const options = useMemo(() => Array.from(new Set(selectableModelsByCapability(config, capability).filter(Boolean))), [capability, config]);
@@ -65,6 +67,16 @@ export function ModelPicker({ config, value, onChange, capability, className, fu
const [routeQuote, setRouteQuote] = useState<LogicalModelQuote | undefined>();
const creationVariant = variant === "creation";
useLayoutEffect(() => {
const trigger = triggerRef.current;
if (!trigger) return;
const updateTriggerWidth = () => setTriggerWidth(Math.ceil(trigger.getBoundingClientRect().width));
updateTriggerWidth();
const observer = new ResizeObserver(updateTriggerWidth);
observer.observe(trigger);
return () => observer.disconnect();
}, [className, fullWidth, showSelectedPrice, variant, value]);
useEffect(() => {
if (!showSelectedPrice || !creditsEnabled || !quoteRequest) {
setRouteQuote(undefined);
@@ -139,7 +151,11 @@ export function ModelPicker({ config, value, onChange, capability, className, fu
ref={menuRef}
data-canvas-no-zoom
className={cn("canvas-model-picker-menu max-w-[calc(100vw-24px)]", creationVariant ? "creation-model-picker-menu w-[360px]" : "w-[var(--panel-width-compact)]")}
style={{ background: theme.node.panel, color: theme.node.text }}
style={{
background: theme.node.panel,
color: theme.node.text,
"--canvas-model-picker-trigger-width": triggerWidth ? String(triggerWidth) + "px" : undefined,
} as CSSProperties}
role="listbox"
aria-label={placeholder}
onKeyDown={handleMenuKeyDown}
@@ -209,7 +225,7 @@ export function ModelPicker({ config, value, onChange, capability, className, fu
arrow={false}
content={content}
classNames={{
root: cn("canvas-model-picker-popover", creationVariant && "creation-model-picker-popover"),
root: cn("canvas-model-picker-popover", creationVariant && "creation-model-picker-popover", popoverClassName),
container: cn("canvas-composer-popover-surface", creationVariant && "creation-model-picker-surface"),
content: "canvas-composer-popover-content",
}}
+16 -1
View File
@@ -75,6 +75,12 @@ export function getAntThemeConfig(dark: boolean): ThemeConfig {
const elevatedBackground = dark ? "rgba(31, 31, 32, 1)" : "rgba(255, 255, 255, 1)";
const subtleBackground = dark ? "rgba(255, 255, 255, 0.055)" : "rgba(17, 17, 17, 0.035)";
const interactiveBorder = dark ? "rgba(255, 255, 255, 0.18)" : "rgba(17, 17, 17, 0.18)";
// 信息提示使用独立的浅色/深色表面,不能复用主操作的纯黑/纯白色;
// 否则 Ant Design 会根据 colorInfo 生成近似纯黑的浅色主题背景,造成文字对比度失效。
const infoBackground = dark ? "rgba(255, 255, 255, 0.08)" : "rgba(17, 17, 17, 0.045)";
const infoBackgroundHover = dark ? "rgba(255, 255, 255, 0.11)" : "rgba(17, 17, 17, 0.07)";
const infoBorder = dark ? "rgba(255, 255, 255, 0.2)" : "rgba(17, 17, 17, 0.14)";
const infoAccent = dark ? "#e4e4e7" : "#3f3f46";
// 黑白主题使用边框表达焦点,避免输入控件周围出现蓝紫色光圈。
const focusShadow = "none";
@@ -87,7 +93,16 @@ export function getAntThemeConfig(dark: boolean): ThemeConfig {
colorPrimaryActive: color.solidActiveBg,
colorPrimaryBg: color.selectedBg,
colorPrimaryBgHover: color.selectedHoverBg,
colorInfo: color.solidBg,
colorInfoBg: infoBackground,
colorInfoBgHover: infoBackgroundHover,
colorInfoBorder: infoBorder,
colorInfoBorderHover: infoBorder,
colorInfo: infoAccent,
colorInfoHover: dark ? "#ffffff" : "#27272a",
colorInfoActive: dark ? "#d4d4d8" : "#52525b",
colorInfoTextHover: dark ? "#fafafa" : "#27272a",
colorInfoText: dark ? "#f4f4f5" : "#27272a",
colorInfoTextActive: dark ? "#e4e4e7" : "#3f3f46",
colorLink: color.solidBg,
colorLinkHover: color.solidHoverBg,
colorLinkActive: color.solidActiveBg,
@@ -29,6 +29,17 @@ export function canvasResourceMentionToken(reference: CanvasResourceReference) {
return `@[node:${reference.nodeId}]`;
}
export function removeCanvasResourceMention(prompt: string, reference: CanvasResourceReference) {
const token = canvasResourceMentionToken(reference);
if (!token || !prompt.includes(token)) return prompt;
return prompt
.split(token)
.join("")
.replace(/[ \t]{2,}/g, " ")
.replace(/\n{3,}/g, "\n\n")
.trim();
}
export function buildAssetMentionReferences(assets: Asset[]): CanvasResourceReference[] {
return assets.flatMap((asset): CanvasResourceReference[] => {
if (asset.kind === "model") return [];
+6 -4
View File
@@ -299,6 +299,8 @@ function fileToDataUrl(file: Blob, signal?: AbortSignal): Promise<string> {
function toExternalItem(item: EagleItem, baseUrl: string, pathMap: Map<string, string[]>) {
const kind = kindFromExtension(item.extension);
const folderIds = item.folderIds || [];
const tags = item.tags || [];
return {
id: item.id,
title: item.name,
@@ -309,10 +311,10 @@ function toExternalItem(item: EagleItem, baseUrl: string, pathMap: Map<string, s
width: item.width,
height: item.height,
bytes: item.size,
tags: item.tags,
folderId: item.folderIds[0],
folderIds: item.folderIds,
folderPath: item.folderIds[0] ? pathMap.get(item.folderIds[0]) : [],
tags,
folderId: folderIds[0],
folderIds,
folderPath: folderIds[0] ? pathMap.get(folderIds[0]) : [],
description: item.annotation,
metadata: { extension: item.extension, modificationTime: item.modificationTime, url: item.url, deleted: item.deleted },
} satisfies ExternalAssetItem;
+1
View File
@@ -1 +1,2 @@
import "./eagle";
import "./prompt-optimizer";
@@ -0,0 +1,352 @@
import { registerPlugin } from "../plugin-registry";
import type {
PluginManifest,
PluginTextContentPart,
PluginTextMessage,
PluginTextTool,
PromptOptimizationInput,
PromptOptimizationMode,
PromptOptimizationResult,
PromptOptimizationVariant,
PromptOptimizerProvider,
RegisteredPlugin,
} from "../plugin-types";
export const PROMPT_OPTIMIZER_PLUGIN_ID = "prompt-optimizer";
const modeLabels: Record<PromptOptimizationMode, string> = {
expand: "扩展想法",
refine: "精修已有提示词",
style: "强化视觉风格",
"model-adapt": "适配当前模型",
reference: "结合参考素材",
};
const optimizerTool: PluginTextTool = {
type: "function",
function: {
name: "optimize_prompt",
description: "返回结构化的 AI 生图或生视频提示词优化结果。",
strict: true,
parameters: {
type: "object",
additionalProperties: false,
required: ["optimizedPrompt", "negativePrompt", "changes", "assumptions", "variants"],
properties: {
optimizedPrompt: { type: "string", description: "可直接用于生成的正向提示词。" },
negativePrompt: { type: "string", description: "需要规避的内容;没有时返回空字符串。" },
changes: { type: "array", items: { type: "string" }, description: "相较输入提示词做出的关键变化。" },
assumptions: { type: "array", items: { type: "string" }, description: "对模糊需求做出的假设;没有时返回空数组。" },
variants: {
type: "array",
items: {
type: "object",
additionalProperties: false,
required: ["label", "prompt"],
properties: {
label: { type: "string" },
prompt: { type: "string" },
},
},
description: "最多两个可选的提示词版本。",
},
},
},
},
};
const manifest: PluginManifest = {
id: PROMPT_OPTIMIZER_PLUGIN_ID,
name: "AI 提示词优化器",
version: "0.3.0",
apiVersion: "1",
category: "ai-capability",
description: "把模糊的生图想法整理成可执行、可比较、适配当前模型的提示词。",
author: "影策团队",
surfaces: ["hybrid"],
permissions: ["canvas.read", "canvas.write", "ai.text"],
trusted: true,
};
const systemPrompt = [
"你是影策工作台里的提示词导演,负责把用户模糊的视觉想法整理成可以直接交给生成模型的提示词。",
"只优化表达和可执行性,不擅自改变用户明确写出的主体、身份、动作、数量、时代、地点、画幅比例或安全边界。",
"优先使用具体可视化语言:主体与关系、构图与景别、动作、环境、材质、光线、色彩、镜头和风格。",
"如果输入已经足够明确,保持原意并做克制的精修;如果信息不足,把不确定项写入 assumptions,不要假装知道。",
"根据 generationMode 选择表达:图片侧重静态画面、构图和材质,视频侧重动作连续性、时长感、镜头运动和首尾衔接。",
"当优化模式是适配当前模型时,先结合 targetProtocol 和 targetModel 判断模型族,再严格执行模型适配策略;不要编造不存在的参数、权重语法或模型能力。",
"最终必须调用 optimize_prompt 工具,不要输出 Markdown,不要在工具调用之外解释。",
].join("\n");
type ModelAdaptationProfile = {
id: string;
label: string;
promptShape: string;
rules: string[];
avoid: string[];
};
const genericImageProfile: ModelAdaptationProfile = {
id: "generic-image",
label: "通用图片模型",
promptShape: "自然语言描述,按主体与动作 → 环境 → 构图 → 光线与材质 → 风格排列。",
rules: ["先锁定主体、数量、身份和动作,再补充可见的画面细节。", "把重要的比例、文字、位置和一致性要求写明确。"],
avoid: ["不要臆造供应商参数或控制语法。", "关键规避项不要只放在 negativePrompt 中,正向提示词也要表达清楚。"],
};
const genericVideoProfile: ModelAdaptationProfile = {
id: "generic-video",
label: "通用视频模型",
promptShape: "单镜头时序描述,按起始画面 → 主体动作 → 镜头运动 → 环境变化 → 结尾状态排列。",
rules: ["每个动作使用可观察、连续的动词,避免一段话塞入互不相连的多个镜头。", "明确主体、镜头和环境谁在运动,并保持角色、服装和场景一致。"],
avoid: ["不要把静态摄影参数堆成关键词列表。", "不要新增用户未要求的转场、角色或剧情。"],
};
function containsAny(value: string, keywords: string[]) {
return keywords.some((keyword) => value.includes(keyword));
}
function resolveModelAdaptationProfile(input: PromptOptimizationInput): ModelAdaptationProfile {
const model = `${input.targetModel || ""} ${input.targetProtocol || ""}`.toLowerCase();
if (input.generationMode === "image") {
if (containsAny(model, ["gemini", "imagen", "nano-banana", "nanobanana"])) {
return {
id: "gemini-image",
label: "Gemini / Imagen 图片模型",
promptShape: "清晰的自然语言场景描述,按主体 → 背景与上下文 → 风格与摄影细节组织。",
rules: ["优先使用完整句子和具体视觉事实,参考图只描述确实可见的内容。", "如果画面含文字,保留原文并明确位置、层级和字数,避免无关装饰。", "控制提示词长度,先保留主体、上下文和风格这三个核心层次。"],
avoid: ["不要使用 SD 权重、反向提示词标签或未确认的供应商参数。"],
};
}
if (containsAny(model, ["gpt-image", "dall-e", "dalle", "openai-image", "openai"])) {
return {
id: "openai-image",
label: "OpenAI 图片模型",
promptShape: "简洁、完整的自然语言描述,先说要生成什么,再补充构图、光线、材质和风格。",
rules: ["使用模型能直接理解的画面描述,不把提示词写成控制台参数。", "对画面中的文字、位置、数量和主体关系使用明确句子。"],
avoid: ["不要添加 SD 权重、逗号关键词堆叠或 -- 参数。", "不要依赖单独 negativePrompt,重要限制要写进正向描述。"],
};
}
if (containsAny(model, ["grok-image", "grok-imagine"])) {
return {
id: "grok-image",
label: "Grok 图片模型",
promptShape: "简洁的自然语言画面描述,主体、动作、环境和视觉风格清晰分层。",
rules: ["保留明确的主体关系、构图和风格意图,避免把提示词写成参数清单。", "有参考图时说明要保留的主体或风格特征,不臆测看不见的细节。"],
avoid: ["不要添加 SD 权重、Midjourney 参数或模型未确认支持的控制语法。"],
};
}
if (containsAny(model, ["seedream", "jimeng", "doubao", "volcengine-ark-image", "volcengine-jimeng-image"])) {
return {
id: "seedream-image",
label: "Seedream / 即梦 / 火山图片模型",
promptShape: "中文自然语言镜头描述,按主体与动作 → 构图 → 光影 → 材质与风格组织。",
rules: ["优先写清人物或主体的外观、动作、空间关系和画面重点。", "需要人物一致性时重复关键外观特征,避免只写抽象的‘保持一致’。", "中文需求保持中文表达,英文专有名词只在确实有帮助时保留。"],
avoid: ["不要套用 SD 的权重语法、质量词串或无意义的英文标签。", "不要把多个镜头和互相冲突的动作混在一条提示词里。"],
};
}
if (containsAny(model, ["flux"])) {
return {
id: "flux-image",
label: "FLUX 图片模型",
promptShape: "自然语言段落 + 少量明确的视觉关键词,主体和动作放在前面。",
rules: ["用具体关系描述主体、位置、材质和光线,而不是重复质量形容词。", "保留用户指定的风格和构图,不主动添加模型参数。"],
avoid: ["不要输出很长的逗号标签清单或堆叠 negative prompt。", "不要添加未经用户要求的 LoRA、采样器或权重标记。"],
};
}
if (containsAny(model, ["sdxl", "stable-diffusion", "stable diffusion", "sd3", "stable3"])) {
return {
id: "stable-diffusion-image",
label: "Stable Diffusion / SDXL 图片模型",
promptShape: "紧凑的分层关键词或短句,按主体 → 构图 → 光线 → 风格与质量组织。",
rules: ["只保留能影响画面的关键词,主体和构图优先。", "如果原提示词已经使用括号权重,只在确有必要时保留并少量调整。", "将画面主体和反向规避项分开表达,避免互相冲突。"],
avoid: ["不要盲目添加过多质量词、艺术家名或模型专属标签。", "不确定权重语法是否被当前渠道支持时,不要主动新增。"],
};
}
if (containsAny(model, ["midjourney", "mid-journey"])) {
return {
id: "midjourney-image",
label: "Midjourney 图片模型",
promptShape: "精炼的视觉描述,主体、场景、构图和风格清晰,参数放在末尾。",
rules: ["优先写画面内容和视觉方向,保持短而有辨识度。", "只有用户原本提供或明确要求时才保留 --ar、--stylize 等参数。"],
avoid: ["不要臆造 Midjourney 参数或把所有摄影术语都堆上去。", "不要使用与当前工作台协议无关的命令前缀。"],
};
}
if (containsAny(model, ["ideogram", "recraft"])) {
return {
id: "design-image",
label: "设计与文字图片模型",
promptShape: "先说明画布、主体和版式,再说明文字内容、位置、层级、字体气质和配色。",
rules: ["画面文字保留精确原文并控制字数,明确文字与主体的空间关系。", "区分内容、版式和视觉风格,避免只给抽象审美词。"],
avoid: ["不要擅自改写品牌名、标题、数字或标语。"],
};
}
return genericImageProfile;
}
if (containsAny(model, ["seedance", "doubao-seedance", "volcengine-ark-video", "volcengine-jimeng-video", "jimeng-video"])) {
return {
id: "seedance-video",
label: "Seedance / 即梦视频模型",
promptShape: "单镜头时序描述,明确起始构图、动作节拍、镜头运动、环境变化和结尾状态。",
rules: ["用连续动作描述主体如何开始、发展和结束,保持镜头内的因果关系。", "人物、服装、场景和道具的一致性优先于堆叠风格词。", "有首帧或参考图时,明确哪些内容必须保持、哪些内容允许变化。"],
avoid: ["不要在一条提示词中拼接多个无关镜头。", "不要把静态图片参数当成视频动作指令。"],
};
}
if (containsAny(model, ["veo", "gemini-veo"])) {
return {
id: "veo-video",
label: "Veo 视频模型",
promptShape: "电影化的自然语言镜头描述,按主体、动作、镜头、环境和节奏组织。",
rules: ["把想法拆成可观察的动作和镜头运动,并补充时间顺序。", "用景别、机位、运镜、光线和环境声等可视化要素控制镜头。"],
avoid: ["不要只写情绪和抽象风格,不给动作或镜头变化。", "不要加入用户未要求的多镜头转场。"],
};
}
if (containsAny(model, ["kling"])) {
return {
id: "kling-video",
label: "Kling 视频模型",
promptShape: "简洁、连续的动作指令,明确主体运动和摄像机运动。",
rules: ["每个动作都写清主体、方向、速度或结果,避免互相冲突的动作。", "优先保证物理连续性、角色一致性和镜头稳定。"],
avoid: ["不要加入过多抽象叙事或无法在短片段中完成的事件。"],
};
}
if (containsAny(model, ["runway", "gen-3", "gen3", "minimax-video", "hailuo", "wan", "ltx-video", "hunyuan-video"])) {
return {
id: "general-video-family",
label: "通用视频模型",
promptShape: "以单个镜头为单位描述起始画面、动作过程、摄影机和结束画面。",
rules: ["动作使用连续动词,明确运动主体和摄像机,不把结果写成静态形容词。", "保持角色、服装、场景和光线的连续性。"],
avoid: ["不要堆砌静态图片关键词或一次安排过多动作。"],
};
}
return genericVideoProfile;
}
function buildUserMessage(input: PromptOptimizationInput, modelProfile: ModelAdaptationProfile | null = input.mode === "model-adapt" ? resolveModelAdaptationProfile(input) : null): PluginTextMessage {
const textParts = [
`优化模式:${modeLabels[input.mode]}`,
`目标类型:${input.generationMode === "image" ? "图片" : "视频"}`,
`目标生成模型:${input.targetModel?.trim() || "未指定"}`,
`目标接口协议:${input.targetProtocol?.trim() || "未指定"}`,
"",
"用户原始提示词:",
input.prompt.trim() || "(用户还没有写出具体提示词,请从参考上下文中提炼一个可执行版本)",
];
if (modelProfile) {
textParts.push(
"",
`模型适配策略:${modelProfile.label}`,
`建议提示词结构:${modelProfile.promptShape}`,
"必须遵守:",
...modelProfile.rules.map((rule) => `- ${rule}`),
"避免:",
...modelProfile.avoid.map((rule) => `- ${rule}`),
"请在 changes 中明确说明已经采用的模型适配要点。",
);
}
if (input.context?.texts?.length) {
textParts.push("", "已连接的文本上下文:", ...input.context.texts.map((item) => `- ${item.title}:${item.text}`));
}
if (input.context?.images?.length) {
textParts.push("", "已连接的参考图已作为图片输入,请只在确实可见的内容上做判断:", ...input.context.images.map((item) => `- ${item.title}`));
}
textParts.push(
"",
"输出要求:",
"1. optimizedPrompt 是一段可以直接复制到当前生成节点的提示词。",
"2. negativePrompt 只填写明确有帮助的规避项,没有就留空。",
"3. changes 和 assumptions 使用简短中文条目。",
"4. variants 最多给出两个明显不同但仍忠于原意的版本,没有必要时返回空数组。",
);
const content: PluginTextContentPart[] = [{ type: "text", text: textParts.join("\n") }];
for (const image of input.context?.images || []) {
if (/^(data:|https?:\/\/)/i.test(image.url.trim())) content.push({ type: "image_url", image_url: { url: image.url.trim() } });
}
return { role: "user", content };
}
function parseJsonObject(value: string) {
const cleaned = value
.trim()
.replace(/^```(?:json)?\s*/i, "")
.replace(/\s*```$/, "");
const candidates = [cleaned];
const start = cleaned.indexOf("{");
const end = cleaned.lastIndexOf("}");
if (start >= 0 && end > start) candidates.push(cleaned.slice(start, end + 1));
for (const candidate of candidates) {
try {
const parsed: unknown = JSON.parse(candidate);
if (parsed && typeof parsed === "object" && !Array.isArray(parsed)) return parsed as Record<string, unknown>;
} catch {
// 某些兼容模型会在 JSON 外包一层解释,继续尝试截取对象部分。
}
}
return null;
}
function stringArray(value: unknown) {
return Array.isArray(value)
? value
.filter((item): item is string => typeof item === "string")
.map((item) => item.trim())
.filter(Boolean)
: [];
}
function variants(value: unknown): PromptOptimizationVariant[] {
if (!Array.isArray(value)) return [];
return value
.flatMap((item): PromptOptimizationVariant[] => {
if (!item || typeof item !== "object") return [];
const record = item as Record<string, unknown>;
const label = typeof record.label === "string" ? record.label.trim() : "备选版本";
const prompt = typeof record.prompt === "string" ? record.prompt.trim() : "";
return prompt ? [{ label: label || "备选版本", prompt }] : [];
})
.slice(0, 2);
}
function normalizeResult(value: Record<string, unknown> | null, sourcePrompt: string, modelProfile?: ModelAdaptationProfile | null): PromptOptimizationResult {
const optimizedPrompt = typeof value?.optimizedPrompt === "string" ? value.optimizedPrompt.trim() : "";
const negativePrompt = typeof value?.negativePrompt === "string" ? value.negativePrompt.trim() : "";
return {
optimizedPrompt: optimizedPrompt || sourcePrompt.trim(),
negativePrompt,
changes: stringArray(value?.changes),
assumptions: stringArray(value?.assumptions),
variants: variants(value?.variants),
modelProfile: modelProfile ? { id: modelProfile.id, label: modelProfile.label } : undefined,
};
}
function createPromptOptimizer(context: Parameters<NonNullable<RegisteredPlugin["createPromptOptimizer"]>>[0]): PromptOptimizerProvider {
const textService = context.services?.ai?.text;
if (!textService) throw new Error("提示词优化器暂未获得文本模型服务");
return {
optimize: async (input, options) => {
const modelProfile = input.mode === "model-adapt" ? resolveModelAdaptationProfile(input) : null;
const response = await textService.requestToolResponse({
model: input.optimizerModel,
messages: [{ role: "system", content: systemPrompt }, buildUserMessage(input, modelProfile)],
tools: [optimizerTool],
toolChoice: { type: "function", name: "optimize_prompt" },
signal: options?.signal,
onDelta: options?.onDelta,
});
const toolCall = response.toolCalls.find((call) => call.name === "optimize_prompt");
const parsed = parseJsonObject(toolCall?.arguments || response.content);
return normalizeResult(parsed, input.prompt, modelProfile);
},
};
}
export const promptOptimizerPlugin: RegisteredPlugin = {
manifest,
createPromptOptimizer,
};
registerPlugin(promptOptimizerPlugin);
+89
View File
@@ -24,6 +24,7 @@ export type PluginPermission =
| "asset.import"
| "asset.upload"
| "generation.run"
| "ai.text"
| "external.open";
export type PluginManifest = {
@@ -54,11 +55,98 @@ export type PluginStorage = {
remove(key: string): Promise<void>;
};
export type PluginTextContentPart =
| { type: "text"; text: string }
| { type: "image_url"; image_url: { url: string } };
export type PluginTextMessage = {
role: "system" | "user" | "assistant";
content: string | PluginTextContentPart[];
};
export type PluginTextTool = {
type: "function";
function: {
name: string;
description?: string;
parameters: Record<string, unknown>;
strict?: boolean;
};
};
export type PluginTextToolChoice = "auto" | "required" | { type: "function"; name: string };
export type PluginTextToolCall = {
name: string;
arguments: string;
};
export type PluginTextResponse = {
content: string;
toolCalls: PluginTextToolCall[];
};
export type PluginTextRequest = {
model?: string;
messages: PluginTextMessage[];
tools?: PluginTextTool[];
toolChoice?: PluginTextToolChoice;
signal?: AbortSignal;
onDelta?: (text: string) => void;
};
export type PluginAiTextService = {
requestToolResponse: (request: PluginTextRequest) => Promise<PluginTextResponse>;
};
export type PluginHostServices = {
ai?: {
text?: PluginAiTextService;
};
};
export type PluginHostContext = {
manifest: PluginManifest;
permissions: ReadonlySet<PluginPermission>;
storage: PluginStorage;
config: Readonly<PluginInstallation["config"]>;
services?: PluginHostServices;
};
export type PromptOptimizationMode = "expand" | "refine" | "style" | "model-adapt" | "reference";
export type PromptOptimizationInput = {
prompt: string;
mode: PromptOptimizationMode;
generationMode: "image" | "video";
targetModel?: string;
targetProtocol?: string;
optimizerModel?: string;
context?: {
texts?: Array<{ title: string; text: string }>;
images?: Array<{ title: string; url: string }>;
};
};
export type PromptOptimizationVariant = {
label: string;
prompt: string;
};
export type PromptOptimizationResult = {
optimizedPrompt: string;
negativePrompt: string;
changes: string[];
assumptions: string[];
variants: PromptOptimizationVariant[];
modelProfile?: { id: string; label: string };
};
export type PromptOptimizerProvider = {
optimize: (
input: PromptOptimizationInput,
options?: { signal?: AbortSignal; onDelta?: (text: string) => void },
) => Promise<PromptOptimizationResult>;
};
export type AssetSourceQuery = {
@@ -118,6 +206,7 @@ export type RegisteredPlugin = {
activate?: (context: PluginHostContext) => Promise<void> | void;
deactivate?: (context: PluginHostContext) => Promise<void> | void;
createAssetSource?: (context: PluginHostContext) => AssetSourceProvider;
createPromptOptimizer?: (context: PluginHostContext) => PromptOptimizerProvider;
};
export type PluginInstallation = {
+104 -86
View File
@@ -2,7 +2,7 @@ import { AnimatePresence, motion, useReducedMotion } from "motion/react";
import { useEffect, useRef, useState, type CSSProperties, type ReactNode } from "react";
import { Link } from "react-router";
import { Bot, Check, ChevronDown, Clapperboard, CloudDownload, Coins, CopyPlus, Focus, FolderKanban, Gauge, Home, LayoutGrid, LoaderCircle, Menu, Pencil, Plus, Redo2, Search, Settings2, Share2, Sparkles, Trash2, Undo2, Upload } from "lucide-react";
import { Button, Dropdown, Modal, Tooltip } from "antd";
import { Button, Dropdown, Modal } from "antd";
import { useWalletBalance } from "@/hooks/use-wallet-balance";
import { aceternityMotion } from "@/lib/aceternity-motion";
@@ -102,38 +102,40 @@ export function CanvasTopBar({
<>
<div className="canvas-topbar pointer-events-none absolute left-0 right-0 top-0 z-[var(--z-toolbar)] flex h-[var(--canvas-topbar-h)] items-center justify-between px-4 sm:px-5">
<div className="canvas-topbar-cluster canvas-topbar-project-cluster pointer-events-auto flex min-w-0 items-center gap-2" style={dockStyle}>
<Dropdown
trigger={["click"]}
menu={{
items: [
{ key: "home", icon: <Home className="size-4" />, label: <Link to="/">主页</Link> },
{ key: "projects", icon: <LayoutGrid className="size-4" />, label: <Link to="/canvas">画布</Link> },
{ type: "divider" },
{ key: "new", icon: <Plus className="size-4" />, label: "新建画布", onClick: onCreateProject },
{ key: "delete", danger: true, icon: <Trash2 className="size-4" />, label: "删除当前画布", onClick: onDeleteProject },
{ type: "divider" },
{ key: "import", icon: <Upload className="size-4" />, label: "导入素材", onClick: onImportImage },
{ key: "search", icon: <Search className="size-4" />, label: <MenuLabel text="搜索节点" shortcut="⌘ K" />, onClick: onOpenSearch },
{
key: "performance",
icon: <Gauge className="size-4" />,
label: "媒体性能",
children: [
{ key: "performance-auto", label: "自动性能", onClick: () => onMediaPerformanceModeChange("auto") },
{ key: "performance-quality", label: "画质优先", onClick: () => onMediaPerformanceModeChange("quality") },
{ key: "performance-fast", label: "性能优先", onClick: () => onMediaPerformanceModeChange("performance") },
],
},
{ type: "divider" },
{ key: "undo", disabled: !canUndo, icon: <Undo2 className="size-4" />, label: <MenuLabel text="撤销" shortcut="⌘ Z" />, onClick: onUndo },
{ key: "redo", disabled: !canRedo, icon: <Redo2 className="size-4" />, label: <MenuLabel text="重做" shortcut="⌘ ⇧ Z / ⌘ Y" />, onClick: onRedo },
],
}}
>
<button type="button" className="canvas-topbar-action grid size-9 place-items-center rounded-full" style={{ color: theme.node.text }} aria-label="打开画布菜单">
<Menu className="size-5" />
</button>
</Dropdown>
<CanvasTopBarTooltip label="打开画布菜单">
<Dropdown
trigger={["click"]}
menu={{
items: [
{ key: "home", icon: <Home className="size-4" />, label: <Link to="/">主页</Link> },
{ key: "projects", icon: <LayoutGrid className="size-4" />, label: <Link to="/canvas">画布</Link> },
{ type: "divider" },
{ key: "new", icon: <Plus className="size-4" />, label: "新建画布", onClick: onCreateProject },
{ key: "delete", danger: true, icon: <Trash2 className="size-4" />, label: "删除当前画布", onClick: onDeleteProject },
{ type: "divider" },
{ key: "import", icon: <Upload className="size-4" />, label: "导入素材", onClick: onImportImage },
{ key: "search", icon: <Search className="size-4" />, label: <MenuLabel text="搜索节点" shortcut="⌘ K" />, onClick: onOpenSearch },
{
key: "performance",
icon: <Gauge className="size-4" />,
label: "媒体性能",
children: [
{ key: "performance-auto", label: "自动性能", onClick: () => onMediaPerformanceModeChange("auto") },
{ key: "performance-quality", label: "画质优先", onClick: () => onMediaPerformanceModeChange("quality") },
{ key: "performance-fast", label: "性能优先", onClick: () => onMediaPerformanceModeChange("performance") },
],
},
{ type: "divider" },
{ key: "undo", disabled: !canUndo, icon: <Undo2 className="size-4" />, label: <MenuLabel text="撤销" shortcut="⌘ Z" />, onClick: onUndo },
{ key: "redo", disabled: !canRedo, icon: <Redo2 className="size-4" />, label: <MenuLabel text="重做" shortcut="⌘ ⇧ Z / ⌘ Y" />, onClick: onRedo },
],
}}
>
<button type="button" className="canvas-topbar-action grid size-9 place-items-center rounded-full" style={{ color: theme.node.text }} aria-label="打开画布菜单">
<Menu className="size-5" />
</button>
</Dropdown>
</CanvasTopBarTooltip>
<div ref={titleRef} className="canvas-topbar-title-block flex min-w-0 flex-auto flex-col items-start overflow-hidden">
{isTitleEditing ? (
@@ -156,11 +158,11 @@ export function CanvasTopBar({
<button type="button" className="min-w-0 flex-1 truncate text-left text-base font-semibold tracking-normal transition-opacity hover:opacity-75" onClick={onStartTitleEditing} title="点击修改画布名称">
{title}
</button>
<Tooltip title="重命名画布">
<CanvasTopBarTooltip label="重命名画布">
<button type="button" className="canvas-topbar-action grid size-7 shrink-0 place-items-center rounded-md opacity-60 transition-opacity hover:opacity-100 focus-visible:outline-none focus-visible:ring-2" style={{ color: theme.node.text }} onClick={onStartTitleEditing} aria-label="重命名画布">
<Pencil className="size-3.5" />
</button>
</Tooltip>
</CanvasTopBarTooltip>
</div>
)}
{projectContext && !isTitleEditing ? (
@@ -181,49 +183,57 @@ export function CanvasTopBar({
</div>
<div className="canvas-topbar-cluster pointer-events-auto flex items-center gap-1.5" style={dockStyle}>
<Button type="text" className="canvas-topbar-action !hidden !h-10 !w-10 !min-w-10 !rounded-xl !p-0 lg:!inline-flex" style={{ color: theme.node.text }} icon={<Search className="size-4" />} onClick={onOpenSearch} aria-label="搜索画布节点" title="搜索画布节点" />
<Dropdown
trigger={["click"]}
placement="bottomRight"
menu={{
items: [
{ key: "libtv", icon: <CopyPlus className="size-4" />, label: "导入 LibTV 画布", onClick: onImportLibTV },
{ key: "tapnow", icon: <CloudDownload className="size-4" />, label: "导入 TapNow 画布", onClick: onImportTapNow },
],
}}
>
<Button type="text" className="canvas-topbar-action canvas-topbar-import-button !h-10 !rounded-xl !px-2.5 !font-medium" style={{ color: theme.node.text }} icon={<CloudDownload className="size-4" />} aria-label="导入第三方画布" title="导入第三方画布">
<span className="hidden lg:inline">导入第三方画布</span>
</Button>
</Dropdown>
<Dropdown
trigger={["click"]}
menu={{
selectable: true,
selectedKeys: [mediaPerformanceMode],
onClick: ({ key }) => onMediaPerformanceModeChange(key as CanvasMediaPerformanceMode),
items: [
{ key: "auto", label: "自动性能" },
{ key: "quality", label: "画质优先" },
{ key: "performance", label: "性能优先" },
],
}}
>
<Button type="text" className="canvas-topbar-action !hidden !h-10 !w-10 !min-w-10 !rounded-xl !p-0 lg:!inline-flex" style={{ color: theme.node.text }} icon={<Gauge className="size-4" />} aria-label="媒体性能模式" title="媒体性能模式" />
</Dropdown>
<CanvasTopBarTooltip label="搜索画布节点">
<Button type="text" className="canvas-topbar-action !hidden !h-10 !w-10 !min-w-10 !rounded-xl !p-0 lg:!inline-flex" style={{ color: theme.node.text }} icon={<Search className="size-4" />} onClick={onOpenSearch} aria-label="搜索画布节点" />
</CanvasTopBarTooltip>
<CanvasTopBarTooltip label="导入第三方画布">
<Dropdown
trigger={["click"]}
placement="bottomRight"
menu={{
items: [
{ key: "libtv", icon: <CopyPlus className="size-4" />, label: "导入 LibTV 画布", onClick: onImportLibTV },
{ key: "tapnow", icon: <CloudDownload className="size-4" />, label: "导入 TapNow 画布", onClick: onImportTapNow },
],
}}
>
<Button type="text" className="canvas-topbar-action canvas-topbar-import-button !h-10 !rounded-xl !px-2.5 !font-medium" style={{ color: theme.node.text }} icon={<CloudDownload className="size-4" />} aria-label="导入第三方画布">
<span className="hidden lg:inline">导入第三方画布</span>
</Button>
</Dropdown>
</CanvasTopBarTooltip>
<CanvasTopBarTooltip label="媒体性能模式">
<Dropdown
trigger={["click"]}
menu={{
selectable: true,
selectedKeys: [mediaPerformanceMode],
onClick: ({ key }) => onMediaPerformanceModeChange(key as CanvasMediaPerformanceMode),
items: [
{ key: "auto", label: "自动性能" },
{ key: "quality", label: "画质优先" },
{ key: "performance", label: "性能优先" },
],
}}
>
<Button type="text" className="canvas-topbar-action !hidden !h-10 !w-10 !min-w-10 !rounded-xl !p-0 lg:!inline-flex" style={{ color: theme.node.text }} icon={<Gauge className="size-4" />} aria-label="媒体性能模式" />
</Dropdown>
</CanvasTopBarTooltip>
{compactAgentStatus ? <CompactAgentStatus status={compactAgentStatus} onClick={onToggleAgent} /> : null}
{user && creditsEnabled ? (
<Link
to="/wallet"
className="canvas-topbar-action inline-flex h-9 min-w-[5.5rem] items-center justify-center gap-1.5 rounded-lg px-2.5 text-xs font-medium tabular-nums"
style={{ color: theme.node.text }}
title="查看积分明细"
>
{refreshing && availableMicrocredits === null ? <LoaderCircle className="size-3.5 animate-spin opacity-60" /> : <Coins className="size-3.5" />}
<span>{availableMicrocredits === null ? "--" : (availableMicrocredits / 1_000_000).toLocaleString("zh-CN", { maximumFractionDigits: 3 })}</span>
</Link>
<CanvasTopBarTooltip label="查看积分明细">
<Link
to="/wallet"
className="canvas-topbar-action inline-flex h-9 min-w-[5.5rem] items-center justify-center gap-1.5 rounded-lg px-2.5 text-xs font-medium tabular-nums"
style={{ color: theme.node.text }}
aria-label="查看积分明细"
>
{refreshing && availableMicrocredits === null ? <LoaderCircle className="size-3.5 animate-spin opacity-60" /> : <Coins className="size-3.5" />}
<span>{availableMicrocredits === null ? "--" : (availableMicrocredits / 1_000_000).toLocaleString("zh-CN", { maximumFractionDigits: 3 })}</span>
</Link>
</CanvasTopBarTooltip>
) : null}
<Tooltip title="进入专注模式(⇧⌘F)">
<CanvasTopBarTooltip label="进入专注模式(⇧⌘F)">
<Button
type="text"
className="canvas-topbar-action !h-10 !w-10 !min-w-10 !rounded-xl !p-0"
@@ -232,9 +242,9 @@ export function CanvasTopBar({
onClick={onEnterFocusMode}
aria-label="进入专注模式"
/>
</Tooltip>
</CanvasTopBarTooltip>
{shortDramaGuide ? (
<Tooltip title={shortDramaGuide.collapsed ? "展开短剧流程" : "收起短剧流程"}>
<CanvasTopBarTooltip label={shortDramaGuide.collapsed ? "展开短剧流程" : "收起短剧流程"}>
<Button
type="text"
className="canvas-topbar-action !h-10 !rounded-xl !px-2.5 !font-medium"
@@ -246,9 +256,11 @@ export function CanvasTopBar({
>
<span className="tabular-nums">{shortDramaGuide.progress.completedCount}/5</span>
</Button>
</Tooltip>
</CanvasTopBarTooltip>
) : null}
<Button type="text" className="canvas-topbar-action !h-10 !w-10 !min-w-10 !rounded-xl !p-0" style={{ color: theme.node.text }} icon={<Share2 className="size-4" />} onClick={onShare} aria-label="分享画布" title="分享画布" />
<CanvasTopBarTooltip label="分享画布">
<Button type="text" className="canvas-topbar-action !h-10 !w-10 !min-w-10 !rounded-xl !p-0" style={{ color: theme.node.text }} icon={<Share2 className="size-4" />} onClick={onShare} aria-label="分享画布" />
</CanvasTopBarTooltip>
<span className="h-6 w-px" style={{ background: theme.toolbar.border }} />
<Button
type="text"
@@ -271,7 +283,7 @@ export function CanvasTopBar({
<Shortcut keys={["工具栏「框选」", "左键拖动"]} value="框选多个节点,完成后自动回到「移动与选择」" />
<Shortcut keys={["Shift / Ctrl / Cmd", "点击"]} value="追加选择节点" />
<Shortcut keys={["Alt", "点击 / 框选"]} value="移除选择节点" />
<Shortcut keys={["Ctrl / Cmd", "1 / 2 / 3"]} value="100% / 适应全部 / 适应选择" />
<Shortcut keys={["Ctrl / Cmd", "1 / 2 / 3"]} value="100% / 适应画布 / 适应选择" />
<Shortcut keys={["?"]} value="打开快捷键" />
<Shortcut keys={["Shift / Ctrl / Cmd", "F"]} value="进入 / 退出专注模式" />
<Shortcut keys={["Ctrl / Cmd", "A"]} value="全选节点" />
@@ -366,6 +378,17 @@ export function CanvasWorkspaceModeSwitch({ mode, onChange }: { mode: CanvasWork
type CanvasTheme = (typeof canvasThemes)[keyof typeof canvasThemes];
function CanvasTopBarTooltip({ label, children }: { label: string; children: ReactNode }) {
return (
<span className="group relative inline-flex">
{children}
<span role="tooltip" className="aceternity-dock-tooltip pointer-events-none absolute left-1/2 top-[calc(100%+8px)] z-[var(--dock-tooltip-z)] -translate-x-1/2 translate-y-1 whitespace-nowrap rounded-md border px-2 py-1 text-[var(--fs-tiny)] font-medium opacity-0 shadow-xl backdrop-blur-xl transition-all duration-150 motion-reduce:transition-none group-hover:translate-y-0 group-hover:opacity-100 group-focus-within:translate-y-0 group-focus-within:opacity-100">
{label}
</span>
</span>
);
}
function ModeOption({ active, motionEnabled, icon, title, description, theme, onClick }: { active: boolean; motionEnabled: boolean; icon: ReactNode; title: string; description: string; theme: CanvasTheme; onClick: () => void }) {
return (
<motion.button
@@ -403,12 +426,7 @@ function CompactAgentStatus({ status, onClick }: { status: { connected: boolean;
const theme = canvasThemes[useThemeStore((state) => state.theme)];
const label = status.connected ? "已连接到本地 Codex" : status.enabled ? status.activity || "连接中" : "正在连接本地 Codex";
const dotColor = status.connected ? "#22c55e" : status.enabled ? "#f59e0b" : theme.node.muted;
return (
<button type="button" className="canvas-topbar-action flex h-10 items-center gap-2 rounded-xl px-3 text-sm font-medium" style={{ background: "transparent", color: theme.node.text }} onClick={onClick} title="打开本地 Codex 面板">
<span className="size-2 rounded-full" style={{ background: dotColor }} />
<span className="max-w-[180px] truncate">{label}</span>
</button>
);
return <CanvasTopBarTooltip label="打开本地 Codex 面板"><button type="button" className="canvas-topbar-action flex h-10 items-center gap-2 rounded-xl px-3 text-sm font-medium" style={{ background: "transparent", color: theme.node.text }} onClick={onClick} aria-label="打开本地 Codex 面板"><span className="size-2 rounded-full" style={{ background: dotColor }} /><span className="max-w-[180px] truncate">{label}</span></button></CanvasTopBarTooltip>;
}
function Shortcut({ keys, value }: { keys: string[]; value: string }) {
+60 -15
View File
@@ -64,8 +64,9 @@ import { CanvasVersionCompareModal } from "@/components/canvas/canvas-version-co
import { CanvasLocalAgentPanel } from "@/components/canvas/canvas-local-agent-panel";
import { useFocusMode } from "@/hooks/use-focus-mode";
import { useCanvasAgentStore } from "@/stores/canvas/use-canvas-agent-store";
import { getContextResourceNodes, type CanvasResourceReference } from "@/lib/canvas/canvas-resource-references";
import { getContextResourceNodes, removeCanvasResourceMention, type CanvasResourceReference } from "@/lib/canvas/canvas-resource-references";
import { CanvasConnectionCreateMenu, CanvasNodePanelOverlay } from "@/components/canvas/canvas-workspace-overlays";
import { CanvasOverlayLayerContainer, CanvasOverlayLayerProvider } from "@/components/canvas/canvas-overlay-layer";
import { CanvasLeaferGraphicsLayer } from "@/components/canvas/canvas-leafer-graphics-layer";
import { CanvasFreeformEmptyState, CanvasLinkedProjectEmptyState, CanvasShortDramaEmptyState, CanvasShortDramaGuide, CanvasStoryInputNodeContent, CanvasStylePlaceholderNodeContent } from "@/components/canvas/canvas-short-drama-entry";
import { failedImageBatchChildren, markImageBatchRetrying, reconcileImageBatchRoot, restoreUnsubmittedImageBatchChild } from "@/lib/canvas/canvas-image-batch-retry";
@@ -500,7 +501,6 @@ function InfiniteCanvasPage() {
handleViewportChange,
handleViewportPreviewChange,
previewViewport,
resetViewport,
screenToCanvas,
setZoomScale,
zoomCanvasIn,
@@ -825,6 +825,7 @@ function InfiniteCanvasPage() {
const {
alignSelectedNodes,
autoArrangeCanvasNodes,
arrangeSelectedNodes,
copyNodesToClipboard,
copySelectedNodes,
@@ -898,7 +899,6 @@ function InfiniteCanvasPage() {
const handleCanvasSelectionStart = useCallback(() => {
setContextMenu(null);
setDialogNodeId(null);
}, []);
const handleNodeInteractionStart = useCallback((selectionModifier: boolean) => {
@@ -925,7 +925,6 @@ function InfiniteCanvasPage() {
setContextMenu(null);
setHoveredNodeId(null);
setToolbarNodeId(null);
setDialogNodeId(null);
}, []);
const { alignmentGuides, cancelSelectionBox, deselectCanvas, dragPreview, frameDropTargetId, handleCanvasMouseDown, handleNodeMouseDown, isNodeDragging, nodeDraggingRef, selectionBoundsElementRef, selectionBox } = useCanvasSelectionController({
@@ -997,6 +996,29 @@ function InfiniteCanvasPage() {
setHoveredNodeId,
});
const handleRemoveNodeReference = useCallback((targetNodeId: string, reference: CanvasResourceReference) => {
const referenceNodeId = reference.nodeId;
if (!referenceNodeId) return;
// 生成节点可能通过配置节点接收参考,只移除参考来源边,保留目标到配置节点的主链。
const configNodeId = connectionsRef.current.find((connection) => {
if (connection.fromNodeId !== targetNodeId) return false;
return nodesRef.current.find((node) => node.id === connection.toNodeId)?.type === CanvasNodeType.Config;
})?.toNodeId;
const removedConnectionIds = new Set(
connectionsRef.current
.filter((connection) => connection.fromNodeId === referenceNodeId && (connection.toNodeId === targetNodeId || connection.toNodeId === configNodeId))
.map((connection) => connection.id),
);
const targetNode = nodesRef.current.find((node) => node.id === targetNodeId);
const currentPrompt = targetNode?.metadata?.composerContent ?? targetNode?.metadata?.prompt ?? "";
const nextPrompt = removeCanvasResourceMention(currentPrompt, reference);
if (nextPrompt !== currentPrompt) handleNodePromptChange(targetNodeId, nextPrompt);
if (!removedConnectionIds.size) return;
connectionsRef.current = connectionsRef.current.filter((connection) => !removedConnectionIds.has(connection.id));
setConnections(connectionsRef.current);
setSelectedConnectionId((current) => current && removedConnectionIds.has(current) ? null : current);
}, [connectionsRef, handleNodePromptChange, nodesRef, setConnections, setSelectedConnectionId]);
const handleProjectFolderInsert = useCallback((folderId: string) => {
const folder = linkedProjectQuery.data?.assetFolders.find((item) => item.id === folderId);
if (!folder || !linkedProjectId) throw new Error("素材文件夹已不存在,请刷新后重试");
@@ -1574,6 +1596,9 @@ function InfiniteCanvasPage() {
onPromptChange={handleNodePromptChange}
onConfigChange={handleConfigNodeChange}
onGenerate={handleGenerateNode}
onRemoveReference={handleRemoveNodeReference}
onClose={() => setDialogNodeId(null)}
onNodeMouseDown={handleNodeMouseDown}
workspaceMode={workspaceMode}
onImageSettingsOpenChange={(open) => {
setNodeImageSettingsOpen(open);
@@ -1582,7 +1607,7 @@ function InfiniteCanvasPage() {
/>
);
},
[configInputsById, handleConfigNodeChange, handleGenerateNode, handleNodePromptChange, mentionReferencesByNodeId, runningNodeId, skillMentionReferences, workspaceMode],
[configInputsById, handleConfigNodeChange, handleGenerateNode, handleNodePromptChange, handleRemoveNodeReference, mentionReferencesByNodeId, runningNodeId, skillMentionReferences, workspaceMode],
);
const renderCanvasNodeContent = useCallback(
@@ -1793,7 +1818,8 @@ function InfiniteCanvasPage() {
{!focusMode && shortDramaEnabled && currentProject?.projectId ? (
<CanvasProjectSidebar projectId={currentProject.projectId} detail={linkedProjectQuery.data} onAddChapter={handleProjectChapterInsert} onLocateStyle={locateProjectStyleNode} onOpenAssets={() => openProjectAssets()} />
) : null}
<section className="relative min-w-0 flex-1 flex flex-col min-h-0 overflow-hidden">
<CanvasOverlayLayerProvider>
<section className="relative min-w-0 flex-1 flex flex-col min-h-0 overflow-hidden">
{!focusMode ? (
<CanvasTopBar
title={currentProject?.title || "未命名画布"}
@@ -2001,7 +2027,7 @@ function InfiniteCanvasPage() {
onExit={exitFocusMode}
onZoomIn={zoomCanvasIn}
onZoomOut={zoomCanvasOut}
onFit={resetViewport}
onFit={fitCanvasContent}
/>
) : null}
@@ -2079,7 +2105,15 @@ function InfiniteCanvasPage() {
</div>
{angleNode?.metadata?.content ? (
<CanvasNodePanelOverlay node={angleNode} viewport={viewport} containerRef={containerRef} panelWidth={580} panelHeight={350}>
<CanvasNodePanelOverlay
node={angleNode}
viewport={viewport}
containerRef={containerRef}
panelWidth={580}
panelHeight={350}
dragOffset={dragPreview?.nodeIds.has(angleNode.id) ? { x: dragPreview.x, y: dragPreview.y } : null}
isDragging={isNodeDragging && Boolean(dragPreview?.nodeIds.has(angleNode.id))}
>
<CanvasNodeAnglePanel
dataUrl={angleNode.metadata.content}
onClose={() => setAngleNodeId(null)}
@@ -2095,6 +2129,8 @@ function InfiniteCanvasPage() {
node={emotionNode}
viewport={viewport}
containerRef={containerRef}
dragOffset={dragPreview?.nodeIds.has(emotionNode.id) ? { x: dragPreview.x, y: dragPreview.y } : null}
isDragging={isNodeDragging && Boolean(dragPreview?.nodeIds.has(emotionNode.id))}
onClose={() => setEmotionNodeId(null)}
onConfirm={(payload: CanvasImageEmotionPayload) => {
void generateEmotionNode(emotionNode, payload);
@@ -2103,7 +2139,13 @@ function InfiniteCanvasPage() {
) : null}
{dialogNode && dialogNode.type !== CanvasNodeType.Script && dialogNode.type !== CanvasNodeType.Drawing && !selectionBox ? (
<CanvasNodePanelOverlay node={dialogNode} viewport={viewport} containerRef={containerRef}>
<CanvasNodePanelOverlay
node={dialogNode}
viewport={viewport}
containerRef={containerRef}
dragOffset={dragPreview?.nodeIds.has(dialogNode.id) ? { x: dragPreview.x, y: dragPreview.y } : null}
isDragging={isNodeDragging && Boolean(dragPreview?.nodeIds.has(dialogNode.id))}
>
{renderCanvasNodePanel(dialogNode)}
</CanvasNodePanelOverlay>
) : null}
@@ -2201,9 +2243,10 @@ function InfiniteCanvasPage() {
{isMiniMapOpen && !focusMode ? <Minimap nodes={nodes} viewport={viewport} viewportSize={size} canvasContainerRef={containerRef} onViewportPreviewChange={previewViewport} onViewportChange={handleViewportChange} /> : null}
{!focusMode ? (
<div
data-canvas-no-zoom
className="absolute bottom-[calc(var(--canvas-inset-y)+var(--space-16))] left-[var(--canvas-inset-x)] z-[var(--z-panel)] flex items-end gap-2 lg:bottom-[var(--canvas-inset-y)]"
<CanvasOverlayLayerContainer
overlayId="asset-tray"
fallbackZIndex="var(--z-panel)"
className="absolute bottom-[calc(var(--canvas-inset-y)+var(--space-16))] left-[var(--canvas-inset-x)] flex items-end gap-2 lg:bottom-[var(--canvas-inset-y)]"
onMouseDown={(event) => event.stopPropagation()}
onPointerDown={(event) => event.stopPropagation()}
onWheel={(event) => event.stopPropagation()}
@@ -2212,7 +2255,8 @@ function InfiniteCanvasPage() {
scale={viewport.k}
containerRef={containerRef}
onScaleChange={setZoomScale}
onReset={resetViewport}
onFitContent={fitCanvasContent}
onAutoArrange={autoArrangeCanvasNodes}
isMiniMapOpen={isMiniMapOpen}
onToggleMiniMap={() => setIsMiniMapOpen((value) => !value)}
onOpenShortcuts={() => setShortcutRequestNonce((value) => value + 1)}
@@ -2225,7 +2269,7 @@ function InfiniteCanvasPage() {
onInsertAssetImage={(asset) => void createImageAssetNode(asset)}
onFocusCanvasImage={focusCanvasImageNode}
/>
</div>
</CanvasOverlayLayerContainer>
) : null}
<CanvasProjectContextMenu
@@ -2478,7 +2522,8 @@ function InfiniteCanvasPage() {
{codexCompactAgent && !assistantMounted ? (
<CanvasLocalAgentPanel headless snapshot={agentSnapshot} canUndoOps={canUndoAgentOps} undoOpsCount={agentUndoCount} onApplyOps={applyAgentOps} onUndoOps={undoAgentOps} autoConnect={codexAutoConnect} />
) : null}
</section>
</section>
</CanvasOverlayLayerProvider>
</main>
</>
);
+1 -1
View File
@@ -258,7 +258,7 @@ export default function SharedCanvasPage() {
<CanvasNodeToolbar node={dragRef.current ? null : toolbarNode} viewport={viewport} containerRef={containerRef} onKeep={keepToolbar} onLeave={hideToolbar} onInfo={(node) => setInfoNodeId(node.id)} onEditText={unauthorized} onDecreaseFont={unauthorized} onIncreaseFont={unauthorized} onToggleDialog={unauthorized} onAnnotate={unauthorized} onGenerateImage={unauthorized} onUpload={unauthorized} onDownload={unauthorized} onSaveAsset={unauthorized} onMaskEdit={unauthorized} onEmotion={unauthorized} onPortraitTexture={unauthorized} onCrop={unauthorized} onSplit={unauthorized} onUpscale={unauthorized} onSuperResolve={unauthorized} onAngle={unauthorized} onViewImage={unauthorized} onExtractVideoLastFrame={unauthorized} onExtractAudioFromVideo={unauthorized} onTrimVideoRegenerate={unauthorized} extractingVideoFrame={false} extractingAudio={false} trimmingVideo={false} onSubtitles={unauthorized} onTimeline={unauthorized} onReversePrompt={unauthorized} onRetry={unauthorized} onToggleFreeResize={unauthorized} onToggleLocked={unauthorized} onDelete={unauthorized} />
<div className="absolute bottom-5 left-5 z-[var(--z-panel-floating)]"><CanvasZoomControls scale={viewport.k} containerRef={containerRef} onScaleChange={setZoom} onReset={resetViewport} isMiniMapOpen={false} onToggleMiniMap={unauthorized} onOpenShortcuts={unauthorized} /></div>
<div className="absolute bottom-5 left-5 z-[var(--z-panel-floating)]"><CanvasZoomControls scale={viewport.k} containerRef={containerRef} onScaleChange={setZoom} onFitContent={resetViewport} isMiniMapOpen={false} onToggleMiniMap={unauthorized} onOpenShortcuts={unauthorized} /></div>
<div className="pointer-events-none absolute bottom-5 right-5 z-[var(--z-panel-floating)] max-w-[340px] text-right text-xs leading-5" style={{ color: theme.node.muted }}>访客操作仅在当前页面临时生效</div>
{contextMenu ? <SharedContextMenu menu={contextMenu} onAdd={addNode} onInfo={() => { if (contextMenu.nodeId) setInfoNodeId(contextMenu.nodeId); setContextMenu(null); }} onUnauthorized={() => { setContextMenu(null); unauthorized(); }} /> : null}
@@ -6,7 +6,7 @@ import { nanoid } from "nanoid";
import { NODE_DEFAULT_SIZE } from "@/constant/canvas";
import { FOLDER_COLLAPSED_HEIGHT, FOLDER_COLLAPSED_WIDTH, FRAME_HEADER_HEIGHT, getFrameChildIds, getFrameChildren, isFrameNode } from "@/lib/canvas/canvas-frame";
import { alignCanvasNodes, layoutCanvasFlow, layoutCanvasNodes, nextCanvasVersionLabel, type CanvasAlignmentMode } from "@/lib/canvas/canvas-layout";
import { createCanvasNode, removeCanvasNodes } from "@/lib/canvas/canvas-project-domain";
import { createCanvasNode, isHiddenBatchChild, removeCanvasNodes } from "@/lib/canvas/canvas-project-domain";
import { isolateCopiedNodeMetadata } from "@/lib/canvas/canvas-node-copy";
import { CanvasNodeType, type CanvasConnection, type CanvasFolderStyle, type CanvasFolderTheme, type CanvasNodeData, type ContextMenuState, type Position } from "@/types/canvas";
import { cloneCanvasDrawing } from "@/lib/canvas/canvas-drawing-storage";
@@ -164,6 +164,28 @@ export function useCanvasNodeOperations({
message.success(mode === "flow" ? "已按连线整理" : "已整理选中节点");
}, [commitNodes, connectionsRef, message, nodesRef, selectedNodeIdsRef]);
const autoArrangeCanvasNodes = useCallback(() => {
const currentNodes = nodesRef.current;
const selectedIds = selectedNodeIdsRef.current;
const hasSelection = selectedIds.size > 0;
const candidates = currentNodes.filter((node) => {
if (node.metadata?.locked || isFrameNode(node) || isHiddenBatchChild(node, currentNodes)) return false;
if (hasSelection) return selectedIds.has(node.id);
return !node.parentId;
});
if (candidates.length < 2) {
message.info(hasSelection ? "请至少选择两个可整理节点" : "画布中至少需要两个可整理节点");
return;
}
const candidateIds = new Set(candidates.map((node) => node.id));
const hasConnections = connectionsRef.current.some((connection) => candidateIds.has(connection.fromNodeId) && candidateIds.has(connection.toNodeId));
const mode = hasConnections ? "flow" : "grid";
const positions = mode === "flow" ? layoutCanvasFlow(candidates, connectionsRef.current) : layoutCanvasNodes(candidates, "grid");
commitNodes(currentNodes.map((node) => positions.has(node.id) ? { ...node, position: positions.get(node.id)! } : node));
message.success(mode === "flow" ? (hasSelection ? "已按连线整理选中节点" : "已按连线整理画布") : (hasSelection ? "已网格整理选中节点" : "已网格整理画布"));
}, [commitNodes, connectionsRef, message, nodesRef, selectedNodeIdsRef]);
const alignSelectedNodes = useCallback((mode: CanvasAlignmentMode) => {
const selected = nodesRef.current.filter((node) => selectedNodeIdsRef.current.has(node.id) && !node.metadata?.locked && !isFrameNode(node));
if (selected.length < 2 || ((mode === "distributeX" || mode === "distributeY") && selected.length < 3)) return;
@@ -485,6 +507,7 @@ export function useCanvasNodeOperations({
return {
alignSelectedNodes,
autoArrangeCanvasNodes,
arrangeSelectedNodes,
copyNodesToClipboard,
copySelectedNodes,
@@ -19,7 +19,7 @@ type UseCanvasSelectionControllerOptions = {
onCanvasSelectionStart: () => void;
onNodeInteractionStart: (selectionModifier: boolean) => void;
onNodeClick: (node: CanvasNodeData) => void;
onBatchConnectionTarget?: (event: ReactMouseEvent, nodeId: string) => boolean;
onBatchConnectionTarget?: (event: ReactMouseEvent | ReactPointerEvent, nodeId: string) => boolean;
onLinkedFolderDrop?: (folder: CanvasNodeData, nodes: CanvasNodeData[]) => void;
onDeselect: () => void;
onSelectionBoxEnd?: () => void;
@@ -127,7 +127,7 @@ export function useCanvasSelectionController({
setSelectedConnectionId(null);
}, [cancelPendingConnectionCreate, nodesRef, onCanvasSelectionStart, screenToCanvas, selectedNodeIdsRef, setSelectedConnectionId]);
const handleNodeMouseDown = useCallback((event: ReactMouseEvent, nodeId: string) => {
const handleNodeMouseDown = useCallback((event: ReactMouseEvent | ReactPointerEvent, nodeId: string) => {
event.stopPropagation();
if (event.button !== 0) return;
if (onBatchConnectionTarget?.(event, nodeId)) return;
@@ -227,7 +227,7 @@ export function useCanvasSelectionController({
}
}, [historyPausedRef, nodesRef, onLinkedFolderDrop, onNodeClick, setNodes, viewportRef]);
const handleMouseMove = useCallback((event: MouseEvent) => {
const handleNodeDragMove = useCallback((event: MouseEvent | PointerEvent) => {
if (!dragRef.current.isDraggingNode) return;
const currentViewport = viewportRef.current;
pendingNodeDragRef.current = { x: (event.clientX - dragRef.current.startX) / currentViewport.k, y: (event.clientY - dragRef.current.startY) / currentViewport.k };
@@ -256,6 +256,10 @@ export function useCanvasSelectionController({
}, [nodesRef, viewportRef]);
const handlePointerMove = useCallback((event: PointerEvent) => {
if (dragRef.current.isDraggingNode) {
handleNodeDragMove(event);
return;
}
const currentSelection = selectionBoxRef.current;
if (!currentSelection) return;
if (event.buttons === 0) {
@@ -299,7 +303,7 @@ export function useCanvasSelectionController({
selectedNodeIdsRef.current = nextSelected;
setSelectedNodeIds(nextSelected);
});
}, [cancelSelectionBox, containerRef, screenToCanvas, selectedNodeIdsRef, setSelectedNodeIds, viewportRef]);
}, [cancelSelectionBox, containerRef, handleNodeDragMove, screenToCanvas, selectedNodeIdsRef, setSelectedNodeIds, viewportRef]);
const finishSelection = useCallback(() => {
const hadPendingSelection = Boolean(selectionBoxRef.current);
@@ -316,7 +320,7 @@ export function useCanvasSelectionController({
};
const handlePointerUp = (event: PointerEvent) => finishNodeDrag(event.clientX, event.clientY);
const cancel = () => finishNodeDrag();
window.addEventListener("mousemove", handleMouseMove);
window.addEventListener("mousemove", handleNodeDragMove);
window.addEventListener("mouseup", handleMouseUp);
window.addEventListener("pointermove", handlePointerMove);
window.addEventListener("pointerup", handlePointerUp);
@@ -325,14 +329,14 @@ export function useCanvasSelectionController({
return () => {
if (dragFrameRef.current) cancelAnimationFrame(dragFrameRef.current);
if (selectionFrameRef.current) cancelAnimationFrame(selectionFrameRef.current);
window.removeEventListener("mousemove", handleMouseMove);
window.removeEventListener("mousemove", handleNodeDragMove);
window.removeEventListener("mouseup", handleMouseUp);
window.removeEventListener("pointermove", handlePointerMove);
window.removeEventListener("pointerup", handlePointerUp);
window.removeEventListener("pointercancel", cancel);
window.removeEventListener("blur", cancel);
};
}, [finishNodeDrag, finishSelection, handleMouseMove, handlePointerMove]);
}, [finishNodeDrag, finishSelection, handleNodeDragMove, handlePointerMove]);
return {
alignmentGuides,
@@ -122,11 +122,6 @@ export function useCanvasViewportController({
setDialogNodeId(node.type === CanvasNodeType.Drawing ? null : node.id);
}, [nodesRef, selectFocusedNode, setDialogNodeId, size.height, size.width, transitionViewportTo, viewportRef]);
const resetViewport = useCallback(() => {
transitionViewportTo({ x: size.width / 2, y: size.height / 2, k: 1 });
setContextMenu(null);
}, [setContextMenu, size.height, size.width, transitionViewportTo]);
const setZoomScale = useCallback((scale: number) => {
cancelViewportTransition();
const next = viewportAtScale(viewportRef.current, size, scale);
@@ -164,7 +159,6 @@ export function useCanvasViewportController({
handleViewportChange,
handleViewportPreviewChange,
previewViewport,
resetViewport,
screenToCanvas,
setZoomScale,
zoomCanvasIn,
+52 -2
View File
@@ -1,6 +1,6 @@
import { useCallback, useEffect, useMemo, useRef, useState, type ChangeEvent, type CSSProperties, type ReactNode, type RefObject } from "react";
import { App, Button, Drawer, Modal, Popover, Spin, Tooltip } from "antd";
import { ArrowDown, ArrowUp, Check, ChevronDown, Clapperboard, Clock3, Copy, Download, FileText, Film, FolderOpen, History, Image as ImageIcon, LoaderCircle, Maximize2, MessageSquareText, Music2, Paperclip, Plus, RefreshCw, Search, SlidersHorizontal, Sparkles, Trash2, X } from "lucide-react";
import { ArrowDown, ArrowUp, Check, ChevronDown, Clapperboard, Clock3, Copy, Download, FileText, Film, FolderOpen, History, Image as ImageIcon, LoaderCircle, Maximize2, MessageSquareText, Music2, Paperclip, Plus, RefreshCw, Search, SlidersHorizontal, Sparkles, Trash2, WandSparkles, X } from "lucide-react";
import { Link } from "react-router";
import { AIMessageMarkdown } from "@/components/ai/ai-message-markdown";
@@ -8,6 +8,7 @@ import { GenerationToolCard, type GenerationToolStatus } from "@/components/ai/g
import { MessageReasoning } from "@/components/ai/message-reasoning";
import { AssetLibraryPickerModal, type AssetLibraryPickerItem } from "@/components/assets/asset-library-picker-modal";
import { CanvasResourceMentionTextarea } from "@/components/canvas/canvas-resource-mention-textarea";
import { CanvasPromptOptimizerDrawer } from "@/components/canvas/canvas-prompt-optimizer-drawer";
import { VoiceRecordingButton } from "@/components/conversation/voice-recording-button";
import { ModelPicker } from "@/components/model-picker";
import { CreditSymbol, requestCreditCost } from "@/constant/credits";
@@ -37,6 +38,10 @@ import { recoverCreationTextTask } from "@/services/creation-text-task-recovery"
import { modelDisplayName, modelOptionName, resolveModelChannel, selectableModelsByCapability, useConfigStore, useEffectiveConfig } from "@/stores/use-config-store";
import { useAssetStore, type Asset } from "@/stores/use-asset-store";
import { useUserStore } from "@/stores/use-user-store";
import type { PromptOptimizerProvider } from "@/lib/plugins/plugin-types";
import { promptOptimizerPlugin, PROMPT_OPTIMIZER_PLUGIN_ID } from "@/lib/plugins/builtin/prompt-optimizer";
import { createPluginHostContext } from "@/services/plugin-host";
import { usePluginStore } from "@/stores/use-plugin-store";
import { buildCreationMentionReferences, creationReferenceMetadata, displayCreationPrompt, expandCreationPrompt, reconcileCreationAttachmentLimit, removeCreationReferenceTokens, selectedCreationReferences, type CreationReference } from "./creation-references";
import { creationAttachmentFromAsset, creationAttachmentFromAudio, creationAttachmentFromAudioAsset, creationAttachmentFromDocument, creationAttachmentFromExternalAsset, creationAttachmentFromImage, creationAttachmentFromVideo, creationAttachmentFromVideoAsset, creationAttachmentKind, creationAudioAsset, creationFileAccepted, creationImageAsset, creationMediaAspectRatio, creationUploadAccept, creationVideoAsset, splitCreationAttachments, type CreationAttachment } from "./creation-assets";
@@ -128,6 +133,11 @@ function completedCreationGenerationTask(input: { taskId: string; task?: Generat
export default function CreatePage() {
const { message: toast, modal } = App.useApp();
const config = useEffectiveConfig();
const promptOptimizerInstallation = usePluginStore((state) => state.installations.find((item) => item.manifest.id === PROMPT_OPTIMIZER_PLUGIN_ID));
const promptOptimizerProvider = useMemo<PromptOptimizerProvider | null>(() => {
if (!promptOptimizerInstallation?.enabled || !promptOptimizerPlugin.createPromptOptimizer) return null;
return promptOptimizerPlugin.createPromptOptimizer(createPluginHostContext(promptOptimizerPlugin, promptOptimizerInstallation, config));
}, [config, promptOptimizerInstallation]);
const updateConfig = useConfigStore((state) => state.updateConfig);
const assets = useAssetStore((state) => state.assets);
const addAsset = useAssetStore((state) => state.addAsset);
@@ -839,6 +849,7 @@ export default function CreatePage() {
setVideoQuality,
count,
setCount,
promptOptimizerProvider,
composerFocusRef,
placeholderOverride: viewMode === "storyboard" && composingNextShot ? `SC.${String(nextShotNumber).padStart(2, "0")} · 写下这一镜的镜头、画面或故事` : undefined,
onSubmit: () => void submit(),
@@ -1105,6 +1116,7 @@ type ComposerProps = {
setVideoQuality: (value: string) => void;
count: string;
setCount: (value: string) => void;
promptOptimizerProvider: PromptOptimizerProvider | null;
composerFocusRef: RefObject<HTMLTextAreaElement | null>;
placeholderOverride?: string;
onSubmit: () => void;
@@ -1113,9 +1125,12 @@ type ComposerProps = {
function CreationComposer(props: ComposerProps) {
const [previewUrl, setPreviewUrl] = useState("");
const [previewType, setPreviewType] = useState<"image" | "video">("image");
const [promptOptimizerOpen, setPromptOptimizerOpen] = useState(false);
const canSubmit = Boolean(props.prompt.trim()) && !props.busy;
const creditsEnabled = useUserStore((state) => state.features.creditsEnabled);
const priceChannel = resolveModelChannel(props.config, props.model);
const canOptimizePrompt = Boolean(props.promptOptimizerProvider) && (props.mode === "image" || props.mode === "video");
const optimizerReferences = props.references.filter((reference) => reference.active && reference.kind !== "skill");
const credits = requestCreditCost({
channelMode: priceChannel.scope === "system" ? "remote" : "local",
modelCosts: priceChannel.modelCosts,
@@ -1141,7 +1156,11 @@ function CreationComposer(props: ComposerProps) {
setPreviewType(type);
setPreviewUrl(url);
};
return <section className={`creation-chat-composer is-${props.variant}`}>
useEffect(() => {
if (!canOptimizePrompt) setPromptOptimizerOpen(false);
}, [canOptimizePrompt]);
const composer = <section className={`creation-chat-composer is-${props.variant}`}>
<div className="creation-chat-writing-surface">
<input ref={props.fileInputRef} type="file" hidden accept={creationUploadAccept(props.mode)} multiple onChange={props.onFileChange} />
{primaryAttachment ? <CreationAttachmentThumbnail item={primaryAttachment} primary canAddMore={canAddMoreReferences && !props.busy} onPreview={previewAttachment} onRemove={props.onRemoveAttachment} onAdd={props.onOpenLibrary} /> : <Tooltip title={!referencesSupported ? "当前模型不支持参考媒体" : "从素材库选择参考内容"}><button type="button" className="creation-chat-reference is-paper" onClick={props.onOpenLibrary} disabled={props.busy || !referencesSupported} aria-label="打开素材库选择参考内容"><Plus /><span>参考内容</span></button></Tooltip>}
@@ -1157,6 +1176,19 @@ function CreationComposer(props: ComposerProps) {
onTranscribed={(text) => props.setPrompt(props.prompt.trim() ? `${props.prompt} ${text}` : text)}
/>
<ModePicker mode={props.mode} onModeChange={props.onModeChange} />
{canOptimizePrompt ? <Tooltip title="用 AI 优化提示词">
<button
type="button"
className="creation-chat-control"
onClick={() => setPromptOptimizerOpen(true)}
aria-label="优化提示词"
aria-expanded={promptOptimizerOpen}
aria-haspopup="dialog"
>
<WandSparkles />
<span>优化</span>
</button>
</Tooltip> : null}
<Tooltip title="从本机上传附件"><button type="button" className="creation-chat-control" onClick={() => props.fileInputRef.current?.click()} disabled={props.busy || !referencesSupported} aria-label="从本机上传附件"><Paperclip /><span>附件</span></button></Tooltip>
<Tooltip title={!referencesSupported ? "当前模型不支持参考媒体" : "从素材库选择参考内容"}><button type="button" className="creation-chat-control" onClick={props.onOpenLibrary} disabled={props.busy || !referencesSupported} aria-label="打开素材库选择参考内容"><FolderOpen /><span>素材库</span></button></Tooltip>
<ModelPicker config={props.config} value={props.model} onChange={props.onModelChange} capability={props.mode} requirements={props.modelRequirements} className="creation-model-picker" placeholder={`选择${modeLabels[props.mode]}模型`} showSelectedPrice variant="creation" />
@@ -1182,6 +1214,24 @@ function CreationComposer(props: ComposerProps) {
</footer>
<CreationMediaPreviewModal url={previewUrl} type={previewType} onClose={() => setPreviewUrl("")} />
</section>;
return (
<CanvasPromptOptimizerDrawer
open={promptOptimizerOpen}
prompt={props.prompt}
generationMode={props.mode === "video" ? "video" : "image"}
targetModel={modelOptionName(props.model) || props.model}
targetProtocol={priceChannel.modelCosts?.find((item) => item.model === modelOptionName(props.model))?.protocol || priceChannel.interfaceType}
config={props.config}
optimizerModel={props.config.textModel}
references={optimizerReferences}
provider={props.promptOptimizerProvider}
onClose={() => setPromptOptimizerOpen(false)}
onApply={props.setPrompt}
>
{composer}
</CanvasPromptOptimizerDrawer>
);
}
function ModePicker({ mode, onModeChange }: { mode: CreationMode; onModeChange: (mode: CreationMode) => void }) {
+6
View File
@@ -6,6 +6,7 @@ import { useNavigate } from "react-router";
import { listRegisteredPlugins } from "@/lib/plugins/plugin-registry";
import "@/lib/plugins/builtin";
import { EAGLE_PLUGIN_ID } from "@/lib/plugins/builtin/eagle";
import { PROMPT_OPTIMIZER_PLUGIN_ID } from "@/lib/plugins/builtin/prompt-optimizer";
import type { PluginManifest, RegisteredPlugin } from "@/lib/plugins/plugin-types";
import { getEagleLibrary, type EagleFolder } from "@/services/api/eagle";
import { fetchPlugins, setPluginEnabled, uploadPlugin, type BackendPlugin } from "@/services/api/plugins";
@@ -522,6 +523,11 @@ export default function PluginsPage() {
</Button>
</div>
</>
) : settingsPlugin.manifest.id === PROMPT_OPTIMIZER_PLUGIN_ID ? (
<div className="rounded-[var(--r-md)] border border-border/60 bg-muted/25 px-3 py-3 text-[var(--fs-body)] leading-6 text-foreground/70">
<p>在创作页或图片、视频节点的提示词编辑器中使用“优化”按钮,即可让当前文本模型整理提示词。</p>
<p className="mt-2 text-[var(--fs-micro)] text-foreground/50">插件不会自动覆盖原提示词,只有点击“采用”后才会回填到当前输入框。</p>
</div>
) : (
<div className="plugin-settings-empty">
{settingsPlugin.manifest.kind === "protocol"
@@ -0,0 +1,190 @@
import { App, Button, Input, Select } from "antd";
import { Activity, CheckCircle2, Clock3, Download, FileText, ShieldCheck } from "lucide-react";
import { useEffect, useState } from "react";
import { exportDiagnosticBundle, downloadDiagnosticBundle, previewDiagnosticBundle, type DiagnosticExportInput, type DiagnosticPreview } from "@/services/diagnostics/diagnostics-api";
import { getClientDiagnosticEvents, getDiagnosticRuntime } from "@/services/diagnostics/client-diagnostics";
type DiagnosticsPanelProps = {
taskId?: string;
projectId?: string;
};
type DiagnosticRange = "15m" | "30m" | "1h" | "24h";
const rangeOptions = [
{ value: "15m", label: "最近 15 分钟" },
{ value: "30m", label: "最近 30 分钟" },
{ value: "1h", label: "最近 1 小时" },
{ value: "24h", label: "最近 24 小时" },
];
export default function DiagnosticsPanel({ taskId, projectId }: DiagnosticsPanelProps) {
const { message } = App.useApp();
const [range, setRange] = useState<DiagnosticRange>("30m");
const [description, setDescription] = useState("");
const [preview, setPreview] = useState<DiagnosticPreview | null>(null);
const [loadingPreview, setLoadingPreview] = useState(false);
const [exporting, setExporting] = useState(false);
const [bundleId, setBundleId] = useState("");
useEffect(() => {
let cancelled = false;
setLoadingPreview(true);
void previewDiagnosticBundle(buildInput(range, undefined, taskId, projectId))
.then((result) => {
if (!cancelled) setPreview(result);
})
.catch(() => {
if (!cancelled) setPreview(null);
})
.finally(() => {
if (!cancelled) setLoadingPreview(false);
});
return () => {
cancelled = true;
};
}, [projectId, range, taskId]);
const handleExport = async () => {
setExporting(true);
try {
const download = await exportDiagnosticBundle(buildInput(range, description, taskId, projectId));
downloadDiagnosticBundle(download);
setBundleId(download.bundleId);
message.success("诊断包已下载,请连同诊断编号提交给支持人员");
} catch (error) {
message.error(error instanceof Error ? error.message : "导出诊断包失败");
} finally {
setExporting(false);
}
};
return (
<div className="settings-pane diagnostics-page">
<div className="settings-section max-w-4xl pb-8">
<header className="border-b border-border/60 pb-6 pt-1">
<div className="mb-3 flex items-center gap-2 text-[var(--fs-tiny)] font-semibold tracking-[0.12em] text-foreground/42">
<span className="h-px w-6 bg-[var(--workspace-accent)]" aria-hidden="true" />
<span>排障工具</span>
</div>
<div className="grid gap-5 md:grid-cols-[minmax(0,1fr)_minmax(240px,0.72fr)] md:items-end md:gap-10">
<div className="min-w-0">
<h2 className="text-xl font-semibold tracking-[-0.02em] text-foreground sm:text-2xl">问题诊断</h2>
<p className="mt-2 max-w-xl text-sm leading-6 text-foreground/55">遇到报错、任务失败或生成卡住时,导出一份给开发人员排查。</p>
</div>
<div className="flex items-start gap-3 rounded-xl border border-emerald-500/20 bg-emerald-500/[.06] px-3.5 py-3">
<span className="grid size-9 shrink-0 place-items-center rounded-lg bg-emerald-500/[.12] text-emerald-600 dark:text-emerald-400">
<ShieldCheck className="size-[18px]" strokeWidth={1.8} aria-hidden="true" />
</span>
<div className="min-w-0">
<div className="text-sm font-semibold text-foreground/85">默认已脱敏</div>
<p className="mt-1 text-xs leading-5 text-foreground/55">不包含 API Key、Cookie、完整提示词或原始媒体。</p>
</div>
</div>
</div>
</header>
<div className="mt-6 space-y-4">
<section className="rounded-xl border border-border/70 bg-background/55 p-4 sm:p-5" aria-labelledby="diagnostic-window-heading">
<div className="flex flex-wrap items-start justify-between gap-3 border-b border-border/55 pb-4">
<div>
<div className="flex items-center gap-2 text-sm font-semibold text-foreground/85">
<Clock3 className="size-4 text-foreground/55" strokeWidth={1.8} aria-hidden="true" />
<h3 id="diagnostic-window-heading">收集范围</h3>
</div>
<p className="mt-1 text-xs leading-5 text-foreground/48">选择问题发生前后的日志时间窗口。</p>
</div>
<span className="rounded-full bg-foreground/[.045] px-2.5 py-1 text-[var(--fs-tiny)] font-medium text-foreground/48">最长 24 小时</span>
</div>
<div className="mt-4 grid gap-4 md:grid-cols-[minmax(0,230px)_minmax(0,1fr)] md:items-end">
<label className="block" htmlFor="diagnostic-range">
<span className="mb-2 block text-xs font-semibold text-foreground/65">时间范围</span>
<Select id="diagnostic-range" className="w-full" value={range} options={rangeOptions} onChange={setRange} />
</label>
<div className="rounded-lg border border-border/55 bg-foreground/[.025] px-3.5 py-3" aria-live="polite">
<div className="flex items-center gap-2 text-sm font-medium text-foreground/78">
<Activity className="size-4 text-emerald-500" strokeWidth={1.8} aria-hidden="true" />
<span>当前账号的可用记录</span>
</div>
<div className="mt-3 grid grid-cols-3 divide-x divide-border/55">
<DiagnosticMetric label="前端事件" value={loadingPreview ? "读取中" : "最多 500"} />
<DiagnosticMetric label="任务" value={loadingPreview ? "读取中" : preview ? String(preview.taskCount) : "待统计"} />
<DiagnosticMetric label="上游调用" value={loadingPreview ? "读取中" : preview ? String(preview.apiCallCount) : "待统计"} />
</div>
</div>
</div>
</section>
<section className="rounded-xl border border-border/70 bg-background/55 p-4 sm:p-5" aria-labelledby="diagnostic-description-heading">
<div className="flex items-start gap-2">
<FileText className="mt-0.5 size-4 text-foreground/55" strokeWidth={1.8} aria-hidden="true" />
<div>
<div className="flex items-center gap-2 text-sm font-semibold text-foreground/85">
<h3 id="diagnostic-description-heading">问题描述</h3>
<span className="rounded-full bg-foreground/[.045] px-2 py-0.5 text-[var(--fs-tiny)] font-medium text-foreground/42">可选</span>
</div>
<p className="mt-1 text-xs leading-5 text-foreground/48">用一句话说明现象,帮助开发人员更快定位。</p>
</div>
</div>
<label className="mt-4 block" htmlFor="diagnostic-description">
<span className="sr-only">遇到了什么问题?</span>
<Input.TextArea id="diagnostic-description" rows={4} maxLength={1000} showCount value={description} onChange={(event) => setDescription(event.target.value)} placeholder="例如:点击生成后一直显示处理中,刷新页面也没有结果。" />
</label>
</section>
</div>
<footer className="mt-5 flex flex-col-reverse gap-4 border-t border-border/60 pt-4 sm:flex-row sm:items-center sm:justify-between">
<p className="max-w-md text-xs leading-5 text-foreground/48">下载后请把 ZIP 文件和诊断编号一起提交。诊断包不会自动上传到服务器。</p>
<div className="flex flex-wrap items-center gap-2.5 sm:justify-end">
{bundleId ? (
<span className="inline-flex items-center gap-1.5 rounded-lg border border-emerald-500/25 bg-emerald-500/[.06] px-2.5 py-2 text-xs font-medium text-emerald-700 dark:text-emerald-300" role="status">
<CheckCircle2 className="size-3.5" strokeWidth={2} aria-hidden="true" />
诊断编号:{bundleId}
</span>
) : null}
<Button size="large" type="primary" icon={<Download className="size-4" strokeWidth={2} />} loading={exporting} onClick={() => void handleExport()}>
导出诊断包
</Button>
</div>
</footer>
</div>
</div>
);
}
function DiagnosticMetric({ label, value }: { label: string; value: string }) {
return (
<div className="min-w-0 px-3 first:pl-0 last:pr-0">
<div className="truncate text-[var(--fs-tiny)] text-foreground/45">{label}</div>
<div className="mt-1 truncate text-sm font-semibold tabular-nums text-foreground/78">{value}</div>
</div>
);
}
function buildInput(range: DiagnosticRange, description: string | undefined, taskId?: string, projectId?: string): DiagnosticExportInput {
const to = new Date();
const from = new Date(to.getTime() - rangeMilliseconds(range));
return {
from: from.toISOString(),
to: to.toISOString(),
taskId: taskId || undefined,
projectId: projectId || undefined,
description: description || undefined,
runtime: getDiagnosticRuntime(),
clientEvents: getClientDiagnosticEvents({ from, to }),
};
}
function rangeMilliseconds(range: DiagnosticRange) {
switch (range) {
case "15m":
return 15 * 60 * 1000;
case "1h":
return 60 * 60 * 1000;
case "24h":
return 24 * 60 * 60 * 1000;
default:
return 30 * 60 * 1000;
}
}
+5 -2
View File
@@ -1,5 +1,5 @@
import { App, Button, Form, Input, InputNumber, Select } from "antd";
import { ArrowLeft, Boxes, Cloud, MessageSquareText, RadioTower, SlidersHorizontal, SquareTerminal } from "lucide-react";
import { ArrowLeft, Boxes, Bug, Cloud, MessageSquareText, RadioTower, SlidersHorizontal, SquareTerminal } from "lucide-react";
import { useEffect, useState, type ReactNode } from "react";
import { useNavigate, useSearchParams } from "react-router";
@@ -13,8 +13,9 @@ export { UserLocalChannelFields, UserLocalChannelSwitch, userLocalChannelChangeP
import { ModelDefaultGrid } from "./model-default-grid";
import { LocalCliSettings } from "./local-cli-settings";
import { PromptPreferencesPane } from "./prompt-preferences-pane";
import DiagnosticsPanel from "./diagnostics-panel";
type ConfigSectionKey = "local-cli" | "channels" | "models" | "preferences" | "prompts" | "storage";
type ConfigSectionKey = "local-cli" | "channels" | "models" | "preferences" | "prompts" | "storage" | "diagnostics";
const configSections: Array<{ key: ConfigSectionKey; label: string; description: string; icon: ReactNode }> = [
{ key: "local-cli", label: "本机工具", description: "连接 Runtime 与官方 CLI", icon: <SquareTerminal className="size-4" /> },
@@ -23,6 +24,7 @@ const configSections: Array<{ key: ConfigSectionKey; label: string; description:
{ key: "preferences", label: "生成偏好", description: "画布、视频与音频默认值", icon: <SlidersHorizontal className="size-4" /> },
{ key: "prompts", label: "提示词偏好", description: "按任务定制平台模板", icon: <MessageSquareText className="size-4" /> },
{ key: "storage", label: "我的对象存储", description: "管理个人媒体存储", icon: <Cloud className="size-4" /> },
{ key: "diagnostics", label: "问题诊断", description: "导出日志协助排查", icon: <Bug className="size-4" /> },
];
export function isConfigSection(value: string | null): value is ConfigSectionKey {
@@ -172,6 +174,7 @@ export default function SettingsPage() {
</SettingsPane>
),
prompts: <SettingsPane fill><PromptPreferencesPane /></SettingsPane>,
diagnostics: <SettingsPane><DiagnosticsPanel taskId={searchParams.get("taskId") || undefined} projectId={searchParams.get("projectId") || undefined} /></SettingsPane>,
storage: (
<SettingsPane>
<div className="settings-section">
+4 -2
View File
@@ -1,7 +1,7 @@
import { App, Button, Drawer, Form, Input, Modal, Select, Switch, Tooltip, Typography } from "antd";
import { LayoutGrid, List, Plus, RefreshCw, Search, Trash2 } from "lucide-react";
import { Bug, LayoutGrid, List, Plus, RefreshCw, Search, Trash2 } from "lucide-react";
import { useCallback, useEffect, useMemo, useRef, useState } from "react";
import { useSearchParams } from "react-router";
import { useNavigate, useSearchParams } from "react-router";
import { MediaPreview } from "@/components/media-preview";
import { ListToolbar, PageHeader, PaginationBar, WorkspacePage } from "@/components/layout/workspace-page";
@@ -53,6 +53,7 @@ function taskStatusFilter(value: string | null): TaskStatusFilter {
export default function TasksPage() {
const { message } = App.useApp();
const navigate = useNavigate();
const [searchParams, setSearchParams] = useSearchParams();
const effectiveConfig = useEffectiveConfig();
const isAiConfigReady = useConfigStore((state) => state.isAiConfigReady);
@@ -537,6 +538,7 @@ export default function TasksPage() {
</Button>
) : null}
{canQueryProviderTask(detailTask) ? <Button icon={<RefreshCw className="size-4" />} loading={actingId === detailTask.id} onClick={() => void queryProviderTask(detailTask)}>手动查询任务</Button> : null}
{isTaskFailed(detailTask) ? <Button icon={<Bug className="size-4" />} onClick={() => navigate(`/settings?section=diagnostics&taskId=${encodeURIComponent(detailTask.id)}${detailTask.projectId ? `&projectId=${encodeURIComponent(detailTask.projectId)}` : ""}`)}>导出诊断包</Button> : null}
</div>
{detailTask.error ? <pre className="task-detail-error max-h-28 overflow-auto whitespace-pre-wrap px-3 py-2 text-xs">{generationErrorMessage(detailTask.error)}</pre> : null}
<TaskResultMedia value={detailTask.resultJson} taskType={detailTask.type} />
+2
View File
@@ -1,5 +1,6 @@
import { DREAMINA_SUBMIT_ERROR_MESSAGES, generationErrorMessage } from "@/lib/generation-error";
import { apiClient, request, type BackendEnvelope } from "@/services/api/request";
import { recordDiagnosticEvent } from "@/services/diagnostics/client-diagnostics";
import {
deleteLocalDreaminaGenerationTask,
listLocalDreaminaGenerationTaskPage,
@@ -219,6 +220,7 @@ export function uploadAgentFile(sessionId: string, file: File) {
export function createGenerationTask(input: CreateTaskInput) {
return request<GenerationTask>(api.post("/tasks", input)).then((task) => {
recordDiagnosticEvent({ level: "info", category: "task", message: "任务已创建", taskId: task.id, projectId: task.projectId });
notifyCanvasTaskCreated(task);
// 创建任务时积分已被预占,不能等任务结束后才刷新可用余额。
window.dispatchEvent(new CustomEvent("wallet:updated"));
@@ -0,0 +1,220 @@
import { type AxiosError, type AxiosRequestConfig } from "axios";
import { apiClient } from "@/services/api/request";
export type ClientDiagnosticLevel = "info" | "warning" | "error";
export type ClientDiagnosticCategory = "navigation" | "action" | "request" | "runtime" | "task" | "plugin";
export type ClientDiagnosticEvent = {
id: string;
timestamp: string;
level: ClientDiagnosticLevel;
category: ClientDiagnosticCategory;
code?: string;
message: string;
route?: string;
durationMs?: number;
httpStatus?: number;
requestId?: string;
traceId?: string;
taskId?: string;
projectId?: string;
canvasId?: string;
stack?: string;
};
type DiagnosticEventInput = Omit<ClientDiagnosticEvent, "id" | "timestamp"> & { timestamp?: string };
type RequestDiagnosticMeta = { startedAt: number; traceId: string };
const maxEvents = 500;
const events: ClientDiagnosticEvent[] = [];
const requestMeta = new WeakMap<object, RequestDiagnosticMeta>();
let initialized = false;
let scopedUserId = "";
let activeTraceId = createDiagnosticId("trace");
export function initializeClientDiagnostics() {
if (initialized || typeof window === "undefined") return;
initialized = true;
window.addEventListener("error", (event) => {
recordDiagnosticEvent({
level: "error",
category: "runtime",
message: event.message || "页面运行异常",
stack: event.error instanceof Error ? event.error.stack : undefined,
});
});
window.addEventListener("unhandledrejection", (event) => {
const reason = event.reason instanceof Error ? event.reason : new Error(String(event.reason || "未处理的 Promise 异常"));
recordDiagnosticEvent({ level: "error", category: "runtime", message: reason.message, stack: reason.stack });
});
apiClient.interceptors.request.use(
(config) => {
const route = normalizeRoute(config.url);
if (config.method?.toLowerCase() === "post" && (route === "/tasks" || route === "/sessions")) {
activeTraceId = createDiagnosticId("trace");
}
const traceId = activeTraceId;
setTraceHeader(config, traceId);
requestMeta.set(config, { startedAt: performance.now(), traceId });
return config;
},
(error) => {
recordDiagnosticEvent({ level: "error", category: "request", message: "请求发送前失败" });
return Promise.reject(error);
},
);
apiClient.interceptors.response.use(
(response) => {
const config = response.config;
const meta = requestMeta.get(config);
const route = normalizeRoute(config.url);
const status = response.status;
const businessCode = response.data && typeof response.data === "object" && "code" in response.data ? Number(response.data.code) : 0;
const requestId = readHeader(response.headers, "x-request-id");
recordDiagnosticEvent({
level: status >= 400 || businessCode !== 0 ? "error" : "info",
category: "request",
code: businessCode !== 0 ? String(businessCode) : undefined,
message: String(config.method || "GET").toUpperCase() + " " + route,
route,
durationMs: meta ? Math.max(0, Math.round(performance.now() - meta.startedAt)) : undefined,
httpStatus: status,
requestId,
traceId: meta?.traceId,
});
return response;
},
(error: AxiosError) => {
const config = error.config;
const meta = config ? requestMeta.get(config) : undefined;
const response = error.response;
const body = response?.data && typeof response.data === "object" ? (response.data as { code?: number; msg?: string }) : undefined;
const route = normalizeRoute(config?.url);
recordDiagnosticEvent({
level: "error",
category: "request",
code: body?.code !== undefined ? String(body.code) : response?.status ? "HTTP_" + response.status : "NETWORK_ERROR",
message: body?.msg || String(config?.method || "GET").toUpperCase() + " " + route + " 请求失败",
route,
durationMs: meta ? Math.max(0, Math.round(performance.now() - meta.startedAt)) : undefined,
httpStatus: response?.status,
requestId: response ? readHeader(response.headers, "x-request-id") : undefined,
traceId: meta?.traceId,
});
return Promise.reject(error);
},
);
}
export function setDiagnosticUserScope(userId: string) {
const next = userId.trim();
if (next === scopedUserId) return;
scopedUserId = next;
events.length = 0;
activeTraceId = createDiagnosticId("trace");
}
export function recordDiagnosticEvent(input: DiagnosticEventInput) {
const event: ClientDiagnosticEvent = {
id: createDiagnosticId("event"),
timestamp: input.timestamp || new Date().toISOString(),
level: input.level,
category: input.category,
code: redactClientText(input.code),
message: redactClientText(input.message) || "未命名诊断事件",
route: normalizeRoute(input.route || (typeof window !== "undefined" ? window.location.pathname : "")),
durationMs: input.durationMs === undefined ? undefined : clampNumber(input.durationMs, 0, 86_400_000),
httpStatus: input.httpStatus === undefined ? undefined : clampNumber(input.httpStatus, 0, 599),
requestId: safeDiagnosticId(input.requestId),
traceId: safeDiagnosticId(input.traceId || activeTraceId),
taskId: safeDiagnosticId(input.taskId),
projectId: safeDiagnosticId(input.projectId),
canvasId: safeDiagnosticId(input.canvasId),
stack: redactClientText(input.stack, 4000),
};
events.push(event);
if (events.length > maxEvents) events.splice(0, events.length - maxEvents);
}
export function getClientDiagnosticEvents(range?: { from?: Date; to?: Date }) {
const from = range?.from?.getTime() ?? Number.NEGATIVE_INFINITY;
const to = range?.to?.getTime() ?? Number.POSITIVE_INFINITY;
return events
.filter((event) => {
const timestamp = Date.parse(event.timestamp);
return Number.isFinite(timestamp) && timestamp >= from && timestamp <= to;
})
.map((event) => ({ ...event }));
}
export function getDiagnosticRuntime() {
return {
appVersion: String(import.meta.env.VITE_APP_VERSION || "dev"),
buildCommit: String(import.meta.env.VITE_BUILD_COMMIT || "unknown"),
browser: typeof navigator !== "undefined" ? navigator.userAgent : "",
os: typeof navigator !== "undefined" ? navigator.platform : "",
timezone: Intl.DateTimeFormat().resolvedOptions().timeZone || "",
};
}
export function getDiagnosticTraceId() {
return activeTraceId;
}
function setTraceHeader(config: AxiosRequestConfig, traceId: string) {
if (!config.headers) config.headers = {};
if (typeof config.headers.set === "function") config.headers.set("X-Canvas-Trace-ID", traceId);
else config.headers["X-Canvas-Trace-ID"] = traceId;
}
function readHeader(headers: unknown, key: string) {
if (!headers || typeof headers !== "object") return undefined;
const candidate = headers as { get?: (name: string) => string | null; [name: string]: unknown };
if (typeof candidate.get === "function") return candidate.get(key) || undefined;
const value = candidate[key] ?? candidate[key.toLowerCase()];
return typeof value === "string" ? value : undefined;
}
function normalizeRoute(value?: string) {
const raw = String(value || "").trim();
if (!raw) return typeof window !== "undefined" ? window.location.pathname : "/";
try {
const parsed = new URL(raw, typeof window !== "undefined" ? window.location.origin : "http://localhost");
return parsed.pathname || "/";
} catch {
return raw.split(/[?#]/, 1)[0] || "/";
}
}
function safeDiagnosticId(value?: string) {
const normalized = String(value || "").trim();
return /^[A-Za-z0-9._:-]{1,96}$/.test(normalized) ? normalized : undefined;
}
function redactClientText(value?: string, maxLength = 1200) {
let text = String(value || "").trim();
if (!text) return "";
text = text.replace(/(authorization|cookie|set-cookie|api[_-]?key|secret[_-]?key|password|token)\s*[:=]\s*[^\s,;]+/gi, "$1=[REDACTED]");
text = text.replace(/https?:\/\/[^\s"'<>]+/gi, (url) => {
try {
const parsed = new URL(url);
parsed.search = "";
parsed.hash = "";
return parsed.toString();
} catch {
return url.split(/[?#]/, 1)[0];
}
});
return text.slice(0, maxLength);
}
function clampNumber(value: number, min: number, max: number) {
return Math.max(min, Math.min(max, Math.round(Number.isFinite(value) ? value : min)));
}
function createDiagnosticId(prefix: string) {
if (typeof crypto !== "undefined" && typeof crypto.randomUUID === "function") return prefix + "-" + crypto.randomUUID().replaceAll("-", "").slice(0, 24);
return prefix + "-" + Date.now().toString(36) + "-" + Math.random().toString(36).slice(2, 12);
}
@@ -0,0 +1,108 @@
import axios from "axios";
import { apiClient, ApiError, request } from "@/services/api/request";
import type { ClientDiagnosticEvent } from "./client-diagnostics";
export type DiagnosticExportInput = {
from: string;
to: string;
taskId?: string;
projectId?: string;
description?: string;
runtime: {
appVersion?: string;
buildCommit?: string;
browser?: string;
os?: string;
timezone?: string;
};
clientEvents: ClientDiagnosticEvent[];
};
export type DiagnosticPreview = {
clientEventLimit: number;
taskCount: number;
taskLogCount: number;
apiCallCount: number;
estimatedBytes: number;
willTruncate: boolean;
};
export type DiagnosticDownload = {
blob: Blob;
bundleId: string;
fileName: string;
};
export function previewDiagnosticBundle(input: DiagnosticExportInput) {
return request<DiagnosticPreview>(apiClient.post("/diagnostics/preview", input));
}
export async function exportDiagnosticBundle(input: DiagnosticExportInput): Promise<DiagnosticDownload> {
try {
const response = await apiClient.post<Blob>("/diagnostics/export", input, { responseType: "blob" });
return {
blob: response.data,
bundleId: readHeader(response.headers, "x-diagnostic-bundle-id") || "",
fileName: parseFileName(readHeader(response.headers, "content-disposition")) || "yingce-diagnostics.zip",
};
} catch (error) {
if (axios.isAxiosError(error) && error.response) {
const status = error.response.status;
const raw = await readErrorBody(error.response.data);
try {
const payload = raw ? (JSON.parse(raw) as { code?: number; msg?: string }) : null;
if (payload) {
const message = status === 404 ? "诊断接口未部署,请重启或重新构建后端" : payload.msg || "导出诊断包失败";
throw new ApiError(message, { status, code: payload.code, cause: error });
}
} catch (parseError) {
if (parseError instanceof ApiError) throw parseError;
}
if (status === 404) {
throw new ApiError("诊断接口未部署,请重启或重新构建后端", { status, cause: error });
}
if (status === 502 || status === 503 || status === 504) {
throw new ApiError("后端服务暂时不可用,请重启后端后重试", { status, cause: error });
}
}
throw error;
}
}
async function readErrorBody(data: unknown) {
if (data instanceof Blob) return data.text();
return typeof data === "string" ? data : "";
}
export function downloadDiagnosticBundle(download: DiagnosticDownload) {
const url = URL.createObjectURL(download.blob);
const anchor = document.createElement("a");
anchor.href = url;
anchor.download = download.fileName;
anchor.style.display = "none";
document.body.appendChild(anchor);
anchor.click();
anchor.remove();
window.setTimeout(() => URL.revokeObjectURL(url), 0);
}
function readHeader(headers: unknown, name: string) {
if (!headers || typeof headers !== "object") return "";
const value = headers as { get?: (key: string) => string | null; [key: string]: unknown };
if (typeof value.get === "function") return value.get(name) || "";
const direct = value[name] ?? value[name.toLowerCase()];
return typeof direct === "string" ? direct : "";
}
function parseFileName(contentDisposition: string) {
const encoded = contentDisposition.match(/filename\*=UTF-8''([^;]+)/i)?.[1];
if (encoded) {
try {
return decodeURIComponent(encoded.replace(/^"|"$/g, ""));
} catch {
return encoded;
}
}
return contentDisposition.match(/filename="?([^";]+)"?/i)?.[1] || "";
}
+35
View File
@@ -0,0 +1,35 @@
import { requestToolResponse, type ResponseFunctionTool, type ResponseInputMessage, type ToolChoice } from "@/services/api/image";
import { pluginStorageFor } from "@/lib/plugins/plugin-storage";
import type { AiConfig } from "@/stores/use-config-store";
import type { PluginHostContext, PluginInstallation, PluginTextRequest, RegisteredPlugin } from "@/lib/plugins/plugin-types";
export function createPluginHostContext(plugin: RegisteredPlugin, installation: PluginInstallation, aiConfig: AiConfig): PluginHostContext {
const permissions = new Set(plugin.manifest.permissions);
return {
manifest: plugin.manifest,
permissions,
storage: pluginStorageFor(plugin.manifest.id),
config: installation.config,
services: {
ai: {
text: {
requestToolResponse: async (request: PluginTextRequest) => {
if (!permissions.has("ai.text")) throw new Error("插件没有调用文本模型的权限");
const response = await requestToolResponse(
{ ...aiConfig, model: request.model?.trim() || aiConfig.textModel },
request.messages as ResponseInputMessage[],
(request.tools || []) as ResponseFunctionTool[],
(request.toolChoice || "auto") as ToolChoice,
request.onDelta,
{ signal: request.signal },
);
return {
content: response.content,
toolCalls: response.toolCalls.map((call) => ({ name: call.function.name, arguments: call.function.arguments })),
};
},
},
},
},
};
}
File diff suppressed because it is too large. Load diff
+5 -34
View File
@@ -105,36 +105,14 @@ describe("public channel model catalog", () => {
});
});
test("treats endpoint-only video metadata as authoritative without inventing 720P", async () => {
test("does not infer a protocol from endpoint-only video metadata", () => {
const catalog: ChannelModelCatalogItem = {
id: "endpoint-video",
supportedEndpointTypes: ["openai-video"],
};
const config = configForCatalog([catalog], { videoSeconds: "6", size: "16:9", vquality: "720" });
const model = "flow::endpoint-video";
const cost = config.channels[0]!.modelCosts![0]!;
expect(cost.capability).toBe("video");
expect(cost.protocol).toBe("newapi-channel-2");
expect(cost.capabilityConfig?.video?.resolutions).toEqual([]);
expect(cost.capabilityConfig?.video?.defaultResolution).toBe("");
expect(selectableModelsByCapability(config, "video")).toEqual([model]);
expect(resolveModelRequestConfig(config, model).interfaceType).toBe("newapi-channel-2");
const canvasHtml = renderToStaticMarkup(React.createElement(CanvasVideoSettingsPopover, { config, onConfigChange: () => undefined }));
expect(canvasHtml).not.toContain("720P");
const createSource = await Bun.file(new URL("../src/pages/create/index.tsx", import.meta.url)).text();
expect(createSource).toContain('const videoResolutionSupported = props.mode === "video" && resolutions.length > 0;');
expect(createSource).toContain("...(videoResolutionSupported ? [videoResolutionLabel(props.videoQuality)] : [])");
let requestBody: Record<string, unknown> = {};
axios.post = (async (_url: string, body: Record<string, unknown>) => {
requestBody = body;
return { data: { id: "endpoint-video-task" } };
}) as typeof axios.post;
await createVideoGenerationTask(config, "synthetic prompt");
expect(requestBody).not.toHaveProperty("resolution");
expect(config.channels[0]!.modelCosts).toEqual([]);
});
test("preserves a manually configured capability profile when a catalog only returns an ID", () => {
@@ -259,7 +237,7 @@ describe("public channel model catalog", () => {
const html = renderToStaticMarkup(React.createElement(CanvasVideoSettingsPopover, { config, onConfigChange: () => undefined }));
expect(html).toContain("横屏 · 10s");
expect(html).toContain("16:9 · 10s");
expect(html).not.toContain("720P");
});
@@ -290,11 +268,7 @@ describe("public channel model catalog", () => {
const normalized = normalizeConfigSnapshot({
config: {
...defaultConfig,
channels: [
platform,
custom,
createModelChannel({ id: "default", name: "默认渠道", apiKey: "", models: ["gpt-image-2"] }),
],
channels: [platform, custom, createModelChannel({ id: "default", name: "默认渠道", apiKey: "", models: ["gpt-image-2"] })],
models: ["default::gpt-image-2", "ghost-image"],
imageModels: ["default::gpt-image-2", "ghost-image"],
imageModel: "default::gpt-image-2",
@@ -302,10 +276,7 @@ describe("public channel model catalog", () => {
}).config;
const staleSnapshot = { ...normalized, models: [...normalized.models, "ghost-image"], imageModels: [...normalized.imageModels, "ghost-image"] };
expect(selectableModelsByCapability(staleSnapshot, "image")).toEqual([
"public-logical-models::frontend-image",
"custom-channel::custom-image-v1",
]);
expect(selectableModelsByCapability(staleSnapshot, "image")).toEqual(["public-logical-models::frontend-image", "custom-channel::custom-image-v1"]);
expect(staleSnapshot.channels.some((channel) => channel.id === "default")).toBe(false);
expect(selectableModelsByCapability(staleSnapshot, "image")).not.toContain("default::gpt-image-2");
expect(selectableModelsByCapability(staleSnapshot, "image")).not.toContain("ghost-image");
+2 -2
View File
@@ -178,7 +178,7 @@ test("Canvas task surfaces route Dreamina uncertainty through shared display sem
expect(nodeSource).toContain("isGenerationTaskSubmissionUncertain(errorDisplayTask)");
expect(taskCenterSource).toContain("if (currentTask && isGenerationTaskSubmissionUncertain(currentTask))");
expect(taskCenterSource).toContain("不能自动重试;请先核对官方状态,避免重复生成");
expect(taskCenterSource).toContain('onRetry={() => void runAction(task.id)}');
expect(taskCenterSource).toContain("onRetry={() => void runAction(task.id)}");
expect(taskCenterSource).toContain("<TaskListRow");
expect(taskCenterSource).toContain("<TaskGridCard");
expect(createSource).not.toContain('item.generationStage === "submission_unknown"');
@@ -192,7 +192,7 @@ test("task center deletion accepts only local Dreamina records", async () => {
const deleteActionSource = sourceSection(source, "const deleteLocalTask =", "const refreshLocalTaskStatus =");
expect(compactedSource).toMatch(/\{detailTask\.provider === "dreamina-cli" \? \( <Button .*?aria-label="删除本机记录".*?onClick=\{\(\) => deleteLocalTask\(detailTask\)\}> 删除本机记录 <\/Button> \) : null\}/);
expect(compactedSource).toContain("任务已由官方接受;删除后仍会在后台同步官方状态。");
expect(compactedSource).toContain("官方状态采用最终一致轮询;转入后台后仍会继续等待并同步官方状态。");
expect(deleteActionSource).toContain("await deleteGenerationTask(task.id);");
});