editmamei 0.22.4 → 0.24.1

package/dist/tools/filter-tools.js

@@ -2,11 +2,7 @@ import { runScript } from '../utils/run-script.js';
 import { validateArgs } from '../utils/validate.js';
 import { OnnxLandmarkDetectionClient } from '../detection/landmark-detection-client.js';
 import { resolveGatedPlacement, PLACEMENT_SCHEMA } from '../perception/grounding-locate.js';
-const APPLY_TO_ACTIVE_LAYER_PROP = {
-    type: 'boolean',
-    description: 'If false (default), the filter is applied to a duplicate of the active layer named "<FilterName> (<Original Name>)" — the original is preserved and the LLM can undo simply by deleting the copy. If true, the filter bakes directly into the active layer (the historical destructive behavior).',
-    default: false,
-};
+import { toolErrorResult, runSnippetTool, applyToActiveLayerProp } from '../utils/tool-helpers.js';
 const gaussianBlurSchema = {
     type: 'object',
     properties: {
@@ -16,7 +12,7 @@ const gaussianBlurSchema = {
             minimum: 0.1,
             maximum: 250,
         },
-        apply_to_active_layer: APPLY_TO_ACTIVE_LAYER_PROP,
+        apply_to_active_layer: applyToActiveLayerProp('the filter'),
     },
     required: ['radius'],
 };
@@ -42,7 +38,7 @@ const sharpenSchema = {
             maximum: 255,
             default: 0,
         },
-        apply_to_active_layer: APPLY_TO_ACTIVE_LAYER_PROP,
+        apply_to_active_layer: applyToActiveLayerProp('the filter'),
     },
     required: ['amount', 'radius'],
 };
@@ -66,7 +62,7 @@ const noiseSchema = {
             description: 'Apply monochromatic noise. Default: false.',
             default: false,
         },
-        apply_to_active_layer: APPLY_TO_ACTIVE_LAYER_PROP,
+        apply_to_active_layer: applyToActiveLayerProp('the filter'),
     },
     required: ['amount'],
 };
@@ -85,7 +81,7 @@ const motionBlurSchema = {
             minimum: 1,
             maximum: 999,
         },
-        apply_to_active_layer: APPLY_TO_ACTIVE_LAYER_PROP,
+        apply_to_active_layer: applyToActiveLayerProp('the filter'),
     },
     required: ['angle', 'radius'],
 };
@@ -169,7 +165,7 @@ const lensBlurSchema = {
             description: 'Invert the depth map. PS default false.',
             default: false,
         },
-        apply_to_active_layer: APPLY_TO_ACTIVE_LAYER_PROP,
+        apply_to_active_layer: applyToActiveLayerProp('the filter'),
     },
 };
 const smartSharpenSchema = {
@@ -251,7 +247,7 @@ const smartSharpenSchema = {
             maximum: 100,
             default: 30,
         },
-        apply_to_active_layer: APPLY_TO_ACTIVE_LAYER_PROP,
+        apply_to_active_layer: applyToActiveLayerProp('the filter'),
     },
 };
 const reduceNoiseSchema = {
@@ -337,7 +333,7 @@ const reduceNoiseSchema = {
             maximum: 100,
             default: 50,
         },
-        apply_to_active_layer: APPLY_TO_ACTIVE_LAYER_PROP,
+        apply_to_active_layer: applyToActiveLayerProp('the filter'),
     },
 };
 const highPassSchema = {
@@ -350,7 +346,7 @@ const highPassSchema = {
             maximum: 1000,
             default: 10,
         },
-        apply_to_active_layer: APPLY_TO_ACTIVE_LAYER_PROP,
+        apply_to_active_layer: applyToActiveLayerProp('the filter'),
     },
     required: ['radius'],
 };
@@ -394,7 +390,7 @@ const radialBlurSchema = {
             ...PLACEMENT_SCHEMA,
             description: 'Grounded alternative to center_x/center_y: NAME the blur center (a `placement` resolving to a POINT — an object centroid, an extremum, a grid intersection). The resolved document-pixel point is normalized to the 0-1 center for you and WINS over center_x/center_y. The blur runs ONLY if the objective gate PASSES.',
         },
-        apply_to_active_layer: APPLY_TO_ACTIVE_LAYER_PROP,
+        apply_to_active_layer: applyToActiveLayerProp('the filter'),
     },
 };
 const pixelateSchema = {
@@ -447,7 +443,7 @@ const pixelateSchema = {
             maximum: 300,
             default: 10,
         },
-        apply_to_active_layer: APPLY_TO_ACTIVE_LAYER_PROP,
+        apply_to_active_layer: applyToActiveLayerProp('the filter'),
     },
     required: ['mode'],
 };
@@ -559,7 +555,7 @@ const distortSchema = {
             minimum: 0,
             default: 12345,
         },
-        apply_to_active_layer: APPLY_TO_ACTIVE_LAYER_PROP,
+        apply_to_active_layer: applyToActiveLayerProp('the filter'),
     },
     required: ['mode'],
 };
@@ -631,7 +627,7 @@ const stylizeSchema = {
             maximum: 99,
             default: 10,
         },
-        apply_to_active_layer: APPLY_TO_ACTIVE_LAYER_PROP,
+        apply_to_active_layer: applyToActiveLayerProp('the filter'),
     },
     required: ['mode'],
 };
@@ -663,7 +659,7 @@ const renderSchema = {
             minimum: 0,
             default: 12345,
         },
-        apply_to_active_layer: APPLY_TO_ACTIVE_LAYER_PROP,
+        apply_to_active_layer: applyToActiveLayerProp('the filter'),
     },
     required: ['mode'],
 };
@@ -698,7 +694,7 @@ const otherSchema = {
             description: 'offset only: vertical shift in pixels (positive = down).',
             default: 0,
         },
-        apply_to_active_layer: APPLY_TO_ACTIVE_LAYER_PROP,
+        apply_to_active_layer: applyToActiveLayerProp('the filter'),
     },
     required: ['mode'],
 };
@@ -724,7 +720,7 @@ const denoiseSchema = {
             maximum: 255,
             default: 10,
         },
-        apply_to_active_layer: APPLY_TO_ACTIVE_LAYER_PROP,
+        apply_to_active_layer: applyToActiveLayerProp('the filter'),
     },
     required: ['mode'],
 };
