mirror of
https://github.com/DayuanJiang/next-ai-draw-io.git
synced 2026-10-12 20:49:53 +08:00
- edit_diagram runs the MCP server's editDiagram: every new_xml is checked first, one cell per operation, and after the edit only the target page is checked, rejecting only errors this edit introduced. An unrelated problem elsewhere in the document no longer blocks every edit. The error lists each failed operation - The streaming edit preview uses the MCP applyDiagramOperations - Delete applyDiagramOperations (292 lines) and wrapWithMxFile from lib/utils.ts, and the unused hand-copied scripts/test-diagram-operations.mjs - One blank document (BLANK_MXFILE) for the web app and the MCP preview, replacing four copies - Saving a .drawio wraps a bare model with normalizeToMxfile - The empty-diagram check uses hasCells, which also counts cells wrapped in a UserObject/object - DiagramOperation is the MCP type - The wrapped-cell and empty-diagram tests now run against the MCP code - New e2e test: edit_diagram changes the canvas, and a failing edit leaves it as it was
568 lines
21 KiB
TypeScript
568 lines
21 KiB
TypeScript
import type { MutableRefObject } from "react"
|
|
import type { DiagramOperation } from "@/components/chat/types"
|
|
import type {
|
|
ValidationState,
|
|
ValidationStatus,
|
|
} from "@/components/chat/ValidationCard"
|
|
import type { ValidationResult } from "@/lib/diagram-validator"
|
|
import { formatValidationFeedback } from "@/lib/diagram-validator"
|
|
import { isMxCellXmlComplete } from "@/lib/utils"
|
|
import { editDiagram } from "@/packages/mcp-server/src/edit-diagram.ts"
|
|
import { prepareNewDiagram } from "@/packages/mcp-server/src/new-diagram.ts"
|
|
|
|
const DEBUG = process.env.NODE_ENV === "development"
|
|
|
|
// display_diagram replaces the document with this one page
|
|
const NEW_PAGE = { pageId: "page-1", pageName: "Page-1" }
|
|
|
|
interface ToolCall {
|
|
toolCallId: string
|
|
toolName: string
|
|
input: unknown
|
|
}
|
|
|
|
type AddToolOutputSuccess = {
|
|
tool: string
|
|
toolCallId: string
|
|
state?: "output-available"
|
|
output: string
|
|
errorText?: undefined
|
|
}
|
|
|
|
type AddToolOutputError = {
|
|
tool: string
|
|
toolCallId: string
|
|
state: "output-error"
|
|
output?: undefined
|
|
errorText: string
|
|
}
|
|
|
|
type AddToolOutputParams = AddToolOutputSuccess | AddToolOutputError
|
|
|
|
type AddToolOutputFn = (params: AddToolOutputParams) => void
|
|
|
|
const MAX_VALIDATION_RETRIES = 3
|
|
|
|
// Type for the validation function passed from useValidateDiagram hook
|
|
type ValidateDiagramFn = (
|
|
imageData: string,
|
|
sessionId?: string,
|
|
) => Promise<ValidationResult>
|
|
|
|
interface UseDiagramToolHandlersParams {
|
|
partialXmlRef: MutableRefObject<string>
|
|
editDiagramOriginalXmlRef: MutableRefObject<Map<string, string>>
|
|
// Failed VLM validations in the current user turn (reset on each user message)
|
|
validationRetryCountRef: MutableRefObject<number>
|
|
chartXMLRef: MutableRefObject<string>
|
|
onDisplayChart: (xml: string, skipValidation?: boolean) => string | null
|
|
onFetchChart: (saveToHistory?: boolean) => Promise<string>
|
|
onExport: () => void
|
|
captureValidationPng?: () => Promise<string | null>
|
|
validateDiagram?: ValidateDiagramFn
|
|
enableVlmValidation?: boolean
|
|
sessionId?: string
|
|
onValidationStateChange?: (
|
|
toolCallId: string,
|
|
state: ValidationState,
|
|
) => void
|
|
}
|
|
|
|
/**
|
|
* Hook that creates the onToolCall handler for diagram-related tools.
|
|
* Handles display_diagram, edit_diagram, and append_diagram tools.
|
|
*
|
|
* Note: addToolOutput is passed at call time (not hook init) because
|
|
* it comes from useChat which creates a circular dependency.
|
|
*/
|
|
export function useDiagramToolHandlers({
|
|
partialXmlRef,
|
|
editDiagramOriginalXmlRef,
|
|
validationRetryCountRef,
|
|
chartXMLRef,
|
|
onDisplayChart,
|
|
onFetchChart,
|
|
onExport,
|
|
captureValidationPng,
|
|
validateDiagram,
|
|
enableVlmValidation = true,
|
|
sessionId,
|
|
onValidationStateChange,
|
|
}: UseDiagramToolHandlersParams) {
|
|
// Helper to update validation state
|
|
const updateValidationState = (
|
|
toolCallId: string,
|
|
status: ValidationStatus,
|
|
options?: {
|
|
attempt?: number
|
|
maxAttempts?: number
|
|
result?: ValidationResult
|
|
error?: string
|
|
imageData?: string
|
|
},
|
|
) => {
|
|
if (onValidationStateChange) {
|
|
onValidationStateChange(toolCallId, {
|
|
status,
|
|
...options,
|
|
})
|
|
}
|
|
}
|
|
const handleToolCall = async (
|
|
{ toolCall }: { toolCall: ToolCall },
|
|
addToolOutput: AddToolOutputFn,
|
|
) => {
|
|
if (DEBUG) {
|
|
console.log(
|
|
`[onToolCall] Tool: ${toolCall.toolName}, CallId: ${toolCall.toolCallId}`,
|
|
)
|
|
}
|
|
|
|
if (toolCall.toolName === "display_diagram") {
|
|
await handleDisplayDiagram(toolCall, addToolOutput)
|
|
} else if (toolCall.toolName === "edit_diagram") {
|
|
await handleEditDiagram(toolCall, addToolOutput)
|
|
} else if (toolCall.toolName === "append_diagram") {
|
|
handleAppendDiagram(toolCall, addToolOutput)
|
|
}
|
|
}
|
|
|
|
const handleDisplayDiagram = async (
|
|
toolCall: ToolCall,
|
|
addToolOutput: AddToolOutputFn,
|
|
) => {
|
|
const { xml } = toolCall.input as { xml: string }
|
|
|
|
// DEBUG: Log raw input to diagnose false truncation detection
|
|
if (DEBUG) {
|
|
console.log(
|
|
"[display_diagram] XML ending (last 100 chars):",
|
|
xml.slice(-100),
|
|
)
|
|
console.log("[display_diagram] XML length:", xml.length)
|
|
}
|
|
|
|
// Check if XML is truncated (incomplete mxCell indicates truncated output)
|
|
const isTruncated = !isMxCellXmlComplete(xml)
|
|
if (DEBUG) {
|
|
console.log("[display_diagram] isTruncated:", isTruncated)
|
|
}
|
|
|
|
if (isTruncated) {
|
|
// Store the partial XML for continuation via append_diagram
|
|
partialXmlRef.current = xml
|
|
|
|
// Tell LLM to use append_diagram to continue
|
|
const partialEnding = partialXmlRef.current.slice(-500)
|
|
addToolOutput({
|
|
tool: "display_diagram",
|
|
toolCallId: toolCall.toolCallId,
|
|
state: "output-error",
|
|
errorText: `Output was truncated due to length limits. Use the append_diagram tool to continue.
|
|
|
|
Your output ended with:
|
|
\`\`\`
|
|
${partialEnding}
|
|
\`\`\`
|
|
|
|
NEXT STEP: Call append_diagram with the continuation XML.
|
|
- Do NOT include wrapper tags or root cells (id="0", id="1")
|
|
- Start from EXACTLY where you stopped
|
|
- Complete all remaining mxCell elements`,
|
|
})
|
|
return
|
|
}
|
|
|
|
// Complete XML received - use it directly
|
|
// (continuation is now handled via append_diagram tool)
|
|
const finalXml = xml
|
|
partialXmlRef.current = "" // Reset any partial from previous truncation
|
|
|
|
// Wrap, validate and auto-fix the model's XML like the MCP server's
|
|
// create_new_diagram, then load it
|
|
const prepared = prepareNewDiagram(finalXml, NEW_PAGE)
|
|
const validationError = prepared.ok
|
|
? onDisplayChart(prepared.xml, true)
|
|
: prepared.error
|
|
|
|
if (validationError) {
|
|
console.warn("[display_diagram] Validation error:", validationError)
|
|
// Return error to model - sendAutomaticallyWhen will trigger retry
|
|
if (DEBUG) {
|
|
console.log(
|
|
"[display_diagram] Adding tool output with state: output-error",
|
|
)
|
|
}
|
|
addToolOutput({
|
|
tool: "display_diagram",
|
|
toolCallId: toolCall.toolCallId,
|
|
state: "output-error",
|
|
errorText: `${validationError}
|
|
|
|
Please fix the XML issues and call display_diagram again with corrected XML.
|
|
|
|
Your failed XML:
|
|
\`\`\`xml
|
|
${finalXml}
|
|
\`\`\``,
|
|
})
|
|
} else {
|
|
// Success - diagram will be rendered by chat-message-display
|
|
if (DEBUG) {
|
|
console.log(
|
|
"[display_diagram] Success! Checking if VLM validation is enabled...",
|
|
)
|
|
}
|
|
|
|
// VLM validation after successful display
|
|
if (
|
|
enableVlmValidation &&
|
|
captureValidationPng &&
|
|
validateDiagram
|
|
) {
|
|
let capturedPngData: string | null = null
|
|
try {
|
|
// Notify UI that we're starting capture
|
|
updateValidationState(toolCall.toolCallId, "capturing")
|
|
|
|
// Small delay (100ms) to allow diagram rendering to complete before capture.
|
|
// This is a best-effort heuristic and may need adjustment for complex diagrams or slower devices.
|
|
await new Promise((resolve) => setTimeout(resolve, 100))
|
|
|
|
capturedPngData = await captureValidationPng()
|
|
if (capturedPngData) {
|
|
if (DEBUG) {
|
|
console.log(
|
|
"[display_diagram] Captured PNG for validation",
|
|
)
|
|
}
|
|
|
|
// Each retry is a new tool call, so count attempts per user turn
|
|
const attempt = validationRetryCountRef.current + 1
|
|
|
|
// Notify UI that we're validating (include the image)
|
|
updateValidationState(
|
|
toolCall.toolCallId,
|
|
"validating",
|
|
{
|
|
attempt,
|
|
maxAttempts: MAX_VALIDATION_RETRIES,
|
|
imageData: capturedPngData,
|
|
},
|
|
)
|
|
|
|
const result = await validateDiagram(
|
|
capturedPngData,
|
|
sessionId,
|
|
)
|
|
|
|
if (!result.valid) {
|
|
if (attempt < MAX_VALIDATION_RETRIES) {
|
|
validationRetryCountRef.current = attempt
|
|
|
|
const feedback =
|
|
formatValidationFeedback(result)
|
|
if (DEBUG) {
|
|
console.log(
|
|
`[display_diagram] Validation failed (attempt ${attempt}/${MAX_VALIDATION_RETRIES}):`,
|
|
result.issues,
|
|
)
|
|
}
|
|
|
|
// Notify UI of validation failure (include the image)
|
|
updateValidationState(
|
|
toolCall.toolCallId,
|
|
"failed",
|
|
{
|
|
attempt,
|
|
maxAttempts: MAX_VALIDATION_RETRIES,
|
|
result,
|
|
imageData: capturedPngData,
|
|
},
|
|
)
|
|
|
|
addToolOutput({
|
|
tool: "display_diagram",
|
|
toolCallId: toolCall.toolCallId,
|
|
state: "output-error",
|
|
errorText: `[Validation attempt ${attempt}/${MAX_VALIDATION_RETRIES}]\n${feedback}`,
|
|
})
|
|
return
|
|
} else {
|
|
// Last attempt - accept the diagram with warning
|
|
if (DEBUG) {
|
|
console.log(
|
|
"[display_diagram] Max validation retries reached, accepting diagram",
|
|
)
|
|
}
|
|
validationRetryCountRef.current = 0
|
|
|
|
// Notify UI that we're accepting with issues (include the image)
|
|
updateValidationState(
|
|
toolCall.toolCallId,
|
|
"skipped",
|
|
{ result, imageData: capturedPngData },
|
|
)
|
|
|
|
addToolOutput({
|
|
tool: "display_diagram",
|
|
toolCallId: toolCall.toolCallId,
|
|
output: "Diagram displayed (validation issues noted but max retries reached).",
|
|
})
|
|
return
|
|
}
|
|
} else {
|
|
// Validation passed - reset retry count
|
|
validationRetryCountRef.current = 0
|
|
if (DEBUG) {
|
|
console.log(
|
|
"[display_diagram] Validation passed!",
|
|
)
|
|
}
|
|
|
|
// Notify UI of success (include the image)
|
|
// Use "success_with_warnings" if valid but has issues
|
|
const hasWarnings = result.issues.length > 0
|
|
updateValidationState(
|
|
toolCall.toolCallId,
|
|
hasWarnings
|
|
? "success_with_warnings"
|
|
: "success",
|
|
{ result, imageData: capturedPngData },
|
|
)
|
|
}
|
|
} else {
|
|
// PNG capture failed - skip validation
|
|
updateValidationState(toolCall.toolCallId, "skipped")
|
|
}
|
|
} catch (error) {
|
|
// VLM validation error - log but don't block the user
|
|
console.warn(
|
|
"[display_diagram] VLM validation error:",
|
|
error,
|
|
)
|
|
updateValidationState(toolCall.toolCallId, "error", {
|
|
error:
|
|
error instanceof Error
|
|
? error.message
|
|
: "Validation failed",
|
|
imageData: capturedPngData || undefined,
|
|
})
|
|
}
|
|
}
|
|
|
|
if (DEBUG) {
|
|
console.log(
|
|
"[display_diagram] Adding tool output with state: output-available",
|
|
)
|
|
}
|
|
addToolOutput({
|
|
tool: "display_diagram",
|
|
toolCallId: toolCall.toolCallId,
|
|
output: "Successfully displayed the diagram.",
|
|
})
|
|
if (DEBUG) {
|
|
console.log(
|
|
"[display_diagram] Tool output added. Diagram should be visible now.",
|
|
)
|
|
}
|
|
}
|
|
}
|
|
|
|
const handleEditDiagram = async (
|
|
toolCall: ToolCall,
|
|
addToolOutput: AddToolOutputFn,
|
|
) => {
|
|
const { operations } = toolCall.input as {
|
|
operations: DiagramOperation[]
|
|
}
|
|
|
|
let currentXml = ""
|
|
// Use the original XML captured during streaming (shared with chat-message-display)
|
|
// This ensures we apply operations to the same base XML that streaming used
|
|
const originalXml = editDiagramOriginalXmlRef.current.get(
|
|
toolCall.toolCallId,
|
|
)
|
|
// On failure, undo the streaming preview so the canvas matches the XML
|
|
// reported back to the model
|
|
const restoreOriginal = () => {
|
|
if (originalXml) onDisplayChart(originalXml, true)
|
|
}
|
|
try {
|
|
if (originalXml) {
|
|
currentXml = originalXml
|
|
} else {
|
|
// Fallback: use chartXML from ref if streaming didn't capture original
|
|
const cachedXML = chartXMLRef.current
|
|
if (cachedXML) {
|
|
currentXml = cachedXML
|
|
} else {
|
|
// Last resort: export from iframe
|
|
currentXml = await onFetchChart(false)
|
|
}
|
|
}
|
|
|
|
// All or nothing, checked like the MCP server's edit_diagram.
|
|
// The model sees the first page, so edits target it.
|
|
const outcome = editDiagram(currentXml, operations, {})
|
|
if (!outcome.ok) {
|
|
const reason = outcome.pageError
|
|
? outcome.errors[0]
|
|
: `No changes were made because ${outcome.errors.length} operation(s) failed:\n${outcome.errors.map((e) => `- ${e}`).join("\n")}`
|
|
restoreOriginal()
|
|
addToolOutput({
|
|
tool: "edit_diagram",
|
|
toolCallId: toolCall.toolCallId,
|
|
state: "output-error",
|
|
errorText: `${reason}
|
|
|
|
Current diagram XML:
|
|
\`\`\`xml
|
|
${currentXml}
|
|
\`\`\`
|
|
|
|
Please check the cell IDs and retry.`,
|
|
})
|
|
// Clean up the shared original XML ref
|
|
editDiagramOriginalXmlRef.current.delete(toolCall.toolCallId)
|
|
return
|
|
}
|
|
|
|
onDisplayChart(outcome.xml, true)
|
|
onExport()
|
|
addToolOutput({
|
|
tool: "edit_diagram",
|
|
toolCallId: toolCall.toolCallId,
|
|
output: `Successfully applied ${outcome.applied} operation(s) to the diagram.`,
|
|
})
|
|
// Clean up the shared original XML ref
|
|
editDiagramOriginalXmlRef.current.delete(toolCall.toolCallId)
|
|
} catch (error) {
|
|
console.error("[edit_diagram] Failed:", error)
|
|
|
|
const errorMessage =
|
|
error instanceof Error ? error.message : String(error)
|
|
|
|
restoreOriginal()
|
|
addToolOutput({
|
|
tool: "edit_diagram",
|
|
toolCallId: toolCall.toolCallId,
|
|
state: "output-error",
|
|
errorText: `Edit failed: ${errorMessage}
|
|
|
|
Current diagram XML:
|
|
\`\`\`xml
|
|
${currentXml || "No XML available"}
|
|
\`\`\`
|
|
|
|
Please check cell IDs and retry, or use display_diagram to regenerate.`,
|
|
})
|
|
// Clean up the shared original XML ref even on error
|
|
editDiagramOriginalXmlRef.current.delete(toolCall.toolCallId)
|
|
}
|
|
}
|
|
|
|
const handleAppendDiagram = (
|
|
toolCall: ToolCall,
|
|
addToolOutput: AddToolOutputFn,
|
|
) => {
|
|
const { xml } = toolCall.input as { xml: string }
|
|
|
|
// Nothing to continue: loading the fragment alone would replace the whole diagram
|
|
if (!partialXmlRef.current) {
|
|
addToolOutput({
|
|
tool: "append_diagram",
|
|
toolCallId: toolCall.toolCallId,
|
|
state: "output-error",
|
|
errorText: `ERROR: There is no truncated diagram to continue, so append_diagram cannot be used now.
|
|
|
|
Use display_diagram to create the complete diagram, or edit_diagram to change the current one.`,
|
|
})
|
|
return
|
|
}
|
|
|
|
// Detect if LLM incorrectly started fresh instead of continuing
|
|
// LLM should only output bare mxCells now, so wrapper tags indicate error
|
|
const trimmed = xml.trim()
|
|
const isFreshStart =
|
|
trimmed.startsWith("<mxGraphModel") ||
|
|
trimmed.startsWith("<root") ||
|
|
trimmed.startsWith("<mxfile") ||
|
|
trimmed.startsWith('<mxCell id="0"') ||
|
|
trimmed.startsWith('<mxCell id="1"')
|
|
|
|
if (isFreshStart) {
|
|
addToolOutput({
|
|
tool: "append_diagram",
|
|
toolCallId: toolCall.toolCallId,
|
|
state: "output-error",
|
|
errorText: `ERROR: You started fresh with wrapper tags. Do NOT include wrapper tags or root cells (id="0", id="1").
|
|
|
|
Continue from EXACTLY where the partial ended:
|
|
\`\`\`
|
|
${partialXmlRef.current.slice(-500)}
|
|
\`\`\`
|
|
|
|
Start your continuation with the NEXT character after where it stopped.`,
|
|
})
|
|
return
|
|
}
|
|
|
|
// Append to accumulated XML
|
|
partialXmlRef.current += xml
|
|
|
|
// Check if XML is now complete (last mxCell is complete)
|
|
const isComplete = isMxCellXmlComplete(partialXmlRef.current)
|
|
|
|
if (isComplete) {
|
|
// Wrap and display the complete diagram
|
|
const finalXml = partialXmlRef.current
|
|
partialXmlRef.current = "" // Reset
|
|
|
|
const prepared = prepareNewDiagram(finalXml, NEW_PAGE)
|
|
const validationError = prepared.ok
|
|
? onDisplayChart(prepared.xml, true)
|
|
: prepared.error
|
|
|
|
if (validationError) {
|
|
addToolOutput({
|
|
tool: "append_diagram",
|
|
toolCallId: toolCall.toolCallId,
|
|
state: "output-error",
|
|
errorText: `Validation error after assembly: ${validationError}
|
|
|
|
Assembled XML:
|
|
\`\`\`xml
|
|
${finalXml.substring(0, 2000)}...
|
|
\`\`\`
|
|
|
|
Please use display_diagram with corrected XML.`,
|
|
})
|
|
} else {
|
|
addToolOutput({
|
|
tool: "append_diagram",
|
|
toolCallId: toolCall.toolCallId,
|
|
output: "Diagram assembly complete and displayed successfully.",
|
|
})
|
|
}
|
|
} else {
|
|
// Still incomplete - signal to continue
|
|
addToolOutput({
|
|
tool: "append_diagram",
|
|
toolCallId: toolCall.toolCallId,
|
|
state: "output-error",
|
|
errorText: `XML still incomplete (mxCell not closed). Call append_diagram again to continue.
|
|
|
|
Current ending:
|
|
\`\`\`
|
|
${partialXmlRef.current.slice(-500)}
|
|
\`\`\`
|
|
|
|
Continue from EXACTLY where you stopped.`,
|
|
})
|
|
}
|
|
}
|
|
|
|
return { handleToolCall }
|
|
}
|