editmamei 0.17.5 → 0.19.0

package/dist/core/tool-groups.js

@@ -0,0 +1,178 @@
+export const GROUPS = {
+    core: {
+        id: 'core',
+        label: 'Core',
+        purpose: 'Session liveness, orientation, and undo/redo — always available.',
+    },
+    inspect: {
+        id: 'inspect',
+        label: 'Inspect',
+        purpose: 'Read document/layer/selection/history state and render previews.',
+    },
+    verify: {
+        id: 'verify',
+        label: 'Verify',
+        purpose: 'Measurement primitives — histogram, region compare, bounds diff — to check work instead of eyeballing.',
+    },
+    document: {
+        id: 'document',
+        label: 'Document & canvas',
+        purpose: 'Open/create/save/export documents; resize/crop/convert/rotate the canvas; place images; guides.',
+    },
+    select: {
+        id: 'select',
+        label: 'Selection',
+        purpose: 'Manual selections, selection edits, and alpha-channel save/load.',
+    },
+    select_ai: {
+        id: 'select_ai',
+        label: 'AI selection',
+        purpose: 'Sensei/CV-backed subject & sky selection (Pro).',
+    },
+    adjust: {
+        id: 'adjust',
+        label: 'Adjustments',
+        purpose: 'Non-destructive adjustment layers + the destructive tonal bakes with no layer equivalent.',
+    },
+    filter: {
+        id: 'filter',
+        label: 'Filters',
+        purpose: 'Blur/sharpen/noise/stylize filters (auto-duplicate-first by default).',
+    },
+    retouch: {
+        id: 'retouch',
+        label: 'Retouch',
+        purpose: 'Content-aware fill/patch/move and brush strokes.',
+    },
+    layers: {
+        id: 'layers',
+        label: 'Layers',
+        purpose: 'Layer lifecycle, properties, transforms, ordering, groups, and styles.',
+    },
+    masks: {
+        id: 'masks',
+        label: 'Masks & paths',
+        purpose: 'Layer masks, clipping masks, vector masks, and work paths.',
+    },
+    type: {
+        id: 'type',
+        label: 'Type',
+        purpose: 'Create and style text layers.',
+    },
+    perception: {
+        id: 'perception',
+        label: 'Perception',
+        purpose: 'On-device CV that gives the model real coordinates/selections — detection, scene read, and detection-driven edits.',
+    },
+    face: {
+        id: 'face',
+        label: 'Face mesh (Pro)',
+        purpose: 'Face-landmark perception and mesh-aimed feature selection / contour strokes (Pro).',
+    },
+    templates: {
+        id: 'templates',
+        label: 'Templates (Pro)',
+        purpose: 'Save, recall, apply, and verify reproducible aesthetic recipes (Pro).',
+    },
+    automation: {
+        id: 'automation',
+        label: 'Automation (Pro)',
+        purpose: 'Play recorded Actions and the ExtendScript escape hatch (Pro).',
+    },
+};
+export const TOOL_GROUPS = {
+    photoshop_ping: 'core',
+    photoshop_overview: 'core',
+    photoshop_undo: 'core',
+    photoshop_redo: 'core',
+    photoshop_list_capabilities: 'core',
+    photoshop_inspect: 'inspect',
+    photoshop_get_preview: 'inspect',
+    photoshop_get_histogram: 'verify',
+    photoshop_compare_regions: 'verify',
+    photoshop_get_layer_bounds_diff: 'verify',
+    photoshop_get_selection_preview: 'verify',
+    photoshop_create_document: 'document',
+    photoshop_open_document: 'document',
+    photoshop_close_document: 'document',
+    photoshop_save_psd: 'document',
+    photoshop_export: 'document',
+    photoshop_place_image: 'document',
+    photoshop_resize_image: 'document',
+    photoshop_crop_document: 'document',
+    photoshop_convert_image_mode: 'document',
+    photoshop_transform_canvas: 'document',
+    photoshop_guides: 'document',
+    photoshop_select: 'select',
+    photoshop_modify_selection: 'select',
+    photoshop_selection_channel: 'select',
+    photoshop_select_subject: 'select_ai',
+    photoshop_select_sky: 'select_ai',
+    photoshop_select_subject_instance: 'select_ai',
+    photoshop_add_adjustment_layer: 'adjust',
+    photoshop_apply_adjustment: 'adjust',
+    photoshop_apply_filter: 'filter',
+    photoshop_retouch: 'retouch',
+    photoshop_apply_brush_stroke: 'retouch',
+    photoshop_create_layer: 'layers',
+    photoshop_delete_layer: 'layers',
+    photoshop_fill_layer: 'layers',
+    photoshop_add_fill_layer: 'layers',
+    photoshop_select_layer: 'layers',
+    photoshop_move_layer_to_position: 'layers',
+    photoshop_duplicate_layer: 'layers',
+    photoshop_layer_via_copy: 'layers',
+    photoshop_convert_to_smart_object: 'layers',
+    photoshop_rasterize_layer: 'layers',
+    photoshop_set_layer: 'layers',
+    photoshop_merge: 'layers',
+    photoshop_bake_layer: 'layers',
+    photoshop_add_layer_style: 'layers',
+    photoshop_transform_layer: 'layers',
+    photoshop_warp_layer: 'layers',
+    photoshop_warp_layer_mesh: 'layers',
+    photoshop_create_group: 'layers',
+    photoshop_move_layer_to_group: 'layers',
+    photoshop_set_group_blend_mode: 'layers',
+    photoshop_ungroup: 'layers',
+    photoshop_delete_group: 'layers',
+    photoshop_layer_mask: 'masks',
+    photoshop_create_clipping_mask: 'masks',
+    photoshop_release_clipping_mask: 'masks',
+    photoshop_path: 'masks',
+    photoshop_vector_mask: 'masks',
+    photoshop_create_text_layer: 'type',
+    photoshop_set_text: 'type',
+    photoshop_detect: 'perception',
+    photoshop_scene: 'perception',
+    photoshop_select_by_reference: 'perception',
+    photoshop_object: 'perception',
+    photoshop_portrait_touchup: 'perception',
+    photoshop_text_on_object: 'perception',
+    photoshop_detect_landmarks: 'face',
+    photoshop_select_face_feature: 'face',
+    photoshop_stroke_face_contour: 'face',
+    photoshop_template_create_evidence: 'templates',
+    photoshop_template_save: 'templates',
+    photoshop_template_list: 'templates',
+    photoshop_template_apply: 'templates',
+    photoshop_template_verify: 'templates',
+    photoshop_template_recall: 'templates',
+    photoshop_template_delete: 'templates',
+    photoshop_list_actions: 'automation',
+    photoshop_play_action: 'automation',
+    photoshop_execute_script: 'automation',
+};
+export function groupOf(toolName) {
+    const group = TOOL_GROUPS[toolName];
+    if (!group) {
+        throw new Error(`Tool '${toolName}' has no entry in src/core/tool-groups.ts. ` +
+            `Every registered tool must be assigned a capability group.`);
+    }
+    return group;
+}
+export function toolsInGroup(group) {
+    return Object.entries(TOOL_GROUPS)
+        .filter(([, g]) => g === group)
+        .map(([name]) => name);
+}