@@ -750,7 +746,7 @@ const blurAdvSchema = {
             maximum: 255,
             default: 20,
         },
-        apply_to_active_layer: APPLY_TO_ACTIVE_LAYER_PROP,
+        apply_to_active_layer: applyToActiveLayerProp('the filter'),
     },
     required: ['mode'],
 };
@@ -804,7 +800,7 @@ const oilPaintSchema = {
             description: 'Whether the lighting/shine relief is applied.',
             default: true,
         },
-        apply_to_active_layer: APPLY_TO_ACTIVE_LAYER_PROP,
+        apply_to_active_layer: applyToActiveLayerProp('the filter'),
     },
 };
 const displaceSchema = {
@@ -840,7 +836,7 @@ const displaceSchema = {
             description: 'How to fill areas pushed outside the layer.',
             default: 'repeat_edge',
         },
-        apply_to_active_layer: APPLY_TO_ACTIVE_LAYER_PROP,
+        apply_to_active_layer: applyToActiveLayerProp('the filter'),
     },
     required: ['map_path'],
 };
@@ -923,7 +919,7 @@ const FILTER_INPUT_SCHEMA = {
             type: 'number',
             description: 'Angle in degrees. Used by motion_blur (−360–360) and distort/twirl (−999–999).',
         },
-        apply_to_active_layer: APPLY_TO_ACTIVE_LAYER_PROP,
+        apply_to_active_layer: applyToActiveLayerProp('the filter'),
     },
     required: ['type'],
 };
