From 0d16c2717850cd5525a0168feba29de8e43f08cd Mon Sep 17 00:00:00 2001 From: WuYongJie <549727955@qq.com> Date: Fri, 20 Nov 2026 15:19:22 +0800 Subject: [PATCH] Use direct batch face edits and allow site-wide issue feedback --- app/api/canvas/[id]/feedback/route.ts | 86 +----------- app/api/feedback/route.ts | 7 + app/feedback/[id]/page.tsx | 82 ++++++------ app/layout.tsx | 6 +- components/canvas/CanvasFeedbackDialog.tsx | 126 ++++++++++-------- components/page-feedback.tsx | 21 +++ lib/canvas/batch-instruction-reference.ts | 75 ++++++----- lib/canvas/feedback-context.ts | 30 ++++- lib/canvas/feedback-contract.ts | 5 +- lib/canvas/feedback-route.ts | 89 +++++++++++++ lib/canvas/feedback-store.ts | 5 +- lib/canvas/generate-image.ts | 19 ++- .../migrations/0107_allow_page_feedback.sql | 1 + lib/db/migrations/meta/_journal.json | 7 + lib/db/schema.ts | 2 +- tests/routes/batch-instruction-edit.test.ts | 41 ++++-- tests/routes/canvas-feedback.test.ts | 33 +++++ 17 files changed, 404 insertions(+), 231 deletions(-) create mode 100644 app/api/feedback/route.ts create mode 100644 components/page-feedback.tsx create mode 100644 lib/canvas/feedback-route.ts create mode 100644 lib/db/migrations/0107_allow_page_feedback.sql diff --git a/app/api/canvas/[id]/feedback/route.ts b/app/api/canvas/[id]/feedback/route.ts index 12246e710..c833b11a2 100644 --- a/app/api/canvas/[id]/feedback/route.ts +++ b/app/api/canvas/[id]/feedback/route.ts @@ -1,92 +1,12 @@ -import { after, NextResponse } from "next/server"; -import { z, ZodError } from "zod"; -import { auth } from "@/app/(auth)/auth"; -import { CanvasFeedbackError, collectCanvasFeedbackContext } from "@/lib/canvas/feedback-context"; -import { feedbackCommandSchema } from "@/lib/canvas/feedback-contract"; -import { - deliverCanvasFeedback, - feedbackReceipt, - findCanvasFeedback, - refreshCanvasFeedback, - saveCanvasFeedback, -} from "@/lib/canvas/feedback-store"; +import { feedbackGet, feedbackPost } from "@/lib/canvas/feedback-route"; export const runtime = "nodejs"; export const dynamic = "force-dynamic"; -const response = (data: unknown, status = 200) => - NextResponse.json(data, { status, headers: { "Cache-Control": "no-store" } }); -function failure(error: unknown) { - if (error instanceof CanvasFeedbackError) return response({ error: error.message }, error.status); - if (error instanceof ZodError || error instanceof SyntaxError) - return response({ error: "反馈资料格式不正确,请重新打开问题反馈后重试。" }, 400); - console.error("[Canvas feedback] request failed", { - errorType: error instanceof Error ? error.name : "unknown", - }); - return response({ error: "反馈暂未保存成功,请保留问题说明,稍后重试。" }, 503); -} export async function POST(request: Request, { params }: { params: Promise<{ id: string }> }) { - try { - const session = await auth(); - if (!session?.user?.id) return response({ error: "登录已过期,请登录后发送反馈。" }, 401); - const projectId = z - .string() - .uuid() - .parse((await params).id); - const raw = await request.text(); - if (new TextEncoder().encode(raw).byteLength > 262144) - return response({ error: "反馈资料过大,请减少补充说明后重试。" }, 413); - const command = feedbackCommandSchema.parse(JSON.parse(raw)); - if (command.action === "submit") { - const existing = await findCanvasFeedback(command.id); - if (existing) { - if (existing.userId !== session.user.id || existing.projectId !== projectId) - throw new CanvasFeedbackError("反馈编号不可用", 409); - return response({ feedback: feedbackReceipt(await refreshCanvasFeedback(existing)) }); - } - } - const context = await collectCanvasFeedbackContext( - session.user.id, - projectId, - command.client, - command.action === "submit" ? command.selection : null, - ); - if (command.action === "context") return response({ context }); - const selected = context.requests.find((item) => item.key === command.selection) || null; - const row = await saveCanvasFeedback({ - id: command.id, - userId: session.user.id, - description: command.description, - appUrl: process.env.NEXT_PUBLIC_APP_URL || new URL(request.url).origin, - snapshot: { - reporter: context.reporter, - project: context.project, - request: selected, - client: command.client, - userAgent: (request.headers.get("user-agent") || "").slice(0, 512), - }, - }); - after(() => deliverCanvasFeedback(row.id)); - return response({ feedback: feedbackReceipt(row) }, 202); - } catch (error) { - return failure(error); - } + return feedbackPost(request, (await params).id); } export async function GET(request: Request, { params }: { params: Promise<{ id: string }> }) { - try { - const session = await auth(); - if (!session?.user?.id) return response({ error: "登录已过期,请登录后查看反馈状态。" }, 401); - const projectId = z - .string() - .uuid() - .parse((await params).id); - const id = z.string().uuid().parse(new URL(request.url).searchParams.get("feedbackId")); - const row = await findCanvasFeedback(id); - if (!row || row.userId !== session.user.id || row.projectId !== projectId) - throw new CanvasFeedbackError("反馈记录不存在", 404); - return response({ feedback: feedbackReceipt(await refreshCanvasFeedback(row)) }); - } catch (error) { - return failure(error); - } + return feedbackGet(request, (await params).id); } diff --git a/app/api/feedback/route.ts b/app/api/feedback/route.ts new file mode 100644 index 000000000..ed7ccab8f --- /dev/null +++ b/app/api/feedback/route.ts @@ -0,0 +1,7 @@ +import { feedbackGet, feedbackPost } from "@/lib/canvas/feedback-route"; + +export const runtime = "nodejs"; +export const dynamic = "force-dynamic"; + +export const POST = (request: Request) => feedbackPost(request, null); +export const GET = (request: Request) => feedbackGet(request, null); diff --git a/app/feedback/[id]/page.tsx b/app/feedback/[id]/page.tsx index 9f908425e..b33f7e4ce 100644 --- a/app/feedback/[id]/page.tsx +++ b/app/feedback/[id]/page.tsx @@ -23,24 +23,26 @@ export default async function CanvasFeedbackPage({ params }: { params: Promise<{ ["反馈人", `${reporter.name} · ${reporter.email} · ${reporter.department || "未登记部门"}`], ["用户编号", reporter.id], ["反馈时间", formatFeedbackTime(feedback.createdAt.toISOString())], - ["画布", `${project.title}(${project.id})`], - ["对话编号", client.chatId || "未打开对话"], - ["请求号", request?.requestId || "尚未获取"], - ["任务或消息编号", request?.id || "未关联"], - ["请求时间", request?.createdAt ? formatFeedbackTime(request.createdAt) : "未记录"], - ["状态与模型", `${request?.status || "页面问题"} / ${request?.model || "未记录"}`], - [ - "处理耗时", - request?.durationMs != null - ? `${(request.durationMs / 1000).toFixed(1)} 秒` - : "未记录或尚未结束", - ], - [ - "资料来源", - request?.evidence === "browser" - ? "浏览器当前对话,服务端尚无对应消息记录" - : "服务端记录及浏览器当前页面", - ], + ...(project.id ? [ + ["画布", `${project.title}(${project.id})`], + ["对话编号", client.chatId || "未打开对话"], + ["请求号", request?.requestId || "尚未获取"], + ["任务或消息编号", request?.id || "未关联"], + ["请求时间", request?.createdAt ? formatFeedbackTime(request.createdAt) : "未记录"], + ["状态与模型", `${request?.status || "页面问题"} / ${request?.model || "未记录"}`], + [ + "处理耗时", + request?.durationMs != null + ? `${(request.durationMs / 1000).toFixed(1)} 秒` + : "未记录或尚未结束", + ], + [ + "资料来源", + request?.evidence === "browser" + ? "浏览器当前对话,服务端尚无对应消息记录" + : "服务端记录及浏览器当前页面", + ], + ] : [["页面", project.title]]), ["页面版本", client.pageVersion], ["浏览器", userAgent], [ @@ -50,7 +52,7 @@ export default async function CanvasFeedbackPage({ params }: { params: Promise<{ ]; return (
-

画布问题反馈

+

问题反馈

{feedbackReceipt(feedback).message}

{fields.map(([label, value]) => ( @@ -78,7 +80,7 @@ export default async function CanvasFeedbackPage({ params }: { params: Promise<{ )} - {client.nodes.length > 0 && ( + {project.id && client.nodes.length > 0 && (
相关画布节点
@@ -86,25 +88,29 @@ export default async function CanvasFeedbackPage({ params }: { params: Promise<{
           
)} -
- 当前对话上下文 -
- {client.messages.map((item) => ( -
-

- {item.role === "user" ? "用户" : "助手"} · {item.id} -

-

{item.text}

+ {project.id && ( + <> +
+ 当前对话上下文 +
+ {client.messages.map((item) => ( +
+

+ {item.role === "user" ? "用户" : "助手"} · {item.id} +

+

{item.text}

+
+ ))}
- ))} -
-
- - 打开相关画布 - + + + 打开相关画布 + + + )}
); } diff --git a/app/layout.tsx b/app/layout.tsx index dcd2550af..e279515c5 100644 --- a/app/layout.tsx +++ b/app/layout.tsx @@ -3,6 +3,7 @@ import { Toaster } from "sonner"; import { ThemeProvider } from "@/components/theme-provider"; import { FaviconUpdater } from "@/components/favicon-updater"; import { ImageDeliveryOptimizer } from "@/components/image-delivery-optimizer"; +import { PageFeedback } from "@/components/page-feedback"; import { AppUpdateNotice } from "@/components/app-update-notice"; import { PAGE_DOWNLOAD_ACTIVE_ATTRIBUTE } from "@/lib/client/page-refresh"; import { getSiteSettings } from "@/lib/db/queries"; @@ -222,7 +223,10 @@ export default function RootLayout({ > - {children} + + {children} + + diff --git a/components/canvas/CanvasFeedbackDialog.tsx b/components/canvas/CanvasFeedbackDialog.tsx index 478a9a2f8..e24a69a21 100644 --- a/components/canvas/CanvasFeedbackDialog.tsx +++ b/components/canvas/CanvasFeedbackDialog.tsx @@ -12,6 +12,7 @@ import { DialogTitle, DialogTrigger, } from "@/components/ui/dialog"; +import { cn } from "@/lib/utils"; import { captureFeedbackChat } from "@/lib/canvas/feedback-client"; import { useCanvasStore } from "@/store/canvas"; import { @@ -27,7 +28,15 @@ const terminal = (value: string) => ["sent", "unread", "read", "failed"].include const fieldClass = "w-full rounded-lg border border-input bg-background px-3 py-2 text-sm text-foreground focus-visible:outline-2 focus-visible:outline-offset-2 focus-visible:outline-ring"; -export function CanvasFeedbackDialog({ projectId }: { projectId: string }) { +export function CanvasFeedbackDialog({ + projectId, + pagePath, + floating = false, +}: { + projectId?: string; + pagePath?: string; + floating?: boolean; +}) { const [open, setOpen] = useState(false); const [context, setContext] = useState(null); const [selection, setSelection] = useState(null); @@ -41,8 +50,8 @@ export function CanvasFeedbackDialog({ projectId }: { projectId: string }) { const submission = useRef(null); const errors = useRef([]); const submitLock = useRef(false); - const endpoint = `/api/canvas/${projectId}/feedback`; - const storageKey = `canvas-feedback:${projectId}`; + const endpoint = projectId ? "/api/canvas/" + projectId + "/feedback" : "/api/feedback"; + const storageKey = projectId ? "canvas-feedback:" + projectId : "page-feedback:" + pagePath; useEffect(() => { const rememberError = (event: ErrorEvent) => { @@ -91,11 +100,12 @@ export function CanvasFeedbackDialog({ projectId }: { projectId: string }) { } const canvas = useCanvasStore.getState(); const selectedIds = new Set(canvas.selectedNodeIds); - const nodes = [...canvas.nodes] + const nodes = projectId ? [...canvas.nodes] .sort((a, b) => Number(selectedIds.has(b.id)) - Number(selectedIds.has(a.id))) - .slice(0, 20); + .slice(0, 20) : []; const client: FeedbackClient = { - ...captureFeedbackChat(projectId), + ...(projectId ? captureFeedbackChat(projectId) : { chatId: null, messages: [] }), + pagePath, capturedAt: new Date().toISOString(), pageVersion: process.env.NEXT_PUBLIC_APP_RELEASE || "development", viewport: { width: window.innerWidth, height: window.innerHeight }, @@ -138,7 +148,7 @@ export function CanvasFeedbackDialog({ projectId }: { projectId: string }) { if (!controller.signal.aborted) setLoading(false); }); return () => controller.abort(); - }, [open, endpoint, projectId, receipt, storageKey]); + }, [open, endpoint, projectId, pagePath, receipt, storageKey]); useEffect(() => { if (!open || !receipt || terminal(receipt.status)) return; @@ -172,7 +182,7 @@ export function CanvasFeedbackDialog({ projectId }: { projectId: string }) { const send = async () => { if (submitLock.current || receipt) return; if (!submission.current) { - if (!captured.current || !context) return; + if (!captured.current || !context || (!projectId && !description.trim())) return; submission.current = { action: "submit", id: crypto.randomUUID(), @@ -237,10 +247,13 @@ export function CanvasFeedbackDialog({ projectId }: { projectId: string }) { @@ -251,7 +264,9 @@ export function CanvasFeedbackDialog({ projectId }: { projectId: string }) { 问题反馈 - 自动附上当前画布、用户和相关请求资料。你可以补充问题现象,发送给魔礼红。 + {projectId + ? "自动附上当前画布、用户和相关请求资料。你可以补充问题现象,发送给魔礼红。" + : "自动附上当前页面和浏览器信息。请说明遇到的问题,发送给魔礼红。"} {receipt ? ( @@ -278,45 +293,48 @@ export function CanvasFeedbackDialog({ projectId }: { projectId: string }) { {context.reporter.name} · {context.project.title}

) : null} -
- - - {selected && ( -
-

- 请求号: - - {selected.requestId || "尚未获取,将附上消息编号"} - -

-

- {selected.prompt} -

- {selected.error && ( -

{selected.error}

- )} -
- )} -
+ {projectId && ( +
+ + + {selected && ( +
+

+ 请求号: + + {selected.requestId || "尚未获取,将附上消息编号"} + +

+

+ {selected.prompt} +

+ {selected.error && ( +

{selected.error}

+ )} +
+ )} +
+ )}