pmx-canvas 0.1.22 → 0.1.24

package/src/server/canvas-operations.ts

@@ -1032,7 +1032,7 @@ export function removeCanvasNode(id: string): {
 }
 
 function isArrangeLocked(node: CanvasNodeState): boolean {
-  return node.pinned || node.data.arrangeLocked === true;
+  return node.pinned || node.dockPosition !== null || node.data.arrangeLocked === true;
 }
 
 function collectArrangeExcludedNodeIds(nodes: CanvasNodeState[]): Set<string> {
@@ -1099,6 +1099,82 @@ function collectGridArrangeExcludedNodeIds(nodes: CanvasNodeState[]): Set<string
   return excluded;
 }
 
+interface ArrangeObstacleRect {
+  id: string;
+  position: { x: number; y: number };
+  size: { width: number; height: number };
+}
+
+const GRID_OBSTACLE_GAP_Y = 72;
+
+function rectsOverlap(a: ArrangeObstacleRect, b: ArrangeObstacleRect): boolean {
+  return (
+    a.position.x < b.position.x + b.size.width &&
+    a.position.x + a.size.width > b.position.x &&
+    a.position.y < b.position.y + b.size.height &&
+    a.position.y + a.size.height > b.position.y
+  );
+}
+
+function collectGridArrangeObstacles(nodes: CanvasNodeState[], excludedIds: Set<string>): ArrangeObstacleRect[] {
+  return nodes
+    .filter((node) => excludedIds.has(node.id) && node.dockPosition === null)
+    .map((node) => ({
+      id: node.id,
+      position: { ...node.position },
+      size: { ...node.size },
+    }));
+}
+
+function buildUpdatedArrangeRect(
+  update: CanvasNodeUpdate,
+  nodesById: Map<string, CanvasNodeState>,
+): ArrangeObstacleRect | null {
+  const node = nodesById.get(update.id);
+  if (!node) return null;
+  return {
+    id: update.id,
+    position: update.position ? { ...update.position } : { ...node.position },
+    size: update.size ? { ...update.size } : { ...node.size },
+  };
+}
+
+function shiftGridUpdatesBelowObstacles(
+  updates: CanvasNodeUpdate[],
+  nodes: CanvasNodeState[],
+  obstacles: ArrangeObstacleRect[],
+): CanvasNodeUpdate[] {
+  if (updates.length === 0 || obstacles.length === 0) return updates;
+
+  // Grid arrange only sees movable nodes, so preserved locked/docked-group frames
+  // need a separate obstacle pass before applying the planned positions.
+  const nodesById = new Map(nodes.map((node) => [node.id, node]));
+  let shifted = updates;
+
+  for (let attempt = 0; attempt <= obstacles.length; attempt++) {
+    const plannedRects = shifted
+      .map((update) => buildUpdatedArrangeRect(update, nodesById))
+      .filter((rect): rect is ArrangeObstacleRect => rect !== null);
+    if (plannedRects.length === 0) return shifted;
+
+    const blockers = obstacles.filter((obstacle) =>
+      plannedRects.some((rect) => rect.id !== obstacle.id && rectsOverlap(rect, obstacle)),
+    );
+    if (blockers.length === 0) return shifted;
+
+    const minPlannedY = Math.min(...plannedRects.map((rect) => rect.position.y));
+    const blockerBottom = Math.max(...blockers.map((rect) => rect.position.y + rect.size.height));
+    const deltaY = blockerBottom + GRID_OBSTACLE_GAP_Y - minPlannedY;
+    if (deltaY <= 0) return shifted;
+
+    shifted = shifted.map((update) => update.position
+      ? { ...update, position: { x: update.position.x, y: update.position.y + deltaY } }
+      : update);
+  }
+
+  return shifted;
+}
+
 export function arrangeCanvasNodes(layout: CanvasArrangeMode): { arranged: number; layout: CanvasArrangeMode } {
   const nodes = canvasState.getLayout().nodes;
   const excludedIds = layout === 'grid'
@@ -1135,6 +1211,9 @@ export function arrangeCanvasNodes(layout: CanvasArrangeMode): { arranged: numbe
         size: { width: bounds.width, height: bounds.height },
       });
     }
+    const obstacles = collectGridArrangeObstacles(nodes, excludedIds);
+    const shiftedUpdates = shiftGridUpdatesBelowObstacles(updates, nodes, obstacles);
+    updates.splice(0, updates.length, ...shiftedUpdates);
   }
 
   canvasState.withSuppressedRecording(() => {

package/src/server/canvas-schema.ts

@@ -245,10 +245,10 @@ const CANVAS_CREATE_TYPES: CanvasCreateTypeSchema[] = [
       { name: 'html', type: 'string', required: false, description: 'HTML document or fragment rendered in the sandboxed iframe.', aliases: ['content', 'stdin'] },
       { name: 'summary', type: 'string', required: false, description: 'Explicit agent-readable summary. If omitted, PMX derives one from visible HTML text.' },
       { name: 'agentSummary', type: 'string', required: false, description: 'Explicit semantic sidecar used by search, pinned context, and spatial context.', aliases: ['agent-summary'] },
-      { name: 'embeddedNodeIds', type: 'string[]', required: false, description: 'Canvas node IDs represented or iframe-embedded by this HTML surface.', aliases: ['embedded-node-id'] },
-      { name: 'embeddedUrls', type: 'string[]', required: false, description: 'URLs represented or iframe-embedded by this HTML surface.', aliases: ['embedded-url'] },
+      { name: 'embeddedNodeIds', type: 'string[]', required: false, description: 'Canvas node IDs represented or iframe-embedded by this HTML surface.', aliases: ['embedded-node-id', 'embedded-node-ids'] },
+      { name: 'embeddedUrls', type: 'string[]', required: false, description: 'URLs represented or iframe-embedded by this HTML surface.', aliases: ['embedded-url', 'embedded-urls'] },
       { name: 'presentation', type: 'boolean', required: false, description: 'Marks this HTML surface as a fullscreen presentation/deck.' },
-      { name: 'slideTitles', type: 'string[]', required: false, description: 'Agent-readable slide titles for presentation HTML.', aliases: ['slide-title'] },
+      { name: 'slideTitles', type: 'string[]', required: false, description: 'Agent-readable slide titles for presentation HTML.', aliases: ['slide-title', 'slide-titles'] },
       { name: 'primitive', type: 'HtmlPrimitiveKind', required: false, description: 'Generate HTML from a built-in communication primitive instead of passing raw HTML.', aliases: ['kind'] },
       { name: 'data', type: 'record<string, unknown>', required: false, description: 'Primitive data when --primitive is used, or arbitrary node metadata.' },
       { name: 'title', type: 'string', required: false, description: 'Optional node title.' },