mirror of
https://github.com/DayuanJiang/next-ai-draw-io.git
synced 2026-10-11 03:59:58 +08:00
MCP preview after the server lost a session (it expired, or the MCP process restarted): - Every server state has an id, made when the state is created. The tab notices a new id even when the version numbers happen to match, and every push names the state it was based on, so one based on a lost state is refused, also when it comes before the tab's first poll (the server recovers the saved file first). - The tab keeps the newest canvas XML, saved or not. When the server knows nothing (no file) or exactly what the tab last saved, the canvas wins and is saved, so edits made while the server was down are kept. Otherwise the server's diagram (an AI write the tab missed, a cleared document that was saved) is shown and the tab's copy goes to History. - Late answers to an old state's push or poll are dropped; a failed push says the server is unreachable; Download as .drawio saves the canvas. Settings and server: - Saved providers this version does not know stay in storage with their keys, and sending no longer trips over them. - The desktop "Ollama (Local)" preset with a key goes to local Ollama again; a server model's Ollama URL variable is read; the admin panel writes Ollama Cloud's URL for a key without one. - Provider error texts show again in the desktop app and for EdgeOne. - .env: a quoted value followed by a comment ending in a quote is read as dotenv reads it; unquoted values are unchanged. - Desktop app: the next launch opens the port where a chat was last saved; a launch elsewhere that saves nothing does not move it, and a page with no chats lets the next launch try the other port once. - The Test button no longer stays busy after another tab changed the key. - A completed append_diagram is no longer undone by an earlier failed edit's preview; a file read once in vain is saved again once it is read or gone. From the first batch's review: - The admin panel's Test of an entry without a URL now tests the server's <P>_BASE_URL, where chat sends the entry's key; chat is unchanged (the first fix rerouted working setups). - The model list ends downloads that are too large, accepts answers without a body, and keeps the "redirects are not allowed" explanation. - A test covers the preview's History rendering.
593 lines
22 KiB
TypeScript
593 lines
22 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>>
|
|
// Tool calls the streaming preview must leave alone (shared with it)
|
|
processedToolCallsRef: MutableRefObject<Set<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,
|
|
processedToolCallsRef,
|
|
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}`,
|
|
)
|
|
}
|
|
|
|
processedToolCallsRef.current.add(toolCall.toolCallId)
|
|
// Only display_diagram, edit_diagram and a completing append_diagram
|
|
// put their result on the canvas. Other tools (get_shape_library,
|
|
// which the server runs, still arrives here) leave the stored
|
|
// originals for the preview code to undo.
|
|
if (toolCall.toolName === "display_diagram") {
|
|
await handleDisplayDiagram(toolCall, addToolOutput, takeOriginals())
|
|
} else if (toolCall.toolName === "edit_diagram") {
|
|
await handleEditDiagram(toolCall, addToolOutput, takeOriginals())
|
|
} else if (toolCall.toolName === "append_diagram") {
|
|
handleAppendDiagram(toolCall, addToolOutput)
|
|
}
|
|
}
|
|
|
|
// Stored originals belong to previews not handled yet: this call's, and
|
|
// those of earlier calls with invalid input, which never get to the
|
|
// handler. The first is the diagram before all of them. A call that
|
|
// draws its result replaces those previews, so the preview code must
|
|
// neither draw them again nor undo them later. Returns that first one.
|
|
const takeOriginals = (): string | undefined => {
|
|
const [originalXml] = editDiagramOriginalXmlRef.current.values()
|
|
for (const id of editDiagramOriginalXmlRef.current.keys()) {
|
|
processedToolCallsRef.current.add(id)
|
|
}
|
|
editDiagramOriginalXmlRef.current.clear()
|
|
return originalXml
|
|
}
|
|
|
|
// originalXml: the diagram before the streamed previews, if any were drawn
|
|
const handleDisplayDiagram = async (
|
|
toolCall: ToolCall,
|
|
addToolOutput: AddToolOutputFn,
|
|
originalXml: string | undefined,
|
|
) => {
|
|
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)
|
|
// Undo the streamed preview, as a failed edit does: the canvas
|
|
// keeps the diagram from before this failed call
|
|
if (originalXml) onDisplayChart(originalXml, true)
|
|
// 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.",
|
|
)
|
|
}
|
|
}
|
|
}
|
|
|
|
// originalXml: the diagram before the streamed previews, if any were drawn.
|
|
// Operations apply to it, the same base XML that streaming used.
|
|
const handleEditDiagram = async (
|
|
toolCall: ToolCall,
|
|
addToolOutput: AddToolOutputFn,
|
|
originalXml: string | undefined,
|
|
) => {
|
|
const { operations } = toolCall.input as {
|
|
operations: DiagramOperation[]
|
|
}
|
|
|
|
let currentXml = ""
|
|
// 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.`,
|
|
})
|
|
return
|
|
}
|
|
|
|
onDisplayChart(outcome.xml, true)
|
|
onExport()
|
|
addToolOutput({
|
|
tool: "edit_diagram",
|
|
toolCallId: toolCall.toolCallId,
|
|
output: `Successfully applied ${outcome.applied} operation(s) to the diagram.`,
|
|
})
|
|
} 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.`,
|
|
})
|
|
}
|
|
}
|
|
|
|
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)
|
|
// It draws now: it takes the stored originals, as display_diagram
|
|
const originalXml = prepared.ok ? takeOriginals() : undefined
|
|
const validationError = prepared.ok
|
|
? onDisplayChart(prepared.xml, true)
|
|
: prepared.error
|
|
|
|
if (validationError) {
|
|
// Loading failed: back to the diagram before the previews
|
|
if (prepared.ok && originalXml) {
|
|
onDisplayChart(originalXml, true)
|
|
}
|
|
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 }
|
|
}
|