editmamei 0.23.0 → 1.0.0

package/dist/tools/document-tools.js

@@ -1,6 +1,10 @@
 import { runScript } from '../utils/run-script.js';
 import { validateArgs } from '../utils/validate.js';
 import { OPEN_DOCUMENT_TIMEOUT_MS, OPEN_DOCUMENT_REPROBE_TIMEOUT_MS, } from '../utils/operation-timeouts.js';
+import { toolErrorResult, runSnippetTool } from '../utils/tool-helpers.js';
+import { purgeSceneChannels } from '../perception/region-precompute.js';
+import { Logger } from '../utils/logger.js';
+const logger = new Logger('document-tools');
 const createDocumentSchema = {
     type: 'object',
     properties: {
@@ -69,6 +73,11 @@ const savePsdSchema = {
             description: 'Include flattened composite for compatibility with other apps. Default true.',
             default: true,
         },
+        keep_scene_channels: {
+            type: 'boolean',
+            description: "Keep the managed scene:* alpha channels ps_read_scene precomputes. Default false — they are DERIVED masks (rebuilt by the next scene read) and each is a full-resolution channel, so baking them into the .psd bloats it badly (~51MB per channel on a 51MP document). Set true only if you want the saved file to carry the masks. The result reports scene_channels_purged either way, so it's never silent. NOTE: the `scene:` channel-name prefix is RESERVED — the purge matches on the prefix alone, so a hand-made channel named e.g. `scene:mine` is deleted along with the derived ones. Name your own channels anything else.",
+            default: false,
+        },
     },
     required: ['output_path'],
 };
