@pinepaper.studio/mcp-server 1.6.32 → 1.6.34

package/dist/tools/handlers.js

@@ -9,8 +9,9 @@ import { dropPrivateRelationParams, normalizeBatchOperationNames, renamedArgumen
 import { nestedIgnoredPaths } from './nested-ignored.js';
 import { CRAFT_FRAME_JS, generateDrawWeave, generateDrawKnots, generateDrawSashiko, generateDrawSubdivision, generateUiKit, uiKitCallProblems, } from './craft-tools.js';
 import { exportPerScene } from './scene-cache-export.js';
+import { boundedStructured, reportedIgnoredPaths } from './reply-fields.js';
 import { codeGenerator, generateQueryMutationsCode, SHEET_RUBRIC } from '../types/code-generator.js';
-import { expandBatchMacros, BatchMacroError } from './batch-macros.js';
+import { expandBatchMacros, BatchMacroError, batchPreflightView, withKeyColumns } from './batch-macros.js';
 import { CreateItemInputSchema, ModifyItemInputSchema, DeleteItemInputSchema, AddRelationInputSchema, RemoveRelationInputSchema, QueryRelationsInputSchema, AnimateItemInputSchema, ImportMotionCaptureInputSchema, KeyframeAnimateInputSchema, ExecuteGeneratorInputSchema, ApplyEffectInputSchema, GetItemsInputSchema, PlayTimelineInputSchema, SetBackgroundColorInputSchema, SetCanvasSizeInputSchema, ImportSVGInputSchema, ImportMermaidInputSchema, AddFilterInputSchema, CreateGlossySphereInputSchema, CreateDiagonalStripesInputSchema, BatchCreateInputSchema, BatchModifyInputSchema, CreateGridInputSchema, GeometryInputSchema, EquationPathInputSchema, EventInputSchema, ConstructionSequenceInputSchema, ValidateSceneInputSchema, CaptureFramesInputSchema, InstantiateOntologyInputSchema, LintSceneInputSchema, MediaInputSchema, TextStyleInputSchema, TextEffectInputSchema, DesignMediumInputSchema, RelightInputSchema, ChoreographInputSchema, EmitterInputSchema, MorphSequenceInputSchema, OriginalCharacterInputSchema, LookInputSchema, RenderHookInputSchema, ShaderGraphInputSchema, ShatterImageInputSchema, ImportLayeredCharacterInputSchema, CharacterInputSchema, GameInputSchema, World3DInputSchema, BrandKitInputSchema, ComponentInputSchema, ArtboardInputSchema, CommentInputSchema, ProvenanceInputSchema, SceneDiffInputSchema, AudioBeatsInputSchema, TemplateParamsInputSchema, RenderBatchInputSchema, AccessibilityCheckInputSchema, QueryMutationsInputSchema, ComposeInputSchema, CropImageInputSchema, PathOpInputSchema, MotionInputSchema, SoundInputSchema, InterchangeInputSchema, StickInputSchema, DesignSystemInputSchema, StoryInputSchema, ChromaKeyInputSchema, RiggingInputSchema, GroupInputSchema, CameraDirectorInputSchema, DetectObjectsInputSchema, ExtractObjectInputSchema, ArrangeInputSchema, CreateSceneInputSchema, GetPerformanceMetricsInputSchema, DiagnosticReportInputSchema, SearchAssetsInputSchema, ImportAssetInputSchema, P5DrawInputSchema, 
 // Diagram schemas
 CreateDiagramShapeInputSchema, ConnectInputSchema, ConnectPortsInputSchema, AddPortsInputSchema, AutoLayoutInputSchema, GetDiagramShapesInputSchema, UpdateConnectorInputSchema, RemoveConnectorInputSchema, DiagramModeInputSchema, 
@@ -161,11 +162,11 @@ function exportGovernorTimeoutMs() {
  * size cap. This reads the user's disk on their instruction, the same as the
  * export side writes to it, and neither should be a wildcard.
  */
-const IMAGE_EXTENSIONS = new Set(['.png', '.jpg', '.jpeg', '.gif', '.webp', '.svg', '.bmp', '.avif']);
+const IMAGE_EXTENSIONS = new Set(['.png', '.apng', '.jpg', '.jpeg', '.gif', '.webp', '.svg', '.bmp', '.avif']);
 const MAX_LOCAL_IMAGE_BYTES = 32 * 1024 * 1024;
 const IMAGE_MIME = {
     '.png': 'image/png', '.jpg': 'image/jpeg', '.jpeg': 'image/jpeg', '.gif': 'image/gif',
-    '.webp': 'image/webp', '.svg': 'image/svg+xml', '.bmp': 'image/bmp', '.avif': 'image/avif',
+    '.webp': 'image/webp', '.apng': 'image/apng', '.svg': 'image/svg+xml', '.bmp': 'image/bmp', '.avif': 'image/avif',
 };
 /**
  * THE PAGE CANNOT FETCH A THIRD-PARTY IMAGE. THIS PROCESS CAN.
@@ -421,6 +422,7 @@ async function saveAdExport(r, input, platform) {
     if (warnings.length && cleanResult.fidelity.note)
         delete cleanResult.fidelity.note;
     return {
+        structuredContent: boundedStructured(cleanResult),
         content: [{
                 type: 'text',
                 text: `Ad saved:\n\n${Object.entries(files).map(([k, v]) => `${k}: ${v}`).join('\n')}\nFormat: ${r.format}\nSize: ${r.adSize.width}x${r.adSize.height}, upload ${(uploadBytes / 1024).toFixed(1)} KB\n\nResult: ${JSON.stringify(cleanResult, null, 2)}`,
@@ -1909,22 +1911,60 @@ export function batchOpIgnoredPaths(args) {
     return out.slice(0, 50);
 }
 export const IGNORED_ARGUMENTS_META_KEY = 'pinepaper.studio/ignoredArguments';
-/** Adds fields to a reply whose first block is a JSON object; false when it is not one (or there is nothing to add). */
+/**
+ * Adds fields to a reply whose first block is a JSON object, and to its structuredContent when it already has one (a
+ * saved export: prose first, data beside it). False when neither took them (or nothing to add is true).
+ */
 function withReplyFields(result, fields) {
     if (!Object.keys(fields).length)
         return true;
+    const hadStructured = !!result.structuredContent;
+    if (result.structuredContent)
+        result.structuredContent = { ...result.structuredContent, ...fields };
     const first = result.content?.[0];
     if (first?.type !== 'text')
-        return false;
+        return hadStructured;
     try {
         const obj = JSON.parse(first.text);
         if (!obj || typeof obj !== 'object' || Array.isArray(obj))
-            return false;
+            return hadStructured;
         result.content = [{ ...first, text: JSON.stringify({ ...obj, ...fields }, null, 2) }, ...result.content.slice(1)];
         return true;
     }
     catch {
-        return false;
+        return hadStructured;
+    }
+}
+/** How many ops a written batch op becomes; a macro that does not expand is refused before anything runs. */
+function expandedOpCount(op) {
+    try {
+        return expandBatchMacros([op]).length;
+    }
+    catch {
+        return 1;
+    }
+}
+/**
+ * The tools that hand back something the studio rendered. Render behaviour follows the live studio, not this package,
+ * so a result is traced by the build that made it. agent_export's generated code says so itself; the rest are asked
+ * here, once, after the call.
+ */
+const RENDERING_TOOLS = new Set(['pinepaper_agent_export', 'pinepaper_capture_frames', 'pinepaper_export_scene', 'pinepaper_export_svg',
+    'pinepaper_export_training_data', 'pinepaper_export_widget', 'pinepaper_export_widget_html', 'pinepaper_render_batch', 'pinepaper_sprite_sheet']);
+async function renderingBuildField(toolName, args, result, options) {
+    if (!RENDERING_TOOLS.has(toolName) || args.estimateOnly === true || result.isError || !options.executeInBrowser || result.structuredContent?.studioBuild)
+        return {};
+    if ((options.executionMode ?? getExecutionMode()) === 'code')
+        return {};
+    const controller = (options.browserController ?? peekBrowserController());
+    if (!controller?.connected || typeof controller.executeCode !== 'function')
+        return {};
+    try {
+        const r = await controller.executeCode(`(function () { return typeof app !== 'undefined' && app.buildId ? app.buildId : null; })();`, false, { bypassGovernor: true });
+        return r?.success && typeof r.result === 'string' ? { studioBuild: r.result } : {};
+    }
+    catch {
+        return {}; // the export stands
     }
 }
 export async function handleToolCall(toolName, args, options = {}) {
@@ -1955,10 +1995,12 @@ export async function handleToolCall(toolName, args, options = {}) {
         }
     }
     const ignored = await ignoredArgumentsNoteFor(toolName, args);
-    if (ignored) {
+    if (ignored)
         result.content = [...(result.content ?? []), { type: 'text', text: ignored.note }];
-        result._meta = { ...(result._meta ?? {}), [IGNORED_ARGUMENTS_META_KEY]: ignored.ignored };
-    }
+    // What only the run can tell: an option or property the op's own warning named. Its sentence is already in the reply.
+    const ignoredPaths = [...new Set([...(ignored?.ignored ?? []), ...reportedIgnoredPaths(toolName, args, result, expandedOpCount)])];
+    if (ignoredPaths.length)
+        result._meta = { ...(result._meta ?? {}), [IGNORED_ARGUMENTS_META_KEY]: ignoredPaths };
     if (renamed.length)
         result._meta = { ...(result._meta ?? {}), [RENAMED_ARGUMENTS_META_KEY]: renamed };
     // IN THE REPLY'S OWN JSON. A client that has structuredContent reads that, and it is built from the first block
@@ -1966,7 +2008,8 @@ export async function handleToolCall(toolName, args, options = {}) {
     const folded = withReplyFields(result, {
         ...(renamed.length ? { translatedArguments: renamed } : {}),
         ...(dropped.length ? { droppedArguments: dropped } : {}),
-        ...(ignored ? { ignoredArguments: ignored.ignored } : {}),
+        ...(ignoredPaths.length ? { ignoredArguments: ignoredPaths } : {}),
+        ...await renderingBuildField(toolName, args, result, options),
     });
     if (!folded) {
         const lines = [...(renamed.length ? [renamedArgumentsNote(renamed)] : []), ...(dropped.length ? [`Not sent to the studio, as its private state: ${dropped.join(', ')}.`] : [])];
@@ -2910,6 +2953,15 @@ async function handleToolCallInner(toolName, args, options, tracker, baseTimerId
                 return executeOrGenerate(code, what, options, 'pinepaper_import_motion_capture');
             }
             case 'pinepaper_keyframe_animate': {
+                // keys: the same keyframes by column; the rest of this path never sees them.
+                try {
+                    args = withKeyColumns(args, 'pinepaper_keyframe_animate');
+                }
+                catch (e) {
+                    if (e instanceof BatchMacroError)
+                        return errorResult(ErrorCodes.VALIDATION_ERROR, e.message, {}, { toolName: 'pinepaper_keyframe_animate' });
+                    throw e;
+                }
                 const input = KeyframeAnimateInputSchema.parse(args);
                 const code = codeGenerator.generateKeyframeAnimate(input);
                 return executeOrGenerate(code, `Applies keyframe animation with ${input.keyframes.length} keyframes to ${input.itemId}`, options, 'pinepaper_keyframe_animate');
@@ -3924,12 +3976,13 @@ You can now start creating new items on a clean canvas.${sizeNote}`,
                 // Opt-out via skipValidation: true when the caller knows what they're
                 // doing (e.g. experimental vocabulary).
                 if (!input.skipValidation) {
-                    const ops = input.operations;
+                    // A create_many item gets the checks a create gets, reported at its own path.
+                    const { ops, paths } = batchPreflightView(input.operations);
                     // A relation registered with register_custom_relation this session is a valid relationType, as in add_relation.
                     const violations = validateBatchVocabulary(ops, { relationType: CUSTOM_RELATION_NAMES });
                     if (violations.length > 0) {
                         return errorResult(ErrorCodes.VALIDATION_ERROR, `Batch preflight rejected ${violations.length} operation${violations.length > 1 ? 's' : ''} with unknown vocabulary value${violations.length > 1 ? 's' : ''}. Fix the offending fields and retry, or pass skipValidation: true to bypass.`, violations.map((v) => ({
-                            path: `operations[${v.opIndex}].${v.field}`,
+                            path: `${paths[v.opIndex]}.${v.field}`,
                             opType: v.opType,
                             vocabulary: v.hint,
                         })));
@@ -3941,7 +3994,7 @@ You can now start creating new items on a clean canvas.${sizeNote}`,
                     const typos = detectBatchPropertyTypos(ops);
                     if (typos.length > 0) {
                         return errorResult(ErrorCodes.VALIDATION_ERROR, `Batch preflight detected ${typos.length} likely property-key typo${typos.length > 1 ? 's' : ''}. Each suggestion is a Levenshtein-≤2 match against the schema for that itemType — fix and retry, or pass skipValidation: true to bypass.`, typos.map((t) => ({
-                            path: `operations[${t.opIndex}].properties.${t.property}`,
+                            path: `${paths[t.opIndex]}.properties.${t.property}`,
                             opType: t.opType,
                             itemType: t.itemType,
                             received: t.property,
@@ -3969,7 +4022,7 @@ You can now start creating new items on a clean canvas.${sizeNote}`,
                 }
                 const code = codeGenerator.generateAgentBatchExecute(input);
                 const description = `Batch executed ${input.operations.length} operations${input.atomic !== false ? ' (atomic)' : ''}`
-                    + (expanded.length !== input.operations.length ? ` (${expanded.length} after expanding ring / grid / orbit / stagger)` : '');
+                    + (expanded.length !== input.operations.length ? ` (${expanded.length} after expanding ring / grid / orbit / stagger / create_many)` : '');
                 // Check for out-of-bounds items before execution
                 let boundsWarning = '';
                 const sizeOp = input.operations.find((op) => op.type === 'set_canvas_size');
@@ -4229,6 +4282,7 @@ You can now start creating new items on a clean canvas.${sizeNote}`,
                         const receipt = await exportFileReceiptOrReason(filePath, exportResult);
                         const cleanResult = { ...exportResult, data: undefined, filePath, fileSize, chunks, file: receipt };
                         return withEngineReport({
+                            structuredContent: boundedStructured(cleanResult),
                             content: [{
                                     type: 'text',
                                     text: `Export saved to file:\n\nFile: ${filePath}\nFormat: ${format}\nSize: ${(fileSize / 1024).toFixed(1)} KB\nPlatform: ${input.platform}\nPaged out of the studio's export store in ${chunks} chunk${chunks === 1 ? '' : 's'}\n${receiptErrorLine(receipt)}${'receiptError' in receipt ? '' : probeLines(receipt)}${lintLines(exportResult)}\nResult: ${JSON.stringify(cleanResult, null, 2)}`,
@@ -4265,7 +4319,7 @@ You can now start creating new items on a clean canvas.${sizeNote}`,
                     const { sccCues: _c, ...rest } = exportResult;
                     void _c;
                     const cleanResult = { ...rest, filePath, fileSize, frameRate: '29.97 drop-frame', fidelity: { warnings } };
-                    return withEngineReport({ content: [{ type: 'text', text: `Export saved to file:\n\nFile: ${filePath}\nFormat: scc (CEA-608, CC1, pop-on)\nSize: ${fileSize} bytes\n\nResult: ${JSON.stringify(cleanResult, null, 2)}` }, exportFileLink(filePath, fileSize)] }, exportBrowserResult.report);
+                    return withEngineReport({ structuredContent: boundedStructured(cleanResult), content: [{ type: 'text', text: `Export saved to file:\n\nFile: ${filePath}\nFormat: scc (CEA-608, CC1, pop-on)\nSize: ${fileSize} bytes\n\nResult: ${JSON.stringify(cleanResult, null, 2)}` }, exportFileLink(filePath, fileSize)] }, exportBrowserResult.report);
                 }
                 if ((format === 'html5-ad' || format === 'playable') && typeof exportResult?.adPage === 'string') {
                     try {
@@ -4295,6 +4349,7 @@ You can now start creating new items on a clean canvas.${sizeNote}`,
                         // it has to be said out loud here rather than left in the JSON.
                         const dropNote = exportResult.incomplete;
                         return withEngineReport({
+                            structuredContent: boundedStructured(cleanResult),
                             content: [{
                                     type: 'text',
                                     text: `Export saved to file:\n\nFile: ${filePath}\nFormat: ${format}\nSize: ${(fileSize / 1024).toFixed(1)} KB\nPlatform: ${input.platform}\n`