CanvasAnvil is an open source AI diagram maker and flowchart generator - an infinite-canvas diagram editor and self-hosted drawio alternative that writes editable .drawio files. Text to diagram, then fix nodes, layout and labels in place. Also AI presentations, interior design CAD/BOM, posters and infographics.
TypeScript ai-agentsai-diagramai-presentationbomcadcanvasdiagramdiagram-generatordrawioflowchartinfographicspptppt-generatorpresentation-generatorreactsvgedittext-to-diagramtypescriptworkflow
Added analysis drawing generation in CAD canvas
codingFeng101d164d1f9bb86
diff --git a/agent/cad/images-agents/key-strategy-board.md b/agent/cad/images-agents/key-strategy-board.mdnew file mode 100644index 0000000..8ca5c6e--- /dev/null+++ b/agent/cad/images-agents/key-strategy-board.md@@ -0,0 +1,28 @@+# Role+You are `cad_key_strategy_board_agent`, an assistant that writes an image prompt for an interior-renovation key strategy board.++# Input+Plan design payload:+{{planDesign}}++Language setting:+{{outputLanguage}}++# Task+Read the plan design payload, then produce one image-generation prompt for a "Key Strategy Board" used for design alignment with the user.++The board should:+- Use interior design strategy analysis / strategy derivation board style.+- Focus on strategy instead of full-space overview.+- Present 3 to 7 key strategies (for example: space utilization, circulation optimization, storage, style unification, daylight and openness, local renovation priorities, budget control).+- Visualize each strategy with keywords, icons, local diagrams, arrows, color blocks, and relationship graphics.+- Show hierarchy, priority, or execution order between strategies.+- Ensure all visible on-image text (titles, labels, callouts, annotations) uses the language specified in "Language setting".+- Be clear, professional, and presentation-ready.+- Avoid CAD drawings, construction-detail drawings, and BOM outputs.++# Output Rules+1. Output exactly one single-paragraph image prompt in the language specified in "Language setting".+2. Do not output Markdown.+3. Do not output explanations, bullet points, or any extra text.+4. If user requirements conflict, reflect trade-offs and priority relations in the prompt.diff --git a/agent/cad/images-agents/overall-analysis-board.md b/agent/cad/images-agents/overall-analysis-board.mdnew file mode 100644index 0000000..b8635d5--- /dev/null+++ b/agent/cad/images-agents/overall-analysis-board.md@@ -0,0 +1,28 @@+# Role+You are `cad_overall_analysis_board_agent`, an assistant that writes an image prompt for an interior-renovation overall analysis board.++# Input+Plan design payload:+{{planDesign}}++Language setting:+{{outputLanguage}}++# Task+Read the plan design payload, then produce one image-generation prompt for an "Overall Analysis Board" used for design alignment with the user.++The board should:+- Use early-stage interior design communication / concept analysis board style.+- Emphasize overall spatial understanding rather than construction details.+- Visually cover project goals, spatial scope and key zones, functional zoning, style direction, core user needs, known constraints, and pending confirmations.+- Ensure all visible on-image text (titles, labels, callouts, annotations) uses the language specified in "Language setting".+- Be clear, clean, professional, and presentation-ready.+- Use visual organization such as blocks, arrows, labels, color zoning, callouts, icons, and keywords.+- Avoid CAD construction drawing style.+- Avoid construction nodes, detailed dimensions, and material-detail drawings.++# Output Rules+1. Output exactly one single-paragraph image prompt in the language specified in "Language setting".+2. Do not output Markdown.+3. Do not output explanations, bullet points, or any extra text.+4. If some information is uncertain, visualize it with labels such as "Pending Confirmation" or "Assumption".diff --git a/src/lib/cad-tasks.ts b/src/lib/cad-tasks.tsindex 44a9062..27f5479 100644--- a/src/lib/cad-tasks.ts+++ b/src/lib/cad-tasks.ts@@ -9,6 +9,8 @@ import cadWallSettingOutPlanTemplate from "../../agent/cad/images-agents/wall-seimport cadMepPlanTemplate from "../../agent/cad/images-agents/mep-plan.md?raw";import cadElevationIndexAndInteriorElevationsTemplate from "../../agent/cad/images-agents/elevation-index-and-interior-elevations.md?raw";import cadDetailDrawingsTemplate from "../../agent/cad/images-agents/detail-drawings.md?raw";+import cadOverallAnalysisBoardTemplate from "../../agent/cad/images-agents/overall-analysis-board.md?raw";+import cadKeyStrategyBoardTemplate from "../../agent/cad/images-agents/key-strategy-board.md?raw";function applyTemplate(template: string, vars: Record<string, string>) {let out = String(template || "");@@ -98,3 +100,30 @@ export function buildCadImagesSheetMessages(args: {],}));}++export function buildCadAnalysisMessages(args: {+ systemContent: string;+ planDesign: string;+ outputLanguage?: string;+}): Array<{ imageId: "overall_analysis" | "key_strategy"; messages: ChatMessage[] }> {+ const resolvedOutputLanguage = String(args.outputLanguage || "English").trim() || "English";+ const specs: Array<{ imageId: "overall_analysis" | "key_strategy"; template: string }> = [+ { imageId: "overall_analysis", template: cadOverallAnalysisBoardTemplate },+ { imageId: "key_strategy", template: cadKeyStrategyBoardTemplate },+ ];++ return specs.map((spec) => {+ const base = applyTemplate(spec.template, {+ planDesign: String(args.planDesign || ""),+ planJson: String(args.planDesign || ""),+ outputLanguage: resolvedOutputLanguage,+ });+ return {+ imageId: spec.imageId,+ messages: [+ { role: "system", content: args.systemContent },+ { role: "user", content: base },+ ],+ };+ });+}diff --git a/src/workspaces/cad/CadWorkspaceShell.tsx b/src/workspaces/cad/CadWorkspaceShell.tsxindex 5965140..1c44bfc 100644--- a/src/workspaces/cad/CadWorkspaceShell.tsx+++ b/src/workspaces/cad/CadWorkspaceShell.tsx@@ -27,6 +27,7 @@ type CodeActionResult = { ok: boolean; retry?: boolean; error?: string; svg?: stconst CAD_WORKSPACE_STORAGE_KEY = "CanvasAnvil-cad-state-v1";const CAD_RENDERS_STORAGE_KEY = "CanvasAnvil-cad-renders-v1";+const CAD_ANALYSIS_IMAGES_STORAGE_KEY = "CanvasAnvil-cad-analysis-images-v1";const CAD_CHAT_STORAGE_KEY = "chat_history_v2_cad";const tryParseJson = (text: string) => {@@ -184,6 +185,17 @@ const readPersistedCadRenders = (): CadRenderItem[] => {}};+const readPersistedCadAnalysisImages = (): CadRenderItem[] => {+ if (typeof window === "undefined") return [];+ try {+ const raw = localStorage.getItem(CAD_ANALYSIS_IMAGES_STORAGE_KEY);+ const parsed = raw ? JSON.parse(raw) : [];+ return normalizeCadRenderItems(parsed, { allowBlob: false, max: 2 });+ } catch {+ return [];+ }+};+const blobToDataUrl = async (blob: Blob) =>await new Promise<string>((resolve) => {const reader = new FileReader();@@ -241,12 +253,24 @@ export function CadWorkspaceShell() {if (fromWorkspaceState.length > 0) return fromWorkspaceState;return readPersistedCadRenders();})();+ const initialCadAnalysisImages = (() => {+ const fromWorkspaceState = normalizeCadRenderItems(initialCadState?.cadAnalysisImages, {+ allowBlob: false,+ max: 2,+ });+ if (fromWorkspaceState.length > 0) return fromWorkspaceState;+ return readPersistedCadAnalysisImages();+ })();const [cad2dSvg, setCad2dSvg] = useState<string | undefined>(() => {const v = initialCadState?.cad2dSvg;return typeof v === "string" ? v : undefined;});const [cadPlan, setCadPlan] = useState<any>(() => initialCadState?.cadPlan ?? null);+ const [cadAnalysisImages, setCadAnalysisImages] = useState<{ title: string; url: string }[]>(+ () => initialCadAnalysisImages,+ );+ const [cadAnalysisImagesLoading, setCadAnalysisImagesLoading] = useState(false);const [cadImages, setCadImages] = useState<{ title: string; url: string }[]>(() => initialCadRenders);const [cadImagesLoading, setCadImagesLoading] = useState(false);const [cadBom, setCadBom] = useState<{ columns: string[]; rows: any[] } | null>(() => {@@ -258,10 +282,7 @@ export function CadWorkspaceShell() {const rows = Array.isArray((v as any).rows) ? (v as any).rows : [];return { columns, rows };});- const [cadFocusPanel, setCadFocusPanel] = useState<"2d" | "renders" | "bom" | null>(() => {- const v = initialCadState?.cadFocusPanel;- return v === "2d" || v === "renders" || v === "bom" ? v : null;- });+ const [cadFocusPanel, setCadFocusPanel] = useState<"analysis" | "2d" | "renders" | "bom" | null>("analysis");const [attachments, setAttachments] = useState<Attachment[]>([]);const [chatHistory, setChatHistory] = useState<ChatMessage[]>([]);@@ -286,6 +307,7 @@ export function CadWorkspaceShell() {JSON.stringify({cad2dSvg: typeof cad2dSvg === "string" ? cad2dSvg : null,cadPlan: cadPlan ?? null,+ cadAnalysisImages: normalizeCadRenderItems(cadAnalysisImages, { allowBlob: false, max: 2 }),cadBom,cadFocusPanel,updatedAt: Date.now(),@@ -293,7 +315,7 @@ export function CadWorkspaceShell() {);} catch {}- }, [cad2dSvg, cadPlan, cadBom, cadFocusPanel]);+ }, [cad2dSvg, cadPlan, cadAnalysisImages, cadBom, cadFocusPanel]);useEffect(() => {if (typeof window === "undefined") return;@@ -308,6 +330,19 @@ export function CadWorkspaceShell() {}}, [cadImages]);+ useEffect(() => {+ if (typeof window === "undefined") return;+ try {+ const stable = normalizeCadRenderItems(cadAnalysisImages, { allowBlob: false, max: 2 });+ if (stable.length > 0) {+ localStorage.setItem(CAD_ANALYSIS_IMAGES_STORAGE_KEY, JSON.stringify(stable));+ } else {+ localStorage.removeItem(CAD_ANALYSIS_IMAGES_STORAGE_KEY);+ }+ } catch {+ }+ }, [cadAnalysisImages]);+useEffect(() => {const nextObjectUrls = cadImages.map((x) => x?.url)@@ -449,6 +484,89 @@ export function CadWorkspaceShell() {return { ok: true };}+ if (parsedType === "cad_analysis_images") {+ const prompts = Array.isArray(parsed.prompts) ? parsed.prompts : [];+ const defaultTitles = [+ uiLang === "zh" ? "整体方案图" : "Overall Scheme",+ uiLang === "zh" ? "重点策略图" : "Key Strategy",+ ];+ const items = prompts+ .map((p: any, idx: number) => ({+ title:+ typeof p?.title === "string" && p.title.trim()+ ? p.title+ : defaultTitles[idx] || (uiLang === "zh" ? `分析图${idx + 1}` : `Analysis ${idx + 1}`),+ prompt: typeof p?.prompt === "string" ? p.prompt : "",+ }))+ .filter((p: any) => p.prompt)+ .slice(0, 2);++ setCadFocusPanel("analysis");+ setCadAnalysisImagesLoading(true);+ setCadAnalysisImages(defaultTitles.map((title) => ({ title, url: "" })));+ try {+ const wait = (ms: number) => new Promise<void>((resolve) => setTimeout(resolve, ms));+ const generateWithRetry = async (prompt: string, maxRetries: number, retryDelayMs: number) => {+ for (let attempt = 0; attempt <= maxRetries; attempt += 1) {+ try {+ const url = await generateImage({ prompt });+ if (url) return url;+ } catch (err) {+ if (attempt >= maxRetries) {+ console.error("CAD analysis image generation attempt failed", err);+ }+ }+ if (attempt < maxRetries) {+ await wait(retryDelayMs * (attempt + 1));+ }+ }+ return "";+ };++ const settled = await Promise.allSettled(+ items.map(async (item) => ({+ title: item.title,+ url: await generateWithRetry(item.prompt, 2, 1200),+ })),+ );++ const final = defaultTitles.map((title, idx) => {+ const result = settled[idx];+ if (result?.status === "fulfilled" && result.value?.url) {+ return {+ title: result.value.title || title,+ url: result.value.url,+ };+ }+ return { title, url: "" };+ });++ const persistableFinal = await Promise.all(+ final.map(async (item) => ({+ title: item.title,+ url: await toPersistableRenderUrl(item.url),+ })),+ );+ setCadAnalysisImages(persistableFinal);+ const failedCount = final.filter((x) => !x.url).length;+ if (failedCount > 0) {+ toast.warning(+ uiLang === "zh"+ ? `有 ${failedCount} 张分析图生成失败,请重试。`+ : `${failedCount} analysis image(s) failed. Please retry.`,+ );+ }+ } catch (e) {+ console.error("CAD analysis image generation failed", e);+ toast.error(tr("分析图生成失败", "Analysis image generation failed"));+ setCadAnalysisImages(defaultTitles.map((title) => ({ title, url: "" })));+ } finally {+ setCadAnalysisImagesLoading(false);+ setCadFocusPanel("analysis");+ }+ return { ok: true };+ }+if (parsedType === "cad_images") {const prompts = Array.isArray(parsed.prompts) ? parsed.prompts : [];const items = prompts@@ -671,10 +789,12 @@ export function CadWorkspaceShell() {cad2dSvgRef.current = undefined;setCad2dSvg(undefined);setCadPlan(null);+ setCadAnalysisImages([]);+ setCadAnalysisImagesLoading(false);setCadImages([]);setCadImagesLoading(false);setCadBom(null);- setCadFocusPanel(null);+ setCadFocusPanel("analysis");setChatHistory([]);setAttachments([]);try {@@ -685,6 +805,10 @@ export function CadWorkspaceShell() {localStorage.removeItem(CAD_RENDERS_STORAGE_KEY);} catch {}+ try {+ localStorage.removeItem(CAD_ANALYSIS_IMAGES_STORAGE_KEY);+ } catch {+ }try {localStorage.removeItem(CAD_CHAT_STORAGE_KEY);} catch {@@ -712,6 +836,8 @@ export function CadWorkspaceShell() {setCad2dSvg(nextSvg);}}plan={cadPlan}+ analysisImages={cadAnalysisImages}+ analysisImagesLoading={cadAnalysisImagesLoading}images={cadImages}imagesLoading={cadImagesLoading}bom={cadBom}@@ -750,7 +876,7 @@ export function CadWorkspaceShell() {onClearAttachments={() => setAttachments([])}onClearWorkspace={clearWorkspace}hideHistoryButton- cadContext={{ plan: cadPlan, svg2d: cad2dSvg }}+ cadContext={{ plan: cadPlan, svg2d: cad2dSvg, analysisImages: cadAnalysisImages }}onCodeAction={handleCadCodeAction}/></ResizablePanel>diff --git a/src/workspaces/cad/chat/ChatPanel.tsx b/src/workspaces/cad/chat/ChatPanel.tsxindex 6823fa5..eef72e9 100644--- a/src/workspaces/cad/chat/ChatPanel.tsx+++ b/src/workspaces/cad/chat/ChatPanel.tsx@@ -10,7 +10,13 @@ import { STORAGE_GLOBAL_CONSTRAINTS_KEY } from '@/workspaces/cad/chat/global-conimport { HistoryDialog, HistoryItem } from '@/workspaces/cad/chat/history-dialog';import { ResetWarningModal } from '@/workspaces/cad/chat/reset-warning-modal';import { useFileProcessor } from '@/lib/use-file-processor';-import { buildCadBomMessages, buildCadImagesMasterMessages, buildCadImagesSheetMessages, buildCadTasksSystemContent } from '@/lib/cad-tasks';+import {+ buildCadAnalysisMessages,+ buildCadBomMessages,+ buildCadImagesMasterMessages,+ buildCadImagesSheetMessages,+ buildCadTasksSystemContent,+} from '@/lib/cad-tasks';import {CAD_PLAN_AGENT_PROMPT,CAD_SVG_AGENT_ROUTER_PROMPT,@@ -62,6 +68,7 @@ interface ChatPanelProps {cadContext?: {plan?: any;svg2d?: string;+ analysisImages?: Array<{ title: string; url: string }>;};flowContext?: {xml?: string;@@ -228,6 +235,40 @@ export function ChatPanel({: "";const cadRenderFallbackTitles = getCadRenderSlotTitles(uiLang);const cadRenderPromptTitlesEn = getCadRenderSlotTitles("en");+ const getCadAnalysisImageRefs = () => {+ if (workspaceId !== "cad") return [] as Array<{ title: string; url: string }>;+ const items = Array.isArray(cadContext?.analysisImages) ? cadContext.analysisImages : [];+ return items+ .map((item, idx) => ({+ title:+ typeof item?.title === "string" && item.title.trim()+ ? item.title.trim()+ : uiLang === "zh"+ ? `分析图${idx + 1}`+ : `Analysis ${idx + 1}`,+ url: String(item?.url || "").trim(),+ }))+ .filter((item) => !!item.url && (/^data:image\//i.test(item.url) || /^https?:\/\//i.test(item.url)))+ .slice(0, 2);+ };+ const buildCadSvgUserContent = (baseText: string) => {+ const refs = getCadAnalysisImageRefs();+ if (refs.length === 0) return baseText;+ const refList = refs.map((ref, idx) => `${idx + 1}. ${ref.title}`).join("\n");+ const text = [+ baseText,+ trText(+ `分析图参考(生成2D平面图时必须参考以下图片中的空间关系、功能分区和重点策略;不要照搬图片文字):\n${refList}`,+ `Analysis image references (when generating the 2D floorplan, you must reference spatial relationships, functional zoning, and key strategies from the following images; do not copy text labels verbatim):\n${refList}`,+ ),+ ]+ .filter(Boolean)+ .join("\n\n");+ return [+ { type: "text", text },+ ...refs.map((ref) => ({ type: "image_url", image_url: { url: ref.url } })),+ ];+ };// Persistence keyconst storageKey = `${STORAGE_KEY_PREFIX}${workspaceId}`;@@ -260,6 +301,7 @@ export function ChatPanel({const MAX_FLOW_AUTO_RETRY = 3;const cadSvgAutoRetryCountRef = useRef(0);const MAX_CAD_SVG_AUTO_RETRY = 3;+ const cadApprovedPlanRef = useRef<any | null>(null);const [files, setFiles] = useState<File[]>([]);const abortControllerRef = useRef<AbortController | null>(null);@@ -461,6 +503,9 @@ export function ChatPanel({if (text.includes('"type"') && text.includes('"cad_images"')) {return trText("(已提交装修图生成任务)", "(CAD drawing generation task submitted)");}+ if (text.includes('"type"') && text.includes('"cad_analysis_images"')) {+ return trText("(已提交分析图生成任务)", "(Analysis image generation task submitted)");+ }if (text.includes('"type"') && text.includes('"cad_plan"')) {const pretty = tryParseCadPlanJson(text);return pretty || trText("(已生成方案)", "(Plan generated)");@@ -560,6 +605,7 @@ export function ChatPanel({const clearHistory = () => {abortControllerRef.current?.abort();abortControllerRef.current = null;+ cadApprovedPlanRef.current = null;setIsLoading(false);setInput('');setPptInputSegments([{ type: "text", text: "" }]);@@ -578,6 +624,7 @@ export function ChatPanel({const startNewChat = () => {abortControllerRef.current?.abort();abortControllerRef.current = null;+ cadApprovedPlanRef.current = null;setIsLoading(false);setInput('');setPptInputSegments([{ type: "text", text: "" }]);@@ -608,6 +655,109 @@ export function ChatPanel({return { ok: true } as CodeActionResult;};+ const extractJsonPayloadText = (text: string) => {+ const raw = String(text || "").trim();+ if (!raw) return "";+ const fenced = raw.match(/```json\s*([\s\S]*?)```/i);+ if (fenced?.[1]) return String(fenced[1]).trim();+ return raw;+ };++ const extractCadPlanPayload = (text: string): any | null => {+ const raw = String(text || "");+ const jsonRegex = /```json\s*([\s\S]*?)```/g;+ let jm: RegExpExecArray | null;+ while ((jm = jsonRegex.exec(raw))) {+ const jsonText = String(jm[1] || "").trim();+ if (!jsonText) continue;+ try {+ const parsed = JSON.parse(jsonText);+ if (parsed?.type === "cad_plan" && parsed?.plan) return parsed;+ } catch {+ }+ }+ const fallback = extractJsonPayloadText(raw);+ try {+ const parsed = JSON.parse(fallback);+ if (parsed?.type === "cad_plan" && parsed?.plan) return parsed;+ } catch {+ }+ return null;+ };++ const normalizeAnalysisPromptText = (text: string, fallback: string) => {+ const raw = String(text || "").trim();+ if (!raw) return fallback;+ const fenced = raw.match(/```[a-zA-Z]*\s*([\s\S]*?)```/);+ const content = fenced?.[1] ? String(fenced[1]).trim() : raw;+ if (!content) return fallback;+ try {+ const parsed = JSON.parse(content);+ if (typeof parsed?.prompt === "string" && parsed.prompt.trim()) return parsed.prompt.trim();+ } catch {+ }+ const line = content.replace(/\r?\n+/g, " ").trim();+ return line || fallback;+ };++ const runCadAutoAnalysisImages = async (args: {+ planDesign: string;+ globalSystemPrompt: string;+ globalConstraints: string;+ controller: AbortController;+ }) => {+ const planDesignVar = String(args.planDesign || "").trim();+ if (!planDesignVar) return false;++ const systemContentTasks = [buildCadTasksSystemContent({+ globalSystemPrompt: args.globalSystemPrompt,+ globalConstraints: args.globalConstraints,+ }), cadOutputLanguageInstruction]+ .filter(Boolean)+ .join("\n\n");++ const analysisMessages = buildCadAnalysisMessages({+ systemContent: systemContentTasks,+ planDesign: planDesignVar,+ outputLanguage: cadOutputLanguage,+ });+ const fallbackTitles = [+ uiLang === "zh" ? "整体方案图" : "Overall Scheme",+ uiLang === "zh" ? "重点策略图" : "Key Strategy",+ ];+ const fallbackPrompts = [+ uiLang === "zh"+ ? "室内装修整体分析图板,展示项目目标、空间范围、功能分区、风格方向、用户核心诉求、已知约束与待确认项。采用清晰的模块分区、箭头关系、色块、标签、图标和关键词注释,突出前期方案沟通,不是 CAD 施工图,不包含施工节点与细部做法。"+ : "Interior renovation overall analysis board, showing project goals, spatial scope, functional zoning, style direction, core user needs, known constraints, and pending confirmations. Clear structure with blocks, arrows, color zones, labels, icons, and keyword callouts. Early-stage design communication style, not a CAD drawing, no construction-detail elements.",+ uiLang === "zh"+ ? "室内装修重点策略图板,展示 3 到 7 个核心策略及其主次关系与执行顺序,包括空间利用、动线优化、收纳、风格统一、采光通透、局部改造优先级与预算控制。使用图标、箭头、关系图与色块表达策略,不是 CAD 图,不包含施工细节。"+ : "Interior renovation key strategy board, showing 3-7 core strategies and their priorities/relations, including space utilization, circulation optimization, storage, style consistency, daylight and openness, local renovation priorities, and budget control. Use icons, arrows, relationship diagrams, and color blocks. Professional communication style, not a CAD drawing, no construction-detail elements.",+ ];++ const settled = await Promise.allSettled(+ analysisMessages.map((entry) =>+ generateChatMessage(entry.messages, chatModel, { signal: args.controller.signal, timeoutMs: 120000 }),+ ),+ );++ const prompts = analysisMessages.map((entry, idx) => {+ const title = fallbackTitles[idx] || (entry.imageId === "overall_analysis" ? "Overall Scheme" : "Key Strategy");+ const fallbackPrompt = fallbackPrompts[idx] || fallbackPrompts[0];+ const response = settled[idx];+ if (response?.status !== "fulfilled") {+ return { title, prompt: fallbackPrompt };+ }+ return {+ title,+ prompt: normalizeAnalysisPromptText(response.value, fallbackPrompt),+ };+ });++ const payload = JSON.stringify({ type: "cad_analysis_images", prompts }, null, 2);+ await runCodeAction(payload, "cad");+ return true;+ };+const applyCodeFromMessage = async (code: string, language?: string) => {const text = String(code || "").trim();if (!text) return false;@@ -651,6 +801,10 @@ export function ChatPanel({toast.success(uiLang === "zh" ? "已应用装修图任务" : "Render task applied");return true;}+ if (parsedType === "cad_analysis_images") {+ toast.success(uiLang === "zh" ? "已应用分析图任务" : "Analysis task applied");+ return true;+ }toast.error(uiLang === "zh" ? "未检测到可应用内容" : "No applicable CAD payload detected");return false;}@@ -1037,13 +1191,19 @@ export function ChatPanel({? `Current diagram XML:\n\n\`\`\`xml\n${flowContext.xml}\n\`\`\``: "";+ const effectiveCadPlan = cadApprovedPlanRef.current ?? cadContext?.plan;const cadContextText =workspaceId === "cad"? [- cadContext?.plan ? `Current CAD plan:\n\n\`\`\`json\n${JSON.stringify(cadContext.plan, null, 2)}\n\`\`\`` : "",+ effectiveCadPlan ? `Current CAD plan:\n\n\`\`\`json\n${JSON.stringify(effectiveCadPlan, null, 2)}\n\`\`\`` : "",typeof cadContext?.svg2d === "string" && cadContext.svg2d.trim()? `Current 2D SVG:\n\n\`\`\`svg\n${cadContext.svg2d}\n\`\`\``: "",+ (() => {+ const refs = getCadAnalysisImageRefs();+ if (refs.length === 0) return "";+ return `Current analysis image references:\n${refs.map((ref, idx) => `${idx + 1}. ${ref.title}`).join("\n")}`;+ })(),].filter(Boolean).join("\n\n")@@ -1434,7 +1594,8 @@ export function ChatPanel({const agent = String(route.agent || "").trim();const beforeHasPlan = !!cadContext?.plan;const beforeHasSvg2d = !!(typeof cadContext?.svg2d === "string" && cadContext.svg2d.trim());- const planJson = cadContext?.plan ? JSON.stringify(cadContext.plan) : "";+ const effectiveCadPlan = cadApprovedPlanRef.current ?? cadContext?.plan;+ const planJson = effectiveCadPlan ? JSON.stringify(effectiveCadPlan) : "";const svg2d = cadContext?.svg2d || "";if (agent === "cad_bom_agent") {@@ -1566,6 +1727,9 @@ export function ChatPanel({}if (agent === "cad_svg_agent") {+ if (!cadApprovedPlanRef.current && cadContext?.plan) {+ cadApprovedPlanRef.current = cadContext.plan;+ }const resolveCadSvgToolFromRouteText = (text: string): "patch" | "replace" | null => {const trimmed = String(text || "").trim();if (!trimmed) return null;@@ -1720,7 +1884,7 @@ export function ChatPanel({let cadSvgToolMessagesBase: ChatMessage[] = [{ role: "system", content: [getCadSvgToolPrompt(cadSvgSelectedTool), globalSystemPrompt, globalConstraints, cadOutputLanguageInstruction].filter(Boolean).join("\n\n") },- { role: "user", content: promptContent }+ { role: "user", content: buildCadSvgUserContent(promptContent) as any }];let cadSvgRun = await runCadSvgTool(cadSvgToolMessagesBase);@@ -1744,7 +1908,7 @@ export function ChatPanel({cadSvgSelectedTool = "replace";cadSvgToolMessagesBase = [{ role: "system", content: [getCadSvgToolPrompt("replace"), globalSystemPrompt, globalConstraints, cadOutputLanguageInstruction].filter(Boolean).join("\n\n") },- { role: "user", content: promptContent }+ { role: "user", content: buildCadSvgUserContent(promptContent) as any }];}@@ -1832,6 +1996,23 @@ export function ChatPanel({const producedHasPlan = /"type"\s*:\s*"cad_plan"/.test(routedFull);const producedHasImages = /"type"\s*:\s*"cad_images"/.test(routedFull);const producedHasBom = /"type"\s*:\s*"cad_bom"/.test(routedFull);+ let autoAnalysisRan = false;+ if (agent === "cad_plan_agent" && producedHasPlan && !controller.signal.aborted) {+ cadApprovedPlanRef.current = null;+ const latestPlanPayload = extractCadPlanPayload(routedFull);+ const latestPlanJson = latestPlanPayload ? JSON.stringify(latestPlanPayload) : planJson;+ if (latestPlanJson) {+ updateLastAssistant(+ `${routedFull}\n\n${trText("方案已更新,正在并发生成整体分析图和重点策略图...", "Plan updated. Generating overall analysis and key strategy images in parallel...")}`,+ );+ autoAnalysisRan = await runCadAutoAnalysisImages({+ planDesign: latestPlanJson,+ globalSystemPrompt,+ globalConstraints,+ controller,+ });+ }+ }const guide = buildCadNextStepGuide({agent,beforeHasPlan,@@ -1841,7 +2022,15 @@ export function ChatPanel({producedHasImages,producedHasBom,});- if (guide) updateLastAssistant(`${routedFull}\n\n${guide}`);+ const autoAnalysisGuide =+ autoAnalysisRan+ ? trText(+ "分析图已按最新方案并发更新。若满意请回复“生成2D平面图”;不满意请继续提出修改意见。",+ "Analysis images are refreshed from the latest plan. If satisfied, reply \"Generate 2D floorplan\"; otherwise continue refining requirements.",+ )+ : "";+ const mergedGuide = [guide, autoAnalysisGuide].filter(Boolean).join("\n\n");+ if (mergedGuide) updateLastAssistant(`${routedFull}\n\n${mergedGuide}`);else updateLastAssistant(routedFull);}return;@@ -1947,13 +2136,19 @@ export function ChatPanel({workspaceId === "flow" && typeof flowContext?.xml === "string" && flowContext.xml.trim()? `Current diagram XML:\n\n\`\`\`xml\n${flowContext.xml}\n\`\`\``: "";+ const effectiveCadPlan = cadApprovedPlanRef.current ?? cadContext?.plan;const cadContextText =workspaceId === "cad"? [- cadContext?.plan ? `Current CAD plan:\n\n\`\`\`json\n${JSON.stringify(cadContext.plan, null, 2)}\n\`\`\`` : "",+ effectiveCadPlan ? `Current CAD plan:\n\n\`\`\`json\n${JSON.stringify(effectiveCadPlan, null, 2)}\n\`\`\`` : "",typeof cadContext?.svg2d === "string" && cadContext.svg2d.trim()? `Current 2D SVG:\n\n\`\`\`svg\n${cadContext.svg2d}\n\`\`\``: "",+ (() => {+ const refs = getCadAnalysisImageRefs();+ if (refs.length === 0) return "";+ return `Current analysis image references:\n${refs.map((ref, idx) => `${idx + 1}. ${ref.title}`).join("\n")}`;+ })(),].filter(Boolean).join("\n\n")@@ -2155,7 +2350,8 @@ export function ChatPanel({const agent = String(route.agent || "").trim();const beforeHasPlan = !!cadContext?.plan;const beforeHasSvg2d = !!(typeof cadContext?.svg2d === "string" && cadContext.svg2d.trim());- const planJson = cadContext?.plan ? JSON.stringify(cadContext.plan) : "";+ const effectiveCadPlan = cadApprovedPlanRef.current ?? cadContext?.plan;+ const planJson = effectiveCadPlan ? JSON.stringify(effectiveCadPlan) : "";const svg2d = cadContext?.svg2d || "";if (agent === "cad_bom_agent") {@@ -2287,6 +2483,9 @@ export function ChatPanel({}if (agent === "cad_svg_agent") {+ if (!cadApprovedPlanRef.current && cadContext?.plan) {+ cadApprovedPlanRef.current = cadContext.plan;+ }const resolveCadSvgToolFromRouteText = (text: string): "patch" | "replace" | null => {const trimmed = String(text || "").trim();if (!trimmed) return null;@@ -2441,7 +2640,7 @@ export function ChatPanel({let cadSvgToolMessagesBase: ChatMessage[] = [{ role: "system", content: [getCadSvgToolPrompt(cadSvgSelectedTool), globalSystemPrompt, globalConstraints, cadOutputLanguageInstruction].filter(Boolean).join("\n\n") },- { role: "user", content: promptContent }+ { role: "user", content: buildCadSvgUserContent(promptContent) as any }];let cadSvgRun = await runCadSvgTool(cadSvgToolMessagesBase);@@ -2465,7 +2664,7 @@ export function ChatPanel({cadSvgSelectedTool = "replace";cadSvgToolMessagesBase = [{ role: "system", content: [getCadSvgToolPrompt("replace"), globalSystemPrompt, globalConstraints, cadOutputLanguageInstruction].filter(Boolean).join("\n\n") },- { role: "user", content: promptContent }+ { role: "user", content: buildCadSvgUserContent(promptContent) as any }];}@@ -2553,6 +2752,23 @@ export function ChatPanel({const producedHasPlan = /"type"\s*:\s*"cad_plan"/.test(routedFull);const producedHasImages = /"type"\s*:\s*"cad_images"/.test(routedFull);const producedHasBom = /"type"\s*:\s*"cad_bom"/.test(routedFull);+ let autoAnalysisRan = false;+ if (agent === "cad_plan_agent" && producedHasPlan && !controller.signal.aborted) {+ cadApprovedPlanRef.current = null;+ const latestPlanPayload = extractCadPlanPayload(routedFull);+ const latestPlanJson = latestPlanPayload ? JSON.stringify(latestPlanPayload) : planJson;+ if (latestPlanJson) {+ updateLastAssistant(+ `${routedFull}\n\n${trText("方案已更新,正在并发生成整体分析图和重点策略图...", "Plan updated. Generating overall analysis and key strategy images in parallel...")}`,+ );+ autoAnalysisRan = await runCadAutoAnalysisImages({+ planDesign: latestPlanJson,+ globalSystemPrompt,+ globalConstraints,+ controller,+ });+ }+ }const guide = buildCadNextStepGuide({agent,beforeHasPlan,@@ -2562,7 +2778,15 @@ export function ChatPanel({producedHasImages,producedHasBom,});- if (guide) updateLastAssistant(`${routedFull}\n\n${guide}`);+ const autoAnalysisGuide =+ autoAnalysisRan+ ? trText(+ "分析图已按最新方案并发更新。若满意请回复“生成2D平面图”;不满意请继续提出修改意见。",+ "Analysis images are refreshed from the latest plan. If satisfied, reply \"Generate 2D floorplan\"; otherwise continue refining requirements.",+ )+ : "";+ const mergedGuide = [guide, autoAnalysisGuide].filter(Boolean).join("\n\n");+ if (mergedGuide) updateLastAssistant(`${routedFull}\n\n${mergedGuide}`);else updateLastAssistant(routedFull);}return;@@ -2658,6 +2882,7 @@ export function ChatPanel({if (last.role !== 'user') return;flowAutoRetryCountRef.current = 0;cadSvgAutoRetryCountRef.current = 0;+ cadApprovedPlanRef.current = null;await runTextChat(base);};@@ -2687,6 +2912,7 @@ export function ChatPanel({setFiles([]);flowAutoRetryCountRef.current = 0;cadSvgAutoRetryCountRef.current = 0;+ cadApprovedPlanRef.current = null;await runTextChat(base);};diff --git a/src/workspaces/cad/workspace/CadWorkspace.tsx b/src/workspaces/cad/workspace/CadWorkspace.tsxindex 679640f..ec960c7 100644--- a/src/workspaces/cad/workspace/CadWorkspace.tsx+++ b/src/workspaces/cad/workspace/CadWorkspace.tsx@@ -1,4 +1,4 @@-import React, { useEffect, useMemo, useRef, useState } from 'react';+import React, { useEffect, useMemo, useRef, useState } from 'react';import { Loader2, MessageSquarePlus, Box, Image as ImageIcon, Table2, Download } from 'lucide-react';import {ContextMenu,@@ -18,12 +18,16 @@ interface CadWorkspaceProps {onSvgChange?: (svg: string) => void;svg2d?: string;plan?: any;+ analysisImages?: { title: string; url: string }[];+ analysisImagesLoading?: boolean;images?: { title: string; url: string }[];imagesLoading?: boolean;bom?: { columns: string[]; rows: any[] } | null;- focusPanel?: "2d" | "renders" | "bom" | null;+ focusPanel?: "analysis" | "2d" | "renders" | "bom" | null;}+type ViewMode = "analysis" | "2d" | "renders" | "bom";+const EMPTY_SVG = `<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 1600 1000"></svg>`;const EMPTY_SENTINEL = "__EMPTY_SVG__";const ENABLE_EDITOR_AUTOSYNC = false;@@ -125,11 +129,22 @@ const isEffectivelyEmptySvg = (text: string) => {}};-export function CadWorkspace({ onAddToChat, onSvgChange, svg2d, plan, images = [], imagesLoading = false, bom, focusPanel }: CadWorkspaceProps) {+export function CadWorkspace({+ onAddToChat,+ onSvgChange,+ svg2d,+ plan,+ analysisImages = [],+ analysisImagesLoading = false,+ images = [],+ imagesLoading = false,+ bom,+ focusPanel,+}: CadWorkspaceProps) {const CAD_RENDERS_STORAGE_KEY = "CanvasAnvil-cad-renders-v1";const [svgContent, setSvgContent] = useState<string | null>(null);const [isSvgEditorReady, setIsSvgEditorReady] = useState(false);- const [viewMode, setViewMode] = useState<"2d" | "renders" | "bom">("2d");+ const [viewMode, setViewMode] = useState<ViewMode>("2d");const [previewImage, setPreviewImage] = useState<{ title: string; url: string } | null>(null);const [isExporting, setIsExporting] = useState(false);const [localImages, setLocalImages] = useState<Array<{ title: string; url: string }>>(() => {@@ -616,6 +631,19 @@ export function CadWorkspace({ onAddToChat, onSvgChange, svg2d, plan, images = [};});}, [localImages, uiLang]);+ const analysisSlots = useMemo(() => {+ const fallbackTitles = [+ uiLang === "zh" ? "整体方案图" : "Overall Scheme",+ uiLang === "zh" ? "重点策略图" : "Key Strategy",+ ];+ return fallbackTitles.map((fallbackTitle, idx) => {+ const item = analysisImages[idx];+ return {+ title: typeof item?.title === "string" && item.title.trim() ? item.title : fallbackTitle,+ url: item?.url || "",+ };+ });+ }, [analysisImages, uiLang]);const hasRenderImages = localImages.some((x) => !!x?.url);@@ -623,6 +651,16 @@ export function CadWorkspace({ onAddToChat, onSvgChange, svg2d, plan, images = [<ContextMenu><ContextMenuTrigger className="w-full h-full bg-muted/20 relative overflow-hidden"><div className="absolute top-4 left-4 z-20 flex items-center gap-2 bg-background/80 backdrop-blur rounded-xl border border-border/50 px-3 py-2 shadow-sm">+ <Button+ size="sm"+ variant={viewMode === "analysis" ? "default" : "outline"}+ className="h-7 px-2 text-xs gap-1"+ onClick={() => setViewMode("analysis")}+ title={uiLang === "zh" ? "查看分析图" : "View analysis images"}+ >+ <ImageIcon className="w-3.5 h-3.5" />+ {uiLang === "zh" ? "分析图" : "Analysis"}+ </Button><Buttonsize="sm"variant={viewMode === "2d" ? "default" : "outline"}@@ -680,7 +718,7 @@ export function CadWorkspace({ onAddToChat, onSvgChange, svg2d, plan, images = [)}</div>- {!svgContent && viewMode !== "2d" && (+ {!svgContent && viewMode !== "2d" && viewMode !== "analysis" && (<div className="w-full h-full flex items-center justify-center"><div className="text-center text-muted-foreground"><p className="mb-2">{uiLang === "zh" ? "暂无 CAD 内容" : "No CAD content yet"}</p>@@ -694,6 +732,51 @@ export function CadWorkspace({ onAddToChat, onSvgChange, svg2d, plan, images = [)}<div className="w-full h-full pt-16 p-6">+ {viewMode === "analysis" && (+ <div className="w-full h-full bg-white dark:bg-zinc-900 shadow-sm rounded-xl overflow-auto border border-border/50 p-4">+ <div className="grid gap-4 grid-cols-1 md:grid-cols-2">+ {analysisSlots.map((img, idx) => (+ <div key={`${img.title}-${idx}`} className="rounded-xl border border-border/50 overflow-hidden bg-background">+ <div className="px-3 py-2 text-xs text-muted-foreground flex items-center justify-between gap-2">+ <ImageIcon className="w-4 h-4" />+ <span className="truncate flex-1">{img.title}</span>+ <div className="flex items-center gap-1">+ <Button+ variant="ghost"+ size="icon"+ className="h-7 w-7"+ onClick={() => setPreviewImage(img)}+ title={uiLang === "zh" ? "查看" : "View"}+ >+ <ImageIcon className="w-4 h-4" />+ </Button>+ <a+ href={img.url || "#"}+ download={`${img.title || (uiLang === "zh" ? "分析图" : "analysis")}.png`}+ className="inline-flex"+ >+ <Button variant="ghost" size="icon" className="h-7 w-7" disabled={!img.url} title={uiLang === "zh" ? "下载" : "Download"}>+ <Download className="w-4 h-4" />+ </Button>+ </a>+ </div>+ </div>+ <div className="aspect-video bg-muted/20">+ {img.url ? (+ <img src={img.url} alt={img.title} className="w-full h-full object-cover cursor-pointer" onClick={() => setPreviewImage(img)} />+ ) : (+ <div className="w-full h-full flex items-center justify-center text-xs text-muted-foreground gap-2">+ {analysisImagesLoading ? <Loader2 className="w-3.5 h-3.5 animate-spin" /> : null}+ <span>{analysisImagesLoading ? (uiLang === "zh" ? "生成中" : "Generating") : (uiLang === "zh" ? "待生成" : "Pending")}</span>+ </div>+ )}+ </div>+ </div>+ ))}+ </div>+ </div>+ )}+{viewMode === "2d" && (<div className="w-full h-full bg-white shadow-sm rounded-xl overflow-hidden border border-border/50"><iframe@@ -791,7 +874,8 @@ export function CadWorkspace({ onAddToChat, onSvgChange, svg2d, plan, images = [<ContextMenuItemonClick={async () => {if (!onAddToChat) return;- if (viewMode === "2d") {+ if (viewMode === "analysis") onAddToChat(JSON.stringify({ type: "cad_analysis_images", images: analysisSlots }, null, 2));+ else if (viewMode === "2d") {const latest = await requestSvgFromEditor({ preferFallbackOnEmpty: true });if (latest) onAddToChat(latest);}