editmamei 0.22.4 → 0.24.1

package/README.md

@@ -76,11 +76,11 @@ These are the choices that shape the surface, and the reason an AI assistant can
 
 ## Tool surface
 
-**75 tools across 16 capability groups** (58 Community, 17 Pro). Every tool is namespaced `photoshop_*` and discoverable at runtime via `tools/list`. Community tools ship in both editions; Pro tools unlock with a license.
+**87 tools across 16 capability groups** (64 Community, 23 Pro). Every tool is namespaced `ps_*` and discoverable at runtime via `tools/list`. Community tools ship in both editions; Pro tools unlock with a license.
 
 | Group | Edition | Tools |
 | --- | --- | --- |
-| **Core** | Community | `ping` · `overview` · `list_capabilities` · `undo` · `redo` |
+| **Core** | Community | `ping` · `overview` · `list_capabilities` · `undo` · `redo` · `report_problem` |
 | **Inspect** | Community | `inspect` · `get_preview` |
 | **Verify** | Community | `get_histogram` · `compare_regions` · `get_layer_bounds_diff` · `get_selection_preview` |
 | **Document & canvas** | Community | `create_document` · `open_document` · `close_document` · `save_psd` · `export` · `place_image` · `resize_image` · `crop_document` · `convert_image_mode` · `transform_canvas` · `guides` |
@@ -88,13 +88,15 @@ These are the choices that shape the surface, and the reason an AI assistant can
 | **Adjustments** | Community | `add_adjustment_layer` · `apply_adjustment` |
 | **Filters** | Community | `apply_filter` |
 | **Retouch** | Community | `retouch` |
-| **Layers** | Community | `create_layer` · `delete_layer` · `fill_layer` · `add_fill_layer` · `select_layer` · `move_layer_to_position` · `duplicate_layer` · `layer_via_copy` · `convert_to_smart_object` · `rasterize_layer` · `set_layer` · `merge` · `bake_layer` · `add_layer_style` · `transform_layer` · `create_group` · `move_layer_to_group` · `set_group_blend_mode` · `ungroup` · `delete_group` |
+| **Layers** | Community | `create_layer` · `delete_layer` · `fill_layer` · `add_fill_layer` · `select_layer` · `move_layer_to_position` · `duplicate_layer` · `copy_to_new_layer` · `convert_to_smart_object` · `rasterize_layer` · `set_layer` · `merge` · `bake_layer` · `add_layer_style` · `transform_layer` · `shape` · `create_group` · `move_layer_to_group` · `set_group_blend_mode` · `ungroup` · `delete_group` |
 | **Masks & paths** | Community | `layer_mask` · `create_clipping_mask` · `path` · `vector_mask` · `apply_image` · `calculations` |
 | **Type** | Community | `create_text_layer` · `set_text` |
-| **Perception** | Community | `detect` · `scene` · `select_by_reference` |
+| **Perception** | Community | `detect` · `read_scene` · `select_by_reference` |
 | **AI selection** | Community | `select_subject` · `select_sky` |
-| **AI selection** | Pro | `select_subject_instance` |
-| **Layers (warp)** | Pro | `warp_layer` · `warp_layer_mesh` |
+| **AI selection** | Pro | `select_subject_instance` · `select_object` |
+| **Filters** | Pro | `apply_camera_raw` |
+| **Layers (warp)** | Pro | `warp_layer` · `warp_layer_mesh` · `warp_layer_along` · `warp_layer_region` · `warp_layer_to` |
+| **Perception** | Pro | `edit_object` · `add_text_to_object` · `resolve_placement` |
 | **Face mesh** | Pro | `detect_landmarks` · `select_face_feature` |
 | **Templates** | Pro | `template_create_evidence` · `template_save` · `template_list` · `template_apply` · `template_verify` · `template_recall` · `template_delete` |
 | **Automation** | Pro | `list_actions` · `play_action` · `execute_script` |

package/dist/api/extendscript/_helpers.js

@@ -3,18 +3,6 @@ export const helperFunctions = `
 function cTID(s) { return app.charIDToTypeID(s); }
 function sTID(s) { return app.stringIDToTypeID(s); }
 `;
