editmamei 1.9.0 → 1.9.1

package/dist/tools/sky-tools.js

@@ -1,18 +1,22 @@
 import { runSnippetTool } from '../utils/tool-helpers.js';
 import { requireLocalPath } from '../utils/local-path.js';
 import { SKY_REPLACEMENT_TIMEOUT_MS } from '../utils/operation-timeouts.js';
+import { defaultSkyPreset, loadSkyPresets, matchSkyPreset, } from '../utils/sky-presets.js';
 const PLACEHOLDER_SKY_ID = '00000000-0000-0000-0000-000000000000';
 const replaceSkyInputSchema = {
     type: 'object',
     properties: {
+        sky: {
+            type: 'string',
+            description: 'Name of one of Photoshop\'s built-in skies, e.g. "Blue Sky 002", "Spectacular 004" or "Sunset Sky 003" (skies the user saved in Photoshop work too). The server finds the image itself, so no file or folder access is needed. Pass "list" to get the installed skies\' names without changing the document. Omit both sky and sky_file to use Photoshop\'s Blue Sky 001 (or the first installed sky).',
+        },
         sky_file: {
             type: 'string',
-            description: 'ABSOLUTE path to the image to use as the sky. Any image Photoshop can open works — it does not need to be a registered Photoshop sky preset. The built-in skies live as .jpg files under the Sky_Presets folder inside your Photoshop settings directory, and their paths can be passed here directly.',
+            description: 'ABSOLUTE path to any image to use as the sky instead of a built-in one; it does not need to be a Photoshop sky preset. Takes precedence over sky.',
         },
         sky_name: {
             type: 'string',
-            description: 'Label recorded on the operation. Cosmetic — it does not select the sky, sky_file does.',
-            default: 'Custom Sky',
+            description: 'Label recorded on the operation. Cosmetic — it does not select the sky. Defaults to the built-in sky\'s name, or "Custom Sky" for sky_file.',
         },
         shift_edge: {
             type: 'number',
@@ -64,9 +68,44 @@ const replaceSkyInputSchema = {
             maximum: 100,
         },
     },
-    required: ['sky_file'],
 };
-async function replaceSky(connection, snippetClient, rawArgs) {
+function resolveSky(args, presets) {
+    if (args.sky_file !== undefined) {
+        return {
+            kind: 'file',
+            path: requireLocalPath('sky_file', args.sky_file),
+            label: 'Custom Sky',
+        };
+    }
+    const installed = presets();
+    if (installed.length === 0) {
+        throw new Error("Photoshop's built-in skies were not found on this computer (the Sky_Presets folder in Photoshop's settings). Pass sky_file with the absolute path to any image to use as the sky.");
+    }
+    const query = typeof args.sky === 'string' && args.sky.trim() !== '' ? args.sky : undefined;
+    const preset = query === undefined ? defaultSkyPreset(installed) : matchSkyPreset(installed, query);
+    if (!preset) {
+        throw new Error(`No built-in sky matches "${query}". Installed skies: ${installed.map((p) => p.name).join('; ')}.`);
+    }
+    return { kind: 'preset', path: preset.file, label: preset.name };
+}
+async function replaceSky(connection, snippetClient, rawArgs, presets) {
+    if (rawArgs.sky_file === undefined &&
+        typeof rawArgs.sky === 'string' &&
+        rawArgs.sky.trim().toLowerCase() === 'list') {
+        const names = presets().map((p) => p.name);
+        return {
+            content: [
+                {
+                    type: 'text',
+                    text: names.length
+                        ? `Installed skies: ${names.join('; ')}.`
+                        : "Photoshop's built-in skies were not found on this computer. Pass sky_file with the absolute path to any image to use as the sky.",
+                },
+            ],
+            structuredContent: { replaced: false, skies: names },
+        };
+    }
+    let sky;
     return runSnippetTool({
         connection,
         snippetClient,
@@ -75,27 +114,33 @@ async function replaceSky(connection, snippetClient, rawArgs) {
         snippet: 'replaceSky',
         errorPrefix: 'Error running Sky Replacement',
         timeoutMs: SKY_REPLACEMENT_TIMEOUT_MS,
-        params: (args) => ({
-            skyPath: requireLocalPath('sky_file', args.sky_file),
-            skyName: args.sky_name ?? 'Custom Sky',
-            skyId: PLACEHOLDER_SKY_ID,
-            shiftEdge: args.shift_edge ?? 0,
-            borderSmoothness: args.border_smoothness ?? 50,
-            brightness: args.brightness ?? 0,
-            temperature: args.temperature ?? 0,
-            harmonizationOpacity: args.harmonization_opacity ?? 35,
-            foregroundLightingOpacity: args.foreground_lighting_opacity ?? 78,
-            edgeLightingOpacity: args.edge_lighting_opacity ?? 70,
-        }),
-        successText: (_result, args) => `Sky replaced using ${String(args.sky_file)}`,
+        params: (args) => {
+            sky = resolveSky(args, presets);
+            return {
+                skyPath: sky.path,
+                skyName: args.sky_name ?? sky.label,
+                skyId: PLACEHOLDER_SKY_ID,
+                shiftEdge: args.shift_edge ?? 0,
+                borderSmoothness: args.border_smoothness ?? 50,
+                brightness: args.brightness ?? 0,
+                temperature: args.temperature ?? 0,
+                harmonizationOpacity: args.harmonization_opacity ?? 35,
+                foregroundLightingOpacity: args.foreground_lighting_opacity ?? 78,
+                edgeLightingOpacity: args.edge_lighting_opacity ?? 70,
+            };
+        },
+        successText: () => sky?.kind === 'preset'
+            ? `Sky replaced using Photoshop's built-in sky "${sky.label}"`
+            : `Sky replaced using ${sky?.path ?? 'the given file'}`,
     });
 }
-export function createSkyTools(connection, snippetClient) {
+export function createSkyTools(connection, snippetClient, options = {}) {
+    const presets = options.presets ?? (() => loadSkyPresets());
     return [
         {
             tool: {
                 name: 'ps_replace_sky',
-                description: 'Run Photoshop\'s Sky Replacement (Adobe Sensei): detect the sky, composite a replacement, and relight/colour-grade the foreground to match. Non-destructive — everything lands in a "Sky Replacement Group" of editable layers above the original, so the result can be tuned or deleted afterwards. sky_file takes an ABSOLUTE path to ANY image on disk, not only Photoshop\'s built-in presets. Reach for harmonization_opacity and foreground_lighting_opacity when the composite reads as pasted-on; those two carry most of the believability. Fails cleanly when the image has no detectable sky (indoor or closed compositions).',
+                description: 'Run Photoshop\'s Sky Replacement (Adobe Sensei): detect the sky, composite a replacement, and relight/colour-grade the foreground to match. Non-destructive — everything lands in a "Sky Replacement Group" of editable layers above the original, so the result can be tuned or deleted afterwards. Pick one of Photoshop\'s built-in skies by name with sky (no path needed; sky "list" names them), or pass sky_file with an ABSOLUTE path to ANY image on disk; with neither, Photoshop\'s Blue Sky 001 is used (or the first installed sky). Reach for harmonization_opacity and foreground_lighting_opacity when the composite reads as pasted-on; those two carry most of the believability. Fails cleanly when the image has no detectable sky (indoor or closed compositions).',
                 inputSchema: replaceSkyInputSchema,
                 outputSchema: {
                     type: 'object',
@@ -113,6 +158,11 @@ export function createSkyTools(connection, snippetClient) {
                         },
                         sky_file: { type: 'string' },
                         sky_name: { type: 'string' },
+                        skies: {
+                            type: 'array',
+                            items: { type: 'string' },
+                            description: 'Installed sky names; returned instead of a composite when sky is "list".',
+                        },
                         context: { type: 'object' },
                     },
                 },
@@ -121,7 +171,7 @@ export function createSkyTools(connection, snippetClient) {
                     idempotentHint: false,
                 },
             },
-            handler: async (args) => replaceSky(connection, snippetClient, args),
+            handler: async (args) => replaceSky(connection, snippetClient, args, presets),
         },
     ];
 }

package/dist/utils/sky-presets.js

@@ -0,0 +1,114 @@
+import { existsSync, readdirSync, readFileSync } from 'node:fs';
+import { homedir } from 'node:os';
+import { join } from 'node:path';
+const GUID_RE = /^[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}$/i;
+const NAME_KEY = Buffer.from('skpNTEXT', 'latin1');
+const ID_KEY = Buffer.from('SzidTEXT', 'latin1');
+export function prettySkyName(raw) {
+    return raw
+        .replace(/([a-z])([A-Z0-9])/g, '$1 $2')
+        .replace(/(\d)([A-Za-z])/g, '$1 $2')
+        .replace(/\s+/g, ' ')
+        .trim();
+}
+export function parseSkyPresets(buf, dir) {
+    const readText = (at) => {
+        if (at + 4 > buf.length)
+            return null;
+        const units = buf.readUInt32BE(at);
+        const end = at + 4 + units * 2;
+        if (units === 0 || units > 512 || end > buf.length)
+            return null;
+        let text = '';
+        for (let i = at + 4; i < end; i += 2) {
+            const unit = buf.readUInt16BE(i);
+            if (unit === 0)
+                break;
+            text += String.fromCharCode(unit);
+        }
+        return { text, end };
+    };
+    const out = [];
+    for (let pos = buf.indexOf(NAME_KEY); pos !== -1; pos = buf.indexOf(NAME_KEY, pos + NAME_KEY.length)) {
+        const name = readText(pos + NAME_KEY.length);
+        if (!name)
+            continue;
+        const rel = buf.subarray(name.end, name.end + 16 + ID_KEY.length).indexOf(ID_KEY);
+        if (rel === -1)
+            continue;
+        const id = readText(name.end + rel + ID_KEY.length);
+        if (!id || !GUID_RE.test(id.text))
+            continue;
+        const file = join(dir, `${id.text}.jpg`);
+        if (existsSync(file))
+            out.push({ name: prettySkyName(name.text), file });
+    }
+    return out;
+}
+export function findSkyPresetsDir(env = process.env, platform = process.platform, home = homedir()) {
+    const list = (dir) => {
+        try {
+            return readdirSync(dir);
+        }
+        catch {
+            return [];
+        }
+    };
+    let candidates = [];
+    if (platform === 'win32') {
+        if (!env.APPDATA)
+            return null;
+        const base = join(env.APPDATA, 'Adobe');
+        candidates = list(base).flatMap((d) => {
+            const m = /^Adobe Photoshop (\d{4})$/.exec(d);
+            return m ? [{ year: +m[1], dir: join(base, d, `${d} Settings`, 'Sky_Presets') }] : [];
+        });
+    }
+    else if (platform === 'darwin') {
+        const base = join(home, 'Library', 'Preferences');
+        candidates = list(base).flatMap((d) => {
+            const m = /^Adobe Photoshop (\d{4}) Settings$/.exec(d);
+            return m ? [{ year: +m[1], dir: join(base, d, 'Sky_Presets') }] : [];
+        });
+    }
+    candidates.sort((a, b) => b.year - a.year);
+    return candidates.find((c) => existsSync(join(c.dir, 'Skies.psp')))?.dir ?? null;
+}
+export function loadSkyPresets(dir = findSkyPresetsDir()) {
+    if (!dir)
+        return [];
+    try {
+        return parseSkyPresets(readFileSync(join(dir, 'Skies.psp')), dir);
+    }
+    catch {
+        return [];
+    }
+}
+const norm = (s) => s.toLowerCase().replace(/[^\p{L}\p{N}]/gu, '');
+const familyAndNumber = (s) => {
+    const m = /^(\p{L}+?)(\d+)/u.exec(norm(s));
+    return m ? { family: m[1], num: Number(m[2]) } : null;
+};
+export function matchSkyPreset(presets, query) {
+    const q = norm(query);
+    if (!q)
+        return undefined;
+    const exact = presets.find((p) => norm(p.name) === q);
+    if (exact)
+        return exact;
+    const want = familyAndNumber(query);
+    if (want) {
+        const hit = presets.find((p) => {
+            const have = familyAndNumber(p.name);
+            return have !== null && have.family.startsWith(want.family) && have.num === want.num;
+        });
+        if (hit)
+            return hit;
+    }
+    return presets.find((p) => norm(p.name).startsWith(q));
+}
+export function defaultSkyPreset(presets) {
+    return (presets.find((p) => /^blue sky\b/i.test(p.name) && /\bby photoshop$/i.test(p.name)) ??
+        presets.find((p) => /^blue sky\b/i.test(p.name)) ??
+        presets[0]);
+}

package/dist/version.js

@@ -1 +1 @@
-export const VERSION = '1.9.0';
+export const VERSION = '1.9.1';

package/package.json

@@ -1,10 +1,13 @@
 {
   "name": "editmamei",
-  "version": "1.9.0",
+  "version": "1.9.1",
   "description": "Photoshop MCP server: natural-language AI photo editing in desktop Photoshop (Community Edition)",
   "mcpName": "io.github.editmamei/editmamei",
   "editmamei": {
     "fixesByVersion": {
+      "1.9.1": [
+        "ps_replace_sky"
+      ],
       "1.9.0": [
         "ps_save_psd"
       ],
@@ -14,10 +17,6 @@
         "ps_select",
         "ps_modify_selection"
       ],
-      "1.2.0": [
-        "ps_delete_layer",
-        "ps_select_layer"
-      ],
       "1.2.1": [
         "ps_read_scene"
       ]