editmamei 0.24.1 → 1.0.0

package/NOTICES.md

@@ -72,36 +72,12 @@ above.
   terms (Apache-2.0 §4(d)) are preserved by reference to that source.
 - Used to detect the 80 COCO object classes.
 
-### MediaPipe FaceMesh (`models/pro/face_mesh_468.onnx`) — facial landmarks (Pro)
-
-- **Upstream:** Google MediaPipe Face Landmark / FaceMesh model (the
-  `face_landmarks_detector` weight from `face_landmarker.task`), trained by Google
-  on its own data. Converted to ONNX (468-point variant) and redistributed via the
-  Hugging Face `Heliosoph/mediapipe-face-onnx` repository.
-- **License:** Apache-2.0 (the model is permissively licensed by Google;
-  commercial-safe — see `docs/product/pro-vision-models.md` for the weights-license
-  diligence). Any upstream `NOTICE`/attribution terms (Apache-2.0 §4(d)) are
-  preserved by reference to those sources.
-- Runs on-device via the same `onnxruntime-web` backend; the image never leaves the
-  machine. Used by the Pro `ps_detect_landmarks` tool to locate the 468-point
-  face mesh (eyes, brows, lips, nose, jaw). Ships in the **Pro module**
-  (`models/pro/`), not the CE tarball.
-
-### MobileSAM (`models/pro/mobile_sam_{encoder,decoder}.onnx`) — promptable segmentation (Pro)
-
-- **Upstream:** MobileSAM ("Faster Segment Anything: Towards Lightweight SAM for
-  Mobile Applications", Zhang et al.; `ChaoningZhang/MobileSAM`) — a distilled
-  TinyViT image encoder paired with the Segment Anything prompt-mask decoder,
-  exported to ONNX (encoder + decoder). Redistributed here as an **FP16** build
-  converted from the FP32 ONNX export (halves the download; INT8 dynamic
-  quantization was evaluated and rejected — it collapsed the encoder to
-  whole-frame masks).
-- **License:** Apache-2.0. Any upstream `NOTICE`/attribution terms (Apache-2.0
-  §4(d)) are preserved by reference to that source.
-- Runs on-device via the same `onnxruntime-web` backend; the image never leaves the
-  machine. Used by the Pro `ps_select_object` tool to turn a box/point prompt into a
-  pixel-accurate organic selection. Ships in the **Pro module** (`models/pro/`), not
-  the CE tarball.
+### Separately licensed modules
+
+The Pro module is delivered as its own artifact and bundles additional third-party
+models. Redistribution obligations follow the artifact that carries the files, so
+those notices and their full license texts ship **inside the Pro module**, beside
+its manifest, rather than being enumerated here.
 
 ---
 

package/README.md

@@ -2,12 +2,10 @@
 
 **Unlock Photoshop with natural-language photo editing.** AI orchestration, not generation.
 
-(Pronounced like _edamame_. Yes, the snack.)
-
 > Independent project, not affiliated with or endorsed by Adobe Inc.
 
 [![npm version](https://img.shields.io/npm/v/editmamei.svg)](https://www.npmjs.com/package/editmamei)
-[![License](https://img.shields.io/badge/License-Proprietary-blue.svg)](https://editmamei.com/license)
+[![License](https://img.shields.io/badge/License-FSL--1.1--MIT-blue.svg)](LICENSE.md)
 [![Platform](https://img.shields.io/badge/Platform-Windows%20%7C%20macOS-lightgrey.svg)]()
 
 Editmamei is a Model Context Protocol (MCP) server that drives the Adobe Photoshop you already have. You describe the edit in plain words, your AI assistant plans the steps, and your own copy of Photoshop carries them out with its standard adjustment layers, masks, selections, and filters. The AI directs and Photoshop edits. No generative model touches your pixels, and no image is uploaded to perform an edit.
@@ -108,6 +106,24 @@ These are the choices that shape the surface, and the reason an AI assistant can
 
 The split is detailed in [pro-features.md](https://github.com/editmamei/editmamei-wiki/blob/main/docs/pro-features.md). Pricing is at [editmamei.com](https://editmamei.com).
 
+This repository holds the Community source. Pro is a separately licensed module and its source is not published here; Community never imports it, so this tree builds and runs on its own.
+
+## Build from source
+
+```bash
+git clone https://github.com/editmamei/editmamei.git
+cd editmamei
+npm install
+npm run build
+npm test
+```
+
+You need Node.js 20+ and a Go toolchain (the build compiles the `editmamei-core` binary that generates Photoshop scripts). The build warns instead of failing when Go is missing, so you can still run the test suite; set `EDITMAMEI_CORE_BIN` to a prebuilt binary if you would rather not install Go.
+
+The test suite runs without Photoshop. It verifies the ExtendScript Editmamei generates, never that Photoshop accepted it, so live verification against a real Photoshop is a separate step.
+
+Contributions are welcome. Start with [CONTRIBUTING.md](CONTRIBUTING.md), which covers the CLA, the branch and pull-request flow, and what to include in a bug report.
+
 ## Configuration
 
 Settings live in `~/.editmamei/settings.json`, managed by the `editmamei config` CLI:
@@ -124,17 +140,33 @@ editmamei config set ps_path "/path/to/Photoshop"
 
 Editmamei runs on your computer and edits in your own Photoshop. No image content, document data, or file paths are sent to Editmamei's servers. It reports anonymous, content-free usage telemetry (on by default, turn it off with `editmamei config set telemetry.usage false`). When your AI assistant needs to see a result, Editmamei sends it a downscaled preview, the same as dropping a photo into a chat with that assistant. Every field is documented in [privacy.md](https://github.com/editmamei/editmamei-wiki/blob/main/docs/privacy.md).
 
+The source in this repository is the same code published to npm, so none of the above has to be taken on trust.
+
 ## Docs and support
 
 - **Features and pricing:** [editmamei.com](https://editmamei.com)
 - **Install, getting started, FAQ, Pro features:** [the wiki](https://github.com/editmamei/editmamei-wiki)
 - **Bugs and feature requests:** [the issue tracker](https://github.com/editmamei/editmamei-wiki/issues). If something's broken, ask your assistant to "report a problem" (or run `editmamei report`) to drop an anonymized diagnostic bundle in your Downloads folder, then attach it to the issue.
-- **Security:** see [editmamei.com/security](https://editmamei.com/security) (don't file security issues publicly)
+- **Security:** see [SECURITY.md](SECURITY.md) (don't file security issues publicly)
 
 ## License
 
-Proprietary, free to install and use. See [the license](https://editmamei.com/license). Third-party dependencies keep their own licenses, listed in the bundled `NOTICES.md`.
+Editmamei CE is [Fair Source](https://fair.io) software under the
+[Functional Source License, v1.1, MIT Future License](LICENSE.md) (FSL-1.1-MIT).
+
+You can read, run, modify, and redistribute the code for almost anything: commercial photo
+editing, internal tools, education, research, security review. The one thing the license
+holds back, for two years per release, is offering the code to others in a commercial
+product or service that competes with Editmamei CE or Pro. If you redistribute the code,
+keep the license and copyright notices with it. Two years after each version ships, that
+version automatically becomes available under plain [MIT](LICENSE.md).
+
+This section is a plain-English summary. The [LICENSE](LICENSE.md) file is the license;
+where they differ, the LICENSE file controls.
+
+Editmamei is not open source under the OSI definition, and we don't call it that. It is
+source-available, with the full CE stack developed in the open.
 
----
+Editmamei Pro is a separate, commercially licensed module; its source is not published.
 
-_Pairs well with: a layered PSD, a willing AI, and a small bowl of edamame._
+Third-party dependencies keep their own licenses, listed in [NOTICES.md](NOTICES.md).

package/dist/api/extendscript/_helpers.js

@@ -182,7 +182,7 @@ export function duplicateForOp(opName, applyToActiveLayer) {
     `;
     }
     return `
-    // Bundle O auto-duplicate-first: the destructive op below will act on
+    // Auto-duplicate-first: the destructive op below will act on
     // a fresh copy of the active layer so the original is preserved.
     // Undoing the op is as simple as deleting the copy.
     var __opOriginal = doc.activeLayer;

package/dist/api/photoshop-api.js

@@ -12,7 +12,7 @@ export class PhotoshopAPIFactory {
             throw new Error('Photoshop info not available — the local install could not be detected. ' +
                 'Check that Photoshop is installed (set PHOTOSHOP_PATH to override detection).');
         }
-        this.logger.debug(`Creating ExtendScript API for Photoshop version ${info.version}`);
+        this.logger.debug(`Photoshop ${info.version} ready for scripting`);
         return new ExtendScriptPhotoshopAPI(this.connection);
     }
 }
@@ -120,17 +120,26 @@ class ExtendScriptPhotoshopAPI {
       } catch (e) {}
     }
 
-    if (typeof result === 'object' && result !== null) {
-      return __mcpJsonEncode(result);
-    }
-    if (typeof result === 'string') {
-      // Plain string return — wrap as a JSON string so the Node-side parser
-      // sees valid JSON. Handlers that expect a string still receive one.
-      return __mcpJsonEncode(result);
-    }
-    return String(result);
+    // Every outcome leaves inside an envelope, so the value a script returned
+    // is never confused with how it ended. A script that legitimately returns
+    // a string beginning with the failure marker used to come back as a thrown
+    // error; inside an envelope it round-trips untouched.
+    return __mcpJsonEncode({ __em: 1, ok: true, value: result });
   } catch (error) {
-    return 'ERROR: ' + (error.message || String(error) || ('code ' + error.number) || 'no error message');
+    // Photoshop's error carries more than a message. Passing the number and
+    // line through means a failure can be identified rather than string-matched
+    // on prose that changes between releases and locales.
+    var __message = '';
+    try { __message = (error && error.message) ? String(error.message) : String(error); } catch (e) { __message = 'unreadable error'; }
+    var __number = null;
+    try { if (error && typeof error.number === 'number') __number = error.number; } catch (e) {}
+    var __line = null;
+    try { if (error && typeof error.line === 'number') __line = error.line; } catch (e) {}
+    return __mcpJsonEncode({
+      __em: 1,
+      ok: false,
+      error: { message: __message, number: __number, line: __line }
+    });
   } finally {
     try { if (__originalRulerUnits !== null) app.preferences.rulerUnits = __originalRulerUnits; } catch (e) {}
     try { if (__originalTypeUnits !== null) app.preferences.typeUnits = __originalTypeUnits; } catch (e) {}
@@ -139,7 +148,4 @@ class ExtendScriptPhotoshopAPI {
 })();
     `.trim();
     }
-    getAPIType() {
-        return 'ExtendScript';
-    }
 }

package/dist/core/server.js

@@ -268,13 +268,13 @@ export class EditmameiServer {
     }
     setupHandlers() {
         this.server.setRequestHandler(ListToolsRequestSchema, async () => {
-            this.logger.debug('Listing available tools');
+            this.logger.debug('Reporting the registered tool surface');
             return {
                 tools: this.toolRegistry.list(),
             };
         });
         this.server.setRequestHandler(CallToolRequestSchema, async (request) => {
-            this.logger.debug(`Tool called: ${request.params.name}`);
+            this.logger.debug(`Received a call for ${request.params.name}`);
             const args = request.params.arguments || {};
             return this.handleToolCall(request.params.name, args);
         });
@@ -314,7 +314,7 @@ export class EditmameiServer {
             if (!alive) {
                 return {
                     content: [
-                        { type: 'text', text: 'Failed to connect to Photoshop' + this.updateNote() },
+                        { type: 'text', text: 'Photoshop did not respond' + this.updateNote() },
                     ],
                     structuredContent: { connected: false, update_available: this.updateInfo },
                 };
@@ -330,7 +330,7 @@ export class EditmameiServer {
                 this.logger.warn(`pingState snippet failed: ${err instanceof Error ? err.message : String(err)}`);
                 return {
                     content: [
-                        { type: 'text', text: 'Failed to connect to Photoshop' + this.updateNote() },
+                        { type: 'text', text: 'Photoshop did not respond' + this.updateNote() },
                     ],
                     structuredContent: { connected: false, update_available: this.updateInfo },
                 };
@@ -397,12 +397,12 @@ export class EditmameiServer {
         this.server.onclose = () => {
             void this.telemetry.shutdown();
         };
-        this.logger.info('MCP Server connected via stdio');
+        this.logger.info('Editmamei is listening on stdio');
     }
     async stop() {
         await this.telemetry.shutdown();
         await this.session.disconnect();
         await this.sessionLog.close();
-        this.logger.info('MCP Server stopped');
+        this.logger.info('Editmamei has shut down');
     }
 }

package/dist/core/session.js

@@ -3,10 +3,10 @@ import { PhotoshopConnection } from '../platform/connection.js';
 import { generateSessionId } from '../utils/session-log.js';
 export class Session {
     logger;
-    connection = null;
     config;
-    lastActivity;
     sessionId;
+    connection = null;
+    lastActivity;
     constructor(config = {}) {
         this.logger = new Logger('Session');
         this.config = { autoConnect: true, ...config };
@@ -23,30 +23,29 @@ export class Session {
         return this.sessionId;
     }
     async initialize() {
-        this.logger.info('Initializing session...');
+        this.logger.info('Starting session', this.sessionId);
         if (this.config.autoConnect) {
             await this.connect();
         }
     }
     async connect() {
         try {
-            this.logger.info('Connecting to Photoshop...');
-            const connected = await this.ensureConnection().ping();
-            if (connected) {
+            const reached = await this.ensureConnection().ping();
+            if (reached) {
                 this.updateActivity();
-                this.logger.info('Successfully connected to Photoshop');
+                this.logger.info('Photoshop is reachable');
                 return true;
             }
-            this.logger.warn('Failed to connect to Photoshop');
+            this.logger.warn('Photoshop did not answer');
             return false;
         }
         catch (error) {
-            this.logger.error('Connection error:', error);
+            this.logger.error('Could not reach Photoshop', error);
             return false;
         }
     }
     async disconnect() {
-        this.logger.info('Disconnecting session...');
+        this.logger.info('Ending session', this.sessionId);
     }
     getConnection() {
         return this.ensureConnection();

package/dist/core/tool-registry.js

@@ -10,10 +10,10 @@ export class ToolRegistry {
     }
     register(name, definition) {
         if (this.tools.has(name)) {
-            this.logger.warn(`Tool '${name}' already registered, overwriting`);
+            this.logger.warn(`Replacing an already-registered tool: ${name}`);
         }
         this.tools.set(name, definition);
-        this.logger.debug(`Registered tool: ${name}`);
+        this.logger.debug(`Registered ${name}`);
     }
     registerAll(definitions) {
         for (const def of definitions) {
@@ -35,9 +35,9 @@ export class ToolRegistry {
     async execute(name, args) {
         const definition = this.tools.get(name);
         if (!definition) {
-            throw new Error(`Tool not found: ${name}`);
+            throw new Error(`No tool is registered under the name '${name}'`);
         }
-        this.logger.debug(`Executing tool: ${name}`);
+        this.logger.debug(`Dispatching ${name}`);
         const started = Date.now();
         let success = true;
         let error;

package/dist/delivery/store.js

@@ -77,6 +77,14 @@ export function readInstalledModule(sku, opts = {}) {
         return null;
     }
 }
+function removeQuietly(path) {
+    try {
+        rmSync(path, { recursive: true, force: true });
+    }
+    catch (err) {
+        logger.warn(`could not remove superseded directory ${path}: ${err instanceof Error ? err.message : String(err)} (harmless; the current tree is unaffected)`);
+    }
+}
 function writeFileAtomic(path, data) {
     const dir = dirname(path);
     mkdirSync(dir, { recursive: true, mode: 0o700 });
@@ -277,12 +285,12 @@ export function loadVerifiedModule(sku, opts = {}, pubKeys = MODULE_SIGNING_PUBL
         renameSync(dir, oldDir);
         try {
             renameSync(regenDir, dir);
-            rmSync(oldDir, { recursive: true, force: true });
+            removeQuietly(oldDir);
         }
         catch (err) {
             rmSync(regenDir, { recursive: true, force: true });
             if (existsSync(dir)) {
-                rmSync(oldDir, { recursive: true, force: true });
+                removeQuietly(oldDir);
             }
             else {
                 renameSync(oldDir, dir);

package/dist/detection/detect-active-doc.js

@@ -18,7 +18,7 @@ export async function detectActiveDoc(connection, client, opts, deps = {}) {
         const tempPath = dir.path('detect.jpg');
         const script = `
       ${getContextInfo}
-      if (app.documents.length === 0) { throw new Error('No active document'); }
+      if (app.documents.length === 0) { throw new Error('No document is open in Photoshop'); }
       for (var __pi = app.documents.length - 1; __pi >= 0; __pi--) {
         try {
           var __pd = app.documents[__pi];

package/dist/kernel/module-lifecycle.js

@@ -51,8 +51,14 @@ export class ModuleLifecycle {
             }
         }
         if (EDITION === 'dev') {
+            const inTreeProSpecifier = '../modules/pro/index.js';
+            const inTreePresent = ['../modules/pro/index.js', '../modules/pro/index.ts'].some((rel) => existsSync(new URL(rel, import.meta.url)));
+            if (!inTreePresent) {
+                this._proModule = null;
+                return null;
+            }
             this._proModule = {
-                importer: () => import('../modules/pro/index.js'),
+                importer: () => import(inTreeProSpecifier),
                 binDir: dirname(resolveProBinaryPath()),
                 abi: null,
             };

package/dist/perception/region-precompute.js

@@ -26,7 +26,7 @@ const PRECOMPUTE_TARGETS = [
 ];
 function deleteSceneChannelsScript() {
     return `
-    if (app.documents.length === 0) { throw new Error('No active document'); }
+    if (app.documents.length === 0) { throw new Error('No document is open in Photoshop'); }
     var doc = app.activeDocument;
     var removed = 0;
     for (var i = doc.channels.length - 1; i >= 0; i--) {
@@ -63,7 +63,7 @@ function channelsExistScript(names) {
     const namesLit = `[${names.map((n) => jsLit(n)).join(', ')}]`;
     return `
     // __mcp_scene_chk__ cheap existence check for previously-saved scene:* channels
-    if (app.documents.length === 0) { throw new Error('No active document'); }
+    if (app.documents.length === 0) { throw new Error('No document is open in Photoshop'); }
     var doc = app.activeDocument;
     var have = {};
     for (var i = 0; i < doc.channels.length; i++) {
@@ -92,7 +92,17 @@ async function channelsExist(connection, names) {
 }
 function loadNamedChannelScript(name) {
     return `
-    if (app.documents.length === 0) { throw new Error('No active document'); }
+    // getSelectionInfo's own source begins with the restoreCompositeChannel
+    // definition (see _helpers.ts), so interpolating it here brings BOTH into
+    // scope. Interpolating restoreCompositeChannel separately as well emitted a
+    // second, byte-identical copy of that function body into every load script —
+    // legal (a later function declaration just wins) but pure waste in a string
+    // that crosses the COM/AppleScript boundary on every select_by_reference.
+    // Hoisted to the TOP so the restoreCompositeChannel(doc) call below sits
+    // after its definition textually, rather than relying on hoisting across an
+    // interpolation boundary.
+    ${getSelectionInfo}
+    if (app.documents.length === 0) { throw new Error('No document is open in Photoshop'); }
     var doc = app.activeDocument;
     var ch = null;
     for (var i = 0; i < doc.channels.length; i++) {
@@ -100,12 +110,10 @@ function loadNamedChannelScript(name) {
     }
     if (!ch) { return { loaded: false }; }
     doc.selection.load(ch, SelectionType.REPLACE);
-    ${restoreCompositeChannel}
     restoreCompositeChannel(doc);
     // Measure in the SAME round trip. The fast path used to return
     // selection_info:null, which forced any caller that wanted to verify the mask
     // into a second PS call — the one thing this path exists to avoid.
-    ${getSelectionInfo}
     return {
       loaded: true,
       width: doc.width.as('px'),

package/dist/perception/select-recipes.js

@@ -134,7 +134,7 @@ function thresholdSkyScript(level, seedX, seedY) {
     ${getSelectionInfo}
     function cTID(s){ return app.charIDToTypeID(s); }
     function sTID(s){ return app.stringIDToTypeID(s); }
-    if (app.documents.length === 0) { throw new Error('No active document'); }
+    if (app.documents.length === 0) { throw new Error('No document is open in Photoshop'); }
     var doc = app.activeDocument;
     var __mk = new ActionDescriptor();
     var __ref = new ActionReference();
@@ -170,7 +170,7 @@ function posterizeRegionScript(seedX, seedY) {
     ${getSelectionInfo}
     function cTID(s){ return app.charIDToTypeID(s); }
     function sTID(s){ return app.stringIDToTypeID(s); }
-    if (app.documents.length === 0) { throw new Error('No active document'); }
+    if (app.documents.length === 0) { throw new Error('No document is open in Photoshop'); }
     var doc = app.activeDocument;
     var __mk = new ActionDescriptor();
     var __ref = new ActionReference();

package/dist/perception/sky-mask-transfer.js

@@ -86,7 +86,7 @@ function buildLoadScript(maskPath, docW, docH, selType) {
         return app.executeActionGet(r).hasKey(app.stringIDToTypeID('selection'));
       } catch (eSe) { return false; }
     }
-    if (app.documents.length === 0) { throw new Error('No active document'); }
+    if (app.documents.length === 0) { throw new Error('No document is open in Photoshop'); }
     var orig = app.activeDocument;
     var combine = '${selType}';
 

package/dist/platform/connection.js

@@ -1,8 +1,5 @@
-import { platform } from 'os';
 import { Logger } from '../utils/logger.js';
-import { PhotoshopDetector } from './detector.js';
-import { WindowsExecutor } from './windows-executor.js';
-import { MacOSExecutor } from './macos-executor.js';
+import { resolveHostPlatform } from './host-platform.js';
 export function truncateForLog(s, maxLen) {
     if (s.length <= maxLen)
         return s;
@@ -11,37 +8,24 @@ export function truncateForLog(s, maxLen) {
 export const RUNNING_LATCH_TTL_MS = 30_000;
 export class PhotoshopConnection {
     logger;
-    detector;
-    executor;
+    host;
+    now;
     photoshopInfo = null;
     detectInFlight = null;
-    macosExecutor;
-    now;
     runningLatchUntil = 0;
     constructor(opts = {}) {
         this.logger = new Logger('PhotoshopConnection');
-        this.detector = new PhotoshopDetector();
         this.now = opts.now ?? Date.now;
-        const platformType = platform();
-        if (platformType === 'win32') {
-            this.executor = new WindowsExecutor();
-        }
-        else if (platformType === 'darwin') {
-            this.macosExecutor = new MacOSExecutor();
-            this.executor = this.macosExecutor;
-        }
-        else {
-            throw new Error(`Unsupported platform: ${platformType}`);
-        }
+        this.host = opts.host ?? resolveHostPlatform();
     }
     async ping() {
         try {
-            this.logger.debug('Pinging Photoshop...');
+            this.logger.debug('Pinging Photoshop');
             const result = await this.executeScript("'pong';");
             return typeof result === 'string' && result.trim() === 'pong';
         }
         catch (error) {
-            this.logger.error('Ping failed:', error);
+            this.logger.error('Ping failed', error);
             return false;
         }
     }
@@ -49,11 +33,13 @@ export class PhotoshopConnection {
         if (this.photoshopInfo)
             return this.photoshopInfo;
         if (!this.detectInFlight) {
-            this.detectInFlight = this.detector
+            this.detectInFlight = this.host.detector
                 .detect()
                 .then((info) => {
-                if (info)
+                if (info) {
+                    this.host.adapter.useInstall?.(info);
                     this.photoshopInfo = info;
+                }
                 return info;
             })
                 .finally(() => {
@@ -68,7 +54,7 @@ export class PhotoshopConnection {
             return this.photoshopInfo?.version || 'Unknown';
         }
         catch (error) {
-            this.logger.error('Failed to get version:', error);
+            this.logger.error('Failed to read the Photoshop version', error);
             throw error;
         }
     }
@@ -79,37 +65,37 @@ export class PhotoshopConnection {
                 throw new Error('Photoshop info not available — the local install could not be detected. ' +
                     'Check that Photoshop is installed (set PHOTOSHOP_PATH to override detection).');
             }
-            if (this.macosExecutor && this.photoshopInfo.appName) {
-                this.macosExecutor.setAppName(this.photoshopInfo.appName);
-            }
-            if (this.now() >= this.runningLatchUntil) {
-                const isRunning = await this.executor.isPhotoshopRunning();
-                if (!isRunning) {
-                    this.logger.info('Photoshop not running, launching...');
-                    await this.executor.launchPhotoshop(this.photoshopInfo.path);
-                }
-                else {
-                    this.runningLatchUntil = this.now() + RUNNING_LATCH_TTL_MS;
-                }
-            }
+            await this.ensureRunning(this.photoshopInfo);
             if (this.logger.isDebugEnabled()) {
-                this.logger.debug(`Executing script (${script.length} chars, PS ${this.photoshopInfo.version}, ${platform()}): ${truncateForLog(script, 200)}`);
+                this.logger.debug(`Executing script (${script.length} chars, PS ${this.photoshopInfo.version}, ${this.host.os}): ${truncateForLog(script, 200)}`);
             }
-            const result = await this.executor.execute(script, timeout);
+            const result = await this.host.adapter.run(script, timeout);
             this.runningLatchUntil = this.now() + RUNNING_LATCH_TTL_MS;
             return result;
         }
         catch (error) {
             this.runningLatchUntil = 0;
-            const psVersion = this.photoshopInfo?.version ?? 'unknown';
-            const head = truncateForLog(script, 200);
-            this.logger.error(`Script execution failed (PS ${psVersion}, ${platform()}, ${script.length} chars):`, error, `\n--- script head (200 chars) ---\n${head}`);
-            if (process.env.LOG_SCRIPT_ON_ERROR === '1') {
-                this.logger.error(`--- full failing script ---\n${script}\n--- end script ---`);
-            }
+            this.logFailure(script, error);
             throw error;
         }
     }
+    async ensureRunning(info) {
+        if (this.now() < this.runningLatchUntil)
+            return;
+        if (await this.host.adapter.isRunning()) {
+            this.runningLatchUntil = this.now() + RUNNING_LATCH_TTL_MS;
+            return;
+        }
+        this.logger.info('Photoshop is not running; launching it');
+        await this.host.adapter.launch(info.path);
+    }
+    logFailure(script, error) {
+        const psVersion = this.photoshopInfo?.version ?? 'unknown';
+        this.logger.error(`Script execution failed (PS ${psVersion}, ${this.host.os}, ${script.length} chars)`, error, `\n--- script head (200 chars) ---\n${truncateForLog(script, 200)}`);
+        if (process.env.LOG_SCRIPT_ON_ERROR === '1') {
+            this.logger.error(`--- full failing script ---\n${script}\n--- end script ---`);
+        }
+    }
     getPhotoshopInfo() {
         return this.photoshopInfo;
     }

package/dist/platform/host-platform.js

@@ -0,0 +1,16 @@
+import { platform } from 'os';
+import { MacOSDetector } from './macos-detector.js';
+import { MacOSScriptRunner } from './macos-runner.js';
+import { WindowsDetector } from './windows-detector.js';
+import { WindowsScriptRunner } from './windows-runner.js';
+export function resolveHostPlatform() {
+    const os = platform();
+    if (os === 'win32') {
+        return { os, adapter: new WindowsScriptRunner(), detector: new WindowsDetector() };
+    }
+    if (os === 'darwin') {
+        return { os, adapter: new MacOSScriptRunner(), detector: new MacOSDetector() };
+    }
+    throw new Error(`Editmamei runs on Windows and macOS; this process is on "${os}". ` +
+        'Adobe ships no Linux build of Photoshop, so there is nothing here to drive.');
+}