@@ -998,360 +994,221 @@ async function applyFilter(connection, snippetClient, detClient, rawArgs) {
     }
 }
 async function applyGaussianBlur(connection, snippetClient, rawArgs) {
-    try {
-        const args = validateArgs(gaussianBlurSchema, rawArgs);
-        const radius = args.radius;
-        const applyToActiveLayer = args.apply_to_active_layer ?? false;
-        const script = await snippetClient.build('applyGaussianBlur', { radius, applyToActiveLayer });
-        const result = await runScript(connection, script);
-        const r = result;
-        const target = r.target_was_copy
-            ? `new copy "${r.target_layer_name ?? '?'}"`
-            : 'active layer (in place)';
-        return {
-            content: [
-                {
-                    type: 'text',
-                    text: `Gaussian Blur radius ${radius}px applied to ${target}.`,
-                },
-            ],
-            structuredContent: result,
-        };
-    }
-    catch (error) {
-        return {
-            content: [
-                {
-                    type: 'text',
-                    text: `Error applying Gaussian Blur: ${error instanceof Error ? error.message : String(error)}`,
-                },
-            ],
-            isError: true,
-        };
-    }
+    return runSnippetTool({
+        connection,
+        snippetClient,
+        rawArgs,
+        schema: gaussianBlurSchema,
+        snippet: 'applyGaussianBlur',
+        errorPrefix: 'Error applying Gaussian Blur',
+        params: (args) => ({
+            radius: args.radius,
+            applyToActiveLayer: args.apply_to_active_layer ?? false,
+        }),
+        successText: (result, args) => {
+            const r = result;
+            const target = r.target_was_copy
+                ? `new copy "${r.target_layer_name ?? '?'}"`
+                : 'active layer (in place)';
+            return `Gaussian Blur radius ${args.radius}px applied to ${target}.`;
+        },
+    });
 }
 async function applySharpen(connection, snippetClient, rawArgs) {
-    try {
-        const args = validateArgs(sharpenSchema, rawArgs);
-        const amount = args.amount;
-        const radius = args.radius;
-        const threshold = args.threshold;
-        const applyToActiveLayer = args.apply_to_active_layer ?? false;
-        const script = await snippetClient.build('applyUnsharpMask', {
-            amount,
-            radius,
-            threshold,
-            applyToActiveLayer,
-        });
-        const result = await runScript(connection, script);
-        const r = result;
-        const target = r.target_was_copy
-            ? `new copy "${r.target_layer_name ?? '?'}"`
-            : 'active layer (in place)';
-        return {
-            content: [
-                {
-                    type: 'text',
-                    text: `Unsharp Mask (amount ${amount}%, radius ${radius}px, threshold ${threshold}) applied to ${target}.`,
-                },
-            ],
-            structuredContent: result,
-        };
-    }
-    catch (error) {
-        return {
-            content: [
-                {
-                    type: 'text',
-                    text: `Error applying sharpen: ${error instanceof Error ? error.message : String(error)}`,
-                },
-            ],
-            isError: true,
-        };
-    }
+    return runSnippetTool({
+        connection,
+        snippetClient,
+        rawArgs,
+        schema: sharpenSchema,
+        snippet: 'applyUnsharpMask',
+        errorPrefix: 'Error applying sharpen',
+        params: (args) => ({
+            amount: args.amount,
+            radius: args.radius,
+            threshold: args.threshold,
+            applyToActiveLayer: args.apply_to_active_layer ?? false,
+        }),
+        successText: (result, args) => {
+            const r = result;
+            const target = r.target_was_copy
+                ? `new copy "${r.target_layer_name ?? '?'}"`
+                : 'active layer (in place)';
+            return `Unsharp Mask (amount ${args.amount}%, radius ${args.radius}px, threshold ${args.threshold}) applied to ${target}.`;
+        },
+    });
 }
 async function applyNoise(connection, snippetClient, rawArgs) {
-    try {
-        const args = validateArgs(noiseSchema, rawArgs);
-        const amount = args.amount;
-        const distribution = args.distribution;
-        const monochromatic = args.monochromatic;
-        const applyToActiveLayer = args.apply_to_active_layer ?? false;
-        const script = await snippetClient.build('applyAddNoise', {
-            amount,
-            distribution,
-            monochromatic,
-            applyToActiveLayer,
-        });
-        const result = await runScript(connection, script);
-        const r = result;
-        const target = r.target_was_copy
-            ? `new copy "${r.target_layer_name ?? '?'}"`
-            : 'active layer (in place)';
-        return {
-            content: [
-                {
-                    type: 'text',
-                    text: `Add Noise ${amount}% (${distribution}${monochromatic ? ', mono' : ''}) applied to ${target}.`,
-                },
-            ],
-            structuredContent: result,
-        };
-    }
-    catch (error) {
-        return {
-            content: [
-                {
-                    type: 'text',
-                    text: `Error applying noise: ${error instanceof Error ? error.message : String(error)}`,
-                },
-            ],
-            isError: true,
-        };
-    }
+    return runSnippetTool({
+        connection,
+        snippetClient,
+        rawArgs,
+        schema: noiseSchema,
+        snippet: 'applyAddNoise',
+        errorPrefix: 'Error applying noise',
+        params: (args) => ({
+            amount: args.amount,
+            distribution: args.distribution,
+            monochromatic: args.monochromatic,
+            applyToActiveLayer: args.apply_to_active_layer ?? false,
+        }),
+        successText: (result, args) => {
+            const r = result;
+            const target = r.target_was_copy
+                ? `new copy "${r.target_layer_name ?? '?'}"`
+                : 'active layer (in place)';
+            const amount = args.amount;
+            const distribution = args.distribution;
+            const monochromatic = args.monochromatic;
+            return `Add Noise ${amount}% (${distribution}${monochromatic ? ', mono' : ''}) applied to ${target}.`;
+        },
+    });
 }
 async function applyMotionBlur(connection, snippetClient, rawArgs) {
-    try {
-        const args = validateArgs(motionBlurSchema, rawArgs);
-        const angle = args.angle;
-        const radius = args.radius;
-        const applyToActiveLayer = args.apply_to_active_layer ?? false;
-        const script = await snippetClient.build('applyMotionBlur', {
-            angle,
-            radius,
-            applyToActiveLayer,
-        });
-        const result = await runScript(connection, script);
-        const r = result;
-        const target = r.target_was_copy
-            ? `new copy "${r.target_layer_name ?? '?'}"`
-            : 'active layer (in place)';
-        return {
-            content: [
-                {
-                    type: 'text',
-                    text: `Motion Blur (angle ${angle}°, radius ${radius}px) applied to ${target}.`,
-                },
-            ],
-            structuredContent: result,
-        };
-    }
-    catch (error) {
-        return {
-            content: [
-                {
-                    type: 'text',
-                    text: `Error applying motion blur: ${error instanceof Error ? error.message : String(error)}`,
-                },
-            ],
-            isError: true,
-        };
-    }
+    return runSnippetTool({
+        connection,
+        snippetClient,
+        rawArgs,
+        schema: motionBlurSchema,
+        snippet: 'applyMotionBlur',
+        errorPrefix: 'Error applying motion blur',
+        params: (args) => ({
+            angle: args.angle,
+            radius: args.radius,
+            applyToActiveLayer: args.apply_to_active_layer ?? false,
+        }),
+        successText: (result, args) => {
+            const r = result;
+            const target = r.target_was_copy
+                ? `new copy "${r.target_layer_name ?? '?'}"`
+                : 'active layer (in place)';
+            return `Motion Blur (angle ${args.angle}°, radius ${args.radius}px) applied to ${target}.`;
+        },
+    });
 }
 async function applyLensBlur(connection, snippetClient, rawArgs) {
-    try {
-        const args = validateArgs(lensBlurSchema, rawArgs);
-        const radius = args.radius ?? 15;
-        const irisShape = args.iris_shape ?? 'hexagon';
-        const irisBladeCurvature = args.iris_blade_curvature ?? 0;
-        const irisRotation = args.iris_rotation ?? 0;
-        const specularBrightness = args.specular_brightness ?? 0;
-        const specularThreshold = args.specular_threshold ?? 255;
-        const noiseAmount = args.noise_amount ?? 0;
-        const noiseDistribution = args.noise_distribution ?? 'uniform';
-        const noiseMonochromatic = args.noise_monochromatic ?? true;
-        const depthSource = args.depth_source ?? 'none';
-        const focalDistance = args.focal_distance ?? 0;
-        const invertDepth = args.invert_depth ?? false;
-        const applyToActiveLayer = args.apply_to_active_layer ?? false;
-        const script = await snippetClient.build('applyLensBlur', {
-            radius,
-            irisShape,
-            irisBladeCurvature,
-            irisRotation,
-            specularBrightness,
-            specularThreshold,
-            noiseAmount,
-            noiseDistribution,
-            noiseMonochromatic,
-            depthSource,
-            focalDistance,
-            invertDepth,
-            applyToActiveLayer,
-        });
-        const result = await runScript(connection, script);
-        const r = result;
-        const target = r.target_was_copy
-            ? `new copy "${r.target_layer_name ?? '?'}"`
-            : 'active layer (in place)';
-        return {
-            content: [
-                {
-                    type: 'text',
-                    text: `Lens Blur (radius ${radius}px, ${irisShape} iris${depthSource !== 'none' ? `, depth=${depthSource}` : ''}) applied to ${target}.`,
-                },
-            ],
-            structuredContent: result,
-        };
-    }
-    catch (error) {
-        return {
-            content: [
-                {
-                    type: 'text',
-                    text: `Error applying Lens Blur: ${error instanceof Error ? error.message : String(error)}`,
-                },
-            ],
-            isError: true,
-        };
-    }
+    return runSnippetTool({
+        connection,
+        snippetClient,
+        rawArgs,
+        schema: lensBlurSchema,
+        snippet: 'applyLensBlur',
+        errorPrefix: 'Error applying Lens Blur',
+        params: (args) => ({
+            radius: args.radius ?? 15,
+            irisShape: args.iris_shape ?? 'hexagon',
+            irisBladeCurvature: args.iris_blade_curvature ?? 0,
+            irisRotation: args.iris_rotation ?? 0,
+            specularBrightness: args.specular_brightness ?? 0,
+            specularThreshold: args.specular_threshold ?? 255,
+            noiseAmount: args.noise_amount ?? 0,
+            noiseDistribution: args.noise_distribution ?? 'uniform',
+            noiseMonochromatic: args.noise_monochromatic ?? true,
+            depthSource: args.depth_source ?? 'none',
+            focalDistance: args.focal_distance ?? 0,
+            invertDepth: args.invert_depth ?? false,
+            applyToActiveLayer: args.apply_to_active_layer ?? false,
+        }),
+        successText: (result, args) => {
+            const r = result;
+            const target = r.target_was_copy
+                ? `new copy "${r.target_layer_name ?? '?'}"`
+                : 'active layer (in place)';
+            const radius = args.radius ?? 15;
+            const irisShape = args.iris_shape ?? 'hexagon';
+            const depthSource = args.depth_source ?? 'none';
+            return `Lens Blur (radius ${radius}px, ${irisShape} iris${depthSource !== 'none' ? `, depth=${depthSource}` : ''}) applied to ${target}.`;
+        },
+    });
 }
 async function applySmartSharpen(connection, snippetClient, rawArgs) {
-    try {
-        const args = validateArgs(smartSharpenSchema, rawArgs);
-        const amount = args.amount ?? 100;
-        const radius = args.radius ?? 1.5;
-        const noiseReduction = args.noise_reduction ?? 10;
-        const removeMode = args.remove_mode ?? 'lensBlur';
-        const motionAngle = args.motion_angle ?? 0;
-        const shadowFade = args.shadow_fade ?? 0;
-        const shadowTonalWidth = args.shadow_tonal_width ?? 50;
-        const shadowRadius = args.shadow_radius ?? 30;
-        const highlightFade = args.highlight_fade ?? 0;
-        const highlightTonalWidth = args.highlight_tonal_width ?? 50;
-        const highlightRadius = args.highlight_radius ?? 30;
-        const applyToActiveLayer = args.apply_to_active_layer ?? false;
-        const script = await snippetClient.build('applySmartSharpen', {
-            amount,
-            radius,
-            noiseReduction,
-            removeMode,
-            motionAngle,
-            shadowFade,
-            shadowTonalWidth,
-            shadowRadius,
-            highlightFade,
-            highlightTonalWidth,
-            highlightRadius,
-            applyToActiveLayer,
-        });
-        const result = await runScript(connection, script);
-        const r = result;
-        const target = r.target_was_copy
-            ? `new copy "${r.target_layer_name ?? '?'}"`
-            : 'active layer (in place)';
-        return {
-            content: [
-                {
-                    type: 'text',
-                    text: `Smart Sharpen (amount ${amount}%, radius ${radius}px, remove ${removeMode}) applied to ${target}.`,
-                },
-            ],
-            structuredContent: result,
-        };
-    }
-    catch (error) {
-        return {
-            content: [
-                {
-                    type: 'text',
-                    text: `Error applying Smart Sharpen: ${error instanceof Error ? error.message : String(error)}`,
-                },
-            ],
-            isError: true,
-        };
-    }
+    return runSnippetTool({
+        connection,
+        snippetClient,
+        rawArgs,
+        schema: smartSharpenSchema,
+        snippet: 'applySmartSharpen',
+        errorPrefix: 'Error applying Smart Sharpen',
+        params: (args) => ({
+            amount: args.amount ?? 100,
+            radius: args.radius ?? 1.5,
+            noiseReduction: args.noise_reduction ?? 10,
+            removeMode: args.remove_mode ?? 'lensBlur',
+            motionAngle: args.motion_angle ?? 0,
+            shadowFade: args.shadow_fade ?? 0,
+            shadowTonalWidth: args.shadow_tonal_width ?? 50,
+            shadowRadius: args.shadow_radius ?? 30,
+            highlightFade: args.highlight_fade ?? 0,
+            highlightTonalWidth: args.highlight_tonal_width ?? 50,
+            highlightRadius: args.highlight_radius ?? 30,
+            applyToActiveLayer: args.apply_to_active_layer ?? false,
+        }),
+        successText: (result, args) => {
+            const r = result;
+            const target = r.target_was_copy
+                ? `new copy "${r.target_layer_name ?? '?'}"`
+                : 'active layer (in place)';
+            const amount = args.amount ?? 100;
+            const radius = args.radius ?? 1.5;
+            const removeMode = args.remove_mode ?? 'lensBlur';
+            return `Smart Sharpen (amount ${amount}%, radius ${radius}px, remove ${removeMode}) applied to ${target}.`;
+        },
+    });
 }
 async function applyReduceNoise(connection, snippetClient, rawArgs) {
-    try {
-        const args = validateArgs(reduceNoiseSchema, rawArgs);
-        const strength = args.strength ?? 5;
-        const preserveDetails = args.preserve_details ?? 50;
-        const colorNoise = args.color_noise ?? 45;
-        const sharpenDetails = args.sharpen_details ?? 25;
-        const removeJpegArtifact = args.remove_jpeg_artifact ?? false;
-        const perChannel = args.per_channel ?? false;
-        const redStrength = args.red_strength ?? 5;
-        const redPreserveDetails = args.red_preserve_details ?? 50;
-        const greenStrength = args.green_strength ?? 5;
-        const greenPreserveDetails = args.green_preserve_details ?? 50;
-        const blueStrength = args.blue_strength ?? 5;
-        const bluePreserveDetails = args.blue_preserve_details ?? 50;
-        const applyToActiveLayer = args.apply_to_active_layer ?? false;
-        const script = await snippetClient.build('applyReduceNoise', {
-            strength,
-            preserveDetails,
-            colorNoise,
-            sharpenDetails,
-            removeJpegArtifact,
-            perChannel,
-            redStrength,
-            redPreserveDetails,
-            greenStrength,
-            greenPreserveDetails,
-            blueStrength,
-            bluePreserveDetails,
-            applyToActiveLayer,
-        });
-        const result = await runScript(connection, script);
-        const r = result;
-        const target = r.target_was_copy
-            ? `new copy "${r.target_layer_name ?? '?'}"`
-            : 'active layer (in place)';
-        return {
-            content: [
-                {
-                    type: 'text',
-                    text: `Reduce Noise (strength ${strength}, color ${colorNoise}${perChannel ? ', per-channel' : ''}) applied to ${target}.`,
-                },
-            ],
-            structuredContent: result,
-        };
-    }
-    catch (error) {
-        return {
-            content: [
-                {
-                    type: 'text',
-                    text: `Error applying Reduce Noise: ${error instanceof Error ? error.message : String(error)}`,
-                },
-            ],
-            isError: true,
-        };
-    }
+    return runSnippetTool({
+        connection,
+        snippetClient,
+        rawArgs,
+        schema: reduceNoiseSchema,
+        snippet: 'applyReduceNoise',
+        errorPrefix: 'Error applying Reduce Noise',
+        params: (args) => ({
+            strength: args.strength ?? 5,
+            preserveDetails: args.preserve_details ?? 50,
+            colorNoise: args.color_noise ?? 45,
+            sharpenDetails: args.sharpen_details ?? 25,
+            removeJpegArtifact: args.remove_jpeg_artifact ?? false,
+            perChannel: args.per_channel ?? false,
+            redStrength: args.red_strength ?? 5,
+            redPreserveDetails: args.red_preserve_details ?? 50,
+            greenStrength: args.green_strength ?? 5,
+            greenPreserveDetails: args.green_preserve_details ?? 50,
+            blueStrength: args.blue_strength ?? 5,
+            bluePreserveDetails: args.blue_preserve_details ?? 50,
+            applyToActiveLayer: args.apply_to_active_layer ?? false,
+        }),
+        successText: (result, args) => {
+            const r = result;
+            const target = r.target_was_copy
+                ? `new copy "${r.target_layer_name ?? '?'}"`
+                : 'active layer (in place)';
+            const strength = args.strength ?? 5;
+            const colorNoise = args.color_noise ?? 45;
+            const perChannel = args.per_channel ?? false;
+            return `Reduce Noise (strength ${strength}, color ${colorNoise}${perChannel ? ', per-channel' : ''}) applied to ${target}.`;
+        },
+    });
 }
 async function applyHighPass(connection, snippetClient, rawArgs) {
-    try {
-        const args = validateArgs(highPassSchema, rawArgs);
-        const radius = args.radius;
-        const applyToActiveLayer = args.apply_to_active_layer ?? false;
-        const script = await snippetClient.build('applyHighPass', { radius, applyToActiveLayer });
-        const result = await runScript(connection, script);
-        const r = result;
-        const target = r.target_was_copy
-            ? `new copy "${r.target_layer_name ?? '?'}"`
-            : 'active layer (in place)';
-        return {
-            content: [
-                {
-                    type: 'text',
-                    text: `High Pass (radius ${radius}px) applied to ${target}.`,
-                },
-            ],
-            structuredContent: result,
-        };
-    }
-    catch (error) {
-        return {
-            content: [
-                {
-                    type: 'text',
-                    text: `Error applying High Pass: ${error instanceof Error ? error.message : String(error)}`,
-                },
-            ],
-            isError: true,
-        };
-    }
+    return runSnippetTool({
+        connection,
+        snippetClient,
+        rawArgs,
+        schema: highPassSchema,
+        snippet: 'applyHighPass',
+        errorPrefix: 'Error applying High Pass',
+        params: (args) => ({
+            radius: args.radius,
+            applyToActiveLayer: args.apply_to_active_layer ?? false,
+        }),
+        successText: (result, args) => {
+            const r = result;
+            const target = r.target_was_copy
+                ? `new copy "${r.target_layer_name ?? '?'}"`
+                : 'active layer (in place)';
+            return `High Pass (radius ${args.radius}px) applied to ${target}.`;
+        },
+    });
 }
 async function applyRadialBlur(connection, snippetClient, detClient, rawArgs) {
     try {
@@ -1407,330 +1264,265 @@ async function applyRadialBlur(connection, snippetClient, detClient, rawArgs) {
         };
     }
     catch (error) {
-        return {
-            content: [
-                {
-                    type: 'text',
-                    text: `Error applying Radial Blur: ${error instanceof Error ? error.message : String(error)}`,
-                },
-            ],
-            isError: true,
-        };
+        return toolErrorResult('Error applying Radial Blur', error);
     }
 }
 async function applyPixelate(connection, snippetClient, rawArgs) {
-    try {
-        const args = validateArgs(pixelateSchema, rawArgs);
-        const mode = args.mode;
-        const applyToActiveLayer = args.apply_to_active_layer ?? false;
-        const params = { mode, applyToActiveLayer };
-        if (mode === 'mosaic' || mode === 'crystallize' || mode === 'pointillize') {
-            params.cellSize = args.cell_size ?? 10;
-        }
-        else if (mode === 'color_halftone') {
-            params.maxRadius = args.max_radius ?? 8;
-            params.angle1 = args.angle_1 ?? 108;
-            params.angle2 = args.angle_2 ?? 162;
-            params.angle3 = args.angle_3 ?? 90;
-            params.angle4 = args.angle_4 ?? 45;
-        }
-        const script = await snippetClient.build('applyPixelate', params);
-        const result = await runScript(connection, script);
-        const r = result;
-        const target = r.target_was_copy
-            ? `new copy "${r.target_layer_name ?? '?'}"`
-            : 'active layer (in place)';
-        return {
-            content: [
-                {
-                    type: 'text',
-                    text: `Pixelate (${mode}) applied to ${target}.`,
-                },
-            ],
-            structuredContent: result,
-        };
-    }
-    catch (error) {
-        return {
-            content: [
-                {
-                    type: 'text',
-                    text: `Error applying Pixelate: ${error instanceof Error ? error.message : String(error)}`,
-                },
-            ],
-            isError: true,
-        };
-    }
+    return runSnippetTool({
+        connection,
+        snippetClient,
+        rawArgs,
+        schema: pixelateSchema,
+        snippet: 'applyPixelate',
+        errorPrefix: 'Error applying Pixelate',
+        params: (args) => {
+            const mode = args.mode;
+            const applyToActiveLayer = args.apply_to_active_layer ?? false;
+            const params = { mode, applyToActiveLayer };
+            if (mode === 'mosaic' || mode === 'crystallize' || mode === 'pointillize') {
+                params.cellSize = args.cell_size ?? 10;
+            }
+            else if (mode === 'color_halftone') {
+                params.maxRadius = args.max_radius ?? 8;
+                params.angle1 = args.angle_1 ?? 108;
+                params.angle2 = args.angle_2 ?? 162;
+                params.angle3 = args.angle_3 ?? 90;
+                params.angle4 = args.angle_4 ?? 45;
+            }
+            return params;
+        },
+        successText: (result, args) => {
+            const r = result;
+            const target = r.target_was_copy
+                ? `new copy "${r.target_layer_name ?? '?'}"`
+                : 'active layer (in place)';
+            return `Pixelate (${args.mode}) applied to ${target}.`;
+        },
+    });
 }
 async function applyDistort(connection, snippetClient, rawArgs) {
-    try {
-        const args = validateArgs(distortSchema, rawArgs);
-        const mode = args.mode;
-        const applyToActiveLayer = args.apply_to_active_layer ?? false;
-        const params = { mode, applyToActiveLayer };
-        if (mode === 'twirl') {
-            params.angle = args.angle ?? 90;
-        }
-        else if (mode === 'pinch') {
-            params.amount = args.amount ?? 50;
-        }
-        else if (mode === 'spherize') {
-            params.amount = args.amount ?? 100;
-        }
-        else if (mode === 'zigzag') {
-            params.amount = args.amount ?? 10;
-            params.ridges = args.ridges ?? 5;
-        }
-        else if (mode === 'ripple') {
-            params.amount = args.amount ?? 100;
-            params.size = args.size ?? 'medium';
-        }
-        else if (mode === 'polar') {
-            params.conversion = args.conversion ?? 'rect_to_polar';
-        }
-        else if (mode === 'wave') {
-            params.waveType = args.wave_type ?? 'sine';
-            params.generators = args.generators ?? 5;
-            params.wavelengthMin = args.wavelength_min ?? 10;
-            params.wavelengthMax = args.wavelength_max ?? 120;
-            params.amplitudeMin = args.amplitude_min ?? 5;
-            params.amplitudeMax = args.amplitude_max ?? 35;
-            params.scaleHorizontal = args.scale_horizontal ?? 100;
-            params.scaleVertical = args.scale_vertical ?? 100;
-            params.undefinedAreas = args.undefined_areas ?? 'repeat_edge';
-            params.randomSeed = args.random_seed ?? 12345;
-        }
-        const script = await snippetClient.build('applyDistort', params);
-        const result = await runScript(connection, script);
-        const r = result;
-        const target = r.target_was_copy
-            ? `new copy "${r.target_layer_name ?? '?'}"`
-            : 'active layer (in place)';
-        return {
-            content: [
-                {
-                    type: 'text',
-                    text: `Distort (${mode}) applied to ${target}.`,
-                },
-            ],
-            structuredContent: result,
-        };
-    }
-    catch (error) {
-        return {
-            content: [
-                {
-                    type: 'text',
-                    text: `Error applying Distort: ${error instanceof Error ? error.message : String(error)}`,
-                },
-            ],
-            isError: true,
-        };
-    }
+    return runSnippetTool({
+        connection,
+        snippetClient,
+        rawArgs,
+        schema: distortSchema,
+        snippet: 'applyDistort',
+        errorPrefix: 'Error applying Distort',
+        params: (args) => {
+            const mode = args.mode;
+            const applyToActiveLayer = args.apply_to_active_layer ?? false;
+            const params = { mode, applyToActiveLayer };
+            if (mode === 'twirl') {
+                params.angle = args.angle ?? 90;
+            }
+            else if (mode === 'pinch') {
+                params.amount = args.amount ?? 50;
+            }
+            else if (mode === 'spherize') {
+                params.amount = args.amount ?? 100;
+            }
+            else if (mode === 'zigzag') {
+                params.amount = args.amount ?? 10;
+                params.ridges = args.ridges ?? 5;
+            }
+            else if (mode === 'ripple') {
+                params.amount = args.amount ?? 100;
+                params.size = args.size ?? 'medium';
+            }
+            else if (mode === 'polar') {
+                params.conversion = args.conversion ?? 'rect_to_polar';
+            }
+            else if (mode === 'wave') {
+                params.waveType = args.wave_type ?? 'sine';
+                params.generators = args.generators ?? 5;
+                params.wavelengthMin = args.wavelength_min ?? 10;
+                params.wavelengthMax = args.wavelength_max ?? 120;
+                params.amplitudeMin = args.amplitude_min ?? 5;
+                params.amplitudeMax = args.amplitude_max ?? 35;
+                params.scaleHorizontal = args.scale_horizontal ?? 100;
+                params.scaleVertical = args.scale_vertical ?? 100;
+                params.undefinedAreas = args.undefined_areas ?? 'repeat_edge';
+                params.randomSeed = args.random_seed ?? 12345;
+            }
+            return params;
+        },
+        successText: (result, args) => {
+            const r = result;
+            const target = r.target_was_copy
+                ? `new copy "${r.target_layer_name ?? '?'}"`
+                : 'active layer (in place)';
+            return `Distort (${args.mode}) applied to ${target}.`;
+        },
+    });
 }
 async function applyStylize(connection, snippetClient, rawArgs) {
-    try {
-        const args = validateArgs(stylizeSchema, rawArgs);
-        const mode = args.mode;
-        const applyToActiveLayer = args.apply_to_active_layer ?? false;
-        const params = { mode, applyToActiveLayer };
-        if (mode === 'emboss') {
-            params.angle = args.angle ?? 135;
-            params.height = args.height ?? 3;
-            params.amount = args.amount ?? 100;
-        }
-        else if (mode === 'wind') {
-            params.method = args.wind_method ?? 'wind';
-            params.direction = args.wind_direction ?? 'left';
-        }
-        else if (mode === 'trace_contour') {
-            params.level = args.level ?? 128;
-            params.edge = args.edge ?? 'lower';
-        }
-        else if (mode === 'tiles') {
-            params.number = args.number ?? 10;
-            params.offset = args.offset ?? 10;
-        }
-        const script = await snippetClient.build('applyStylize', params);
-        const result = await runScript(connection, script);
-        const r = result;
-        const target = r.target_was_copy
-            ? `new copy "${r.target_layer_name ?? '?'}"`
-            : 'active layer (in place)';
-        return {
-            content: [
-                {
-                    type: 'text',
-                    text: `Stylize (${mode}) applied to ${target}.`,
-                },
-            ],
-            structuredContent: result,
-        };
-    }
-    catch (error) {
-        return {
-            content: [
-                {
-                    type: 'text',
-                    text: `Error applying Stylize: ${error instanceof Error ? error.message : String(error)}`,
-                },
-            ],
-            isError: true,
-        };
-    }
+    return runSnippetTool({
+        connection,
+        snippetClient,
+        rawArgs,
+        schema: stylizeSchema,
+        snippet: 'applyStylize',
+        errorPrefix: 'Error applying Stylize',
+        params: (args) => {
+            const mode = args.mode;
+            const applyToActiveLayer = args.apply_to_active_layer ?? false;
+            const params = { mode, applyToActiveLayer };
+            if (mode === 'emboss') {
+                params.angle = args.angle ?? 135;
+                params.height = args.height ?? 3;
+                params.amount = args.amount ?? 100;
+            }
+            else if (mode === 'wind') {
+                params.method = args.wind_method ?? 'wind';
+                params.direction = args.wind_direction ?? 'left';
+            }
+            else if (mode === 'trace_contour') {
+                params.level = args.level ?? 128;
+                params.edge = args.edge ?? 'lower';
+            }
+            else if (mode === 'tiles') {
+                params.number = args.number ?? 10;
+                params.offset = args.offset ?? 10;
+            }
+            return params;
+        },
+        successText: (result, args) => {
+            const r = result;
+            const target = r.target_was_copy
+                ? `new copy "${r.target_layer_name ?? '?'}"`
+                : 'active layer (in place)';
+            return `Stylize (${args.mode}) applied to ${target}.`;
+        },
+    });
 }
 async function applyRender(connection, snippetClient, rawArgs) {
-    try {
-        const args = validateArgs(renderSchema, rawArgs);
-        const mode = args.mode;
-        const applyToActiveLayer = args.apply_to_active_layer ?? false;
-        const params = { mode, applyToActiveLayer };
-        if (mode === 'fibers') {
-            params.variance = args.variance ?? 16;
-            params.strength = args.fiber_strength ?? 4;
-            params.seed = args.seed ?? 12345;
-        }
-        const script = await snippetClient.build('applyRender', params);
-        const result = await runScript(connection, script);
-        const r = result;
-        const target = r.target_was_copy
-            ? `new copy "${r.target_layer_name ?? '?'}"`
-            : 'active layer (in place)';
-        return {
-            content: [
-                {
-                    type: 'text',
-                    text: `Render (${mode}) applied to ${target}.`,
-                },
-            ],
-            structuredContent: result,
-        };
-    }
-    catch (error) {
-        return {
-            content: [
-                {
-                    type: 'text',
-                    text: `Error applying Render: ${error instanceof Error ? error.message : String(error)}`,
-                },
-            ],
-            isError: true,
-        };
-    }
+    return runSnippetTool({
+        connection,
+        snippetClient,
+        rawArgs,
+        schema: renderSchema,
+        snippet: 'applyRender',
+        errorPrefix: 'Error applying Render',
+        params: (args) => {
+            const mode = args.mode;
+            const applyToActiveLayer = args.apply_to_active_layer ?? false;
+            const params = { mode, applyToActiveLayer };
+            if (mode === 'fibers') {
+                params.variance = args.variance ?? 16;
+                params.strength = args.fiber_strength ?? 4;
+                params.seed = args.seed ?? 12345;
+            }
+            return params;
+        },
+        successText: (result, args) => {
+            const r = result;
+            const target = r.target_was_copy
+                ? `new copy "${r.target_layer_name ?? '?'}"`
+                : 'active layer (in place)';
+            return `Render (${args.mode}) applied to ${target}.`;
+        },
+    });
 }
 async function applyOther(connection, snippetClient, rawArgs) {
-    try {
-        const args = validateArgs(otherSchema, rawArgs);
-        const mode = args.mode;
-        const applyToActiveLayer = args.apply_to_active_layer ?? false;
-        const params = { mode, applyToActiveLayer };
-        if (mode === 'maximum' || mode === 'minimum') {
-            params.radius = args.radius ?? 3;
-            params.preserve = args.preserve ?? 'roundness';
-        }
-        else if (mode === 'offset') {
-            params.horizontal = args.horizontal ?? 0;
-            params.vertical = args.vertical ?? 0;
-        }
-        const script = await snippetClient.build('applyOther', params);
-        const result = await runScript(connection, script);
-        const r = result;
-        const target = r.target_was_copy
-            ? `new copy "${r.target_layer_name ?? '?'}"`
-            : 'active layer (in place)';
-        return {
-            content: [{ type: 'text', text: `Other filter (${mode}) applied to ${target}.` }],
-            structuredContent: result,
-        };
-    }
-    catch (error) {
-        return {
-            content: [
-                {
-                    type: 'text',
-                    text: `Error applying filter: ${error instanceof Error ? error.message : String(error)}`,
-                },
-            ],
-            isError: true,
-        };
-    }
+    return runSnippetTool({
+        connection,
+        snippetClient,
+        rawArgs,
+        schema: otherSchema,
+        snippet: 'applyOther',
+        errorPrefix: 'Error applying filter',
+        params: (args) => {
+            const mode = args.mode;
+            const applyToActiveLayer = args.apply_to_active_layer ?? false;
+            const params = { mode, applyToActiveLayer };
+            if (mode === 'maximum' || mode === 'minimum') {
+                params.radius = args.radius ?? 3;
+                params.preserve = args.preserve ?? 'roundness';
+            }
+            else if (mode === 'offset') {
+                params.horizontal = args.horizontal ?? 0;
+                params.vertical = args.vertical ?? 0;
+            }
+            return params;
+        },
+        successText: (result, args) => {
+            const r = result;
+            const target = r.target_was_copy
+                ? `new copy "${r.target_layer_name ?? '?'}"`
+                : 'active layer (in place)';
+            return `Other filter (${args.mode}) applied to ${target}.`;
+        },
+    });
 }
 async function applyDenoise(connection, snippetClient, rawArgs) {
-    try {
-        const args = validateArgs(denoiseSchema, rawArgs);
-        const mode = args.mode;
-        const applyToActiveLayer = args.apply_to_active_layer ?? false;
-        const params = { mode, applyToActiveLayer };
-        if (mode === 'median') {
-            params.radius = args.radius ?? 4;
-        }
-        else if (mode === 'dust_and_scratches') {
-            params.radius = args.radius ?? 3;
-            params.threshold = args.threshold ?? 10;
-        }
-        const script = await snippetClient.build('applyDenoise', params);
-        const result = await runScript(connection, script);
-        const r = result;
-        const target = r.target_was_copy
-            ? `new copy "${r.target_layer_name ?? '?'}"`
-            : 'active layer (in place)';
-        return {
-            content: [{ type: 'text', text: `Noise reduction (${mode}) applied to ${target}.` }],
-            structuredContent: result,
-        };
-    }
-    catch (error) {
-        return {
-            content: [
-                {
-                    type: 'text',
-                    text: `Error applying noise reduction: ${error instanceof Error ? error.message : String(error)}`,
-                },
-            ],
-            isError: true,
-        };
-    }
+    return runSnippetTool({
+        connection,
+        snippetClient,
+        rawArgs,
+        schema: denoiseSchema,
+        snippet: 'applyDenoise',
+        errorPrefix: 'Error applying noise reduction',
+        params: (args) => {
+            const mode = args.mode;
+            const applyToActiveLayer = args.apply_to_active_layer ?? false;
+            const params = { mode, applyToActiveLayer };
+            if (mode === 'median') {
+                params.radius = args.radius ?? 4;
+            }
+            else if (mode === 'dust_and_scratches') {
+                params.radius = args.radius ?? 3;
+                params.threshold = args.threshold ?? 10;
+            }
+            return params;
+        },
+        successText: (result, args) => {
+            const r = result;
+            const target = r.target_was_copy
+                ? `new copy "${r.target_layer_name ?? '?'}"`
+                : 'active layer (in place)';
+            return `Noise reduction (${args.mode}) applied to ${target}.`;
+        },
+    });
 }
 async function applyBlurAdv(connection, snippetClient, rawArgs) {
-    try {
-        const args = validateArgs(blurAdvSchema, rawArgs);
-        const mode = args.mode;
-        const applyToActiveLayer = args.apply_to_active_layer ?? false;
-        const params = { mode, applyToActiveLayer };
-        if (mode === 'surface_blur') {
-            params.radius = args.radius ?? 15;
-            params.threshold = args.threshold ?? 20;
-        }
-        else if (mode === 'box_blur') {
-            params.radius = args.radius ?? 12;
-        }
-        const script = await snippetClient.build('applyBlurAdv', params);
-        const result = await runScript(connection, script);
-        const r = result;
-        const target = r.target_was_copy
-            ? `new copy "${r.target_layer_name ?? '?'}"`
-            : 'active layer (in place)';
-        return {
-            content: [{ type: 'text', text: `Blur (${mode}) applied to ${target}.` }],
-            structuredContent: result,
-        };
-    }
-    catch (error) {
-        return {
-            content: [
-                {
-                    type: 'text',
-                    text: `Error applying blur: ${error instanceof Error ? error.message : String(error)}`,
-                },
-            ],
-            isError: true,
-        };
-    }
+    return runSnippetTool({
+        connection,
+        snippetClient,
+        rawArgs,
+        schema: blurAdvSchema,
+        snippet: 'applyBlurAdv',
+        errorPrefix: 'Error applying blur',
+        params: (args) => {
+            const mode = args.mode;
+            const applyToActiveLayer = args.apply_to_active_layer ?? false;
+            const params = { mode, applyToActiveLayer };
+            if (mode === 'surface_blur') {
+                params.radius = args.radius ?? 15;
+                params.threshold = args.threshold ?? 20;
+            }
+            else if (mode === 'box_blur') {
+                params.radius = args.radius ?? 12;
+            }
+            return params;
+        },
+        successText: (result, args) => {
+            const r = result;
+            const target = r.target_was_copy
+                ? `new copy "${r.target_layer_name ?? '?'}"`
+                : 'active layer (in place)';
+            return `Blur (${args.mode}) applied to ${target}.`;
+        },
+    });
 }
 async function applyOilPaint(connection, snippetClient, rawArgs) {
-    try {
-        const args = validateArgs(oilPaintSchema, rawArgs);
-        const params = {
+    return runSnippetTool({
+        connection,
+        snippetClient,
+        rawArgs,
+        schema: oilPaintSchema,
+        snippet: 'applyOilPaint',
+        errorPrefix: 'Error applying Oil Paint',
+        params: (args) => ({
             stylization: args.stylization ?? 4,
             cleanliness: args.cleanliness ?? 2.3,
             brushScale: args.brush_scale ?? 0.8,
@@ -1739,71 +1531,38 @@ async function applyOilPaint(connection, snippetClient, rawArgs) {
             shine: args.shine ?? 1.3,
             lightingOn: args.lighting_on ?? true,
             applyToActiveLayer: args.apply_to_active_layer ?? false,
-        };
-        const script = await snippetClient.build('applyOilPaint', params);
-        const result = await runScript(connection, script);
-        const r = result;
-        const target = r.target_was_copy
-            ? `new copy "${r.target_layer_name ?? '?'}"`
-            : 'active layer (in place)';
-        return {
-            content: [
-                {
-                    type: 'text',
-                    text: `Oil Paint applied to ${target}.`,
-                },
-            ],
-            structuredContent: result,
-        };
-    }
-    catch (error) {
-        return {
-            content: [
-                {
-                    type: 'text',
-                    text: `Error applying Oil Paint: ${error instanceof Error ? error.message : String(error)}`,
-                },
-            ],
-            isError: true,
-        };
-    }
+        }),
+        successText: (result) => {
+            const r = result;
+            const target = r.target_was_copy
+                ? `new copy "${r.target_layer_name ?? '?'}"`
+                : 'active layer (in place)';
+            return `Oil Paint applied to ${target}.`;
+        },
+    });
 }
 async function applyDisplace(connection, snippetClient, rawArgs) {
-    try {
-        const args = validateArgs(displaceSchema, rawArgs);
-        const params = {
+    return runSnippetTool({
+        connection,
+        snippetClient,
+        rawArgs,
+        schema: displaceSchema,
+        snippet: 'applyDisplace',
+        errorPrefix: 'Error applying Displace',
+        params: (args) => ({
             mapPath: args.map_path,
             horizontalScale: args.horizontal_scale ?? 10,
             verticalScale: args.vertical_scale ?? 10,
             displacementMap: args.displacement_map ?? 'stretch_to_fit',
             undefinedAreas: args.undefined_areas ?? 'repeat_edge',
             applyToActiveLayer: args.apply_to_active_layer ?? false,
-        };
-        const script = await snippetClient.build('applyDisplace', params);
-        const result = await runScript(connection, script);
-        const r = result;
-        const target = r.target_was_copy
-            ? `new copy "${r.target_layer_name ?? '?'}"`
-            : 'active layer (in place)';
-        return {
-            content: [
-                {
-                    type: 'text',
-                    text: `Displace applied to ${target} using map ${params.mapPath}.`,
-                },
-            ],
-            structuredContent: result,
-        };
-    }
-    catch (error) {
-        return {
-            content: [
-                {
-                    type: 'text',
-                    text: `Error applying Displace: ${error instanceof Error ? error.message : String(error)}`,
-                },
-            ],
-            isError: true,
-        };
-    }
+        }),
+        successText: (result, args) => {
+            const r = result;
+            const target = r.target_was_copy
+                ? `new copy "${r.target_layer_name ?? '?'}"`
+                : 'active layer (in place)';
+            return `Displace applied to ${target} using map ${args.map_path}.`;
+        },
+    });
 }