@pinepaper.studio/mcp-server 1.5.4 → 1.5.5

package/dist/types/code-generator.js

@@ -10,10 +10,6 @@ import { CreateItemInputSchema, ModifyItemInputSchema, AddRelationInputSchema, A
 CreateDiagramShapeInputSchema, ConnectInputSchema, ConnectPortsInputSchema, AddPortsInputSchema, AutoLayoutInputSchema, GetDiagramShapesInputSchema, UpdateConnectorInputSchema, RemoveConnectorInputSchema, DiagramModeInputSchema, 
 // Agent flow mode types
 AgentStartJobInputSchema, AgentEndJobInputSchema, AgentResetInputSchema, AgentBatchExecuteInputSchema, AgentExportInputSchema, AgentAnalyzeInputSchema, 
-// Interactive/Trigger types
-AddTriggerInputSchema, RemoveTriggerInputSchema, QueryTriggersInputSchema, 
-// Quiz types
-CreateQuizInputSchema, GetQuizStateInputSchema, ResetQuizInputSchema, 
 // Letter collage types
 CreateLetterCollageInputSchema, AnimateLetterCollageInputSchema, 
 // Map types
@@ -292,11 +288,27 @@ app.animate(item, {
 ({ success: true, itemId: '${itemId}', animationType: '${animationType}' });
 `.trim();
 }
+/**
+ * PinePaper's keyframe interpolator only tweens `position` when it is an [x, y]
+ * ARRAY. Callers (and other agents) routinely pass a { x, y } object, which is
+ * silently ignored — the item then stays frozen for the whole animation. Accept
+ * both shapes by normalizing { x, y } -> [x, y] before the keyframes are emitted.
+ */
+function normalizeKeyframePositions(keyframes) {
+    return (keyframes || []).map((kf) => {
+        const props = kf?.properties;
+        const p = props?.position;
+        if (p && !Array.isArray(p) && typeof p === 'object' && 'x' in p && 'y' in p) {
+            return { ...kf, properties: { ...props, position: [p.x, p.y] } };
+        }
+        return kf;
+    });
+}
 /**
  * Template for keyframe animation
  */
 function generateKeyframeAnimateCode(itemId, keyframes, duration, loop = false, timeOffset, clipInPoint, clipOutPoint) {
-    const keyframesJson = JSON.stringify(keyframes, null, 2);
+    const keyframesJson = JSON.stringify(normalizeKeyframePositions(keyframes), null, 2);
     const calculatedDuration = duration || Math.max(...keyframes.map(k => k.time));
     const opts = { duration: calculatedDuration, loop };
     if (timeOffset !== undefined)
@@ -456,35 +468,29 @@ const size = app.getCanvasSize();
  */
 function generateClearCanvasCode() {
     return `
-// Clear all items from canvas
-const entries = app.itemRegistry.getAll();
-const itemIds = entries.map(entry => entry.id || entry.itemId);
-let removedCount = 0;
-
-for (const itemId of itemIds) {
-  try {
-    const item = app.getItemById(itemId);
-    if (item) {
-      item.remove();
-      app.itemRegistry.remove(itemId);
-      removedCount++;
-    }
-  } catch (e) {
-    console.warn('Failed to remove item:', itemId, e);
-  }
-}
-
-// Also clear any relations
-if (app.clearAllRelations) {
-  app.clearAllRelations();
+// Clear all items from canvas. Prefer app.clearCanvas() — the canonical
+// reset that also tears down relations, the (virtual) camera animation,
+// generators, effects and background. The old manual loop here was broken:
+// it keyed item lookups on entry.id/entry.itemId (the registry getAll()
+// entries don't expose those — getItemById wants the registry id), so it
+// removed 0 items, and it called the non-existent app.clearAllRelations.
+const before = app.itemRegistry ? app.itemRegistry.getAll().length : 0;
+
+if (typeof app.clearCanvas === 'function') {
+  app.clearCanvas();
+} else {
+  // Fallback for older builds without clearCanvas().
+  if (app.textItemGroup) app.textItemGroup.removeChildren();
+  if (app.patternGroup) app.patternGroup.removeChildren();
+  if (app.itemRegistry) app.itemRegistry.clear();
+  if (app.relationRegistry) app.relationRegistry.clear();
 }
 
-app.historyManager.saveState();
+if (app.historyManager) app.historyManager.saveState();
 
-// Verify canvas is empty
-const remaining = app.itemRegistry.getAll().length;
+const remaining = app.itemRegistry ? app.itemRegistry.getAll().length : 0;
 
-({ success: true, removedCount, remainingItems: remaining });
+({ success: true, removedCount: Math.max(0, before - remaining), remainingItems: remaining });
 `.trim();
 }
 /**
@@ -1178,13 +1184,9 @@ if (typeof app.generators !== 'undefined' && app.generators['${backgroundGenerat
   const sourceId = nameToId['${source}'];
   const targetId = nameToId['${target}'];
   if (sourceId && targetId) {
-    const sourceItem = app.itemRegistry.get(sourceId);
-    const targetItem = app.itemRegistry.get(targetId);
-    if (sourceItem && targetItem) {
-      const params = ${paramsStr};
-      app.relationManager.addRelation(sourceItem, targetItem, '${type}', params);
-      results.relations.push({ source: '${source}', target: '${target}', type: '${type}' });
-    }
+    const params = ${paramsStr};
+    app.addRelation(sourceId, targetId, '${type}', params);
+    results.relations.push({ source: '${source}', target: '${target}', type: '${type}' });
   }
 })();
 `);
@@ -1601,14 +1603,7 @@ throw new Error('Unknown diagram mode action: ${action}');
     if (item.shadowColor || item.shadowBlur) analysis.hasShadows = true;
   });
 
-  // Check animation manager for registered animations
-  if (app.animationManager) {
-    const animations = app.animationManager.getAll ? app.animationManager.getAll() : (app.animationManager.animations || []);
-    if (animations.length > 0) {
-      analysis.hasAnimations = true;
-      animationSet.add('managed');
-    }
-  }
+  // FxTool has no animationManager — animations are detected via item.data.animationType walk above
   // Check timeline for active animations
   if (app.timeline && (app.timeline.isPlaying || app.timeline.animations?.length > 0)) {
     analysis.hasAnimations = true;
@@ -1779,16 +1774,29 @@ throw new Error('Unknown diagram mode action: ${action}');
      */
     generateBatchOperationCode(op, index) {
         switch (op.type) {
-            case 'create':
+            case 'create': {
                 const pos = op.position || { x: 400, y: 300 };
-                const props = JSON.stringify(op.properties || {});
-                return `
+                const createProps = (op.properties || {});
+                const props = JSON.stringify(createProps);
+                let createCode = `
 const item = app.create('${op.itemType}', { position: { x: ${pos.x}, y: ${pos.y} }, ...${props} });
-const itemId = item.data && item.data.id ? item.data.id : app.registerItem(item, '${op.itemType}', { source: 'mcp-batch' });
+const itemId = item.data && item.data.id ? item.data.id : app.registerItem(item, '${op.itemType}', { source: 'mcp-batch' });`;
+                // app.create() does not read blendMode/opacity from its params, but the
+                // underlying Paper.js item supports them directly — apply post-create so
+                // callers can pass them inline in `properties` and have them take effect.
+                if (createProps.blendMode !== undefined) {
+                    createCode += `\nif ('blendMode' in item) item.blendMode = ${JSON.stringify(createProps.blendMode)};`;
+                }
+                if (createProps.opacity !== undefined) {
+                    createCode += `\nif ('opacity' in item) item.opacity = ${JSON.stringify(createProps.opacity)};`;
+                }
+                createCode += `
 // Ensure item is visible above backgrounds/generators
 if (item.bringToFront) item.bringToFront();
 return { itemId };
 `;
+                return createCode;
+            }
             case 'modify':
                 const itemRef = op.itemId?.startsWith('$')
                     ? `itemIds[${op.itemId.substring(1)}]`
@@ -1869,7 +1877,7 @@ return { success: true, width: ${w}, height: ${h} };
                 const kfItemRef = op.itemId?.startsWith('$')
                     ? `itemIds[${op.itemId.substring(1)}]`
                     : `'${op.itemId}'`;
-                const kfJson = JSON.stringify(op.keyframes || []);
+                const kfJson = JSON.stringify(normalizeKeyframePositions(op.keyframes || []));
                 const kfDuration = op.duration || (op.keyframes?.length ? Math.max(...op.keyframes.map(k => k.time)) : 5);
                 const kfLoop = op.loop ?? false;
                 return `
@@ -1883,16 +1891,14 @@ return { itemId: targetId, duration: ${kfDuration}, loop: ${kfLoop} };
                     ? `itemIds[${op.itemId.substring(1)}]`
                     : `'${op.itemId}'`;
                 const maskOpts = JSON.stringify(op.maskOptions || {});
+                const preset = op.maskPreset || op.maskType || 'wipeLeft';
                 return `
 const targetId = ${maskItemRef};
-if (!app.maskSystem) throw new Error('Mask system not available');
-const result = app.maskSystem.applyAnimatedMask(targetId, {
-  preset: ${op.maskPreset ? `'${op.maskPreset}'` : 'null'},
-  maskType: ${op.maskType ? `'${op.maskType}'` : 'null'},
-  options: ${maskOpts},
-  maskOptions: ${maskOpts}
-});
-return result;
+const item = app.getItemById(targetId);
+if (!item) throw new Error('Item not found: ' + targetId);
+if (!app.applyAnimatedMask) throw new Error('Mask system not available');
+const maskedGroup = app.applyAnimatedMask(item, '${preset}', ${maskOpts});
+return { success: !!maskedGroup, itemId: targetId, preset: '${preset}' };
 `;
             }
             case 'apply_effect': {
@@ -1940,8 +1946,9 @@ return { success: true, action: 'seek', time: ${op.time || 0} };
      */
     generateAgentExport(input) {
         const validated = AgentExportInputSchema.parse(input);
-        const { platform, format, quality, framing } = validated;
+        const { platform, format, quality, framing, duration } = validated;
         const qualityLevel = quality || 'standard';
+        const videoDuration = duration ?? 5;
         // Quality settings (bitrate in bps for VideoEncoder)
         const qualitySettings = {
             draft: { compression: 0.6, fps: 15, dpi: 72, bitrate: 2_000_000 },
@@ -2055,7 +2062,7 @@ return { success: true, action: 'seek', time: ${op.time || 0} };
         // ExportEngine._quickExportVideo overrides quality with undefined for
         // mp4/webm, _calculateBitrate yields NaN, and VideoEncoder.configure
         // rejects with 'malformed bitrate value'.
-        const baseVideoSettings = { format, fps: settings.fps, quality: settings.compression, duration: 5 };
+        const baseVideoSettings = { format, fps: settings.fps, quality: settings.compression, duration: ${videoDuration} };
         const blobToDataUrl = (b) => new Promise(resolve => {
           const r = new FileReader();
           r.onloadend = () => resolve(r.result);
@@ -2178,14 +2185,7 @@ return { success: true, action: 'seek', time: ${op.time || 0} };
     if (item.shadowColor || item.shadowBlur) hasShadow = true;
   });
 
-  // Check animation manager for registered animations
-  if (app.animationManager) {
-    const animations = app.animationManager.getAll ? app.animationManager.getAll() : (app.animationManager.animations || []);
-    if (animations.length > 0) {
-      analysis.hasAnimations = true;
-      animationSet.add('managed');
-    }
-  }
+  // FxTool has no animationManager — animations are detected via item.data.animationType walk above
   // Check timeline for active animations
   if (app.timeline && (app.timeline.isPlaying || app.timeline.animations?.length > 0)) {
     analysis.hasAnimations = true;
@@ -2249,257 +2249,6 @@ return { success: true, action: 'seek', time: ${op.time || 0} };
     suggestedPlatforms
   };
 })();
-`.trim();
-    }
-    // ===========================================================================
-    // INTERACTIVE TRIGGER CODE GENERATORS
-    // ===========================================================================
-    /**
-     * Generate code for adding a trigger
-     */
-    generateAddTrigger(input) {
-        const validated = AddTriggerInputSchema.parse(input);
-        const { itemId, event, actions, condition, timelineOffset } = validated;
-        const actionsStr = JSON.stringify(actions);
-        const conditionStr = condition ? `'${condition.replace(/'/g, "\\'")}'` : 'null';
-        const offsetStr = timelineOffset !== undefined ? timelineOffset : 'null';
-        return `
-// Add trigger to ${itemId}
-const item = app.getItemById('${itemId}');
-if (!item) throw new Error('Item not found: ${itemId}');
-
-const trigger = {
-  event: '${event}',
-  actions: ${actionsStr},
-  condition: ${conditionStr},
-  timelineOffset: ${offsetStr}
-};
-
-// Initialize triggers array if needed
-if (!item.data) item.data = {};
-if (!item.data.triggers) item.data.triggers = [];
-
-// Add trigger
-item.data.triggers.push(trigger);
-
-// Register event handler
-if (app.triggerManager) {
-  app.triggerManager.registerTrigger(item, trigger);
-}
-
-app.historyManager.saveState();
-({ success: true, itemId: '${itemId}', event: '${event}', triggerId: item.data.triggers.length - 1 });
-`.trim();
-    }
-    /**
-     * Generate code for removing a trigger
-     */
-    generateRemoveTrigger(input) {
-        const validated = RemoveTriggerInputSchema.parse(input);
-        const { itemId, event, removeAll } = validated;
-        if (removeAll) {
-            return `
-// Remove all triggers from ${itemId}
-const item = app.getItemById('${itemId}');
-if (!item) throw new Error('Item not found: ${itemId}');
-
-const removedCount = item.data?.triggers?.length || 0;
-if (item.data) item.data.triggers = [];
-
-if (app.triggerManager) {
-  app.triggerManager.unregisterAll(item);
-}
-
-app.historyManager.saveState();
-({ success: true, itemId: '${itemId}', removedCount, removeAll: true });
-`.trim();
-        }
-        return `
-// Remove ${event} trigger from ${itemId}
-const item = app.getItemById('${itemId}');
-if (!item) throw new Error('Item not found: ${itemId}');
-
-let removedCount = 0;
-if (item.data?.triggers) {
-  const before = item.data.triggers.length;
-  item.data.triggers = item.data.triggers.filter(t => t.event !== '${event}');
-  removedCount = before - item.data.triggers.length;
-}
-
-if (app.triggerManager) {
-  app.triggerManager.unregisterEvent(item, '${event}');
-}
-
-app.historyManager.saveState();
-({ success: true, itemId: '${itemId}', event: '${event}', removedCount });
-`.trim();
-    }
-    /**
-     * Generate code for querying triggers
-     */
-    generateQueryTriggers(input) {
-        const validated = QueryTriggersInputSchema.parse(input);
-        const { itemId, event } = validated;
-        if (itemId) {
-            return `
-// Query triggers for ${itemId}
-const item = app.getItemById('${itemId}');
-if (!item) throw new Error('Item not found: ${itemId}');
-
-let triggers = item.data?.triggers || [];
-${event ? `triggers = triggers.filter(t => t.event === '${event}');` : ''}
-
-({ success: true, itemId: '${itemId}', triggers, count: triggers.length });
-`.trim();
-        }
-        return `
-// Query all triggers
-const allTriggers = [];
-const items = app.itemRegistry ? app.itemRegistry.getAll() : [];
-
-items.forEach(entry => {
-  const item = entry.item;
-  if (item.data?.triggers?.length > 0) {
-    let triggers = item.data.triggers;
-    ${event ? `triggers = triggers.filter(t => t.event === '${event}');` : ''}
-    triggers.forEach((trigger, idx) => {
-      allTriggers.push({
-        itemId: entry.id,
-        triggerId: idx,
-        ...trigger
-      });
-    });
-  }
-});
-
-({ success: true, triggers: allTriggers, count: allTriggers.length${event ? `, event: '${event}'` : ''} });
-`.trim();
-    }
-    // ===========================================================================
-    // QUIZ CODE GENERATORS
-    // ===========================================================================
-    /**
-     * Generate code for creating a quiz
-     */
-    generateCreateQuiz(input) {
-        const validated = CreateQuizInputSchema.parse(input);
-        const { title, questions, passingScore, showScore, allowRetry, shuffleQuestions, shuffleOptions } = validated;
-        const quizConfig = JSON.stringify({
-            title: title || 'Untitled Quiz',
-            questions,
-            passingScore: passingScore || 70,
-            showScore: showScore !== false,
-            allowRetry: allowRetry !== false,
-            shuffleQuestions: shuffleQuestions || false,
-            shuffleOptions: shuffleOptions || false,
-        }, null, 2);
-        return `
-// Create quiz
-const quizConfig = ${quizConfig};
-
-// Initialize quiz manager if needed
-if (!app.quizManager) {
-  app.quizManager = {
-    quizzes: [],
-    activeQuiz: null,
-    createQuiz: function(config) {
-      const quiz = {
-        id: 'quiz_' + Date.now(),
-        ...config,
-        state: {
-          currentQuestion: 0,
-          answers: [],
-          score: 0,
-          maxScore: config.questions.reduce((sum, q) => sum + q.points, 0),
-          complete: false
-        }
-      };
-      this.quizzes.push(quiz);
-      this.activeQuiz = quiz;
-      return quiz;
-    }
-  };
-}
-
-const quiz = app.quizManager.createQuiz(quizConfig);
-app.historyManager.saveState();
-
-({
-  success: true,
-  quizId: quiz.id,
-  title: quiz.title,
-  questionCount: quiz.questions.length,
-  maxScore: quiz.state.maxScore,
-  passingScore: quiz.passingScore
-});
-`.trim();
-    }
-    /**
-     * Generate code for getting quiz state
-     */
-    generateGetQuizState(input) {
-        const validated = GetQuizStateInputSchema.parse(input);
-        const { quizId } = validated;
-        const quizRef = quizId
-            ? `app.quizManager.quizzes.find(q => q.id === '${quizId}')`
-            : 'app.quizManager?.activeQuiz';
-        return `
-// Get quiz state
-if (!app.quizManager) {
-  return { success: false, error: 'No quiz manager initialized' };
-}
-
-const quiz = ${quizRef};
-if (!quiz) {
-  return { success: false, error: 'Quiz not found' };
-}
-
-({
-  success: true,
-  quizId: quiz.id,
-  title: quiz.title,
-  currentQuestion: quiz.state.currentQuestion,
-  totalQuestions: quiz.questions.length,
-  score: quiz.state.score,
-  maxScore: quiz.state.maxScore,
-  answers: quiz.state.answers,
-  complete: quiz.state.complete,
-  passed: quiz.state.complete ? (quiz.state.score / quiz.state.maxScore * 100) >= quiz.passingScore : null
-});
-`.trim();
-    }
-    /**
-     * Generate code for resetting a quiz
-     */
-    generateResetQuiz(input) {
-        const validated = ResetQuizInputSchema.parse(input);
-        const { quizId } = validated;
-        const quizRef = quizId
-            ? `app.quizManager.quizzes.find(q => q.id === '${quizId}')`
-            : 'app.quizManager?.activeQuiz';
-        return `
-// Reset quiz
-if (!app.quizManager) {
-  return { success: false, error: 'No quiz manager initialized' };
-}
-
-const quiz = ${quizRef};
-if (!quiz) {
-  return { success: false, error: 'Quiz not found' };
-}
-
-// Reset state
-quiz.state = {
-  currentQuestion: 0,
-  answers: [],
-  score: 0,
-  maxScore: quiz.questions.reduce((sum, q) => sum + q.points, 0),
-  complete: false
-};
-
-app.historyManager.saveState();
-
-({ success: true, quizId: quiz.id, reset: true });
 `.trim();
     }
     // ===========================================================================
@@ -2588,80 +2337,6 @@ app.historyManager.saveState();
 
   return result;
 })();