package/dist/core/tool-tiers.js

@@ -1,26 +1,17 @@
 export const TOOL_TIERS = {
     photoshop_ping: 'community',
+    photoshop_list_capabilities: 'community',
     photoshop_list_actions: 'pro',
     photoshop_play_action: 'pro',
     photoshop_execute_script: 'pro',
     photoshop_add_adjustment_layer: 'community',
-    photoshop_apply_shadows_highlights: 'community',
-    photoshop_apply_equalize: 'community',
-    photoshop_apply_color_lookup: 'community',
+    photoshop_apply_adjustment: 'community',
     photoshop_create_document: 'community',
     photoshop_close_document: 'community',
     photoshop_open_document: 'community',
     photoshop_save_psd: 'community',
-    photoshop_export_jpeg: 'community',
-    photoshop_export_png: 'community',
-    photoshop_apply_gaussian_blur: 'community',
-    photoshop_apply_sharpen: 'community',
-    photoshop_apply_noise: 'community',
-    photoshop_apply_motion_blur: 'community',
-    photoshop_apply_lens_blur: 'community',
-    photoshop_apply_smart_sharpen: 'community',
-    photoshop_apply_reduce_noise: 'community',
-    photoshop_apply_high_pass: 'community',
+    photoshop_export: 'community',
+    photoshop_apply_filter: 'community',
     photoshop_create_group: 'community',
     photoshop_move_layer_to_group: 'community',
     photoshop_set_group_blend_mode: 'community',
@@ -30,59 +21,57 @@ export const TOOL_TIERS = {
     photoshop_release_clipping_mask: 'dev',
     photoshop_undo: 'community',
     photoshop_redo: 'community',
-    photoshop_get_history: 'community',
     photoshop_place_image: 'community',
     photoshop_resize_image: 'community',
     photoshop_crop_document: 'community',
+    photoshop_convert_image_mode: 'community',
     photoshop_move_layer_to_position: 'community',
     photoshop_convert_to_smart_object: 'community',
     photoshop_rasterize_layer: 'community',
-    photoshop_set_layer_opacity: 'community',
-    photoshop_set_layer_blend_mode: 'community',
-    photoshop_set_layer_visibility: 'community',
-    photoshop_set_layer_locked: 'community',
-    photoshop_rename_layer: 'community',
+    photoshop_set_layer: 'community',
     photoshop_duplicate_layer: 'community',
-    photoshop_merge_visible_layers: 'community',
-    photoshop_stamp_visible: 'community',
-    photoshop_flatten_image: 'community',
+    photoshop_layer_via_copy: 'community',
+    photoshop_merge: 'community',
+    photoshop_bake_layer: 'community',
     photoshop_add_layer_style: 'community',
     photoshop_create_layer: 'community',
     photoshop_delete_layer: 'community',
     photoshop_create_text_layer: 'community',
     photoshop_fill_layer: 'community',
-    photoshop_get_layer_tree: 'community',
+    photoshop_add_fill_layer: 'community',
     photoshop_select_layer: 'community',
-    photoshop_fit_layer_to_document: 'community',
-    photoshop_scale_layer: 'community',
-    photoshop_move_layer: 'community',
-    photoshop_rotate_layer: 'community',
-    photoshop_get_metadata: 'community',
+    photoshop_transform_layer: 'community',
+    photoshop_warp_layer: 'pro',
+    photoshop_warp_layer_mesh: 'pro',
+    photoshop_transform_canvas: 'community',
+    photoshop_guides: 'community',
+    photoshop_inspect: 'community',
     photoshop_overview: 'community',
     photoshop_get_preview: 'community',
     photoshop_get_layer_bounds_diff: 'community',
     photoshop_compare_regions: 'community',
     photoshop_get_histogram: 'community',
-    photoshop_apply_content_aware_fill: 'community',
-    photoshop_apply_patch: 'community',
-    photoshop_apply_content_aware_move: 'community',
+    photoshop_retouch: 'community',
     photoshop_apply_brush_stroke: 'dev',
-    photoshop_select_rectangle: 'community',
+    photoshop_detect: 'community',
+    photoshop_object: 'dev',
+    photoshop_portrait_touchup: 'dev',
+    photoshop_text_on_object: 'dev',
+    photoshop_detect_landmarks: 'pro',
+    photoshop_select_face_feature: 'pro',
+    photoshop_stroke_face_contour: 'dev',
+    photoshop_scene: 'community',
+    photoshop_select_by_reference: 'community',
+    photoshop_select: 'community',
     photoshop_select_subject: 'pro',
     photoshop_select_sky: 'pro',
-    photoshop_select_color_range: 'community',
-    photoshop_magic_wand: 'community',
-    photoshop_get_selection_info: 'community',
+    photoshop_select_subject_instance: 'pro',
+    photoshop_modify_selection: 'community',
     photoshop_get_selection_preview: 'community',
-    photoshop_feather_selection: 'community',
-    photoshop_select_all: 'community',
-    photoshop_deselect: 'community',
-    photoshop_invert_selection: 'community',
-    photoshop_save_selection_to_channel: 'community',
-    photoshop_load_selection_from_channel: 'community',
-    photoshop_create_layer_mask: 'community',
-    photoshop_delete_layer_mask: 'community',
-    photoshop_apply_layer_mask: 'community',
+    photoshop_selection_channel: 'community',
+    photoshop_layer_mask: 'community',
+    photoshop_path: 'community',
+    photoshop_vector_mask: 'community',
     photoshop_template_create_evidence: 'pro',
     photoshop_template_save: 'pro',
     photoshop_template_list: 'pro',
@@ -90,10 +79,7 @@ export const TOOL_TIERS = {
     photoshop_template_verify: 'pro',
     photoshop_template_recall: 'pro',
     photoshop_template_delete: 'pro',
-    photoshop_set_text_font: 'community',
-    photoshop_set_text_color: 'community',
-    photoshop_set_text_alignment: 'community',
-    photoshop_update_text_content: 'community',
+    photoshop_set_text: 'community',
 };
 export function tierOf(toolName) {
     const tier = TOOL_TIERS[toolName];

package/dist/delivery/bundle.js

@@ -27,6 +27,9 @@ export function unzipBundle(container) {
     const out = [];
     let total = 0;
     for (const e of entries) {
+        if (isUnsafeEntryName(e.entryName)) {
+            throw new BundleError(`bundle entry '${e.entryName}' escapes the install directory`);
+        }
         const declared = e.header?.size ?? 0;
         if (declared > MAX_ENTRY_BYTES) {
             throw new BundleError(`bundle entry '${e.entryName}' is too large (${declared} bytes)`);
@@ -68,6 +71,11 @@ export function safeResolve(root, name) {
     }
     return out;
 }
+export function isUnsafeEntryName(name) {
+    if (isAbsolute(name) || /^[A-Za-z]:[\\/]/.test(name) || /^[\\/]{2}/.test(name))
+        return true;
+    return name.split(/[\\/]/).some((seg) => seg === '..');
+}
 function isCoreBinary(name) {
     const base = name.split('/').pop() ?? name;
     return base.startsWith('editmamei-core-');

package/dist/delivery/config.js

@@ -1,5 +1,28 @@
 const DEFAULT_BASE_URL = 'https://editmamei-delivery.editmamei.workers.dev';
 export function resolveDeliveryConfig(url = process.env.EDITMAMEI_DELIVERY_URL) {
     const baseUrl = (url ?? DEFAULT_BASE_URL).replace(/\/+$/, '');
+    assertSecureEndpoint(baseUrl);
     return { baseUrl };
 }
+function assertSecureEndpoint(baseUrl) {
+    if (!baseUrl)
+        return;
+    let u;
+    try {
+        u = new URL(baseUrl);
+    }
+    catch {
+        throw new Error(`EDITMAMEI_DELIVERY_URL is not a valid URL: ${baseUrl}`);
+    }
+    if (u.protocol === 'https:')
+        return;
+    const host = u.hostname;
+    const isLoopback = host === 'localhost' ||
+        host === '::1' ||
+        host === '[::1]' ||
+        /^127(?:\.\d{1,3}){3}$/.test(host);
+    if (u.protocol === 'http:' && isLoopback)
+        return;
+    throw new Error(`EDITMAMEI_DELIVERY_URL must use https (got ${u.protocol}//${host}); ` +
+        'plaintext http is allowed only for localhost during local development.');
+}

package/dist/delivery/provision.js

@@ -25,7 +25,8 @@ export async function provisionModules(key, opts = {}) {
             result.notConfigured = true;
             return result;
         }
-        throw e;
+        result.errors.push({ sku: '*', message: errMsg(e) });
+        return result;
     }
     let manifest;
     try {
@@ -54,6 +55,14 @@ export async function provisionModules(key, opts = {}) {
                 result.skipped.push({ sku, version: latest, reason: 'up-to-date' });
                 continue;
             }
+            if (installed && compareVersions(latest, installed.version) < 0) {
+                result.skipped.push({
+                    sku,
+                    version: latest,
+                    reason: `rollback-blocked (installed v${installed.version} is newer than manifest latest v${latest})`,
+                });
+                continue;
+            }
             const vEntry = entry.versions[latest];
             if (!vEntry) {
                 result.errors.push({ sku, message: `manifest has no descriptor for ${sku} v${latest}` });
@@ -82,7 +91,8 @@ export async function provisionModules(key, opts = {}) {
                 });
                 continue;
             }
-            if (!verifyModuleSignature(sku, latest, digest, vEntry.sig, opts.signingKeys)) {
+            const sig = vEntry.sig;
+            if (!verifyModuleSignature(sku, latest, digest, sig, opts.signingKeys)) {
                 result.errors.push({
                     sku,
                     message: `signature verification failed for ${sku} v${latest} — refusing to install unverified module code`,
@@ -97,6 +107,7 @@ export async function provisionModules(key, opts = {}) {
                 sha256: digest,
                 alg: contentKey.alg,
                 content_key: contentKey.key,
+                sig: sig,
             }, blob, opts);
             result.installed.push({ sku, version: latest });
         }
@@ -109,3 +120,20 @@ export async function provisionModules(key, opts = {}) {
 function errMsg(e) {
     return e instanceof Error ? e.message : String(e);
 }
+function compareVersions(a, b) {
+    const [aCore, aPre] = a.split('-', 2);
+    const [bCore, bPre] = b.split('-', 2);
+    const ap = aCore.split('.').map(Number);
+    const bp = bCore.split('.').map(Number);
+    for (let i = 0; i < 3; i++) {
+        if (ap[i] !== bp[i])
+            return ap[i] - bp[i];
+    }
+    if (aPre === bPre)
+        return 0;
+    if (aPre === undefined)
+        return 1;
+    if (bPre === undefined)
+        return -1;
+    return aPre < bPre ? -1 : 1;
+}

package/dist/delivery/store.js

@@ -2,12 +2,15 @@ import { join, dirname } from 'node:path';
 import { existsSync, mkdirSync, readFileSync, writeFileSync, renameSync } from 'node:fs';
 import { settingsDir } from '../core/settings.js';
 import { installBundle } from './bundle.js';
+import { sha256Hex } from './crypto.js';
+import { verifyModuleSignature, MODULE_SIGNING_PUBLIC_KEYS } from './signing.js';
 import { Logger } from '../utils/logger.js';
 const logger = new Logger('Modules');
 const INSTALLED_FILENAME = 'installed.json';
 export const PRO_SKU = 'pro';
 export const PRO_HANDLERS_ENTRY = 'pro-handlers.mjs';
 const MODULE_MANIFEST = 'manifest.json';
+const MODULE_ARTIFACT = 'artifact.enc';
 export function modulesRoot(opts = {}) {
     return join(settingsDir(opts), 'modules');
 }
@@ -23,6 +26,9 @@ export function moduleHandlersPath(sku, version, opts = {}) {
 export function moduleBinDir(sku, version, opts = {}) {
     return join(installedModuleDir(sku, version, opts), 'bin');
 }
+export function moduleArtifactPath(sku, version, opts = {}) {
+    return join(installedModuleDir(sku, version, opts), MODULE_ARTIFACT);
+}
 function isInstalledModule(v) {
     if (typeof v !== 'object' || v === null)
         return false;
@@ -33,6 +39,7 @@ function isInstalledModule(v) {
         typeof r.sha256 === 'string' &&
         typeof r.alg === 'string' &&
         typeof r.content_key === 'string' &&
+        typeof r.sig === 'string' &&
         typeof r.installed_at === 'string');
 }
 export function readInstalledModule(sku, opts = {}) {
@@ -65,9 +72,41 @@ function writeFileAtomic(path, data) {
     renameSync(tmp, path);
 }
 export function installModule(rec, blob, opts = {}) {
-    installBundle(blob, rec.content_key, installedModuleDir(rec.sku, rec.version, opts));
+    const dir = installedModuleDir(rec.sku, rec.version, opts);
+    installBundle(blob, rec.content_key, dir);
+    writeFileSync(moduleArtifactPath(rec.sku, rec.version, opts), Buffer.from(blob), { mode: 0o600 });
     const now = opts.now ?? Date.now;
     const installed = { ...rec, installed_at: new Date(now()).toISOString() };
     writeFileAtomic(installedPath(rec.sku, opts), JSON.stringify(installed, null, 2) + '\n');
     return installed;
 }
+export function loadVerifiedModule(sku, opts = {}, pubKeys = MODULE_SIGNING_PUBLIC_KEYS) {
+    const rec = readInstalledModule(sku, opts);
+    if (!rec)
+        return null;
+    const version = rec.version;
+    const dir = installedModuleDir(sku, version, opts);
+    try {
+        const blob = readFileSync(moduleArtifactPath(sku, version, opts));
+        const digest = sha256Hex(blob);
+        if (digest !== rec.sha256) {
+            logger.warn(`module '${sku}' v${version} artifact hash changed since install — refusing to load`);
+            return null;
+        }
+        if (!verifyModuleSignature(sku, version, digest, rec.sig, pubKeys)) {
+            logger.warn(`module '${sku}' v${version} signature did not verify at boot — refusing to load`);
+            return null;
+        }
+        installBundle(blob, rec.content_key, dir);
+        return {
+            version,
+            dir,
+            handlersPath: moduleHandlersPath(sku, version, opts),
+            binDir: moduleBinDir(sku, version, opts),
+        };
+    }
+    catch (err) {
+        logger.warn(`module '${sku}' v${version} failed boot verification: ${err instanceof Error ? err.message : String(err)}`);
+        return null;
+    }
+}

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

@@ -0,0 +1,84 @@
+import { readFile } from 'node:fs/promises';
+import { getContextInfo } from '../api/extendscript/_helpers.js';
+import { jsLit, jsNum } from '../utils/jsx.js';
+import { runScript } from '../utils/run-script.js';
+import { TempDir, userOwnedTempRoot } from '../utils/temp.js';
+import { mapDetectionToDoc, } from './detection-client.js';
+export async function detectActiveDoc(connection, client, opts) {
+    const maxDimension = opts.maxDimension ?? 1024;
+    const dir = process.platform === 'darwin'
+        ? await TempDir.createWithRoot(userOwnedTempRoot(), 'editmamei-detect-')
+        : await TempDir.create('editmamei-detect-');
+    try {
+        const tempPath = dir.path('detect.jpg');
+        const script = `
+      ${getContextInfo}
+      if (app.documents.length === 0) { throw new Error('No active document'); }
+      for (var __pi = app.documents.length - 1; __pi >= 0; __pi--) {
+        try {
+          var __pd = app.documents[__pi];
+          if (String(__pd.name).indexOf('__mcp_detect__') !== -1) {
+            try { __pd.close(SaveOptions.DONOTSAVECHANGES); } catch (e0) {}
+          }
+        } catch (e1) {}
+      }
+      var orig = app.activeDocument;
+      var origW = orig.width.as('px');
+      var origH = orig.height.as('px');
+      var dup = orig.duplicate(orig.name + ' __mcp_detect__');
+      try {
+        var w = dup.width.as('px');
+        var h = dup.height.as('px');
+        var longEdge = (w > h) ? w : h;
+        if (longEdge > ${jsNum(maxDimension, 1024)}) {
+          var scale = ${jsNum(maxDimension, 1024)} / longEdge;
+          dup.resizeImage(
+            UnitValue(Math.round(w * scale), 'px'),
+            UnitValue(Math.round(h * scale), 'px'),
+            null,
+            ResampleMethod.BICUBIC
+          );
+        }
+        var outFile = new File(${jsLit(tempPath)});
+        var opts = new JPEGSaveOptions();
+        opts.quality = 8;
+        opts.embedColorProfile = true;
+        opts.formatOptions = FormatOptions.STANDARDBASELINE;
+        dup.saveAs(outFile, opts, true, Extension.LOWERCASE);
+        if (!outFile.exists) {
+          try { dup.close(SaveOptions.DONOTSAVECHANGES); } catch (eD) {}
+          try { app.activeDocument = orig; } catch (eA) {}
+          throw new Error('JPEG saveAs reported success but no file at ' + outFile.fsName);
+        }
+        dup.close(SaveOptions.DONOTSAVECHANGES);
+        app.activeDocument = orig;
+        return { ok: true, doc_width: origW, doc_height: origH, context: getContextInfo() };
+      } catch (e) {
+        try { dup.close(SaveOptions.DONOTSAVECHANGES); } catch (e2) {}
+        try { app.activeDocument = orig; } catch (e3) {}
+        throw e;
+      }
+    `;
+        const exp = (await runScript(connection, script));
+        const docWidth = exp.doc_width ?? 0;
+        const docHeight = exp.doc_height ?? 0;
+        const raw = await client.detect(tempPath, {
+            faces: opts.faces,
+            objects: opts.objects,
+            faceThreshold: opts.faceThreshold,
+            objectThreshold: opts.objectThreshold,
+            maxObjects: opts.maxObjects,
+        });
+        let exportBytes = Buffer.alloc(0);
+        try {
+            exportBytes = await readFile(tempPath);
+        }
+        catch {
+        }
+        const result = mapDetectionToDoc(raw, docWidth, docHeight);
+        return { docWidth, docHeight, result, raw, context: exp.context, exportBytes };
+    }
+    finally {
+        await dir.cleanup();
+    }
+}

package/dist/detection/detection-client.js

@@ -0,0 +1,62 @@
+import { detectFaces } from './face-detector.js';
+import { detectObjects } from './object-detector.js';
+export class OnnxDetectionClient {
+    async detect(imagePath, opts) {
+        const wantFaces = opts.faces ?? false;
+        const wantObjects = opts.objects ?? false;
+        const [faceRes, objRes] = await Promise.all([
+            wantFaces ? detectFaces(imagePath, opts.faceThreshold) : Promise.resolve(null),
+            wantObjects
+                ? detectObjects(imagePath, { threshold: opts.objectThreshold, maxObjects: opts.maxObjects })
+                : Promise.resolve(null),
+        ]);
+        const dims = faceRes ?? objRes;
+        const result = {
+            image: { width: dims?.width ?? 0, height: dims?.height ?? 0 },
+            backends: {},
+        };
+        if (faceRes) {
+            result.faces = faceRes.faces.map((f) => ({ bbox: f.bbox, confidence: f.confidence }));
+            result.backends.faces = 'ultraface';
+        }
+        if (objRes) {
+            result.objects = objRes.objects.map((o) => ({
+                label: o.label,
+                class_id: o.class_id,
+                bbox: o.bbox,
+                confidence: o.confidence,
+            }));
+            result.backends.objects = 'dfine-s';
+        }
+        return result;
+    }
+}
+export function mapDetectionToDoc(result, docWidth, docHeight) {
+    const sx = result.image.width ? docWidth / result.image.width : 1;
+    const sy = result.image.height ? docHeight / result.image.height : 1;
+    const clamp = (v, max) => Math.min(Math.max(v, 0), max);
+    const rect = (r) => {
+        const x1 = clamp(Math.round(r[0] * sx), docWidth);
+        const y1 = clamp(Math.round(r[1] * sy), docHeight);
+        const x2 = clamp(Math.round(r[2] * sx), docWidth);
+        const y2 = clamp(Math.round(r[3] * sy), docHeight);
+        return [Math.min(x1, x2), Math.min(y1, y2), Math.max(x1, x2), Math.max(y1, y2)];
+    };
+    const scaleFeatures = (feat) => ({
+        ...feat,
+        points: feat.points.map((p) => ({ x: p.x * sx, y: p.y * sy, z: p.z })),
+    });
+    const mapFace = (f) => ({
+        ...f,
+        bbox: rect(f.bbox),
+        ...(f.features ? { features: scaleFeatures(f.features) } : {}),
+    });
+    return {
+        image: { width: docWidth, height: docHeight },
+        backends: result.backends,
+        ...(result.faces ? { faces: result.faces.map(mapFace) } : {}),
+        ...(result.objects
+            ? { objects: result.objects.map((o) => ({ ...o, bbox: rect(o.bbox) })) }
+            : {}),
+    };
+}