feat(canvas): Agent 输入框 - 支持 / 选技能与 @ 光标插入画布素材
AgentChatComposer 由纯 textarea 升级为内联引用编辑器: - @ 复用 CanvasResourceMentionTextarea,光标处插入画布节点/素材引用 chip + 悬浮预览 - / 弹出已加入技能候选,选择后替换为 @[skill:xxx] 引用 token - 提交时引用 token 保留在 prompt 文本随发送链路送出;新 props 可选,向后兼容在线/本地两条 Agent
This commit is contained in:
1 parent
e4c0f8f585
commit
c0e017d006
2 files changed
+140
-22
No files matched your search
@@ -1,11 +1,14 @@
|
|||||||
import { useEffect, useRef, useState, type ReactNode } from "react";
|
import { useEffect, useRef, useState, type ClipboardEvent as ReactClipboardEvent, type KeyboardEvent as ReactKeyboardEvent, type ReactNode } from "react";
|
||||||
import { Button, Tooltip } from "antd";
|
import { Button, Tooltip } from "antd";
|
||||||
import { ArrowUp, CheckCircle2, CircleAlert, ImagePlus, LoaderCircle, UserRound, Wrench, X, XCircle } from "lucide-react";
|
import { ArrowUp, CheckCircle2, CircleAlert, ImagePlus, LoaderCircle, Sparkles, UserRound, Wrench, X, XCircle } from "lucide-react";
|
||||||
|
|
||||||
import { canvasThemes } from "@/lib/canvas-theme";
|
import { canvasThemes } from "@/lib/canvas-theme";
|
||||||
import type { CanvasAgentOperationImpact } from "@/lib/canvas/canvas-agent-ops";
|
import type { CanvasAgentOperationImpact } from "@/lib/canvas/canvas-agent-ops";
|
||||||
import type { LocalUser } from "@/stores/use-user-store";
|
import type { LocalUser } from "@/stores/use-user-store";
|
||||||
import { AIMessageMarkdown } from "@/components/ai/ai-message-markdown";
|
import { AIMessageMarkdown } from "@/components/ai/ai-message-markdown";
|
||||||
|
import { CanvasResourceMentionTextarea } from "./canvas-resource-mention-textarea";
|
||||||
|
import type { CanvasResourceReference } from "@/lib/canvas/canvas-resource-references";
|
||||||
|
import type { Skill } from "@/services/api/skills";
|
||||||
|
|
||||||
export type CanvasAgentChatAttachment = { id: string; name: string; url: string };
|
export type CanvasAgentChatAttachment = { id: string; name: string; url: string };
|
||||||
export type CanvasAgentMode = "online" | "local";
|
export type CanvasAgentMode = "online" | "local";
|
||||||
@@ -179,6 +182,9 @@ export function AgentChatComposer({
|
|||||||
onAddFiles,
|
onAddFiles,
|
||||||
onRemoveAttachment,
|
onRemoveAttachment,
|
||||||
left,
|
left,
|
||||||
|
references = [],
|
||||||
|
slashSkills,
|
||||||
|
includeAssetLibrary,
|
||||||
}: {
|
}: {
|
||||||
prompt: string;
|
prompt: string;
|
||||||
attachments?: CanvasAgentChatAttachment[];
|
attachments?: CanvasAgentChatAttachment[];
|
||||||
@@ -191,9 +197,78 @@ export function AgentChatComposer({
|
|||||||
onAddFiles?: (files: FileList | File[] | null) => void | Promise<void>;
|
onAddFiles?: (files: FileList | File[] | null) => void | Promise<void>;
|
||||||
onRemoveAttachment?: (id: string) => void;
|
onRemoveAttachment?: (id: string) => void;
|
||||||
left?: ReactNode;
|
left?: ReactNode;
|
||||||
|
/** 供「@」插入的画布节点/素材/技能引用候选(可选,默认空,缺省时退化为普通输入框) */
|
||||||
|
references?: CanvasResourceReference[];
|
||||||
|
/** 供「/」弹出的技能候选(可选) */
|
||||||
|
slashSkills?: Skill[];
|
||||||
|
/** 是否在「@」候选里包含素材库资源 */
|
||||||
|
includeAssetLibrary?: boolean;
|
||||||
}) {
|
}) {
|
||||||
const fileInputRef = useRef<HTMLInputElement>(null);
|
const fileInputRef = useRef<HTMLInputElement>(null);
|
||||||
|
const [slash, setSlash] = useState<{ start: number; query: string } | null>(null);
|
||||||
|
const [slashIndex, setSlashIndex] = useState(0);
|
||||||
|
const availableSlashSkills = slashSkills ?? [];
|
||||||
const canSubmit = !disabled && !sending && Boolean(prompt.trim() || attachments.length);
|
const canSubmit = !disabled && !sending && Boolean(prompt.trim() || attachments.length);
|
||||||
|
const activeSlashIndex = Math.min(Math.max(slashIndex, 0), Math.max(availableSlashSkills.length - 1, 0));
|
||||||
|
|
||||||
|
// 在输入值末尾检测「/关键词」打开技能候选;选择后替换为 @[skill:xxx] 引用 token(保持在 prompt 文本里)。
|
||||||
|
const handlePromptChange = (value: string) => {
|
||||||
|
onPromptChange(value);
|
||||||
|
const match = /(^|\s)\/([^\s/]*)$/.exec(value);
|
||||||
|
if (match && availableSlashSkills.length) {
|
||||||
|
const next = { start: match.index + match[1].length, query: match[2] };
|
||||||
|
setSlash((current) => (current && current.start === next.start && current.query === next.query ? current : next));
|
||||||
|
setSlashIndex(0);
|
||||||
|
} else if (slash) {
|
||||||
|
setSlash(null);
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|
||||||
|
const applySlashSkill = (skill: Skill) => {
|
||||||
|
const token = `@[skill:${skill.skill_id}] `;
|
||||||
|
const next = slash
|
||||||
|
? `${prompt.slice(0, slash.start)}${token}${prompt.slice(slash.start + slash.query.length)}`
|
||||||
|
: prompt
|
||||||
|
? `${prompt.replace(/\s+$/u, "")} ${token}`
|
||||||
|
: token;
|
||||||
|
setSlash(null);
|
||||||
|
setSlashIndex(0);
|
||||||
|
onPromptChange(next);
|
||||||
|
};
|
||||||
|
|
||||||
|
// slash 菜单的键盘控制在 capture 阶段拦截(contentEditable/textarea 内部先消费 Enter,外层冒泡拿不到)
|
||||||
|
const handleSlashKeyCapture = (event: ReactKeyboardEvent) => {
|
||||||
|
if (!slash || !availableSlashSkills.length) return;
|
||||||
|
if (event.nativeEvent.isComposing || event.keyCode === 229) return;
|
||||||
|
if (event.key === "ArrowDown") {
|
||||||
|
event.preventDefault();
|
||||||
|
event.stopPropagation();
|
||||||
|
setSlashIndex((index) => Math.min(index + 1, availableSlashSkills.length - 1));
|
||||||
|
} else if (event.key === "ArrowUp") {
|
||||||
|
event.preventDefault();
|
||||||
|
event.stopPropagation();
|
||||||
|
setSlashIndex((index) => Math.max(index - 1, 0));
|
||||||
|
} else if (event.key === "Enter" || event.key === "Tab") {
|
||||||
|
event.preventDefault();
|
||||||
|
event.stopPropagation();
|
||||||
|
applySlashSkill(availableSlashSkills[activeSlashIndex]);
|
||||||
|
} else if (event.key === "Escape") {
|
||||||
|
event.preventDefault();
|
||||||
|
event.stopPropagation();
|
||||||
|
setSlash(null);
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|
||||||
|
// 保留粘贴图片成附件(contentEditable 模式内部会把粘贴转纯文本,capture 阶段先拦截图片)
|
||||||
|
const handlePasteCapture = (event: ReactClipboardEvent) => {
|
||||||
|
if (!onAddFiles) return;
|
||||||
|
const images = Array.from(event.clipboardData.files).filter((file) => file.type.startsWith("image/"));
|
||||||
|
if (!images.length) return;
|
||||||
|
event.preventDefault();
|
||||||
|
event.stopPropagation();
|
||||||
|
void onAddFiles(images);
|
||||||
|
};
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<div className="px-3 pb-3 pt-1" onWheelCapture={(event) => event.stopPropagation()}>
|
<div className="px-3 pb-3 pt-1" onWheelCapture={(event) => event.stopPropagation()}>
|
||||||
<div className="rounded-lg border px-3 pb-2.5 pt-3 transition-[border-color,box-shadow] duration-150 focus-within:border-current" style={{ background: theme.node.fill, borderColor: theme.toolbar.border, color: theme.accent.primary, boxShadow: `0 10px 30px ${theme.spatial.shadow}` }}>
|
<div className="rounded-lg border px-3 pb-2.5 pt-3 transition-[border-color,box-shadow] duration-150 focus-within:border-current" style={{ background: theme.node.fill, borderColor: theme.toolbar.border, color: theme.accent.primary, boxShadow: `0 10px 30px ${theme.spatial.shadow}` }}>
|
||||||
@@ -211,25 +286,47 @@ export function AgentChatComposer({
|
|||||||
))}
|
))}
|
||||||
</div>
|
</div>
|
||||||
) : null}
|
) : null}
|
||||||
<textarea
|
<div className="relative" onKeyDownCapture={handleSlashKeyCapture} onPasteCapture={handlePasteCapture}>
|
||||||
value={prompt}
|
<div className="thin-scrollbar max-h-40 min-h-[60px] overflow-y-auto">
|
||||||
onChange={(event) => onPromptChange(event.target.value)}
|
<CanvasResourceMentionTextarea
|
||||||
onPaste={(event) => {
|
value={prompt}
|
||||||
if (!onAddFiles) return;
|
references={references}
|
||||||
const images = Array.from(event.clipboardData.files).filter((file) => file.type.startsWith("image/"));
|
includeAssetLibrary={includeAssetLibrary}
|
||||||
if (!images.length) return;
|
sendOnEnter
|
||||||
event.preventDefault();
|
disabled={disabled}
|
||||||
void onAddFiles(images);
|
onChange={handlePromptChange}
|
||||||
}}
|
onSubmit={onSubmit}
|
||||||
onKeyDown={(event) => {
|
className="w-full resize-none border-0 bg-transparent px-1 py-1 text-sm leading-5 outline-none placeholder:opacity-45"
|
||||||
if (event.key !== "Enter" || event.shiftKey || event.ctrlKey || event.metaKey) return;
|
containerClassName="min-h-[60px]"
|
||||||
event.preventDefault();
|
style={{ color: theme.node.text }}
|
||||||
void onSubmit();
|
placeholder={placeholder}
|
||||||
}}
|
aria-label="Agent 输入"
|
||||||
className="thin-scrollbar max-h-40 min-h-[60px] w-full resize-none border-0 bg-transparent px-1 py-1 text-sm leading-5 outline-none placeholder:opacity-45"
|
/>
|
||||||
style={{ color: theme.node.text }}
|
</div>
|
||||||
placeholder={placeholder}
|
{slash && availableSlashSkills.length ? (
|
||||||
/>
|
<div
|
||||||
|
data-agent-slash-menu
|
||||||
|
className="absolute bottom-full left-0 z-[var(--z-toolbar)] mb-1.5 w-full max-w-xs overflow-hidden rounded-lg border p-1 shadow-lg"
|
||||||
|
style={{ background: theme.toolbar.panel, borderColor: theme.toolbar.border }}
|
||||||
|
onMouseDown={(event) => event.preventDefault()}
|
||||||
|
>
|
||||||
|
{availableSlashSkills.map((skill, index) => (
|
||||||
|
<button
|
||||||
|
key={skill.skill_id}
|
||||||
|
type="button"
|
||||||
|
className="flex w-full min-w-0 items-center gap-2 rounded-md px-2 py-1.5 text-left text-xs"
|
||||||
|
style={{ background: index === activeSlashIndex ? theme.toolbar.itemHover : "transparent", color: theme.node.text }}
|
||||||
|
onMouseEnter={() => setSlashIndex(index)}
|
||||||
|
onClick={() => applySlashSkill(skill)}
|
||||||
|
>
|
||||||
|
<Sparkles className="size-3.5 shrink-0 opacity-70" />
|
||||||
|
<span className="min-w-0 truncate font-medium">{skill.skill_name}</span>
|
||||||
|
{skill.description ? <span className="min-w-0 flex-1 truncate opacity-50">{skill.description}</span> : null}
|
||||||
|
</button>
|
||||||
|
))}
|
||||||
|
</div>
|
||||||
|
) : null}
|
||||||
|
</div>
|
||||||
<div className="mt-2 flex items-center justify-between gap-2">
|
<div className="mt-2 flex items-center justify-between gap-2">
|
||||||
<div className="flex min-w-0 items-center gap-1">
|
<div className="flex min-w-0 items-center gap-1">
|
||||||
{onAddFiles ? (
|
{onAddFiles ? (
|
||||||
|
|||||||
@@ -1,4 +1,4 @@
|
|||||||
import { memo, useCallback, useEffect, useRef, useState, type PointerEvent as ReactPointerEvent } from "react";
|
import { memo, useCallback, useEffect, useMemo, useRef, useState, type PointerEvent as ReactPointerEvent } from "react";
|
||||||
import { App, Button, Segmented, Tooltip } from "antd";
|
import { App, Button, Segmented, Tooltip } from "antd";
|
||||||
import copyToClipboard from "copy-to-clipboard";
|
import copyToClipboard from "copy-to-clipboard";
|
||||||
import { Copy, FolderOpen, History, LoaderCircle, MessageSquareText, PlugZap, Plus, RefreshCw, RotateCcw, Terminal, Trash2 } from "lucide-react";
|
import { Copy, FolderOpen, History, LoaderCircle, MessageSquareText, PlugZap, Plus, RefreshCw, RotateCcw, Terminal, Trash2 } from "lucide-react";
|
||||||
@@ -23,6 +23,8 @@ import {
|
|||||||
type AgentThreadSummary,
|
type AgentThreadSummary,
|
||||||
} from "@/stores/canvas/use-canvas-agent-store";
|
} from "@/stores/canvas/use-canvas-agent-store";
|
||||||
import { previewCanvasAgentOps, summarizeCanvasAgentOps, type CanvasAgentOp, type CanvasAgentSnapshot } from "@/lib/canvas/canvas-agent-ops";
|
import { previewCanvasAgentOps, summarizeCanvasAgentOps, type CanvasAgentOp, type CanvasAgentSnapshot } from "@/lib/canvas/canvas-agent-ops";
|
||||||
|
import { buildCanvasResourceReferences } from "@/lib/canvas/canvas-resource-references";
|
||||||
|
import { listAddedSkills, type Skill } from "@/services/api/skills";
|
||||||
import { isProjectAgentReadTool, isProjectAgentToolName, runProjectAgentTool } from "@/services/api/project-agent-tools";
|
import { isProjectAgentReadTool, isProjectAgentToolName, runProjectAgentTool } from "@/services/api/project-agent-tools";
|
||||||
import { AgentChatComposer, AgentChatMessage, AgentPanelTabs, AgentPendingToolCard, AgentWorkingMessage, type CanvasAgentChatAttachment } from "./canvas-agent-chat-ui";
|
import { AgentChatComposer, AgentChatMessage, AgentPanelTabs, AgentPendingToolCard, AgentWorkingMessage, type CanvasAgentChatAttachment } from "./canvas-agent-chat-ui";
|
||||||
import { VoiceRecordingButton } from "@/components/conversation/voice-recording-button";
|
import { VoiceRecordingButton } from "@/components/conversation/voice-recording-button";
|
||||||
@@ -103,6 +105,22 @@ export const CanvasLocalAgentPanel = memo(function CanvasLocalAgentPanel({
|
|||||||
} = useCanvasAgentStore();
|
} = useCanvasAgentStore();
|
||||||
const [resizing, setResizing] = useState(false);
|
const [resizing, setResizing] = useState(false);
|
||||||
const listRef = useRef<HTMLDivElement>(null);
|
const listRef = useRef<HTMLDivElement>(null);
|
||||||
|
// 供 Agent 输入框「@」插入的画布节点引用候选(active 标记为可用,供「@」菜单列出),与「/」弹出的已加入技能候选
|
||||||
|
const composerReferences = useMemo(() => buildCanvasResourceReferences(snapshot.nodes, snapshot.connections).map((item) => ({ ...item, active: true })), [snapshot]);
|
||||||
|
const [composerSkills, setComposerSkills] = useState<Skill[]>([]);
|
||||||
|
useEffect(() => {
|
||||||
|
let cancelled = false;
|
||||||
|
listAddedSkills()
|
||||||
|
.then((result) => {
|
||||||
|
if (!cancelled) setComposerSkills(result?.skills ?? []);
|
||||||
|
})
|
||||||
|
.catch(() => {
|
||||||
|
// 技能列表加载失败只影响「/」菜单,不影响输入主功能
|
||||||
|
});
|
||||||
|
return () => {
|
||||||
|
cancelled = true;
|
||||||
|
};
|
||||||
|
}, []);
|
||||||
const snapshotRef = useRef(snapshot);
|
const snapshotRef = useRef(snapshot);
|
||||||
const confirmToolsRef = useRef(confirmTools);
|
const confirmToolsRef = useRef(confirmTools);
|
||||||
const pendingToolRef = useRef<AgentPendingToolCall | null>(null);
|
const pendingToolRef = useRef<AgentPendingToolCall | null>(null);
|
||||||
@@ -637,6 +655,9 @@ export const CanvasLocalAgentPanel = memo(function CanvasLocalAgentPanel({
|
|||||||
sending={sending || waiting}
|
sending={sending || waiting}
|
||||||
placeholder="询问 Codex,或让它操作画布"
|
placeholder="询问 Codex,或让它操作画布"
|
||||||
theme={theme}
|
theme={theme}
|
||||||
|
references={composerReferences}
|
||||||
|
slashSkills={composerSkills}
|
||||||
|
includeAssetLibrary
|
||||||
onPromptChange={(prompt) => setAgentState({ prompt })}
|
onPromptChange={(prompt) => setAgentState({ prompt })}
|
||||||
onSubmit={sendPrompt}
|
onSubmit={sendPrompt}
|
||||||
onAddFiles={addAttachments}
|
onAddFiles={addAttachments}
|
||||||
|
|||||||
Reference in new issue
Block a user