@@ -196,7 +205,7 @@ export function createDocumentTools(connection, snippetClient) {
         {
             tool: {
                 name: 'ps_open_document',
-                description: 'Open a file from disk into Photoshop with all dialogs suppressed (uses last-used Camera Raw settings for raw/HEIC). Returns document name, dimensions, color mode, and whether the source was a raw format. Use this in the pipeline to load Inbox files for editing.',
+                description: 'Open a file from disk into Photoshop with all dialogs suppressed (uses last-used Camera Raw settings for raw/HEIC). Returns document name, dimensions, color mode, and whether the source was a raw format. Use this in the pipeline to load Inbox files for editing. If the file is ALREADY open, its existing document is activated rather than opened a second time — `already_open: true` says so, and any edits made to it are still there (Photoshop would otherwise open a duplicate with a fresh Background, which silently strands prior work).',
                 inputSchema: openDocumentSchema,
                 outputSchema: {
                     type: 'object',
@@ -209,6 +218,7 @@ export function createDocumentTools(connection, snippetClient) {
                         color_mode: { type: 'string' },
                         bits_per_channel: { type: 'number' },
                         is_raw_source: { type: 'boolean' },
+                        already_open: { type: 'boolean' },
                         file_path: { type: 'string' },
                         context: { type: 'object' },
                     },
@@ -298,50 +308,34 @@ async function exportImage(connection, snippetClient, rawArgs) {
     }
 }
 async function createDocument(connection, snippetClient, rawArgs) {
-    try {
-        const args = validateArgs(createDocumentSchema, rawArgs);
-        const width = args.width;
-        const height = args.height;
-        const resolution = args.resolution;
-        const colorMode = args.color_mode;
-        const colorModeMap = {
-            RGB: 'NewDocumentMode.RGB',
-            CMYK: 'NewDocumentMode.CMYK',
-            Grayscale: 'NewDocumentMode.GRAYSCALE',
-        };
-        const mappedMode = colorModeMap[colorMode];
-        if (!mappedMode) {
-            throw new Error(`colorModeMap missing entry for "${colorMode}" — schema enum and ` +
-                `internal mapping have drifted. Update src/tools/document-tools.ts.`);
-        }
-        const script = await snippetClient.build('newDocument', {
-            width,
-            height,
-            resolution,
-            colorMode: mappedMode,
-        });
-        const result = await runScript(connection, script);
-        return {
-            content: [
-                {
-                    type: 'text',
-                    text: `Document created: ${width}x${height}px at ${resolution}dpi (${colorMode})`,
-                },
-            ],
-            structuredContent: result,
-        };
-    }
-    catch (error) {
-        return {
-            content: [
-                {
-                    type: 'text',
-                    text: `Error creating document: ${error instanceof Error ? error.message : String(error)}`,
-                },
-            ],
-            isError: true,
-        };
-    }
+    return runSnippetTool({
+        connection,
+        snippetClient,
+        rawArgs,
+        schema: createDocumentSchema,
+        snippet: 'newDocument',
+        errorPrefix: 'Error creating document',
+        params: (args) => {
+            const colorMode = args.color_mode;
+            const colorModeMap = {
+                RGB: 'NewDocumentMode.RGB',
+                CMYK: 'NewDocumentMode.CMYK',
+                Grayscale: 'NewDocumentMode.GRAYSCALE',
+            };
+            const mappedMode = colorModeMap[colorMode];
+            if (!mappedMode) {
+                throw new Error(`colorModeMap missing entry for "${colorMode}" — schema enum and ` +
+                    `internal mapping have drifted. Update src/tools/document-tools.ts.`);
+            }
+            return {
+                width: args.width,
+                height: args.height,
+                resolution: args.resolution,
+                colorMode: mappedMode,
+            };
+        },
+        successText: (_result, args) => `Document created: ${args.width}x${args.height}px at ${args.resolution}dpi (${args.color_mode})`,
+    });
 }
 async function closeDocument(connection, snippetClient, rawArgs) {
     try {
@@ -365,15 +359,7 @@ async function closeDocument(connection, snippetClient, rawArgs) {
         };
     }
     catch (error) {
-        return {
-            content: [
-                {
-                    type: 'text',
-                    text: `Error closing document: ${error instanceof Error ? error.message : String(error)}`,
-                },
-            ],
-            isError: true,
-        };
+        return toolErrorResult('Error closing document', error);
     }
 }
 function isScriptTimeoutError(message) {
@@ -425,45 +411,44 @@ async function openDocumentPipeline(connection, snippetClient, rawArgs) {
                 };
             }
         }
-        return {
-            content: [
-                {
-                    type: 'text',
-                    text: `Error opening document: ${message}`,
-                },
-            ],
-            isError: true,
-        };
+        return toolErrorResult('Error opening document', error);
     }
 }
 async function savePsdPipeline(connection, snippetClient, rawArgs) {
+    let args;
     try {
-        const args = validateArgs(savePsdSchema, rawArgs);
-        const outputPath = args.output_path;
-        const maximizeCompat = args.maximize_compatibility;
-        const script = await snippetClient.build('savePsdAsCopy', { outputPath, maximizeCompat });
-        const result = await runScript(connection, script);
-        return {
-            content: [
-                {
-                    type: 'text',
-                    text: `PSD saved:\n${JSON.stringify(result, null, 2)}`,
-                },
-            ],
-            structuredContent: result,
-        };
+        args = validateArgs(savePsdSchema, rawArgs);
     }
     catch (error) {
-        return {
-            content: [
-                {
-                    type: 'text',
-                    text: `Error saving PSD: ${error instanceof Error ? error.message : String(error)}`,
-                },
-            ],
-            isError: true,
-        };
+        return toolErrorResult('Error saving PSD', error);
+    }
+    let purged = 0;
+    if (args.keep_scene_channels !== true) {
+        try {
+            purged = await purgeSceneChannels(connection);
+        }
+        catch (err) {
+            logger.debug(`save_psd: scene-channel purge failed, saving anyway — ` +
+                `${err instanceof Error ? err.message : String(err)}`);
+        }
+    }
+    const res = await runSnippetTool({
+        connection,
+        snippetClient,
+        rawArgs,
+        schema: savePsdSchema,
+        snippet: 'savePsdAsCopy',
+        errorPrefix: 'Error saving PSD',
+        params: (args) => ({
+            outputPath: args.output_path,
+            maximizeCompat: args.maximize_compatibility,
+        }),
+        successText: (result) => `PSD saved:\n${JSON.stringify(result, null, 2)}`,
+    });
+    if (!res.isError && typeof res.structuredContent === 'object' && res.structuredContent !== null) {
+        res.structuredContent.scene_channels_purged = purged;
     }
+    return res;
 }
 async function exportJpegPipeline(connection, snippetClient, rawArgs) {
     try {
@@ -491,48 +476,28 @@ async function exportJpegPipeline(connection, snippetClient, rawArgs) {
         };
     }
     catch (error) {
-        return {
-            content: [
-                {
-                    type: 'text',
-                    text: `Error exporting JPEG: ${error instanceof Error ? error.message : String(error)}`,
-                },
-            ],
-            isError: true,
-        };
+        return toolErrorResult('Error exporting JPEG', error);
     }
 }
 async function exportPngPipeline(connection, snippetClient, rawArgs) {
-    try {
-        const args = validateArgs(exportPngSchema, rawArgs);
-        const outputPath = args.output_path;
-        const transparentBg = args.transparent_background;
-        const longEdgePx = args.long_edge_px;
-        const compression = args.compression;
-        const params = { outputPath, transparentBg, compression };
-        if (longEdgePx !== undefined)
-            params.longEdgePx = longEdgePx;
-        const script = await snippetClient.build('exportPngPipeline', params);
-        const result = await runScript(connection, script);
-        return {
-            content: [
-                {
-                    type: 'text',
-                    text: `PNG exported:\n${JSON.stringify(result, null, 2)}`,
-                },
-            ],
-            structuredContent: result,
-        };
-    }
-    catch (error) {
-        return {
-            content: [
-                {
-                    type: 'text',
-                    text: `Error exporting PNG: ${error instanceof Error ? error.message : String(error)}`,
-                },
-            ],
-            isError: true,
-        };
-    }
+    return runSnippetTool({
+        connection,
+        snippetClient,
+        rawArgs,
+        schema: exportPngSchema,
+        snippet: 'exportPngPipeline',
+        errorPrefix: 'Error exporting PNG',
+        params: (args) => {
+            const longEdgePx = args.long_edge_px;
+            const params = {
+                outputPath: args.output_path,
+                transparentBg: args.transparent_background,
+                compression: args.compression,
+            };
+            if (longEdgePx !== undefined)
+                params.longEdgePx = longEdgePx;
+            return params;
+        },
+        successText: (result) => `PNG exported:\n${JSON.stringify(result, null, 2)}`,
+    });
 }