pmx-canvas 0.1.19 → 0.1.21

package/src/server/canvas-serialization.ts

@@ -27,6 +27,7 @@ export interface CanvasAnnotationSummary {
   color: string;
   width: number;
   pointCount: number;
+  text: string | null;
   label: string | null;
   createdAt: string;
 }
@@ -75,6 +76,15 @@ export function getCanvasNodeTitle(node: CanvasNodeState): string | null {
 }
 
 export function getCanvasNodeContent(node: CanvasNodeState): string | null {
+  if (node.type === 'html') {
+    const primitive = typeof node.data.htmlPrimitive === 'string' ? node.data.htmlPrimitive : null;
+    const description = pickString(node.data.description);
+    return pickString(node.data.agentSummary)
+      ?? pickString(node.data.contentSummary)
+      ?? (primitive
+        ? (description ? `${primitive}: ${description}` : primitive)
+        : null);
+  }
   return pickString(node.data.content)
     ?? pickString(node.data.fileContent)
     ?? pickString(node.data.text)
@@ -86,12 +96,13 @@ export function getCanvasNodeContent(node: CanvasNodeState): string | null {
 
 export function serializeCanvasNode(node: CanvasNodeState): SerializedCanvasNode {
   const data = normalizeCanvasNodeData(node.type, node.data);
+  const normalizedNode = { ...node, data };
   return {
     ...node,
     data,
     kind: getCanvasNodeKind(node, data),
-    title: getCanvasNodeTitle(node),
-    content: getCanvasNodeContent(node),
+    title: getCanvasNodeTitle(normalizedNode),
+    content: getCanvasNodeContent(normalizedNode),
     path: pickString(data.path),
     url: pickString(data.url),
     provenance: pickProvenance(data.provenance),
@@ -180,7 +191,8 @@ export function summarizeCanvasAnnotation(annotation: CanvasAnnotation): CanvasA
     color: annotation.color,
     width: annotation.width,
     pointCount: annotation.points.length,
-    label: annotation.label ?? null,
+    text: annotation.text ?? null,
+    label: annotation.label ?? annotation.text ?? null,
     createdAt: annotation.createdAt,
   };
 }
@@ -208,7 +220,7 @@ export function summarizeCanvasAnnotationForContext(
   const targetNodeTitles = targetNodes.map((node) => getCanvasNodeTitle(node) ?? node.id);
   return {
     id: annotation.id,
-    label: annotation.label ?? null,
+    label: annotation.label ?? annotation.text ?? null,
     bounds: annotation.bounds,
     targetNodeIds: targetNodes.map((node) => node.id),
     targetNodeTitles,

package/src/server/canvas-state.ts

@@ -162,11 +162,12 @@ export interface CanvasAnnotationPoint {
 
 export interface CanvasAnnotation {
   id: string;
-  type: 'freehand';
+  type: 'freehand' | 'text';
   points: CanvasAnnotationPoint[];
   bounds: { x: number; y: number; width: number; height: number };
   color: string;
   width: number;
+  text?: string;
   label?: string;
   createdAt: string;
 }
@@ -201,6 +202,10 @@ interface GroupNodesOptions {
   keepGroupFrame?: boolean;
 }
 
+interface ApplyUpdatesOptions {
+  skipGroupChildTranslation?: boolean;
+}
+
 function formatBatchUpdateDescription(updates: CanvasNodeUpdate[]): string {
   let moved = 0;
   let resized = 0;
@@ -1216,7 +1221,7 @@ class CanvasStateManager {
     };
   }
 
-  applyUpdates(updates: CanvasNodeUpdate[]): { applied: number; skipped: number } {
+  applyUpdates(updates: CanvasNodeUpdate[], options: ApplyUpdatesOptions = {}): { applied: number; skipped: number } {
     let applied = 0;
     let skipped = 0;
     const touchedParentGroups = new Map<string, { compact: boolean }>();
@@ -1259,7 +1264,7 @@ class CanvasStateManager {
       }
       oldSnapshots.set(update.id, structuredClone(existing));
       appliedUpdates.push({ id: update.id, ...structuredClone(nextPatch) });
-      if (existing.type === 'group' && nextPatch.position) {
+      if (existing.type === 'group' && nextPatch.position && options.skipGroupChildTranslation !== true) {
         this.translateGroupChildren(
           update.id,
           nextPatch.position.x - existing.position.x,
@@ -1297,7 +1302,7 @@ class CanvasStateManager {
         operationType: 'batch',
         description: formatBatchUpdateDescription(appliedUpdates),
         forward: this.suppressed(() => {
-          this.applyUpdates(appliedUpdates.map((update) => structuredClone(update)));
+          this.applyUpdates(appliedUpdates.map((update) => structuredClone(update)), options);
         }),
         inverse: this.suppressed(() => {
           for (const snapshot of inverseSnapshots) {