Add shape path, mask, render queue and 3D tools; fix broken and data-losing tools

package.json

@@ -26,7 +26,7 @@
   "author": "",
   "license": "MIT",
   "dependencies": {
-    "@modelcontextprotocol/sdk": "^1.0.0",
+    "@modelcontextprotocol/sdk": "^1.32.1",
     "winston": "^3.11.0",
     "zod": "^3.22.4"
   },

src/ae-integration/generators/assetGenerators.ts

@@ -57,12 +57,13 @@ export function generateImportFolder(params: {
   script += 'var rootFolder = app.project.items.addFolder(folder.name);\n';
   script += 'importFilesFromFolder(folder, rootFolder);\n';
 
-  script += '{\n';
+  script += 'var result = ({\n';
   script += '  folderId: rootFolder.id,\n';
   script += '  folderName: rootFolder.name,\n';
   script += '  importedCount: importedItems.length,\n';
   script += '  items: importedItems\n';
-  script += '};\n';
+  script += '});\n';
+  script += 'result;\n';
 
   return wrapInUndoGroup(script, 'Import Folder');
 }
@@ -271,11 +272,12 @@ export function generateCollectFiles(params: {
   script += 'var projectFile = new File(outputFolder.fsName + "/" + (app.project.file ? app.project.file.name : "collected_project.aep"));\n';
   script += 'app.project.save(projectFile);\n';
 
-  script += '{\n';
+  script += 'var result = ({\n';
   script += '  outputPath: outputFolder.fsName,\n';
   script += '  collectedCount: collectedFiles.length,\n';
   script += '  files: collectedFiles\n';
-  script += '};\n';
+  script += '});\n';
+  script += 'result;\n';
 
   return wrapInUndoGroup(script, 'Collect Files');
 }

src/ae-integration/generators/compositionGenerators.ts

@@ -293,15 +293,37 @@ export function generateRenderFrame(params: {
   script += 'if (!comp.saveFrameToPng) {\n';
   script += '  throw new Error("saveFrameToPng is not available in this After Effects version");\n';
   script += '}\n';
+  // Remove any previous render first. Otherwise an old file satisfies the
+  // existence check below even when nothing new was written.
+  script += 'if (outFile.exists && !outFile.remove()) {\n';
+  script += '  throw new Error("Cannot remove the previous frame render: " + outFile.fsName);\n';
+  script += '}\n';
   script += 'comp.saveFrameToPng(t, outFile);\n';
+  // saveFrameToPng returns BEFORE the file is on disk (measured on AE 26.5: it
+  // appears ~50 ms later). Checking immediately reported every render as a
+  // failure. Wait for the file to appear, then for its size to stop changing,
+  // as a best-effort check for an incomplete write.
+  script += 'var waitedMs = 0;\n';
+  script += 'while (!outFile.exists && waitedMs < 15000) { $.sleep(50); waitedMs += 50; }\n';
   script += 'if (!outFile.exists) {\n';
-  script += '  throw new Error("Frame render did not produce a file: " + outFile.fsName);\n';
+  script += '  throw new Error("Frame render did not produce a file within 15s: " + outFile.fsName);\n';
+  script += '}\n';
+  script += 'var lastSize = -1, stableChecks = 0;\n';
+  script += 'while (stableChecks < 3 && waitedMs < 15000) {\n';
+  script += '  $.sleep(50); waitedMs += 50;\n';
+  script += '  if (outFile.length > 0 && outFile.length === lastSize) { stableChecks++; } else { stableChecks = 0; }\n';
+  script += '  lastSize = outFile.length;\n';
+  script += '}\n';
+  script += 'if (stableChecks < 3 || !outFile.exists || outFile.length <= 0) {\n';
+  script += '  throw new Error("Frame render did not finish writing within 15s: " + outFile.fsName);\n';
   script += '}\n';
 
   script += generateResultObject({
     success: 'true',
     time: 't',
-    path: 'outFile.fsName'
+    path: 'outFile.fsName',
+    bytes: 'outFile.length',
+    waitedMs: 'waitedMs'
   });
 
   return script;

src/ae-integration/generators/effectsGenerators.ts

@@ -450,16 +450,21 @@ export function generateReorderEffects(params: {
   script += generateCompAccess(params.compId, params.compName);
   script += generateLayerAccess('comp', params.layerIndex, params.layerName);
 
-  script += 'var effects = layer.property("Effects");\n';
-  script += 'var effect = effects(' + params.effectIndex + ');\n';
-  script += 'if (!effect) {\n';
-  script += '  throw new Error("Effect not found at index: ' + params.effectIndex + '");\n';
+  script += 'var effects = layer.property("ADBE Effect Parade");\n';
+  script += 'if (' + params.effectIndex + ' < 1 || ' + params.effectIndex + ' > effects.numProperties) {\n';
+  script += '  throw new Error("Effect index ' + params.effectIndex + ' out of range; layer has " + effects.numProperties + " effect(s)");\n';
+  script += '}\n';
+  script += 'if (' + params.newIndex + ' < 1 || ' + params.newIndex + ' > effects.numProperties) {\n';
+  script += '  throw new Error("New index ' + params.newIndex + ' out of range; layer has " + effects.numProperties + " effect(s)");\n';
   script += '}\n';
+  script += 'var effect = effects.property(' + params.effectIndex + ');\n';
 
+  // moveTo() invalidates this reference, so read the name first.
+  script += 'var movedEffectName = effect.name;\n';
   script += 'effect.moveTo(' + params.newIndex + ');\n';
 
   script += generateResultObject({
-    effectName: 'effect.name',
+    effectName: 'movedEffectName',
     newIndex: String(params.newIndex)
   });
 
@@ -523,10 +528,11 @@ export function generateCopyEffects(params: {
   script += '  }\n';
   script += '}\n';
 
-  script += '{\n';
+  script += 'var result = ({\n';
   script += '  copiedEffects: copiedEffects,\n';
   script += '  count: copiedEffects.length\n';
-  script += '};\n';
+  script += '});\n';
+  script += 'result;\n';
 
   return wrapInUndoGroup(script, 'Copy Effects');
 }