-export const bitsPerChannelHelper = `
-function getBitsPerChannelInt(doc) {
-  try {
-    var bpc = doc.bitsPerChannel;
-    if (bpc === BitsPerChannelType.ONE) return 1;
-    if (bpc === BitsPerChannelType.EIGHT) return 8;
-    if (bpc === BitsPerChannelType.SIXTEEN) return 16;
-    if (bpc === BitsPerChannelType.THIRTYTWO) return 32;
-  } catch (e) {}
-  return 0;
-}
-`;
 export const normNameHelper = `
 function normName(s) {
   if (s === null || s === undefined) return '';
@@ -205,7 +193,29 @@ export function duplicateForOp(opName, applyToActiveLayer) {
     var __opTargetIsCopy = true;
     `;
 }
+export const countLayersRecursiveHelper = `
+function __countLayersRecursive(layers) {
+  var total = 0;
+  var n = 0;
+  try { n = layers.length; } catch (eN) { n = 0; }
+  for (var i = 0; i < n; i++) {
+    var candidate = null;
+    try { candidate = layers[i]; } catch (eC) { continue; }
+    if (!candidate) continue;
+    total++;
+    var isGroup = false;
+    try { isGroup = (candidate instanceof LayerSet); } catch (eG) {}
+    if (isGroup) {
+      var childLayers = null;
+      try { childLayers = candidate.layers; } catch (eCl) { childLayers = null; }
+      if (childLayers) total += __countLayersRecursive(childLayers);
+    }
+  }
+  return total;
+}
+`;
 export const getContextInfo = `
+${countLayersRecursiveHelper}
 function getContextInfo() {
   // The whole body is wrapped in try/catch — a destructive op that
   // succeeded but then triggered "document closed" / "active layer gone"
@@ -228,6 +238,7 @@ function getContextInfo() {
         resolution: doc.resolution,
         colorMode: String(doc.mode),
         layerCount: doc.layers.length,
+        total_layer_count: __countLayersRecursive(doc.layers),
         hasSelection: (function () {
           // ExtendScript throws "No such element" when accessing doc.selection.bounds
           // with no active selection, and that error is NOT catchable when DoJavaScript
@@ -242,12 +253,35 @@ function getContextInfo() {
 
       if (doc.activeLayer) {
         var layer = doc.activeLayer;
+
+        // layer.visible on the ExtendScript DOM returns EFFECTIVE
+        // visibility (parent-chain AND own flag) NO MATTER which proxy
+        // resolves it -- re-reading through a fresh doc.layers walk does
+        // NOT recover the layer's own flag (verified live 2026-07: a
+        // visible child inside a hidden group reads visible:false from
+        // every DOM proxy, active-layer or walked). The own flag is only
+        // readable via Action Manager's Vsbl property, keyed by the
+        // layer's stable id (putIdentifier, not putName -- names aren't
+        // unique). Confirmed live on both an ArtLayer and a LayerSet.
+        // Falls back to the DOM (effective) value if the AM read throws,
+        // so a failure degrades to the old behavior instead of breaking
+        // the context block every tool returns.
+        var __effectiveVisible = layer.visible;
+        var __ownVisible = __effectiveVisible;
+        try {
+          var __visRef = new ActionReference();
+          __visRef.putProperty(app.charIDToTypeID('Prpr'), app.charIDToTypeID('Vsbl'));
+          __visRef.putIdentifier(app.charIDToTypeID('Lyr '), layer.id);
+          __ownVisible = app.executeActionGet(__visRef).getBoolean(app.charIDToTypeID('Vsbl'));
+        } catch (eOwn) {}
+
         context.activeLayer = {
           name: layer.name,
           kind: String(layer.kind),
           opacity: layer.opacity,
           blendMode: String(layer.blendMode),
-          visible: layer.visible,
+          visible: __ownVisible,
+          effectively_visible: __effectiveVisible,
           locked: layer.allLocked,
           isBackground: layer.isBackgroundLayer
         };
@@ -302,3 +336,53 @@ function getMinimalContextInfo() {
   }
 }
 `;
