editmamei 1.0.3 → 1.2.0

package/dist/tools/filter-tools.js

@@ -2,7 +2,9 @@ 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';
-import { toolErrorResult, runSnippetTool, applyToActiveLayerProp } from '../utils/tool-helpers.js';
+import { toolErrorResult, runSnippetTool, applyToActiveLayerProp, asSmartFilterProp, unknownDiscriminator, } from '../utils/tool-helpers.js';
+import { LAYER_BLEND_MODES } from '../utils/blend-modes.js';
+import { runSmartFilterOp } from './smart-object-tools.js';
 const gaussianBlurSchema = {
     type: 'object',
     properties: {
@@ -13,6 +15,7 @@ const gaussianBlurSchema = {
             maximum: 250,
         },
         apply_to_active_layer: applyToActiveLayerProp('the filter'),
+        as_smart_filter: asSmartFilterProp(),
     },
     required: ['radius'],
 };
@@ -39,6 +42,7 @@ const sharpenSchema = {
             default: 0,
         },
         apply_to_active_layer: applyToActiveLayerProp('the filter'),
+        as_smart_filter: asSmartFilterProp(),
     },
     required: ['amount', 'radius'],
 };
@@ -63,6 +67,7 @@ const noiseSchema = {
             default: false,
         },
         apply_to_active_layer: applyToActiveLayerProp('the filter'),
+        as_smart_filter: asSmartFilterProp(),
     },
     required: ['amount'],
 };
@@ -82,6 +87,7 @@ const motionBlurSchema = {
             maximum: 999,
         },
         apply_to_active_layer: applyToActiveLayerProp('the filter'),
+        as_smart_filter: asSmartFilterProp(),
     },
     required: ['angle', 'radius'],
 };
@@ -166,6 +172,7 @@ const lensBlurSchema = {
             default: false,
         },
         apply_to_active_layer: applyToActiveLayerProp('the filter'),
+        as_smart_filter: asSmartFilterProp(),
     },
 };
 const smartSharpenSchema = {
@@ -248,6 +255,7 @@ const smartSharpenSchema = {
             default: 30,
         },
         apply_to_active_layer: applyToActiveLayerProp('the filter'),
+        as_smart_filter: asSmartFilterProp(),
     },
 };
 const reduceNoiseSchema = {
@@ -334,6 +342,7 @@ const reduceNoiseSchema = {
             default: 50,
         },
         apply_to_active_layer: applyToActiveLayerProp('the filter'),
+        as_smart_filter: asSmartFilterProp(),
     },
 };
 const highPassSchema = {
@@ -347,6 +356,7 @@ const highPassSchema = {
             default: 10,
         },
         apply_to_active_layer: applyToActiveLayerProp('the filter'),
+        as_smart_filter: asSmartFilterProp(),
     },
     required: ['radius'],
 };
@@ -391,6 +401,7 @@ const radialBlurSchema = {
             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: applyToActiveLayerProp('the filter'),
+        as_smart_filter: asSmartFilterProp(),
     },
 };
 const pixelateSchema = {
@@ -444,6 +455,7 @@ const pixelateSchema = {
             default: 10,
         },
         apply_to_active_layer: applyToActiveLayerProp('the filter'),
+        as_smart_filter: asSmartFilterProp(),
     },
     required: ['mode'],
 };
@@ -556,6 +568,7 @@ const distortSchema = {
             default: 12345,
         },
         apply_to_active_layer: applyToActiveLayerProp('the filter'),
+        as_smart_filter: asSmartFilterProp(),
     },
     required: ['mode'],
 };
@@ -628,6 +641,7 @@ const stylizeSchema = {
             default: 10,
         },
         apply_to_active_layer: applyToActiveLayerProp('the filter'),
+        as_smart_filter: asSmartFilterProp(),
     },
     required: ['mode'],
 };
@@ -660,6 +674,7 @@ const renderSchema = {
             default: 12345,
         },
         apply_to_active_layer: applyToActiveLayerProp('the filter'),
+        as_smart_filter: asSmartFilterProp(),
     },
     required: ['mode'],
 };
@@ -695,6 +710,7 @@ const otherSchema = {
             default: 0,
         },
         apply_to_active_layer: applyToActiveLayerProp('the filter'),
