editmamei 1.3.0 → 1.5.0

package/dist/utils/session-log.js

@@ -51,6 +51,10 @@ export const ERROR_CLASS_TABLE = [
         errorClass: 'file_io',
         pattern: /\b(ENOENT|EBUSY|EACCES|EPERM|EMFILE|ENOSPC)\b/,
     },
+    {
+        errorClass: 'unknown_discriminator',
+        pattern: /unknown [^"]{1,40}"[^"]*"\. Allowed: /i,
+    },
     {
         errorClass: 'schema_validation',
         pattern: /\bvalidat|required.*field|missing required argument|must be.*type|invalid (input|argument)/i,
@@ -76,6 +80,7 @@ export const ERROR_CLASS_TABLE = [
         errorClass: 'wrong_layer_kind',
         pattern: /pixel layer|text layer|smart object layer|layer kind|rasterize it first/i,
     },
+    { errorClass: 'channel_not_visible', pattern: /histogram for visible channels/i },
     { errorClass: 'ps_command_unavailable', pattern: /not currently available/i },
     { errorClass: 'timeout', pattern: /timed? ?out|Script execution timeout|exceeded.*bytes/i },
     {
@@ -85,6 +90,10 @@ export const ERROR_CLASS_TABLE = [
     { errorClass: 'ai_selection_no_result', pattern: /returned no result/i },
     { errorClass: 'ps_general_error', pattern: /general photoshop error/i },
     { errorClass: 'ps_no_such_element', pattern: /no such element/i },
+    {
+        errorClass: 'extendscript_reference_error',
+        pattern: /\b[A-Za-z_$][\w$]*\s+is undefined\s*$/,
+    },
     { errorClass: 'write_not_verified', pattern: /did not verify/i },
     { errorClass: 'ps_empty_error', pattern: /:\s*$/ },
     { errorClass: 'ps_op_failed', pattern: /failed[: (]/i },
@@ -98,6 +107,11 @@ export function classifyError(error) {
     }
     return 'other';
 }
+export const NO_ERROR_TEXT_CLASS = 'no_error_text';
+export const ALL_ERROR_CLASSES = [
+    ...ERROR_CLASS_TABLE.map((entry) => entry.errorClass),
+    NO_ERROR_TEXT_CLASS,
+];
 export function elideImagePayloads(value) {
     if (Array.isArray(value))
         return value.map(elideImagePayloads);
@@ -253,7 +267,7 @@ export class SessionLog {
         this.metaEmitted = true;
         await this.writeLine(JSON.stringify(this.buildMetaEntry()));
     }
-    async append(entry, result) {
+    async append(entry, result, resultBytes) {
         if (!this.metaEmitted) {
             await this.emitMeta();
         }
@@ -263,14 +277,14 @@ export class SessionLog {
         const callKey = JSON.stringify({ tool: entry.tool, args: sanitizedArgs });
         const retrySignal = callKey === this.lastCallKey;
         this.lastCallKey = callKey;
-        const resultBytes = computeResultBytes(result);
+        const finalResultBytes = resultBytes !== undefined ? resultBytes : computeResultBytes(result);
         let hoisted = {};
         try {
             hoisted = hoistContextScalars(result);
         }
         catch {
         }
-        const errorClass = classifyError(entry.error);
+        const errorClass = entry.success ? null : (classifyError(entry.error) ?? NO_ERROR_TEXT_CLASS);
         const captureResult = process.env.EDITMAMEI_LOG_RESULTS === '1' && result !== undefined
             ? this.sanitizeValue(elideImagePayloads(result))
             : undefined;
@@ -288,7 +302,7 @@ export class SessionLog {
             edition: EDITION,
             platform: process.platform,
             ps_version: this.psVersion,
-            result_bytes: resultBytes,
+            result_bytes: finalResultBytes,
             ...hoisted,
             ...(errorClass !== null ? { error_class: errorClass } : {}),
             retry_signal: retrySignal,

package/dist/utils/tool-budget-context.js

@@ -0,0 +1,14 @@
+import { AsyncLocalStorage } from 'node:async_hooks';
+const storage = new AsyncLocalStorage();
+export function budgetContextFor(toolName, budgetMs, now = Date.now()) {
+    const ownDeadline = now + budgetMs;
+    const outer = storage.getStore();
+    const deadline = outer ? Math.min(ownDeadline, outer.deadline) : ownDeadline;
+    return { toolName, budgetMs, deadline };
+}
+export function runWithToolBudget(context, fn) {
+    return storage.run(context, fn);
+}
+export function currentToolBudget() {
+    return storage.getStore();
+}