+export const parentPathHelper = `
+function __parentPathOf(doc, layer) {
+  function __ppWalk(layers, trail) {
+    var n = 0;
+    try { n = layers.length; } catch (eN) {}
+    for (var i = 0; i < n; i++) {
+      var candidate = null;
+      try { candidate = layers[i]; } catch (eC) { continue; }
+      if (!candidate) continue;
+      if (candidate === layer) return trail;
+      var isGroup = false;
+      try { isGroup = (candidate instanceof LayerSet); } catch (eG) {}
+      if (isGroup) {
+        var cname = null;
+        try { cname = candidate.name; } catch (eNm) {}
+        var childLayers = null;
+        try { childLayers = candidate.layers; } catch (eCl) {}
+        if (childLayers) {
+          var found = __ppWalk(childLayers, trail.concat([cname]));
+          if (found !== null) return found;
+        }
+      }
+    }
+    return null;
+  }
+  return __ppWalk(doc.layers, []);
+}
+`;
+export const hoistFromActiveGroupHelper = `
+function __hoistFromActiveGroupIfNeeded(doc, preMkActive, newLayer, intoActiveGroup) {
+  if (intoActiveGroup) return false;
+  var preWasGroup = false;
+  try { preWasGroup = (preMkActive instanceof LayerSet); } catch (eG) {}
+  if (!preWasGroup) return false;
+  var landedInside = false;
+  try {
+    var n = preMkActive.layers.length;
+    for (var i = 0; i < n; i++) {
+      if (preMkActive.layers[i] === newLayer) { landedInside = true; break; }
+    }
+  } catch (eIn) {}
+  if (!landedInside) return false;
+  try {
+    newLayer.move(preMkActive, ElementPlacement.PLACEBEFORE);
+    try { doc.activeLayer = newLayer; } catch (eA) {}
+    return true;
+  } catch (eMove) {}
+  return false;
+}
+`;

package/dist/api/photoshop-api.js

@@ -7,11 +7,12 @@ export class PhotoshopAPIFactory {
         this.connection = connection;
     }
     async createAPI() {
-        const info = this.connection.getPhotoshopInfo();
+        const info = await this.connection.ensureDetected();
         if (!info) {
-            throw new Error('Photoshop info not available. Please detect Photoshop first.');
+            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.info(`Creating ExtendScript API for Photoshop version ${info.version}`);
+        this.logger.debug(`Creating ExtendScript API for Photoshop version ${info.version}`);
         return new ExtendScriptPhotoshopAPI(this.connection);
     }
 }

package/dist/api/snippet-client.js

@@ -52,21 +52,49 @@ export class CompositeSnippetClient {
         return target.build(name, params);
     }
 }
+const SNIPPET_CACHE_MAX_ENTRIES = 256;
 export class GoSnippetClient {
     binaryPath;
     timeoutMs;
     extraEnv;
+    cache = new Map();
+    cachedBinaryMtimeMs = null;
     constructor(opts = {}) {
         this.binaryPath = opts.binaryPath ?? resolveCoreBinaryPath();
         this.timeoutMs = opts.timeoutMs ?? 10_000;
-        this.extraEnv = opts.env ?? {};
+        this.extraEnv = { ...(opts.env ?? {}) };
+    }
+    refreshCacheValidity() {
+        let mtimeMs;
+        try {
+            mtimeMs = statSync(this.binaryPath).mtimeMs;
+        }
+        catch {
+            return false;
+        }
+        if (mtimeMs !== this.cachedBinaryMtimeMs) {
+            this.cache.clear();
+            this.cachedBinaryMtimeMs = mtimeMs;
+        }
+        return true;
     }
     async build(name, params = {}) {
         ensureExecutable(this.binaryPath);
+        const paramsJson = JSON.stringify(params);
+        const cacheUsable = this.refreshCacheValidity();
+        const cacheKey = name + '\u0000' + paramsJson;
+        if (cacheUsable) {
+            const cached = this.cache.get(cacheKey);
+            if (cached !== undefined) {
+                this.cache.delete(cacheKey);
+                this.cache.set(cacheKey, cached);
+                return cached;
+            }
+        }
         const env = Object.keys(this.extraEnv).length > 0 ? { ...process.env, ...this.extraEnv } : undefined;
         const result = await runChildWithTimeout(this.binaryPath, ['build', name], {
             timeout: this.timeoutMs,
-            input: JSON.stringify(params),
+            input: paramsJson,
             diagLabel: `editmamei-core build ${name}`,
             env,
         });
@@ -74,6 +102,14 @@ export class GoSnippetClient {
             throw new Error(`editmamei-core build "${name}" failed (exit ${result.exitCode}): ` +
                 `${result.stderr.trim() || '(no stderr)'}`);
         }
+        if (cacheUsable) {
+            this.cache.set(cacheKey, result.stdout);
+            if (this.cache.size > SNIPPET_CACHE_MAX_ENTRIES) {
+                const oldestKey = this.cache.keys().next().value;
+                if (oldestKey !== undefined)
+                    this.cache.delete(oldestKey);
+            }
+        }
         return result.stdout;
     }
 }