+        as_smart_filter: asSmartFilterProp(),
     },
     required: ['mode'],
 };
@@ -721,6 +737,7 @@ const denoiseSchema = {
             default: 10,
         },
         apply_to_active_layer: applyToActiveLayerProp('the filter'),
+        as_smart_filter: asSmartFilterProp(),
     },
     required: ['mode'],
 };
@@ -747,6 +764,7 @@ const blurAdvSchema = {
             default: 20,
         },
         apply_to_active_layer: applyToActiveLayerProp('the filter'),
+        as_smart_filter: asSmartFilterProp(),
     },
     required: ['mode'],
 };
@@ -801,6 +819,7 @@ const oilPaintSchema = {
             default: true,
         },
         apply_to_active_layer: applyToActiveLayerProp('the filter'),
+        as_smart_filter: asSmartFilterProp(),
     },
 };
 const displaceSchema = {
@@ -837,6 +856,7 @@ const displaceSchema = {
             default: 'repeat_edge',
         },
         apply_to_active_layer: applyToActiveLayerProp('the filter'),
+        as_smart_filter: asSmartFilterProp(),
     },
     required: ['map_path'],
 };
@@ -848,6 +868,22 @@ const FILTER_OUTPUT_SCHEMA = {
         target_was_copy: { type: 'boolean' },
         target_layer_name: { type: 'string' },
         original_layer_name: { type: 'string' },
+        is_smart_object: { type: 'boolean' },
+        count: { type: 'number' },
+        filters: { type: 'array' },
+        visibility_set: { type: 'boolean' },
+        requested_enabled: { type: 'boolean' },
+        enabled: { type: 'boolean' },
+        opacity: { type: 'number' },
+        blend_mode: { type: 'string' },
+        removed: { type: 'boolean' },
+        removed_filter_name: { type: 'string' },
+        removed_filter_type: { type: 'string' },
+        remaining_count: { type: 'number' },
+        index: { type: 'number' },
+        filter_name: { type: 'string' },
+        filter_type: { type: 'string' },
+        layer_name: { type: 'string' },
         context: { type: 'object' },
     },
 };
@@ -871,13 +907,26 @@ const FILTER_TYPES = [
     'displace',
     'oil_paint',
 ];
