pmx-canvas 0.1.13 → 0.1.14

package/dist/types/client/nodes/ExtAppFrame.d.ts

@@ -1,7 +1,6 @@
 import type { CallToolResult } from '@modelcontextprotocol/sdk/types.js';
 import { AppBridge } from '@modelcontextprotocol/ext-apps/app-bridge';
 import type { CanvasNodeState } from '../types';
-type IframeLoadTarget = Pick<HTMLIFrameElement, 'addEventListener' | 'removeEventListener' | 'contentDocument'>;
 type ExtAppBridgeNotifications = Pick<AppBridge, 'sendToolInput' | 'sendToolResult'>;
 type DisplayMode = 'inline' | 'fullscreen' | 'pip';
 interface ExtAppHostDimensionsTarget {
@@ -9,7 +8,6 @@ interface ExtAppHostDimensionsTarget {
     clientHeight?: number;
     getBoundingClientRect(): Pick<DOMRectReadOnly, 'width' | 'height'>;
 }
-export declare function waitForExtAppFrameLoad(target: IframeLoadTarget): Promise<void>;
 export declare function getExtAppBridgeInitKey(node: CanvasNodeState, retryKey: number): string;
 export declare function resolveExtAppDisplayModeRequest(requestedMode: DisplayMode, isExpanded: boolean): {
     nextMode: DisplayMode;
@@ -26,7 +24,8 @@ export declare function resolveExtAppContainerDimensions(target: ExtAppHostDimen
     height: number;
 };
 export declare function shouldApplyExtAppSizeChange(height: unknown, isExpanded: boolean): height is number;
-export declare function ExtAppFrame({ node }: {
+export declare function ExtAppFrame({ node, expanded }: {
     node: CanvasNodeState;
+    expanded?: boolean;
 }): import("preact/jsx-runtime").JSX.Element;
 export {};

package/dist/types/client/nodes/McpAppNode.d.ts

@@ -1,4 +1,5 @@
 import type { CanvasNodeState } from '../types';
-export declare function McpAppNode({ node }: {
+export declare function McpAppNode({ node, expanded }: {
     node: CanvasNodeState;
+    expanded?: boolean;
 }): import("preact/src").JSX.Element;

package/dist/types/server/canvas-operations.d.ts

@@ -40,6 +40,12 @@ interface CanvasAddNodeInput {
     title?: string;
     content?: string;
     data?: Record<string, unknown>;
+    toolName?: string;
+    category?: string;
+    status?: string;
+    duration?: string;
+    resultSummary?: string;
+    error?: string;
     x?: number;
     y?: number;
     width?: number;
@@ -106,6 +112,8 @@ export declare function validateCanvasNodePatch(patch: {
         height: number;
     };
 }): string | null;
+export declare function mergeTraceNodeDataFields(base: Record<string, unknown>, input: Record<string, unknown>): Record<string, unknown>;
+export declare function hasTraceNodeDataFields(input: Record<string, unknown>): boolean;
 export declare function scheduleCodeGraphRecompute(onComplete?: () => void): void;
 export declare function addCanvasNode(input: CanvasAddNodeInput): {
     id: string;

package/dist/types/server/diagram-presets.d.ts

@@ -9,11 +9,13 @@ export declare const DEFAULT_EXCALIDRAW_ELEMENTS: ReadonlyArray<Record<string, u
 export declare const EXCALIDRAW_MCP_TRANSPORT: ExternalMcpTransportConfig;
 export interface DiagramPresetOpenInput {
     elements: unknown;
+    nodeId?: string;
     title?: string;
     x?: number;
     y?: number;
     width?: number;
     height?: number;
+    timeoutMs?: number;
 }
 export interface ExcalidrawOpenMcpAppInput {
     transport: ExternalMcpTransportConfig;
@@ -22,11 +24,13 @@ export interface ExcalidrawOpenMcpAppInput {
     toolArguments: {
         elements: string;
     };
+    nodeId?: string;
     title?: string;
     x?: number;
     y?: number;
     width?: number;
     height?: number;
+    timeoutMs?: number;
 }
 export declare function inferExcalidrawCameraUpdate(elements: Array<Record<string, unknown>>): Record<string, unknown> | null;
 export declare function normalizeExcalidrawElements(elements: unknown): string;

package/dist/types/server/index.d.ts

@@ -23,6 +23,12 @@ export declare class PmxCanvas extends EventEmitter {
         type: CanvasNodeState['type'];
         title?: string;
         content?: string;
+        toolName?: string;
+        category?: string;
+        status?: string;
+        duration?: string;
+        resultSummary?: string;
+        error?: string;
         x?: number;
         y?: number;
         width?: number;
@@ -198,12 +204,14 @@ export declare class PmxCanvas extends EventEmitter {
         transport: ExternalMcpTransportConfig;
         toolName: string;
         toolArguments?: Record<string, unknown>;
+        nodeId?: string;
         serverName?: string;
         title?: string;
         x?: number;
         y?: number;
         width?: number;
         height?: number;
+        timeoutMs?: number;
     }): Promise<{
         ok: true;
         id?: string;

package/dist/types/server/mcp-app-runtime.d.ts

@@ -18,6 +18,7 @@ export interface OpenMcpAppInput {
     toolName: string;
     toolArguments?: Record<string, unknown>;
     serverName?: string;
+    timeoutMs?: number;
 }
 export interface OpenMcpAppResult {
     sessionId: string;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pmx-canvas",
-  "version": "0.1.13",
+  "version": "0.1.14",
   "description": "Spatial canvas workbench for coding agents — infinite 2D canvas with agent-native CLI, MCP integration, nodes, edges, file watching, and snapshots",
   "type": "module",
   "main": "./src/server/index.ts",

package/src/cli/agent.ts

@@ -26,6 +26,7 @@ import {
 
 const DEFAULT_PORT = 4313;
 const defaultConsoleLog = console.log;
+const TRACE_NODE_FIELDS = ['toolName', 'category', 'status', 'duration', 'resultSummary', 'error'] as const;
 
 interface CanvasSchemaField {
   name: string;
@@ -1078,6 +1079,12 @@ cmd('node add', 'Add a node to the canvas', [
     height: 'Use a positive number, e.g. --height 280',
   });
   applyStrictSizeFlags(body, flags);
+  if (type === 'trace') {
+    for (const field of TRACE_NODE_FIELDS) {
+      const value = getStringFlag(flags, field);
+      if (value !== undefined) body[field] = value;
+    }
+  }
 
   // Support --stdin for piping content
   if (flags.stdin) {
@@ -1565,7 +1572,9 @@ cmd('external-app add', 'Create a hosted external app node', [
     title: typeof flags.title === 'string' ? flags.title : 'Excalidraw Diagram',
     elements: DEFAULT_EXCALIDRAW_ELEMENTS,
   };
-  const elementsJson = getStringFlag(flags, 'elements-json');
+  const nodeId = getStringFlag(flags, 'node-id', 'nodeId', 'id');
+  if (nodeId) body.nodeId = nodeId;
+  const elementsJson = getStringFlag(flags, 'elements-json', 'elements');
   if (elementsJson !== undefined) body.elements = parseJsonValue(elementsJson, 'Excalidraw elements', 'Use --elements-json \'[{"type":"rectangle","id":"r1","x":0,"y":0,"width":120,"height":80}]\'');
   const elementsFile = getStringFlag(flags, 'elements-file', 'initial-file');
   if (elementsFile) body.elements = parseJsonValue(readFileSync(elementsFile, 'utf-8'), 'Excalidraw elements file', 'Use --elements-file ./scene.excalidraw');
@@ -1575,6 +1584,8 @@ cmd('external-app add', 'Create a hosted external app node', [
     width: 'Use a positive number, e.g. --width 960',
     height: 'Use a positive number, e.g. --height 720',
   });
+  const timeoutMs = optionalPositiveFiniteFlag(flags, 'timeout-ms', 'Use a positive number, e.g. --timeout-ms 120000');
+  if (timeoutMs !== undefined) body.timeoutMs = timeoutMs;
 
   const result = await api('POST', '/api/canvas/diagram', body);
   output(result && typeof result === 'object' && !Array.isArray(result) && 'nodeId' in result && !('id' in result)
@@ -2303,9 +2314,12 @@ function showCommandHelp(name: string): void {
     console.log('\nOptions:');
     console.log('  --kind excalidraw          External app kind to create');
     console.log('  --title <title>            Node title');
+    console.log('  --node-id <id>             Existing Excalidraw app node to update in place');
+    console.log('  --elements <json>          Optional Excalidraw elements array JSON');
     console.log('  --elements-json <json>     Optional Excalidraw elements array JSON');
     console.log('  --elements-file <path>     Optional file containing Excalidraw elements JSON');
     console.log('  --initial-file <path>      Alias for --elements-file');
+    console.log('  --timeout-ms <number>      Optional downstream MCP timeout for cold starts');
   }
   console.log('');
 }

package/src/client/canvas/ExpandedNodeOverlay.tsx

@@ -26,13 +26,13 @@ function renderContent(node: CanvasNodeState, expanded: boolean) {
     case 'markdown':
       return <MarkdownNode node={node} expanded={expanded} />;
     case 'mcp-app':
-      return <McpAppNode node={node} />;
+      return <McpAppNode node={node} expanded={expanded} />;
     case 'webpage':
       return <WebpageNode node={node} expanded={expanded} />;
     case 'json-render':
-      return <McpAppNode node={node} />;
+      return <McpAppNode node={node} expanded={expanded} />;
     case 'graph':
-      return <McpAppNode node={node} />;
+      return <McpAppNode node={node} expanded={expanded} />;
     case 'prompt':
       return <PromptNode node={node} />;
     case 'response':

package/src/client/nodes/ExtAppFrame.tsx

@@ -13,11 +13,6 @@ import type { CanvasNodeState } from '../types';
 
 type McpUiTheme = 'light' | 'dark';
 
-type IframeLoadTarget = Pick<
-  HTMLIFrameElement,
-  'addEventListener' | 'removeEventListener' | 'contentDocument'
->;
-
 type ExtAppBridgeNotifications = Pick<AppBridge, 'sendToolInput' | 'sendToolResult'>;
 type DisplayMode = 'inline' | 'fullscreen' | 'pip';
 const DEFAULT_EXT_APP_SANDBOX = 'allow-scripts allow-popups allow-popups-to-escape-sandbox';
@@ -43,21 +38,6 @@ async function postJson<T>(url: string, body: Record<string, unknown>): Promise<
   return json.result as T;
 }
 
-export function waitForExtAppFrameLoad(target: IframeLoadTarget): Promise<void> {
-  const readyState = target.contentDocument?.readyState;
-  if (readyState === 'interactive' || readyState === 'complete') {
-    return Promise.resolve();
-  }
-
-  return new Promise<void>((resolve) => {
-    const onLoad = () => {
-      target.removeEventListener('load', onLoad);
-      resolve();
-    };
-    target.addEventListener('load', onLoad, { once: true });
-  });
-}
-
 export function getExtAppBridgeInitKey(node: CanvasNodeState, retryKey: number): string {
   const html = typeof node.data.html === 'string' ? node.data.html : '';
   const serverName = typeof node.data.serverName === 'string' ? node.data.serverName : '';
@@ -131,7 +111,7 @@ export function shouldApplyExtAppSizeChange(height: unknown, isExpanded: boolean
   return typeof height === 'number' && Number.isFinite(height) && height > 0 && !isExpanded;
 }
 
-export function ExtAppFrame({ node }: { node: CanvasNodeState }) {
+export function ExtAppFrame({ node, expanded = false }: { node: CanvasNodeState; expanded?: boolean }) {
   const iframeRef = useRef<HTMLIFrameElement>(null);
   const bridgeRef = useRef<AppBridge | null>(null);
   const transportRef = useRef<PostMessageTransport | null>(null);
@@ -164,10 +144,9 @@ export function ExtAppFrame({ node }: { node: CanvasNodeState }) {
   const sessionError = node.data.sessionError as string | undefined;
   const maxHeight = node.size.height;
   const nodeId = node.id;
-  const frameKey = `${node.id}:${retryKey}`;
-  const bridgeInitKey = getExtAppBridgeInitKey(node, retryKey);
+  const frameKey = getExtAppBridgeInitKey(node, retryKey);
   const toMcpTheme = (theme: string): McpUiTheme => (theme === 'light' ? 'light' : 'dark');
-  const isExpanded = expandedNodeId.value === nodeId;
+  const isExpanded = expanded || expandedNodeId.value === nodeId;
 
   latestToolInputRef.current = toolInput;
   latestToolResultRef.current = toolResult;
@@ -221,9 +200,9 @@ export function ExtAppFrame({ node }: { node: CanvasNodeState }) {
     return sendPromise;
   };
 
-  // Initialize bridge when iframe loads and HTML is available
+  // Initialize as soon as HTML is mounted; some apps send initialize before iframe load fires.
   useEffect(() => {
-    if (!html) return; // Wait for HTML to arrive
+    if (!html) return;
     const iframe = iframeRef.current;
     if (!iframe) return;
     let disposed = false;
@@ -242,12 +221,8 @@ export function ExtAppFrame({ node }: { node: CanvasNodeState }) {
     };
 
     const init = async () => {
-      let contentWindow = iframe.contentWindow;
-      if (!contentWindow) {
-        await waitForExtAppFrameLoad(iframe);
-        if (disposed) return;
-        contentWindow = iframe.contentWindow;
-      }
+      if (!html) return;
+      const contentWindow = iframe.contentWindow;
       if (!contentWindow) {
         throw new Error('Ext-app iframe window is unavailable');
       }
@@ -397,8 +372,8 @@ export function ExtAppFrame({ node }: { node: CanvasNodeState }) {
         bridgeReadyRef.current = true;
         setStatus('ready');
         setError(null);
-        scheduleHostContextUpdate();
-        void sendExtAppBootstrapState(bridge, latestToolInputRef.current, undefined)
+        void Promise.resolve(bridge.sendHostContextChange(buildHostContext(isExpanded ? 'fullscreen' : 'inline')))
+          .then(() => sendExtAppBootstrapState(bridge, latestToolInputRef.current, undefined))
           .then(() => flushToolResult(bridge))
           .catch((err) => {
             const msg = err instanceof Error ? err.message : String(err);
@@ -481,7 +456,7 @@ export function ExtAppFrame({ node }: { node: CanvasNodeState }) {
         transportRef.current = null;
       }
     };
-  }, [bridgeInitKey]);
+  }, [frameKey]);
 
   // Forward tool result when it arrives after bridge is ready
   useEffect(() => {

package/src/client/nodes/McpAppNode.tsx

@@ -13,9 +13,9 @@ function withTheme(url: string): string {
   }
 }
 
-export function McpAppNode({ node }: { node: CanvasNodeState }) {
+export function McpAppNode({ node, expanded = false }: { node: CanvasNodeState; expanded?: boolean }) {
   if (node.data.mode === 'ext-app') {
-    return <ExtAppFrame node={node} />;
+    return <ExtAppFrame node={node} expanded={expanded} />;
   }
 
   const url = withTheme((node.data.url as string) || '');

package/src/client/state/sse-bridge.ts

@@ -529,6 +529,7 @@ function handleExtAppOpen(data: Record<string, unknown>): void {
   if (typeof data.toolCallId !== 'string' || !data.toolCallId) return;
   ensureExtAppNode({
     toolCallId: data.toolCallId,
+    ...(typeof data.nodeId === 'string' && data.nodeId.length > 0 ? { nodeId: data.nodeId } : {}),
     title: data.title,
     html: data.html,
     toolInput: data.toolInput,

package/src/mcp/server.ts

@@ -261,6 +261,12 @@ export async function startMcpServer(): Promise<void> {
       width: z.number().optional().describe('Width in pixels (default: 720)'),
       height: z.number().optional().describe('Height in pixels (default: 600)'),
       strictSize: z.boolean().optional().describe('Keep explicit width/height fixed and scroll overflowing content instead of browser auto-fitting'),
+      toolName: z.string().optional().describe('Trace node tool or operation label'),
+      category: z.string().optional().describe('Trace node category: mcp, file, subagent, or other'),
+      status: z.string().optional().describe('Trace node status: running, success, or failed'),
+      duration: z.string().optional().describe('Trace node duration badge text'),
+      resultSummary: z.string().optional().describe('Trace node result summary'),
+      error: z.string().optional().describe('Trace node error message'),
     },
     async (input) => {
       const c = await ensureCanvas();
@@ -303,11 +309,13 @@ export async function startMcpServer(): Promise<void> {
       toolName: z.string().describe('Tool name on the external MCP server'),
       serverName: z.string().optional().describe('Optional display name for the external MCP server'),
       toolArguments: z.record(z.string(), z.unknown()).optional().describe('Arguments passed to the external tool call'),
+      nodeId: z.string().optional().describe('Existing mcp-app node ID to update in place instead of creating a new node.'),
       title: z.string().optional().describe('Optional canvas node title override'),
       x: z.number().optional().describe('X position (auto-placed if omitted)'),
       y: z.number().optional().describe('Y position (auto-placed if omitted)'),
       width: z.number().optional().describe('Width in pixels (default: 720)'),
       height: z.number().optional().describe('Height in pixels (default: 500)'),
+      timeoutMs: z.number().optional().describe('Optional MCP request timeout in milliseconds for cold external app servers'),
       transport: z.union([
         z.object({
           type: z.literal('stdio'),
@@ -331,11 +339,13 @@ export async function startMcpServer(): Promise<void> {
           toolName: input.toolName,
           ...(typeof input.serverName === 'string' ? { serverName: input.serverName } : {}),
           ...(input.toolArguments ? { toolArguments: input.toolArguments } : {}),
+          ...(typeof input.nodeId === 'string' ? { nodeId: input.nodeId } : {}),
           ...(typeof input.title === 'string' ? { title: input.title } : {}),
           ...(typeof input.x === 'number' ? { x: input.x } : {}),
           ...(typeof input.y === 'number' ? { y: input.y } : {}),
           ...(typeof input.width === 'number' ? { width: input.width } : {}),
           ...(typeof input.height === 'number' ? { height: input.height } : {}),
+          ...(typeof input.timeoutMs === 'number' ? { timeoutMs: input.timeoutMs } : {}),
         });
         return {
           content: [{ type: 'text', text: JSON.stringify(result, null, 2) }],
@@ -357,27 +367,37 @@ export async function startMcpServer(): Promise<void> {
         z.string().describe('JSON array string of Excalidraw elements'),
         z.array(z.record(z.string(), z.unknown())).describe('Array of Excalidraw elements'),
       ]).describe('Excalidraw elements to render. See https://github.com/excalidraw/excalidraw-mcp for the element format.'),
+      nodeId: z.string().optional().describe('Existing Excalidraw mcp-app node ID to update in place instead of creating a new node.'),
       title: z.string().optional().describe('Optional canvas node title override'),
       x: z.number().optional().describe('X position (auto-placed if omitted)'),
       y: z.number().optional().describe('Y position (auto-placed if omitted)'),
       width: z.number().optional().describe('Width in pixels (default: 720)'),
       height: z.number().optional().describe('Height in pixels (default: 500)'),
+      timeoutMs: z.number().optional().describe('Optional MCP request timeout in milliseconds for Excalidraw cold starts. Client-side MCP hosts may still enforce their own total request timeout.'),
     },
-    async (input) => {
+    async (input, extra) => {
       const c = await ensureCanvas();
       try {
         const result = await c.addDiagram({
           elements: input.elements,
+          ...(typeof input.nodeId === 'string' ? { nodeId: input.nodeId } : {}),
           ...(typeof input.title === 'string' ? { title: input.title } : {}),
           ...(typeof input.x === 'number' ? { x: input.x } : {}),
           ...(typeof input.y === 'number' ? { y: input.y } : {}),
           ...(typeof input.width === 'number' ? { width: input.width } : {}),
           ...(typeof input.height === 'number' ? { height: input.height } : {}),
+          ...(typeof input.timeoutMs === 'number' ? { timeoutMs: input.timeoutMs } : {}),
         });
         return {
           content: [{ type: 'text', text: JSON.stringify(result, null, 2) }],
         };
       } catch (error) {
+        if (extra.signal.aborted) {
+          return {
+            content: [{ type: 'text', text: 'canvas_add_diagram was cancelled by the MCP client before Excalidraw finished. Retry with a higher client request timeout and pass timeoutMs to PMX Canvas for the downstream Excalidraw call.' }],
+            isError: true,
+          };
+        }
         return {
           content: [{ type: 'text', text: error instanceof Error ? error.message : String(error) }],
           isError: true,

package/src/server/canvas-operations.ts

@@ -76,6 +76,12 @@ interface CanvasAddNodeInput {
   title?: string;
   content?: string;
   data?: Record<string, unknown>;
+  toolName?: string;
+  category?: string;
+  status?: string;
+  duration?: string;
+  resultSummary?: string;
+  error?: string;
   x?: number;
   y?: number;
   width?: number;
@@ -109,6 +115,7 @@ interface CanvasNodeLookupInput {
 }
 
 const MAX_CONTEXT_PINS = 20;
+const TRACE_DATA_FIELDS = ['toolName', 'category', 'status', 'duration', 'resultSummary', 'error'] as const;
 
 function isRecord(value: unknown): value is Record<string, unknown> {
   return value !== null && typeof value === 'object' && !Array.isArray(value);
@@ -757,10 +764,23 @@ function buildWebpageNodeData(input: CanvasAddNodeInput): Record<string, unknown
   };
 }
 
+function normalizeTraceNodeData(input: CanvasAddNodeInput): Record<string, unknown> {
+  const data: Record<string, unknown> = { ...(input.data ?? {}) };
+  for (const field of TRACE_DATA_FIELDS) {
+    const value = input[field];
+    if (typeof value === 'string') data[field] = value;
+  }
+  if (input.title) data.title = input.title;
+  if (input.content) data.content = input.content;
+  if (input.strictSize) data.strictSize = true;
+  return data;
+}
+
 function buildNodeData(input: CanvasAddNodeInput): Record<string, unknown> {
   if (input.type === 'file') return buildFileNodeData(input);
   if (input.type === 'image') return buildImageNodeData(input);
   if (input.type === 'webpage') return buildWebpageNodeData(input);
+  if (input.type === 'trace') return normalizeTraceNodeData(input);
   return {
     ...(input.data ?? {}),
     ...(input.title ? { title: input.title } : {}),
@@ -769,6 +789,21 @@ function buildNodeData(input: CanvasAddNodeInput): Record<string, unknown> {
   };
 }
 
+export function mergeTraceNodeDataFields(
+  base: Record<string, unknown>,
+  input: Record<string, unknown>,
+): Record<string, unknown> {
+  const next: Record<string, unknown> = { ...base };
+  for (const field of TRACE_DATA_FIELDS) {
+    if (typeof input[field] === 'string') next[field] = input[field];
+  }
+  return next;
+}
+
+export function hasTraceNodeDataFields(input: Record<string, unknown>): boolean {
+  return TRACE_DATA_FIELDS.some((field) => typeof input[field] === 'string');
+}
+
 export function scheduleCodeGraphRecompute(onComplete?: () => void): void {
   if (codeGraphTimer) clearTimeout(codeGraphTimer);
   codeGraphTimer = setTimeout(() => {

package/src/server/diagram-presets.ts

@@ -43,11 +43,13 @@ export const EXCALIDRAW_MCP_TRANSPORT: ExternalMcpTransportConfig = {
 
 export interface DiagramPresetOpenInput {
   elements: unknown;
+  nodeId?: string;
   title?: string;
   x?: number;
   y?: number;
   width?: number;
   height?: number;
+  timeoutMs?: number;
 }
 
 export interface ExcalidrawOpenMcpAppInput {
@@ -55,11 +57,13 @@ export interface ExcalidrawOpenMcpAppInput {
   toolName: string;
   serverName: string;
   toolArguments: { elements: string };
+  nodeId?: string;
   title?: string;
   x?: number;
   y?: number;
   width?: number;
   height?: number;
+  timeoutMs?: number;
 }
 
 function isRecord(value: unknown): value is Record<string, unknown> {
@@ -111,6 +115,21 @@ function finiteNumber(value: unknown): number | null {
   return typeof value === 'number' && Number.isFinite(value) ? value : null;
 }
 
+function positiveFiniteNumber(value: unknown): number | null {
+  const num = finiteNumber(value);
+  return num !== null && num > 0 ? num : null;
+}
+
+function labelFromBoundText(element: Record<string, unknown>): Record<string, unknown> | null {
+  const text = typeof element.text === 'string' ? element.text : '';
+  if (text.trim().length === 0) return null;
+  const fontSize = positiveFiniteNumber(element.fontSize);
+  return {
+    text,
+    ...(fontSize ? { fontSize } : {}),
+  };
+}
+
 function elementHasCameraUpdate(elements: Array<Record<string, unknown>>): boolean {
   return elements.some((element) => element.type === 'cameraUpdate');
 }
@@ -134,39 +153,38 @@ function normalizeExcalidrawBoundText(elements: Array<Record<string, unknown>>):
   }
 
   let changed = false;
-  const boundElementIdsByContainer = new Map<string, Set<string>>();
+  const labelsByContainer = new Map<string, Record<string, unknown>>();
 
   for (const element of elements) {
     if (element.type !== 'text' || typeof element.id !== 'string' || typeof element.containerId !== 'string') continue;
     const container = elementsById.get(element.containerId);
-    if (!container) continue;
-    const ids = boundElementIdsByContainer.get(element.containerId) ?? new Set<string>();
-    ids.add(element.id);
-    boundElementIdsByContainer.set(element.containerId, ids);
+    if (!container || (container.type !== 'rectangle' && container.type !== 'ellipse' && container.type !== 'diamond')) continue;
+    const label = labelFromBoundText(element);
+    if (!label) continue;
+    labelsByContainer.set(element.containerId, label);
   }
 
-  const normalized = elements.map((element) => {
-    if (typeof element.id !== 'string') return element;
-    const boundTextIds = boundElementIdsByContainer.get(element.id);
-    if (!boundTextIds || boundTextIds.size === 0) return element;
-
-    const existing = Array.isArray(element.boundElements)
-      ? element.boundElements.filter(isRecord)
-      : [];
-    const existingTextIds = new Set(
-      existing
-        .filter((boundElement) => boundElement.type === 'text' && typeof boundElement.id === 'string')
-        .map((boundElement) => boundElement.id as string),
-    );
-    const missing = [...boundTextIds].filter((id) => !existingTextIds.has(id));
-    if (missing.length === 0) return element;
+  const normalized: Array<Record<string, unknown>> = [];
+  for (const element of elements) {
+    if (element.type === 'text' && typeof element.containerId === 'string') {
+      if (labelsByContainer.has(element.containerId)) {
+        changed = true;
+        continue;
+      }
+    }
+
+    if (typeof element.id !== 'string' || !labelsByContainer.has(element.id)) {
+      normalized.push(element);
+      continue;
+    }
 
     changed = true;
-    return {
-      ...element,
-      boundElements: [...existing, ...missing.map((id) => ({ type: 'text', id }))],
-    };
-  });
+    const { boundElements: _boundElements, ...container } = element;
+    normalized.push({
+      ...container,
+      label: labelsByContainer.get(element.id),
+    });
+  }
 
   return changed ? normalized : elements;
 }
@@ -333,10 +351,12 @@ export function buildExcalidrawOpenMcpAppInput(input: DiagramPresetOpenInput): E
     serverName: EXCALIDRAW_SERVER_NAME,
     toolArguments: { elements },
   };
+  if (typeof input.nodeId === 'string' && input.nodeId.trim().length > 0) out.nodeId = input.nodeId.trim();
   if (typeof input.title === 'string' && input.title.trim().length > 0) out.title = input.title.trim();
   if (typeof input.x === 'number' && Number.isFinite(input.x)) out.x = input.x;
   if (typeof input.y === 'number' && Number.isFinite(input.y)) out.y = input.y;
   if (typeof input.width === 'number' && Number.isFinite(input.width)) out.width = input.width;
   if (typeof input.height === 'number' && Number.isFinite(input.height)) out.height = input.height;
+  if (typeof input.timeoutMs === 'number' && Number.isFinite(input.timeoutMs) && input.timeoutMs > 0) out.timeoutMs = input.timeoutMs;
   return out;
 }