package/dist/core/server.js

@@ -13,30 +13,18 @@ import { loadSettings, applyTelemetryEnvOverrides, applyUpdateCheckEnvOverride,
 import { TelemetryClient } from '../telemetry/client.js';
 import { resolveInstallChannel } from '../install-channel.js';
 import { checkForUpdate, shouldCheckForUpdate } from '../update/check.js';
-import { join, dirname } from 'node:path';
-import { pathToFileURL } from 'node:url';
-import { GoSnippetClient, resolveProBinaryPath, coreBinaryName } from '../api/snippet-client.js';
+import { join } from 'node:path';
+import { GoSnippetClient, coreBinaryName } from '../api/snippet-client.js';
 import { isProEntitled } from '../license/entitlement.js';
 import { createPingLicenseRefresher } from '../license/ping-refresh.js';
-import { loadVerifiedModule, readInstalledModule, installedPath, PRO_SKU, } from '../delivery/store.js';
-import { provisionModules } from '../delivery/provision.js';
-import { readLicense } from '../license/store.js';
-import { existsSync } from 'node:fs';
 import { runScript } from '../utils/run-script.js';
 import { listTemplates } from '../utils/template-storage.js';
+import { toolErrorResult } from '../utils/tool-helpers.js';
 import { Kernel } from '../kernel/kernel.js';
-import { HOST_MIN_ABI } from '../kernel/host-api.js';
 import { ceModule } from '../modules/ce/index.js';
 import { hostDetectionRuntime } from '../detection/runtime.js';
-export function classifyModuleOutcome(inputs) {
-    if (inputs.proModuleLoaded && inputs.skipReason === null)
-        return 'loaded';
-    if (inputs.skipReason === 'corrupt')
-        return 'skipped_corrupt';
-    if (inputs.skipReason === 'incompatible')
-        return 'skipped_incompatible';
-    return inputs.entitled ? 'absent' : 'lapsed';
-}
+import { ModuleLifecycle, classifyModuleOutcome } from '../kernel/module-lifecycle.js';
+export { classifyModuleOutcome };
 let logScriptOnErrorWarned = false;
 function warnLogScriptOnErrorOnce(logger) {
     if (logScriptOnErrorWarned)
@@ -64,8 +52,10 @@ export class EditmameiServer {
     sessionLog;
     telemetry;
     kernel;
-    proModule = null;
-    moduleSkipReason = null;
+    moduleLifecycle;
+    get moduleSkipReason() {
+        return this.moduleLifecycle.moduleSkipReason;
+    }
     psVersion = null;
     updateInfo = null;
     snippetClient = new GoSnippetClient();
@@ -134,7 +124,7 @@ export class EditmameiServer {
         this.toolRegistry.register('ps_ping', {
             tool: {
                 name: 'ps_ping',
-                description: 'Test connection to Photoshop and report session-start discovery signals. Read-only and idempotent. Call this once at the start of a session to confirm liveness before invoking any other tool. **If the user has given you an open-ended editing task, ALSO call `ps_overview` after this** — it returns the workflow contract + capabilities map + verification primitives so you can plan well. Returns `version` (folds the deleted photoshop_get_version), `custom_action_sets` (count of Action Sets loaded in the Photoshop Actions palette — non-zero means recorded workflows exist; if action tools are available in this build they will appear in `tools/list`), `user_templates` (count of saved Editmamei templates), and `open_documents` (names of documents already open in Photoshop, so the LLM does not have to ask which doc to edit).',
+                description: 'Test connection to Photoshop and report session-start discovery signals. Read-only and idempotent. Call this once at the start of a session to confirm liveness before invoking any other tool. **If the user has given you an open-ended editing task, ALSO call `ps_overview` after this** — it returns the workflow contract + capabilities map + verification primitives so you can plan well. Returns `version` (folds the removed get-version tool), `custom_action_sets` (count of Action Sets loaded in the Photoshop Actions palette — non-zero means recorded workflows exist; if action tools are available in this build they will appear in `tools/list`), `user_templates` (count of saved Editmamei templates), and `open_documents` (names of documents already open in Photoshop, so the LLM does not have to ask which doc to edit).',
                 inputSchema: {
                     type: 'object',
                     properties: {},
@@ -150,7 +140,7 @@ export class EditmameiServer {
                         degraded: {
                             type: 'array',
                             items: { type: 'string' },
-                            description: 'List of optional discovery signals that could not be gathered (e.g. "pingState" if the in-PS state snippet failed, "templates" if ~/.editmamei/templates was unreadable). Empty when all signals were collected cleanly. Returned defaults for any degraded field cannot be trusted as ground truth.',
+                            description: 'List of optional discovery signals that could not be gathered (e.g. "pingState" if the go-core snippet builder itself failed to produce the in-PS state script — a broken/missing local install, unrelated to whether Photoshop is reachable; liveness falls back to a cheap ping probe in that case — "templates" if ~/.editmamei/templates was unreadable). Empty when all signals were collected cleanly. Returned defaults for any degraded field cannot be trusted as ground truth.',
                         },
                         update_available: {
                             type: ['object', 'null'],
@@ -204,162 +194,39 @@ export class EditmameiServer {
             },
             handler: async () => this.listCapabilities(),
         });
-        this.proModule = this.resolveProModule();
+        this.moduleLifecycle = new ModuleLifecycle({
+            toolRegistry: this.toolRegistry,
+            logger: this.logger,
+            assertToolsClassified: () => this.assertToolsClassified(),
+        });
+        const proModule = this.moduleLifecycle.resolveProModule();
         this.kernel = new Kernel({
             registry: this.toolRegistry,
             connection: this.session.getConnection(),
             snippet: this.snippetClient,
             detection: hostDetectionRuntime(),
-            resolveModuleSnippet: (manifest) => manifest.goCoreSnippets && manifest.goCoreSnippets.length > 0 && this.proModule
-                ? new GoSnippetClient({ binaryPath: join(this.proModule.binDir, coreBinaryName()) })
+            resolveModuleSnippet: (manifest) => manifest.goCoreSnippets && manifest.goCoreSnippets.length > 0 && proModule
+                ? new GoSnippetClient({ binaryPath: join(proModule.binDir, coreBinaryName()) })
                 : null,
             sessionId: this.session.getSessionId(),
             logger: this.logger,
         });
+        this.moduleLifecycle.setKernel(this.kernel);
         this.kernel.loadBuiltins([ceModule]);
         this.assertToolsClassified();
         this.logger.info(`Registered ${this.toolRegistry.count()} tools (edition: ${EDITION})`);
     }
-    resolveProModule() {
-        if (isProEntitled()) {
-            const verified = loadVerifiedModule(PRO_SKU);
-            if (verified) {
-                const abi = readInstalledModule(PRO_SKU)?.abi ?? null;
-                return {
-                    importer: () => import(pathToFileURL(verified.handlersPath).href),
-                    binDir: verified.binDir,
-                    abi,
-                };
-            }
-            if (EDITION !== 'dev' && existsSync(installedPath(PRO_SKU))) {
-                this.moduleSkipReason = 'corrupt';
-            }
-        }
-        if (EDITION === 'dev') {
-            return {
-                importer: () => import('../modules/pro/index.js'),
-                binDir: dirname(resolveProBinaryPath()),
-                abi: null,
-            };
-        }
-        return null;
-    }
     async loadModules() {
-        if (!this.proModule)
-            return;
-        if (this.proModule.abi !== null && this.proModule.abi < HOST_MIN_ABI) {
-            this.logger.warn(`Pro module (abi ${this.proModule.abi}) is older than this host requires ` +
-                `(min abi ${HOST_MIN_ABI}) — booting Community; will re-provision in the background.`);
-            this.moduleSkipReason = 'incompatible';
-            return;
-        }
-        const snapshot = this.toolRegistry.snapshot();
-        try {
-            await this.kernel.loadDownloaded(this.proModule.importer);
-            this.assertToolsClassified();
-        }
-        catch (err) {
-            const changed = this.toolRegistry.count() - snapshot.size;
-            this.toolRegistry.restore(snapshot);
-            this.logger.warn(`Pro module could not be loaded on this host — booting Community and rolling back ` +
-                `${changed} module tool change(s); will re-provision in the background: ` +
-                `${err instanceof Error ? err.message : String(err)}`);
-            this.moduleSkipReason = 'incompatible';
-        }
+        return this.moduleLifecycle.loadModules();
     }
     computeModuleStatus() {
-        if (!readLicense())
-            return null;
-        const installed = readInstalledModule(PRO_SKU);
-        return {
-            module: PRO_SKU,
-            outcome: classifyModuleOutcome({
-                proModuleLoaded: this.proModule !== null,
-                skipReason: this.moduleSkipReason,
-                entitled: isProEntitled(),
-            }),
-            module_version: installed?.version ?? null,
-            abi: installed?.abi ?? null,
-        };
+        return this.moduleLifecycle.computeModuleStatus();
     }
     async reprovisionIfModuleSkipped(delivery = {}) {
-        const reason = this.moduleSkipReason;
-        if (reason === null)
-            return;
-        const license = readLicense();
-        if (!license) {
-            this.logger.warn('A Pro module was skipped but no cached license was found — staying Community. ' +
-                'Run `editmamei activate <key>` to restore Pro.');
-            return;
-        }
-        try {
-            const prov = await provisionModules(license.key, {
-                force: reason === 'corrupt',
-                config: delivery.config,
-                fetchImpl: delivery.fetchImpl,
-                signingKeys: delivery.signingKeys,
-                sleep: delivery.sleep,
-            });
-            if (prov.installed.length > 0) {
-                for (const m of prov.installed) {
-                    this.logger.info(`Pro module updated to v${m.version}, restart to load.`);
-                }
-                return;
-            }
-            if (prov.notConfigured) {
-                this.logger.warn('Module delivery is not configured — staying Community.');
-                return;
-            }
-            for (const e of prov.errors) {
-                this.logger.warn(`Could not re-provision the ${e.sku} module (staying Community): ${e.message}`);
-            }
-            if (prov.errors.length === 0) {
-                if (reason === 'incompatible') {
-                    this.logger.warn('The published Pro module does not yet support this host version — staying ' +
-                        'Community. Update Editmamei when a compatible release ships; ' +
-                        '`editmamei report` files a diagnostic.');
-                }
-                else {
-                    this.logger.warn('Re-provision installed nothing for the corrupt Pro module — staying ' +
-                        'Community. Try `editmamei repair`; `editmamei report` if it persists.');
-                }
-            }
-        }
-        catch (err) {
-            this.logger.warn(`Background Pro-module re-provision failed (staying Community): ` +
-                `${err instanceof Error ? err.message : String(err)}`);
-        }
+        return this.moduleLifecycle.reprovisionIfModuleSkipped(delivery);
     }
     async ensureEntitledModuleFresh(delivery = {}) {
-        if (this.moduleSkipReason !== null)
-            return;
-        if (!isProEntitled())
-            return;
-        const underTest = process.env.VITEST !== undefined || process.env.NODE_ENV === 'test';
-        if (underTest && !delivery.fetchImpl)
-            return;
-        const license = readLicense();
-        if (!license)
-            return;
-        try {
-            const prov = await provisionModules(license.key, {
-                config: delivery.config,
-                fetchImpl: delivery.fetchImpl,
-                signingKeys: delivery.signingKeys,
-                sleep: delivery.sleep,
-            });
-            for (const m of prov.installed) {
-                this.logger.info(`Pro module updated to v${m.version} — restart to load.`);
-            }
-            for (const e of prov.errors) {
-                this.logger.warn(`Pro-module freshness check could not provision the ${e.sku} module ` +
-                    `(staying on the installed version): ${e.message}`);
-            }
-        }
-        catch (err) {
-            this.logger.warn(`Background Pro-module freshness check failed (staying on the installed version): ` +
-                `${err instanceof Error ? err.message : String(err)}`);
-        }
+        return this.moduleLifecycle.ensureEntitledModuleFresh(delivery);
     }
     assertToolsClassified() {
         for (const tool of this.toolRegistry.list()) {
@@ -420,29 +287,12 @@ export class EditmameiServer {
         }
         catch (error) {
             this.logger.error(`Tool execution failed: ${name}`, error);
-            return {
-                content: [
-                    {
-                        type: 'text',
-                        text: `Error: ${error instanceof Error ? error.message : String(error)}`,
-                    },
-                ],
-                isError: true,
-            };
+            return toolErrorResult('Error', error);
         }
     }
     async pingPhotoshop() {
         this.refreshLicenseOnPing();
         const connection = this.session.getConnection();
-        const isConnected = await connection.ping();
-        if (!isConnected) {
-            return {
-                content: [
-                    { type: 'text', text: 'Failed to connect to Photoshop' + this.updateNote() },
-                ],
-                structuredContent: { connected: false, update_available: this.updateInfo },
-            };
-        }
         let version = 'Unknown';
         let actionSetsCount = 0;
         let openDocuments = [];
@@ -454,8 +304,37 @@ export class EditmameiServer {
         }
         catch {
         }
+        let pingStateSnippet = null;
         try {
-            const state = (await runScript(connection, await this.snippetClient.build('pingState')));
+            pingStateSnippet = await this.snippetClient.build('pingState');
+        }
+        catch (err) {
+            this.logger.warn(`pingState snippet build failed (go-core binary missing/broken?): ${err instanceof Error ? err.message : String(err)}`);
+            const alive = await connection.ping().catch(() => false);
+            if (!alive) {
+                return {
+                    content: [
+                        { type: 'text', text: 'Failed to connect to Photoshop' + this.updateNote() },
+                    ],
+                    structuredContent: { connected: false, update_available: this.updateInfo },
+                };
+            }
+            degraded.push('pingState');
+        }
+        if (pingStateSnippet !== null) {
+            let state;
+            try {
+                state = (await runScript(connection, pingStateSnippet));
+            }
+            catch (err) {
+                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() },
+                    ],
+                    structuredContent: { connected: false, update_available: this.updateInfo },
+                };
+            }
             if (state.version)
                 version = state.version;
             if (typeof state.action_sets_count === 'number')
@@ -463,10 +342,6 @@ export class EditmameiServer {
             if (Array.isArray(state.open_documents))
                 openDocuments = state.open_documents;
         }
-        catch (err) {
-            this.logger.warn(`pingState snippet failed: ${err instanceof Error ? err.message : String(err)}`);
-            degraded.push('pingState');
-        }
         let userTemplates = 0;
         try {
             const templates = await listTemplates();
@@ -527,6 +402,7 @@ export class EditmameiServer {
     async stop() {
         await this.telemetry.shutdown();
         await this.session.disconnect();
+        await this.sessionLog.close();
         this.logger.info('MCP Server stopped');
     }
 }