+const FILTER_OPS = ['apply', 'list', 'set_visibility', 'set_blend', 'remove'];
 const FILTER_INPUT_SCHEMA = {
     type: 'object',
     properties: {
+        op: {
+            type: 'string',
+            enum: [...FILTER_OPS],
+            default: 'apply',
+            description: 'apply (default): apply a NEW filter — set `type` (+ its own params). ' +
+                'list: read every re-editable Smart Filter on the active Smart Object (index, name, type, enabled, opacity, blend mode). ' +
+                'set_visibility: turn one Smart Filter on/off without losing its settings (needs `index` + `enabled`). ' +
+                "set_blend: restyle one Smart Filter's `opacity` and/or `blend_mode` (needs `index` + at least one of them). " +
+                'remove: delete one Smart Filter from the stack (needs `index`). ' +
+                'The four management ops act on the Smart Filter stack that apply as_smart_filter=true creates; indices are ' +
+                '1-based and come from op=list, where 1 is the first-applied filter (bottom of the stack).',
+        },
         type: {
             type: 'string',
             enum: [...FILTER_TYPES],
-            description: 'Which filter to apply. Each type uses its own parameters: ' +
+            description: 'Which filter to apply. Required when op=apply (the default); ignored otherwise. Each type uses its own parameters: ' +
                 'gaussian_blur(radius); motion_blur(angle, radius); lens_blur(radius, iris_shape, …); ' +
                 'radial_blur(amount, method spin|zoom, quality, center_x, center_y); ' +
                 'sharpen=Unsharp Mask(amount, radius, threshold); smart_sharpen(amount, radius, remove_mode, …); ' +
@@ -920,30 +969,65 @@ const FILTER_INPUT_SCHEMA = {
             description: 'Angle in degrees. Used by motion_blur (−360–360) and distort/twirl (−999–999).',
         },
         apply_to_active_layer: applyToActiveLayerProp('the filter'),
+        as_smart_filter: asSmartFilterProp(),
+        index: {
+            type: 'integer',
+            description: "1-based index of the filter to act on, as reported by op=list. 1 is the FIRST-APPLIED filter (bottom of the Smart Filters stack in the Layers panel). Required for every op except 'list'.",
+            minimum: 1,
+            maximum: 1000,
+        },
+        enabled: {
+            type: 'boolean',
+            description: 'set_visibility only: true shows the filter, false hides it. The filter stays in the stack either way and keeps all its settings.',
+        },
+        opacity: {
+            type: 'number',
+            description: 'set_blend only: filter opacity 0-100. Omit to leave the current opacity untouched.',
+            minimum: 0,
+            maximum: 100,
+        },
+        blend_mode: {
+            type: 'string',
+            enum: [...LAYER_BLEND_MODES],
+            description: 'set_blend only: how the filter result composites against the unfiltered layer. Same names as ps_set_layer. Omit to leave the current mode untouched.',
+        },
     },
-    required: ['type'],
 };
+const FILTER_DESCRIPTION = "Apply a Photoshop filter (op=apply, the default) to a DUPLICATE of the active layer by default — the original is preserved, undo by deleting the copy. Pass apply_to_active_layer:true to bake into the original instead. Choose the filter with `type` (see the `type` field for its params); pass as_smart_filter:true on a Smart Object to apply it as a re-editable SMART FILTER instead of rasterizing. This same tool also reads and manages that re-editable Smart Filter stack: op=list (every filter's index/name/type/enabled/opacity/blend), op=set_visibility (toggle one off/on), op=set_blend (restyle opacity/blend_mode), op=remove (delete one). Management ops need a 1-based `index` from op=list first — index 1 is the first-applied filter, at the bottom of the stack. Covers blur, sharpen, noise, high_pass, pixelate, distort, displace, and oil_paint.";
 export function createFilterTools(connection, snippetClient, client = new OnnxLandmarkDetectionClient()) {
     return [
         {
             tool: {
-                name: 'ps_apply_filter',
-                description: 'Apply a Photoshop filter to a DUPLICATE of the active layer by default (auto-duplicate-first — the original is preserved, undo by deleting the copy). Pass `apply_to_active_layer: true` to bake into the original. Auto-rasterizes text/smart-object layers. Choose the filter with `type`; each type takes its own parameters (see the `type` field). Covers blur (gaussian_blur/motion_blur/lens_blur/radial_blur), sharpen (`sharpen`=Unsharp Mask, `smart_sharpen`), noise (`noise`=Add Noise, `reduce_noise`), high_pass, pixelate, distort, displace, and oil_paint.',
+                name: 'ps_filter',
+                description: FILTER_DESCRIPTION,
                 inputSchema: FILTER_INPUT_SCHEMA,
                 outputSchema: FILTER_OUTPUT_SCHEMA,
                 annotations: {
-                    title: 'Apply Filter',
+                    title: 'Filter',
                     destructiveHint: true,
                     idempotentHint: false,
                 },
             },
-            handler: async (args) => applyFilter(connection, snippetClient, client, args),
+            handler: async (args) => runFilterTool(connection, snippetClient, client, args),
         },
     ];
 }
+async function runFilterTool(connection, snippetClient, detClient, rawArgs) {
+    const op = rawArgs.op ?? 'apply';
+    if (op !== 'apply') {
+        if (!FILTER_OPS.includes(op)) {
+            return unknownDiscriminator('filter op', op, FILTER_OPS);
+        }
+        return runSmartFilterOp(connection, snippetClient, rawArgs);
+    }
+    if (rawArgs.type === undefined) {
+        return toolErrorResult('Error in ps_filter', new Error('op=apply needs a `type` (which filter to apply) — see the `type` field for the full list.'));
+    }
+    return applyFilter(connection, snippetClient, detClient, rawArgs);
+}
 async function applyFilter(connection, snippetClient, detClient, rawArgs) {
     const type = rawArgs.type;
-    const { type: _omit, ...rest } = rawArgs;
+    const { type: _omitType, op: _omitOp, ...rest } = rawArgs;
     switch (type) {
         case 'gaussian_blur':
             return applyGaussianBlur(connection, snippetClient, rest);
@@ -1004,6 +1088,7 @@ async function applyGaussianBlur(connection, snippetClient, rawArgs) {
         params: (args) => ({
             radius: args.radius,
             applyToActiveLayer: args.apply_to_active_layer ?? false,
+            asSmartFilter: args.as_smart_filter ?? false,
         }),
         successText: (result, args) => {
             const r = result;
@@ -1027,6 +1112,7 @@ async function applySharpen(connection, snippetClient, rawArgs) {
             radius: args.radius,
             threshold: args.threshold,
             applyToActiveLayer: args.apply_to_active_layer ?? false,
+            asSmartFilter: args.as_smart_filter ?? false,
         }),
         successText: (result, args) => {
             const r = result;
@@ -1050,6 +1136,7 @@ async function applyNoise(connection, snippetClient, rawArgs) {
             distribution: args.distribution,
             monochromatic: args.monochromatic,
             applyToActiveLayer: args.apply_to_active_layer ?? false,
+            asSmartFilter: args.as_smart_filter ?? false,
         }),
         successText: (result, args) => {
             const r = result;
@@ -1075,6 +1162,7 @@ async function applyMotionBlur(connection, snippetClient, rawArgs) {
             angle: args.angle,
             radius: args.radius,
             applyToActiveLayer: args.apply_to_active_layer ?? false,
+            asSmartFilter: args.as_smart_filter ?? false,
         }),
         successText: (result, args) => {
             const r = result;
@@ -1107,6 +1195,7 @@ async function applyLensBlur(connection, snippetClient, rawArgs) {
             focalDistance: args.focal_distance ?? 0,
             invertDepth: args.invert_depth ?? false,
             applyToActiveLayer: args.apply_to_active_layer ?? false,
+            asSmartFilter: args.as_smart_filter ?? false,
         }),
         successText: (result, args) => {
             const r = result;
@@ -1141,6 +1230,7 @@ async function applySmartSharpen(connection, snippetClient, rawArgs) {
             highlightTonalWidth: args.highlight_tonal_width ?? 50,
             highlightRadius: args.highlight_radius ?? 30,
             applyToActiveLayer: args.apply_to_active_layer ?? false,
+            asSmartFilter: args.as_smart_filter ?? false,
         }),
         successText: (result, args) => {
             const r = result;
@@ -1176,6 +1266,7 @@ async function applyReduceNoise(connection, snippetClient, rawArgs) {
             blueStrength: args.blue_strength ?? 5,
             bluePreserveDetails: args.blue_preserve_details ?? 50,
             applyToActiveLayer: args.apply_to_active_layer ?? false,
+            asSmartFilter: args.as_smart_filter ?? false,
         }),
         successText: (result, args) => {
             const r = result;
@@ -1200,6 +1291,7 @@ async function applyHighPass(connection, snippetClient, rawArgs) {
         params: (args) => ({
             radius: args.radius,
             applyToActiveLayer: args.apply_to_active_layer ?? false,
+            asSmartFilter: args.as_smart_filter ?? false,
         }),
         successText: (result, args) => {
             const r = result;
@@ -1229,6 +1321,7 @@ async function applyRadialBlur(connection, snippetClient, detClient, rawArgs) {
             grounded = { x: Math.round(loc.geom.point.x), y: Math.round(loc.geom.point.y) };
         }
         const applyToActiveLayer = args.apply_to_active_layer ?? false;
+        const asSmartFilter = args.as_smart_filter ?? false;
         const script = await snippetClient.build('applyRadialBlur', {
             amount,
             method,
@@ -1236,6 +1329,7 @@ async function applyRadialBlur(connection, snippetClient, detClient, rawArgs) {
             centerX,
             centerY,
             applyToActiveLayer,
+            asSmartFilter,
         });
         const result = await runScript(connection, script);
         const r = result;
@@ -1278,7 +1372,8 @@ async function applyPixelate(connection, snippetClient, rawArgs) {
         params: (args) => {
             const mode = args.mode;
             const applyToActiveLayer = args.apply_to_active_layer ?? false;
-            const params = { mode, applyToActiveLayer };
+            const asSmartFilter = args.as_smart_filter ?? false;
+            const params = { mode, applyToActiveLayer, asSmartFilter };
             if (mode === 'mosaic' || mode === 'crystallize' || mode === 'pointillize') {
                 params.cellSize = args.cell_size ?? 10;
             }
@@ -1311,7 +1406,8 @@ async function applyDistort(connection, snippetClient, rawArgs) {
         params: (args) => {
             const mode = args.mode;
             const applyToActiveLayer = args.apply_to_active_layer ?? false;
-            const params = { mode, applyToActiveLayer };
+            const asSmartFilter = args.as_smart_filter ?? false;
+            const params = { mode, applyToActiveLayer, asSmartFilter };
             if (mode === 'twirl') {
                 params.angle = args.angle ?? 90;
             }
@@ -1366,7 +1462,8 @@ async function applyStylize(connection, snippetClient, rawArgs) {
         params: (args) => {
             const mode = args.mode;
             const applyToActiveLayer = args.apply_to_active_layer ?? false;
-            const params = { mode, applyToActiveLayer };
+            const asSmartFilter = args.as_smart_filter ?? false;
+            const params = { mode, applyToActiveLayer, asSmartFilter };
             if (mode === 'emboss') {
                 params.angle = args.angle ?? 135;
                 params.height = args.height ?? 3;
@@ -1406,7 +1503,8 @@ async function applyRender(connection, snippetClient, rawArgs) {
         params: (args) => {
             const mode = args.mode;
             const applyToActiveLayer = args.apply_to_active_layer ?? false;
-            const params = { mode, applyToActiveLayer };
+            const asSmartFilter = args.as_smart_filter ?? false;
+            const params = { mode, applyToActiveLayer, asSmartFilter };
             if (mode === 'fibers') {
                 params.variance = args.variance ?? 16;
                 params.strength = args.fiber_strength ?? 4;
@@ -1434,7 +1532,8 @@ async function applyOther(connection, snippetClient, rawArgs) {
         params: (args) => {
             const mode = args.mode;
             const applyToActiveLayer = args.apply_to_active_layer ?? false;
-            const params = { mode, applyToActiveLayer };
+            const asSmartFilter = args.as_smart_filter ?? false;
+            const params = { mode, applyToActiveLayer, asSmartFilter };
             if (mode === 'maximum' || mode === 'minimum') {
                 params.radius = args.radius ?? 3;
                 params.preserve = args.preserve ?? 'roundness';
@@ -1465,7 +1564,8 @@ async function applyDenoise(connection, snippetClient, rawArgs) {
         params: (args) => {
             const mode = args.mode;
             const applyToActiveLayer = args.apply_to_active_layer ?? false;
-            const params = { mode, applyToActiveLayer };
+            const asSmartFilter = args.as_smart_filter ?? false;
+            const params = { mode, applyToActiveLayer, asSmartFilter };
             if (mode === 'median') {
                 params.radius = args.radius ?? 4;
             }
@@ -1495,7 +1595,8 @@ async function applyBlurAdv(connection, snippetClient, rawArgs) {
         params: (args) => {
             const mode = args.mode;
             const applyToActiveLayer = args.apply_to_active_layer ?? false;
-            const params = { mode, applyToActiveLayer };
+            const asSmartFilter = args.as_smart_filter ?? false;
+            const params = { mode, applyToActiveLayer, asSmartFilter };
             if (mode === 'surface_blur') {
                 params.radius = args.radius ?? 15;
                 params.threshold = args.threshold ?? 20;
@@ -1531,6 +1632,7 @@ async function applyOilPaint(connection, snippetClient, rawArgs) {
             shine: args.shine ?? 1.3,
             lightingOn: args.lighting_on ?? true,
             applyToActiveLayer: args.apply_to_active_layer ?? false,
+            asSmartFilter: args.as_smart_filter ?? false,
         }),
         successText: (result) => {
             const r = result;
@@ -1556,6 +1658,7 @@ async function applyDisplace(connection, snippetClient, rawArgs) {
             displacementMap: args.displacement_map ?? 'stretch_to_fit',
             undefinedAreas: args.undefined_areas ?? 'repeat_edge',
             applyToActiveLayer: args.apply_to_active_layer ?? false,
+            asSmartFilter: args.as_smart_filter ?? false,
         }),
         successText: (result, args) => {
             const r = result;