-`.trim();
-    }
-    /**
-     * Generate code to get letter collage options
-     */
-    generateGetLetterCollageOptions() {
-        return `
-// Get letter collage options
-(function() {
-  if (!app.getLetterCollageOptions) {
-    // Return static options if function not available
-    return {
-      success: true,
-      styles: ['tile', 'magazine', 'paperCut', 'fold', 'gradient', 'image'],
-      tilePalettes: {
-        game: ['wordle', 'scrabble'],
-        vibrant: ['candy', 'neon', 'rainbow'],
-        soft: ['pastel', 'cotton'],
-        natural: ['earth', 'ocean', 'forest', 'sunset'],
-        professional: ['corporate', 'minimal', 'slate'],
-        seasonal: ['christmas', 'halloween', 'spring'],
-        magazine: ['magazine', 'newspaper', 'vintage'],
-        paperCraft: ['paperCraft', 'origami', 'craftPaper']
-      },
-      gradientPalettes: ['rainbow', 'sunset', 'ocean', 'fire', 'gold', 'rose', 'ice', 'cyberpunk', 'neonGlow', 'purplePink'],
-      gradientDirections: ['vertical', 'horizontal', 'diagonal', 'radial']
-    };
-  }
-
-  return app.getLetterCollageOptions();
-})();
-`.trim();
-    }
-    // ===========================================================================
-    // CANVAS PRESETS CODE GENERATORS
-    // ===========================================================================
-    /**
-     * Generate code to get canvas presets
-     */
-    generateGetCanvasPresets() {
-        return `
-// Get canvas presets
-(function() {
-  if (app.getCanvasPresets) {
-    return app.getCanvasPresets();
-  }
-
-  // Return static presets if function not available
-  return {
-    success: true,
-    presets: [
-      { key: 'youtube-thumbnail', name: 'YouTube Thumbnail', width: 1280, height: 720, aspectRatio: '16:9', category: 'video' },
-      { key: 'youtube-short', name: 'YouTube Shorts', width: 1080, height: 1920, aspectRatio: '9:16', category: 'video' },
-      { key: 'tiktok', name: 'TikTok', width: 1080, height: 1920, aspectRatio: '9:16', category: 'video' },
-      { key: 'instagram-story', name: 'Instagram Story', width: 1080, height: 1920, aspectRatio: '9:16', category: 'social' },
-      { key: 'instagram-post', name: 'Instagram Post (Square)', width: 1080, height: 1080, aspectRatio: '1:1', category: 'social' },
-      { key: 'instagram-landscape', name: 'Instagram Landscape', width: 1080, height: 566, aspectRatio: '1.91:1', category: 'social' },
-      { key: 'instagram-portrait', name: 'Instagram Portrait', width: 1080, height: 1350, aspectRatio: '4:5', category: 'social' },
-      { key: 'facebook-post', name: 'Facebook Post', width: 1200, height: 630, aspectRatio: '1.91:1', category: 'social' },
-      { key: 'facebook-cover', name: 'Facebook Cover', width: 820, height: 312, aspectRatio: '2.63:1', category: 'social' },
-      { key: 'facebook-story', name: 'Facebook Story', width: 1080, height: 1920, aspectRatio: '9:16', category: 'social' },
-      { key: 'twitter-post', name: 'Twitter/X Post', width: 1200, height: 675, aspectRatio: '16:9', category: 'social' },
-      { key: 'twitter-header', name: 'Twitter/X Header', width: 1500, height: 500, aspectRatio: '3:1', category: 'social' },
-      { key: 'linkedin-post', name: 'LinkedIn Post', width: 1200, height: 627, aspectRatio: '1.91:1', category: 'social' },
-      { key: 'linkedin-banner', name: 'LinkedIn Banner', width: 1584, height: 396, aspectRatio: '4:1', category: 'social' },
-      { key: 'pinterest-pin', name: 'Pinterest Pin', width: 1000, height: 1500, aspectRatio: '2:3', category: 'social' },
-      { key: 'presentation-16x9', name: 'Presentation 16:9', width: 1920, height: 1080, aspectRatio: '16:9', category: 'presentation' },
-      { key: 'presentation-4x3', name: 'Presentation 4:3', width: 1024, height: 768, aspectRatio: '4:3', category: 'presentation' },
-      { key: 'hd-720p', name: 'HD 720p', width: 1280, height: 720, aspectRatio: '16:9', category: 'video' },
-      { key: 'full-hd-1080p', name: 'Full HD 1080p', width: 1920, height: 1080, aspectRatio: '16:9', category: 'video' },
-      { key: 'default', name: 'Default', width: 800, height: 600, aspectRatio: '4:3', category: 'general' }
-    ]
-  };
-})();
 `.trim();
     }
     // ===========================================================================
@@ -3446,22 +3121,27 @@ app.historyManager.saveState();
         const optionsStr = validated.options ? JSON.stringify(validated.options) : '{}';
         const keyframesStr = validated.keyframes ? JSON.stringify(validated.keyframes) : 'null';
         const maskOptionsStr = validated.maskOptions ? JSON.stringify(validated.maskOptions) : '{}';
+        const preset = validated.preset || validated.maskType || 'wipeLeft';
+        // Per-preset options. Custom keyframes are an animated-mask extension —
+        // when supplied, fall through to maskingSystem.applyCustomMask instead.
         return `
 // Apply animated mask to ${validated.itemId}
 (function() {
-  if (!app.maskSystem) {
+  if (!app.applyAnimatedMask) {
     return { success: false, error: 'Mask system not available' };
   }
+  const item = app.getItemById('${validated.itemId}');
+  if (!item) return { success: false, error: 'Item not found: ${validated.itemId}' };
 
   try {
-    const result = app.maskSystem.applyAnimatedMask('${validated.itemId}', {
-      preset: ${validated.preset ? `'${validated.preset}'` : 'null'},
-      maskType: ${validated.maskType ? `'${validated.maskType}'` : 'null'},
-      keyframes: ${keyframesStr},
-      options: ${optionsStr},
-      maskOptions: ${maskOptionsStr}
-    });
-    return result;
+    const mergedOpts = Object.assign({}, ${optionsStr}, ${maskOptionsStr});
+    let maskedGroup;
+    if (${keyframesStr} && app.maskingSystem && app.maskingSystem.applyCustomMask) {
+      maskedGroup = app.maskingSystem.applyCustomMask(item, '${preset}', ${keyframesStr}, mergedOpts);
+    } else {
+      maskedGroup = app.applyAnimatedMask(item, '${preset}', mergedOpts);
+    }
+    return { success: !!maskedGroup, itemId: '${validated.itemId}', preset: '${preset}' };
   } catch (error) {
     return { success: false, error: error.message };
   }
@@ -3475,17 +3155,15 @@ app.historyManager.saveState();
         return `
 // Apply custom mask to ${validated.itemId}
 (function() {
-  if (!app.maskSystem) {
+  if (!app.maskingSystem || !app.maskingSystem.applyCustomMask) {
     return { success: false, error: 'Mask system not available' };
   }
+  const item = app.getItemById('${validated.itemId}');
+  if (!item) return { success: false, error: 'Item not found: ${validated.itemId}' };
 
   try {
-    const result = app.maskSystem.applyCustomMask('${validated.itemId}', {
-      maskType: '${validated.maskType}',
-      keyframes: ${keyframesStr},
-      maskOptions: ${maskOptionsStr}
-    });
-    return result;
+    const maskedGroup = app.maskingSystem.applyCustomMask(item, '${validated.maskType}', ${keyframesStr}, ${maskOptionsStr});
+    return { success: !!maskedGroup, itemId: '${validated.itemId}', maskType: '${validated.maskType}' };
   } catch (error) {
     return { success: false, error: error.message };
   }
@@ -3497,12 +3175,17 @@ app.historyManager.saveState();
         return `
 // Remove mask from ${validated.itemId}
 (function() {
-  if (!app.maskSystem) {
+  if (!app.removeMask) {
     return { success: false, error: 'Mask system not available' };
   }
+  // The item id may point at either the masked group OR the original item;
+  // app.removeMask expects the masked group, so resolve and walk up if needed.
+  const item = app.getItemById('${validated.itemId}');
+  if (!item) return { success: false, error: 'Item not found: ${validated.itemId}' };
+  const maskedGroup = (item.data && item.data.isMaskedGroup) ? item : (item.parent && item.parent.data && item.parent.data.isMaskedGroup ? item.parent : item);
 
   try {
-    const result = app.maskSystem.removeMask('${validated.itemId}');
+    app.removeMask(maskedGroup);
     return { success: true, itemId: '${validated.itemId}', message: 'Mask removed' };
   } catch (error) {
     return { success: false, error: error.message };
@@ -3596,10 +3279,12 @@ app.historyManager.saveState();
 })();
 `.trim();
     }
+    // =============================================================================
+    // TEMPLATE
+    // =============================================================================
     generateApplyTemplate(input) {
         const { templateId, category, listOnly } = input;
         if (listOnly || !templateId) {
-            // List mode: return available templates, optionally filtered by category
             const categoryFilter = category ? `'${category}'` : 'null';
             return `
 // List available templates
@@ -3625,7 +3310,6 @@ app.historyManager.saveState();
 })();
 `.trim();
         }
-        // Load mode: apply a specific template
         return `
 // Apply template: ${templateId}
 (async function() {
@@ -3901,7 +3585,7 @@ ${mask ? `    app.imageTools.applyMask(raster, '${mask}');\n` : ''}    const ite
 // Select all items
 (function() {
   app.selectAll();
-  const items = app.getSelection().map(i => i.data?.itemId || i.name || i.id);
+  const items = app.getSelectedItems().map(i => i.data?.itemId || i.name || i.id);
   return { success: true, action: 'select_all', count: items.length, items };
 })();`.trim();
             case 'deselect_all':
@@ -3915,7 +3599,7 @@ ${mask ? `    app.imageTools.applyMask(raster, '${mask}');\n` : ''}    const ite
                 return `
 // Get current selection
 (function() {
-  const items = app.getSelection().map(i => ({
+  const items = app.getSelectedItems().map(i => ({
     itemId: i.data?.itemId || i.name || i.id,
     type: i.data?.itemType || i.className,
     bounds: i.bounds ? { x: i.bounds.x, y: i.bounds.y, width: i.bounds.width, height: i.bounds.height } : null
@@ -3926,7 +3610,7 @@ ${mask ? `    app.imageTools.applyMask(raster, '${mask}');\n` : ''}    const ite
                 return `
 // Delete selected items
 (function() {
-  const selection = app.getSelection();
+  const selection = app.getSelectedItems();
   const deleted = selection.map(i => i.data?.itemId || i.name || i.id);
   app.deleteSelected();
   return { success: true, action: 'delete_selected', deleted, count: deleted.length };
@@ -4160,29 +3844,6 @@ ${mask ? `    app.imageTools.applyMask(raster, '${mask}');\n` : ''}    const ite
                 return `(function() { return { error: 'Unknown precomp action: ${input.action}' }; })();`;
         }
     }
-    generateView(input) {
-        switch (input.action) {
-            case 'fit': {
-                const mode = input.mode || 'content';
-                const padding = input.padding ?? 20;
-                return `
-// Fit view to ${mode}
-(function() {
-  app.fitView('${mode}', ${padding});
-  return { success: true, action: 'fit', mode: '${mode}', padding: ${padding} };
-})();`.trim();
-            }
-            case 'get_state':
-                return `
-// Get current view state
-(function() {
-  const state = app.getViewState();
-  return { success: true, action: 'get_state', ...state };
-})();`.trim();
-            default:
-                return `(function() { return { error: 'Unknown view action: ${input.action}' }; })();`;
-        }
-    }
     generateBackground(input) {
         switch (input.action) {
             case 'set': {
@@ -4226,8 +3887,9 @@ ${mask ? `    app.imageTools.applyMask(raster, '${mask}');\n` : ''}    const ite
                 return `
 // Get background info
 (function() {
-  const bg = app.getBackground();
-  return { success: true, action: 'get', ...bg };
+  // FxTool exposes getBackgroundMode() returning the mode string only.
+  const mode = app.getBackgroundMode ? app.getBackgroundMode() : null;
+  return { success: true, action: 'get', mode };
 })();`.trim();
             default:
                 return `(function() { return { error: 'Unknown background action: ${input.action}' }; })();`;
@@ -4435,61 +4097,6 @@ ${mask ? `    app.imageTools.applyMask(raster, '${mask}');\n` : ''}    const ite
         }
     }
     // ===========================================================================
-    // STORAGE
-    // ===========================================================================
-    generateStorage(input) {
-        const guard = `if (!app.storageManager) return { error: 'StorageManager not available' };`;
-        switch (input.action) {
-            case 'save': {
-                const name = input.name ? JSON.stringify(input.name) : "'Untitled Project'";
-                const thumbnailCode = input.thumbnail
-                    ? `const thumbnail = app.exportThumbnail ? app.exportThumbnail() : null;\n  if (thumbnail) project.thumbnail = thumbnail;`
-                    : '';
-                return `
-// Save project
-(async function() {
-  ${guard}
-  const project = { name: ${name}, data: app.serialize() };
-  ${thumbnailCode}
-  const projectId = await app.storageManager.saveProject(project);
-  return { success: true, action: 'save', projectId, name: ${name} };
-})();`.trim();
-            }
-            case 'load': {
-                const projId = JSON.stringify(input.projectId || '');
-                return `
-// Load project
-(async function() {
-  ${guard}
-  const project = await app.storageManager.loadProject(${projId});
-  if (!project) return { error: 'Project not found: ' + ${projId} };
-  app.deserialize(project.data);
-  return { success: true, action: 'load', projectId: ${projId}, name: project.name };
-})();`.trim();
-            }
-            case 'list':
-                return `
-// List saved projects
-(async function() {
-  ${guard}
-  const projects = await app.storageManager.listProjects();
-  return { success: true, action: 'list', projects: projects.map(p => ({ id: p.id, name: p.name, updatedAt: p.updatedAt })), count: projects.length };
-})();`.trim();
-            case 'delete': {
-                const projId = JSON.stringify(input.projectId || '');
-                return `
-// Delete project
-(async function() {
-  ${guard}
-  await app.storageManager.deleteProject(${projId});
-  return { success: true, action: 'delete', projectId: ${projId} };
-})();`.trim();
-            }
-            default:
-                return `(function() { return { error: 'Unknown storage action: ${input.action}' }; })();`;
-        }
-    }
-    // ===========================================================================
     // INTERACTION
     // ===========================================================================
     generateInteraction(input) {
@@ -4559,8 +4166,8 @@ ${mask ? `    app.imageTools.applyMask(raster, '${mask}');\n` : ''}    const ite
         return `
 // Export widget (pp:PinePaper ontology JSON)
 (async function() {
-  if (!app.exportWidget) return { error: 'Widget export not available' };
-  const result = await app.exportWidget(${JSON.stringify(opts)});
+  if (!app.exportEngine || !app.exportEngine.exportWidget) return { error: 'Widget export not available' };
+  const result = await app.exportEngine.exportWidget(${JSON.stringify(opts)});
   return { success: true, json: result.json, filename: result.filename, embedCode: result.embedCode, metadata: result.data?.metadata };
 })();`.trim();
     }
@@ -4573,8 +4180,8 @@ ${mask ? `    app.imageTools.applyMask(raster, '${mask}');\n` : ''}    const ite
         return `
 // Export widget as self-contained HTML
 (async function() {
-  if (!app.exportWidgetHTML) return { error: 'Widget HTML export not available' };
-  const result = await app.exportWidgetHTML(${JSON.stringify(opts)});
+  if (!app.exportEngine || !app.exportEngine.exportWidgetHTML) return { error: 'Widget HTML export not available' };
+  const result = await app.exportEngine.exportWidgetHTML(${JSON.stringify(opts)});
   return { success: true, html: result.html, estimatedSize: result.estimatedSize, analysis: { itemTypes: [...result.analysis.itemTypes], relationTypes: [...result.analysis.relationTypes], hasSimpleAnimations: result.analysis.hasSimpleAnimations, hasKeyframeAnimations: result.analysis.hasKeyframeAnimations, hasMasks: result.analysis.hasMasks } };
 })();`.trim();
     }