editmamei 0.22.1 → 0.22.3

package/dist/core/server.js

@@ -11,11 +11,13 @@ import { Session } from './session.js';
 import { SessionLog, classifyError } from '../utils/session-log.js';
 import { loadSettings, applyTelemetryEnvOverrides, applyUpdateCheckEnvOverride, } from './settings.js';
 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 { 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';
@@ -25,6 +27,16 @@ import { listTemplates } from '../utils/template-storage.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';
+}
 let logScriptOnErrorWarned = false;
 function warnLogScriptOnErrorOnce(logger) {
     if (logScriptOnErrorWarned)
@@ -40,8 +52,8 @@ export function __resetLogScriptOnErrorWarnForTests() {
     logScriptOnErrorWarned = false;
 }
 const FIRST_RUN_DISCLOSURE = 'First run: Editmamei collects anonymous, content-free usage telemetry (tool name, ' +
-    'success, duration, version/edition/OS/PS-version) to find what breaks. It never sends ' +
-    'image content, file paths, or personal data. Opt out anytime: ' +
+    'success, duration, version/edition/OS/PS-version, install channel) to find what breaks. ' +
+    'It never sends image content, file paths, or personal data. Opt out anytime: ' +
     '`editmamei config set telemetry.usage false` (or edit ~/.editmamei/settings.json). ' +
     'Opt in to sanitized diagnostics: `editmamei config set telemetry.diagnostics true`.';
 export class EditmameiServer {
@@ -57,6 +69,7 @@ export class EditmameiServer {
     psVersion = null;
     updateInfo = null;
     snippetClient = new GoSnippetClient();
+    refreshLicenseOnPing = createPingLicenseRefresher();
     constructor() {
         this.logger = new Logger('EditmameiServer');
         this.session = new Session();
@@ -67,6 +80,9 @@ export class EditmameiServer {
         this.telemetry = new TelemetryClient({
             settings: effectiveSettings,
             getPsVersion: () => this.psVersion,
+            edition: isProEntitled() ? 'pro' : 'community',
+            channel: resolveInstallChannel(),
+            getModuleStatus: () => this.computeModuleStatus(),
         });
         if (created)
             this.logger.info(FIRST_RUN_DISCLOSURE);
@@ -193,6 +209,7 @@ export class EditmameiServer {
             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()) })
                 : null,
@@ -250,6 +267,21 @@ export class EditmameiServer {
             this.moduleSkipReason = 'incompatible';
         }
     }
+    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,
+        };
+    }
     async reprovisionIfModuleSkipped(delivery = {}) {
         const reason = this.moduleSkipReason;
         if (reason === null)
@@ -369,6 +401,7 @@ export class EditmameiServer {
         }
     }
     async pingPhotoshop() {
+        this.refreshLicenseOnPing();
         const connection = this.session.getConnection();
         const isConnected = await connection.ping();
         if (!isConnected) {

package/dist/detection/runtime.js

@@ -2,35 +2,60 @@ import { createRequire } from 'node:module';
 import { dirname, join } from 'node:path';
 import { fileURLToPath, pathToFileURL } from 'node:url';
 import { decode } from 'jpeg-js';
-import { readFileSync } from 'node:fs';
-import * as ort from 'onnxruntime-web';
+import { existsSync, readFileSync } from 'node:fs';
+import * as staticOrt from 'onnxruntime-web';
+export let ort = staticOrt;
+let injectedLoadModel = null;
+let injectedModelDirs = null;
+export function useHostRuntime(host, proModelsDir) {
+    injectedLoadModel = host.loadModel;
+    ort = host.ort;
+    injectedModelDirs = [proModelsDir, host.ceModelsDir];
+}
+export function hostDetectionRuntime() {
+    return { loadModel: hostLoadModel, ort: staticOrt, ceModelsDir: hostModelsDir() };
+}
 let configured = false;
 function configureOrt() {
     if (configured)
         return;
     const require = createRequire(import.meta.url);
     const ortDist = dirname(require.resolve('onnxruntime-web'));
-    ort.env.wasm.wasmPaths = pathToFileURL(join(ortDist, '/')).href;
-    ort.env.wasm.numThreads = 1;
-    ort.env.logLevel = 'error';
+    staticOrt.env.wasm.wasmPaths = pathToFileURL(join(ortDist, '/')).href;
+    staticOrt.env.wasm.numThreads = 1;
+    staticOrt.env.logLevel = 'error';
     configured = true;
 }
 const sessions = new Map();
-export function loadModel(absPath) {
+function hostLoadModel(absPath) {
     configureOrt();
     let p = sessions.get(absPath);
     if (!p) {
-        p = ort.InferenceSession.create(absPath, { logSeverityLevel: 3 });
+        p = staticOrt.InferenceSession.create(absPath, { logSeverityLevel: 3 });
         sessions.set(absPath, p);
     }
     return p;
 }
-export function resolveModelPath(filename) {
+export function loadModel(absPath) {
+    return injectedLoadModel ? injectedLoadModel(absPath) : hostLoadModel(absPath);
+}
+function hostModelsDir() {
     const override = process.env.EDITMAMEI_MODELS_DIR;
     if (override)
-        return join(override, filename);
+        return override;
     const here = dirname(fileURLToPath(import.meta.url));
-    return join(here, '..', 'models', filename);
+    return join(here, '..', 'models');
+}
+export function resolveModelPath(filename) {
+    if (injectedModelDirs) {
+        for (const dir of injectedModelDirs) {
+            const candidate = join(dir, filename);
+            if (existsSync(candidate))
+                return candidate;
+        }
+        return join(injectedModelDirs[injectedModelDirs.length - 1], filename);
+    }
+    return join(hostModelsDir(), filename);
 }
 export function decodeJpeg(path) {
     let img;
@@ -43,4 +68,3 @@ export function decodeJpeg(path) {
     }
     return { width: img.width, height: img.height, data: img.data };
 }
-export { ort };

package/dist/kernel/host-api.js

@@ -1,2 +1,2 @@
-export const KERNEL_ABI = 1;
+export const KERNEL_ABI = 2;
 export const HOST_MIN_ABI = 1;

package/dist/kernel/kernel.js

@@ -1,12 +1,13 @@
 import { CompositeSnippetClient } from '../api/snippet-client.js';
 import { Logger } from '../utils/logger.js';
 import { runScript } from '../utils/run-script.js';
-import { KERNEL_ABI } from './host-api.js';
+import { KERNEL_ABI, } from './host-api.js';
 export class Kernel {
     registry;
     connection;
     snippet;
     resolveModuleSnippet;
+    detection;
     sessionId;
     logger;
     invokeDepth = 0;
@@ -16,6 +17,7 @@ export class Kernel {
         this.connection = deps.connection;
         this.snippet = deps.snippet;
         this.resolveModuleSnippet = deps.resolveModuleSnippet;
+        this.detection = deps.detection;
         this.sessionId = deps.sessionId;
         this.logger = deps.logger;
     }
@@ -35,6 +37,7 @@ export class Kernel {
             connection: this.connection,
             executeScript: (innerBody, timeoutMs) => runScript(this.connection, innerBody, timeoutMs),
             snippet: this.snippetFor(manifest),
+            detection: this.detection,
             session: { id: this.sessionId },
             logger: new Logger(`module:${manifest.id}`),
         };

package/dist/license/entitlement.js

@@ -7,6 +7,7 @@ const logger = new Logger('License');
 export const GRACE_MS = 30 * 24 * 60 * 60 * 1000;
 export const REFRESH_AFTER_MS = 7 * 24 * 60 * 60 * 1000;
 export const EXPIRED_REFRESH_TIMEOUT_MS = 5_000;
+export const CLOCK_SKEW_TOLERANCE_MS = 24 * 60 * 60 * 1000;
 export function evaluateEntitlement(rec, now) {
     if (!rec)
         return { entitled: false, reason: 'no-license' };
@@ -77,9 +78,10 @@ export async function refreshIfStale(ops = {}) {
         return;
     const last = Date.parse(rec.last_validated_at);
     const age = Number.isFinite(last) ? now - last : Infinity;
-    if (age <= REFRESH_AFTER_MS)
+    const clockSkewed = age < -CLOCK_SKEW_TOLERANCE_MS;
+    if (!clockSkewed && age <= REFRESH_AFTER_MS)
         return;
-    if (age <= GRACE_MS) {
+    if (clockSkewed || age <= GRACE_MS) {
         refresh(ops).catch((err) => {
             logger.warn(`Background license refresh failed (grace covers offline use): ` +
                 `${err instanceof Error ? err.message : String(err)}`);

package/dist/license/ping-refresh.js

@@ -0,0 +1,14 @@
+import { refreshIfStale } from './entitlement.js';
+export function createPingLicenseRefresher(refresh = refreshIfStale) {
+    let fired = false;
+    return () => {
+        if (fired)
+            return;
+        fired = true;
+        try {
+            void refresh().catch(() => { });
+        }
+        catch {
+        }
+    };
+}

package/dist/platform/macos-executor.js

@@ -103,7 +103,6 @@ export class MacOSExecutor {
             throw new Error('jsxPath contains a character that would break AppleScript interpolation');
         }
         return `tell application "${this.appName}"
-\tactivate
 \tdo javascript "$.evalFile(decodeURI('${encodeURI(posixPath)}'))"
 end tell`;
     }

package/dist/telemetry/client.js

@@ -1,7 +1,8 @@
 import { Logger } from '../utils/logger.js';
 import { EDITION } from '../edition.js';
 import { VERSION } from '../version.js';
-import { buildDiagnosticEvent, buildSessionStart, buildSessionSummary, buildUsageEvent, dayBucket, isContentSafe, PS_VERSION_UNKNOWN, } from './events.js';
+import { resolveInstallChannel } from '../install-channel.js';
+import { buildDiagnosticEvent, buildModuleStatus, buildSessionStart, buildSessionSummary, buildUsageEvent, dayBucket, isContentSafe, PS_VERSION_UNKNOWN, } from './events.js';
 import { sanitizeMessage, sanitizeSnippet, sanitizeStderrTail } from './sanitize.js';
 import { httpTransport, resolveEndpoint } from './transport.js';
 import { appendOutboxSync, clearOutbox, clearSessionState, readOutbox, readSessionState, writeSessionStateSync, } from './outbox.js';
@@ -23,6 +24,7 @@ export class TelemetryClient {
     maxBatchSize;
     active;
     outboxOpts;
+    getModuleStatus;
     queue = [];
     timer = null;
     shutdownPromise = null;
@@ -39,11 +41,13 @@ export class TelemetryClient {
         this.maxBatchSize = opts.maxBatchSize ?? MAX_BATCH_SIZE;
         this.active = opts.active ?? (EDITION !== 'dev' && !isTestEnv());
         this.outboxOpts = opts.outboxDir ? { dir: opts.outboxDir } : {};
+        this.getModuleStatus = opts.getModuleStatus ?? (() => null);
         this.dims = {
             install_id: this.settings.telemetry.install_id,
             editmamei_version: VERSION,
-            edition: EDITION,
+            edition: opts.edition ?? EDITION,
             platform: process.platform,
+            channel: opts.channel ?? resolveInstallChannel(),
             getPsVersion: opts.getPsVersion,
         };
     }
@@ -57,6 +61,9 @@ export class TelemetryClient {
         this.timer.unref?.();
         if (this.settings.telemetry.usage) {
             this.enqueue(buildSessionStart(this.dims, this.now()));
+            const moduleStatus = this.getModuleStatus();
+            if (moduleStatus)
+                this.enqueue(buildModuleStatus(this.dims, moduleStatus, this.now()));
             void this.flush();
         }
     }

package/dist/telemetry/events.js

@@ -55,6 +55,22 @@ export function buildSessionStart(dims, now) {
         edition: dims.edition,
         platform: dims.platform,
         ps_version: psVersionOf(dims),
+        channel: dims.channel,
+    };
+}
+export function buildModuleStatus(dims, status, now) {
+    return {
+        v: TELEMETRY_SCHEMA_VERSION,
+        type: 'module_status',
+        install_id: dims.install_id,
+        ts_bucket: dayBucket(now),
+        editmamei_version: dims.editmamei_version,
+        edition: dims.edition,
+        platform: dims.platform,
+        module: status.module,
+        outcome: status.outcome,
+        module_version: status.module_version,
+        abi: status.abi,
     };
 }
 export function buildDiagnosticEvent(dims, diag, now) {

package/dist/version.js

@@ -1 +1 @@
-export const VERSION = '0.22.1';
+export const VERSION = '0.22.3';

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "editmamei",
-  "version": "0.22.1",
+  "version": "0.22.3",
   "description": "Editmamei — Unlock Photoshop with natural-language photo editing (Community Edition)",
   "main": "dist/index.js",
   "type": "module",
@@ -41,7 +41,7 @@
   },
   "dependencies": {
     "@modelcontextprotocol/sdk": "^1.0.4",
-    "adm-zip": "^0.5.17",
+    "adm-zip": "^0.6.0",
     "jpeg-js": "^0.4.4",
     "onnxruntime-web": "1.27.0"
   }