@versori/run 0.7.0-alpha.8 → 1.0.0-alpha.2

package/script/src/interpreter/durable/DurableInterpreter.js

@@ -246,7 +246,10 @@ class DurableInterpreter {
         if (!(workflow instanceof Workflow_js_1.WorkflowImpl)) {
             throw new Error('workflow is not an instance of WorkflowImpl');
         }
-        this.log.info('DurableInterpreter.register', { workflow });
+        const triggerName = 'id' in workflow.trigger && typeof workflow.trigger.id === 'string'
+            ? workflow.trigger.id
+            : workflow.trigger.constructor.name;
+        this.log.info('DurableInterpreter.register', { workflow, triggerName });
         const compilerContext = {
             compiler: this.compiler,
             log: this.log,
@@ -265,11 +268,12 @@ class DurableInterpreter {
         const trigger$ = this.compiler.compileTrigger(compilerContext, workflow.trigger, combinedSignal);
         const task$ = this.compiler.compileTask(compilerContext, workflow.task);
         const registration = {
+            triggerName,
             trigger$,
             task$,
             localAbortController,
             sigintListener: () => {
-                this.log.info('Received SIGINT, shutting down workflow');
+                this.log.info('Received SIGINT, shutting down workflow', { triggerName });
                 localAbortController.abort();
             },
         };
@@ -297,16 +301,22 @@ class DurableInterpreter {
             Deno.addSignalListener('SIGINT', registration.sigintListener);
             registration.subscription = registration.trigger$
                 .pipe((0, rxjs_1.tap)((ctx) => {
-                ctx.log.info('DurableInterpreter.executionStarted', {});
+                ctx.log.info('DurableInterpreter.executionStarted', {
+                    triggerName: registration.triggerName,
+                });
             }), (0, rxjs_1.mergeMap)((ctx) => (0, rxjs_1.of)(ctx).pipe(registration.task$, (0, rxjs_1.catchError)((err) => {
                 ctx.log.error('DurableInterpreter.executionError', {
+                    triggerName: registration.triggerName,
                     error: err instanceof Error ? err.toString() : err,
                 });
                 try {
                     ctx.options.onError?.(ctx.withData(err));
                 }
                 catch (err) {
-                    ctx.log.error('DurableInterpreter.onErrorError: failed to call onError handler', { error: err instanceof Error ? err.toString() : err });
+                    ctx.log.error('DurableInterpreter.onErrorError: failed to call onError handler', {
+                        triggerName: registration.triggerName,
+                        error: err instanceof Error ? err.toString() : err,
+                    });
                     ctx.options.onError?.(ctx.withData({
                         message: 'Internal server error',
                         error: err instanceof Error ? err.toString() : err,
@@ -318,13 +328,17 @@ class DurableInterpreter {
                 next: (ctx) => {
                     const durationMs = Date.now() - ctx.startTime.getTime();
                     ctx.log.info('DurableInterpreter.executionCompleted', {
+                        triggerName: registration.triggerName,
                         durationMs,
                     });
                     try {
                         ctx.options.onSuccess?.(ctx);
                     }
                     catch (err) {
-                        ctx.log.error('DurableInterpreter.onSuccessError: failed to call onSuccess handler', { error: err instanceof Error ? err.toString() : err });
+                        ctx.log.error('DurableInterpreter.onSuccessError: failed to call onSuccess handler', {
+                            triggerName: registration.triggerName,
+                            error: err instanceof Error ? err.toString() : err,
+                        });
                         ctx.options.onSuccess?.(ctx.withData({
                             message: 'Internal server error',
                             error: err instanceof Error ? err.toString() : err,
@@ -334,12 +348,15 @@ class DurableInterpreter {
                 },
                 error: (err) => {
                     this.log.error('DurableInterpreter.error', {
+                        triggerName: registration.triggerName,
                         error: err instanceof Error ? err.toString() : err,
                     });
                     Deno.removeSignalListener('SIGINT', registration.sigintListener);
                 },
                 complete: () => {
-                    this.log.info('DurableInterpreter.workflowCompleted');
+                    this.log.info('DurableInterpreter.workflowCompleted', {
+                        triggerName: registration.triggerName,
+                    });
                     Deno.removeSignalListener('SIGINT', registration.sigintListener);
                 },
             });

package/script/src/interpreter/durable/Queue.d.ts

@@ -1,9 +1,12 @@
-import { Logger } from '@versori/run/observability';
+import { Logger } from '../../observability/mod.js';
 export type WorkflowMsgMetadata = {
     parentWorkflowId?: string;
     executionId: string;
     activationId: string;
     userId?: string;
+    traceparent?: string;
+    tracestate?: string;
+    [key: string]: any;
 };
 export type Workflows = {
     workflows: Workflow[];
@@ -27,6 +30,7 @@ export type SubmitWorkflow = {
     payload: string;
     maxAttempts?: number;
     metadata: WorkflowMsgMetadata;
+    after?: string;
     projectId?: string;
     environmentId?: string;
 };

package/script/src/interpreter/durable/Queue.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"Queue.d.ts","sourceRoot":"","sources":["../../../../src/src/interpreter/durable/Queue.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"Queue.d.ts","sourceRoot":"","sources":["../../../../src/src/interpreter/durable/Queue.ts"],"names":[],"mappings":"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"}

package/script/src/interpreter/durable/compilers/catch.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"catch.d.ts","sourceRoot":"","sources":["../../../../../src/src/interpreter/durable/compilers/catch.ts"],"names":[],"mappings":"AAgBA,OAAO,EAAE,SAAS,EAAE,MAAM,iCAAiC,CAAC;AAG5D,OAAO,EAA2B,YAAY,EAAE,MAAM,YAAY,CAAC;AAqFnE,eAAO,MAAM,aAAa,EAAE,YAAY,CAAC,GAAG,EAAE,GAAG,EAAE,SAAS,CAAC,GAAG,EAAE,GAAG,CAAC,CAGrE,CAAC"}
+{"version":3,"file":"catch.d.ts","sourceRoot":"","sources":["../../../../../src/src/interpreter/durable/compilers/catch.ts"],"names":[],"mappings":"AAgBA,OAAO,EAAE,SAAS,EAAE,MAAM,iCAAiC,CAAC;AAG5D,OAAO,EAA2B,YAAY,EAAE,MAAM,YAAY,CAAC;AAuFnE,eAAO,MAAM,aAAa,EAAE,YAAY,CAAC,GAAG,EAAE,GAAG,EAAE,SAAS,CAAC,GAAG,EAAE,GAAG,CAAC,CAGrE,CAAC"}

package/script/src/interpreter/durable/compilers/catch.js

@@ -46,15 +46,15 @@ function compileCatch(compilerCtx, task) {
                             reason: 'error',
                             severity: 'high',
                         });
-                        return errorOperator((0, rxjs_1.of)(ctx.withData(new ExecutionError_js_1.ExecutionError(ctx, error.message, { cause: error }))));
+                        return errorOperator((0, rxjs_1.of)(ctx.withData(new ExecutionError_js_1.ExecutionError(ctx, error.message, { cause: error }), { recoveredFromCatch: true })));
                     }
                     ctx.log.error('execution has encountered an error', {
                         error: error,
                     });
                     compilerCtx.issueProvider.submitIssue({
                         annotations: {
-                            'error': error.message,
-                            'stack': error.stack || '',
+                            'error': String(error),
+                            'stack': '',
                             'workflowId': ctx.options.workflow?.id || ctx.workflow?.id || '',
                             'executionId': ctx.executionId,
                             'activationId': ctx.activation.id,
@@ -65,7 +65,7 @@ function compileCatch(compilerCtx, task) {
                     });
                     span.setAttribute('error', `${error}`);
                     span.end();
-                    return errorOperator((0, rxjs_1.of)(ctx.withData(new ExecutionError_js_1.ExecutionError(ctx, `${error}`, { cause: error }))));
+                    return errorOperator((0, rxjs_1.of)(ctx.withData(new ExecutionError_js_1.ExecutionError(ctx, `${error}`, { cause: error }), { recoveredFromCatch: true })));
                 });
             }));
         }));

package/script/src/interpreter/durable/compilers/durableworkflow.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"durableworkflow.d.ts","sourceRoot":"","sources":["../../../../../src/src/interpreter/durable/compilers/durableworkflow.ts"],"names":[],"mappings":"AAeA,OAAO,EAAE,UAAU,EAAE,MAAM,MAAM,CAAC;AAClC,OAAO,EAAW,WAAW,EAAE,MAAM,6BAA6B,CAAC;AACnE,OAAO,EACH,mBAAmB,EACnB,sBAAsB,EACzB,MAAM,yCAAyC,CAAC;AAEjD,OAAO,EAAE,sBAAsB,EAAE,MAAM,0BAA0B,CAAC;AAClE,OAAO,EAAE,eAAe,EAAE,MAAM,UAAU,CAAC;AAE3C,wBAAgB,sBAAsB,CAClC,GAAG,EAAE,sBAAsB,EAC3B,OAAO,EAAE,sBAAsB,EAC/B,MAAM,EAAE,WAAW,GACpB,UAAU,CAAC,WAAW,CAAC,mBAAmB,CAAC,CAAC,CAyF9C;AAED,eAAO,MAAM,uBAAuB,EAAE,eAAe,CAAC,mBAAmB,EAAE,sBAAsB,CAIhG,CAAC"}
+{"version":3,"file":"durableworkflow.d.ts","sourceRoot":"","sources":["../../../../../src/src/interpreter/durable/compilers/durableworkflow.ts"],"names":[],"mappings":"AAeA,OAAO,EAAE,UAAU,EAAE,MAAM,MAAM,CAAC;AAElC,OAAO,EAAW,WAAW,EAAE,MAAM,6BAA6B,CAAC;AACnE,OAAO,EACH,mBAAmB,EACnB,sBAAsB,EACzB,MAAM,yCAAyC,CAAC;AAEjD,OAAO,EAAE,sBAAsB,EAAE,MAAM,0BAA0B,CAAC;AAClE,OAAO,EAAE,eAAe,EAAE,MAAM,UAAU,CAAC;AAG3C,wBAAgB,sBAAsB,CAClC,GAAG,EAAE,sBAAsB,EAC3B,OAAO,EAAE,sBAAsB,EAC/B,MAAM,EAAE,WAAW,GACpB,UAAU,CAAC,WAAW,CAAC,mBAAmB,CAAC,CAAC,CAuJ9C;AAED,eAAO,MAAM,uBAAuB,EAAE,eAAe,CAAC,mBAAmB,EAAE,sBAAsB,CAI5F,CAAC"}

package/script/src/interpreter/durable/compilers/durableworkflow.js

@@ -18,6 +18,7 @@ const mod_js_1 = require("../../../../deps/jsr.io/@std/ulid/1.0.0/mod.js");
 const rxjs_1 = require("rxjs");
 const DurableTrigger_js_1 = require("../../../dsl/triggers/DurableTrigger.js");
 const constants_js_1 = require("../../../internal/constants.js");
+const tracePropagation_js_1 = require("../../../observability/tracePropagation.js");
 function compileDurableWorkflow(ctx, trigger, signal) {
     return new rxjs_1.Observable((subscriber) => {
         function cleanup() {
@@ -44,41 +45,77 @@ function compileDurableWorkflow(ctx, trigger, signal) {
                         continue;
                     }
                     for (const wf of wfs.workflows) {
-                        const data = JSON.parse(atob(wf.payload ?? '{}'));
-                        let activation;
-                        if (wf.metadata?.activationId) {
+                        // If the metadata carries a traceparent, extractTraceContext returns a
+                        // context with the remote span as parent; otherwise it returns the
+                        // current active context, which causes startActiveSpan to create a new
+                        // root span (new trace). Either way the SDK does the right thing.
+                        const parentCtx = (0, tracePropagation_js_1.extractTraceContext)(wf.metadata);
+                        await ctx.tracer.startActiveSpan(`durableworkflow-${trigger.id}`, {}, parentCtx, async (span) => {
+                            span.setAttribute('task.id', trigger.id);
+                            span.setAttribute('task.type', 'durableworkflow');
+                            span.setAttribute('execution.id', wf.metadata?.executionId ?? '');
+                            if (wf.metadata?.activationId) {
+                                span.setAttribute('activation.id', wf.metadata.activationId);
+                            }
+                            if (wf.metadata?.traceparent) {
+                                span.setAttribute('trace.continuation', true);
+                            }
                             try {
-                                const { data } = await ctx.platformApi.getActivation({
-                                    path: {
-                                        activation_id: wf.metadata.activationId,
-                                        organisation_id: ctx.organisationId,
-                                        environment_id: Deno.env.get(constants_js_1.envVarEnvId) || 'development',
+                                const payload = wf.payload ? atob(wf.payload) : '{}';
+                                const data = JSON.parse(payload);
+                                let activation;
+                                if (wf.metadata?.activationId) {
+                                    try {
+                                        const { data } = await ctx.platformApi
+                                            .getActivation({
+                                            path: {
+                                                activation_id: wf.metadata.activationId,
+                                                organisation_id: ctx.organisationId,
+                                                environment_id: Deno.env.get(constants_js_1.envVarEnvId) ||
+                                                    'development',
+                                            },
+                                            throwOnError: true,
+                                        });
+                                        activation = data;
+                                    }
+                                    catch (error) {
+                                        ctx.log.error('Failed to get activation', {
+                                            error,
+                                        });
+                                        throw new Error('Failed to get activation');
+                                    }
+                                }
+                                const newContext = ctx.contextProvider
+                                    .createWithExecutionId(activation, data, wf.metadata?.executionId ?? (0, mod_js_1.ulid)().toString(), {
+                                    workflow: wf,
+                                    onSuccess: (completedContext) => {
+                                        const opts = completedContext
+                                            .options;
+                                        if (opts.recoveredFromCatch) {
+                                            return;
+                                        }
+                                        // locked status means we own the workflow and it's not completed yet
+                                        if (wf.status !== 'locked') {
+                                            return;
+                                        }
+                                        ctx.queueProvider.complete({
+                                            id: wf.id,
+                                            output: btoa(JSON.stringify(completedContext.data)),
+                                            status: 'completed',
+                                        });
                                     },
-                                    throwOnError: true,
                                 });
-                                activation = data;
+                                consecutiveErrors = 0;
+                                subscriber.next(newContext);
                             }
                             catch (error) {
-                                ctx.log.error('Failed to get activation', { error });
-                                throw new Error('Failed to get activation');
+                                span.recordException(error instanceof Error ? error : new Error(String(error)));
+                                ctx.log.error('Error processing workflow', { error });
+                            }
+                            finally {
+                                span.end();
                             }
-                        }
-                        const newContext = ctx.contextProvider.createWithExecutionId(activation, data, wf.metadata?.executionId ?? (0, mod_js_1.ulid)().toString(), {
-                            workflow: wf,
-                            onSuccess: (completedContext) => {
-                                // locked status means we own the workflow and it's not completed yet
-                                if (wf.status !== 'locked') {
-                                    return;
-                                }
-                                ctx.queueProvider.complete({
-                                    id: wf.id,
-                                    output: btoa(JSON.stringify(completedContext.data)),
-                                    status: 'completed',
-                                });
-                            },
                         });
-                        consecutiveErrors = 0;
-                        subscriber.next(newContext);
                     }
                 }
                 catch (error) {

package/script/src/interpreter/durable/compilers/fn.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"fn.d.ts","sourceRoot":"","sources":["../../../../../src/src/interpreter/durable/compilers/fn.ts"],"names":[],"mappings":"AAgBA,OAAO,EAAE,MAAM,EAAE,MAAM,8BAA8B,CAAC;AAEtD,OAAO,EAA2B,YAAY,EAAE,MAAM,YAAY,CAAC;AA+BnE,eAAO,MAAM,UAAU,EAAE,YAAY,CAAC,GAAG,EAAE,GAAG,EAAE,MAAM,CAAC,GAAG,EAAE,GAAG,CAAC,CAG/D,CAAC"}
+{"version":3,"file":"fn.d.ts","sourceRoot":"","sources":["../../../../../src/src/interpreter/durable/compilers/fn.ts"],"names":[],"mappings":"AAgBA,OAAO,EAAE,MAAM,EAAE,MAAM,8BAA8B,CAAC;AAEtD,OAAO,EAA2B,YAAY,EAAE,MAAM,YAAY,CAAC;AAiCnE,eAAO,MAAM,UAAU,EAAE,YAAY,CAAC,GAAG,EAAE,GAAG,EAAE,MAAM,CAAC,GAAG,EAAE,GAAG,CAAC,CAG/D,CAAC"}

package/script/src/interpreter/durable/compilers/fn.js

@@ -22,12 +22,15 @@ function compileFn(compilerCtx, task) {
         return await compilerCtx.tracer.startActiveSpan(`fn-${task.id}`, async (span) => {
             span.setAttribute('task.id', task.id);
             span.setAttribute('execution.id', ctx.executionId);
-            if (typeof ctx.idx === 'number') {
+            try {
+                if (typeof ctx.idx === 'number') {
+                    return ctx.withData(await task._fn(ctx, ctx.idx));
+                }
+                return ctx.withData(await task._fn(ctx));
+            }
+            finally {
                 span.end();
-                return ctx.withData(await task._fn(ctx, ctx.idx));
             }
-            span.end();
-            return ctx.withData(await task._fn(ctx));
         });
     }));
 }

package/script/src/interpreter/durable/compilers/webhook.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"webhook.d.ts","sourceRoot":"","sources":["../../../../../src/src/interpreter/durable/compilers/webhook.ts"],"names":[],"mappings":"AA2BA,OAAO,EAAE,WAAW,EAAE,cAAc,EAAE,MAAM,yCAAyC,CAAC;AAGtF,OAAO,EAAE,eAAe,EAAE,MAAM,YAAY,CAAC;AAuD7C,eAAO,MAAM,eAAe,EAAE,eAAe,CAAC,WAAW,EAAE,cAAc,CA0SxE,CAAC"}
+{"version":3,"file":"webhook.d.ts","sourceRoot":"","sources":["../../../../../src/src/interpreter/durable/compilers/webhook.ts"],"names":[],"mappings":"AA2BA,OAAO,EAAE,WAAW,EAAE,cAAc,EAAE,MAAM,yCAAyC,CAAC;AAGtF,OAAO,EAAE,eAAe,EAAE,MAAM,YAAY,CAAC;AAuD7C,eAAO,MAAM,eAAe,EAAE,eAAe,CAAC,WAAW,EAAE,cAAc,CAySxE,CAAC"}

package/script/src/interpreter/durable/compilers/webhook.js

@@ -102,12 +102,13 @@ exports.webhookCompiler = {
             },
             request: req,
         });
+        const routeMiddleware = [];
         if (!trigger.options.request?.rawBody) {
-            ctx.webhookRouter.use(express_1.default.json({ limit: '50mb', type: ['application/json', '*/*+json'] }));
-            ctx.webhookRouter.use((0, express_xml_bodyparser_1.default)(xml2jsDefaults));
+            routeMiddleware.push(express_1.default.json({ limit: '50mb', type: ['application/json', '*/*+json'] }));
+            routeMiddleware.push((0, express_xml_bodyparser_1.default)(xml2jsDefaults));
         }
         else {
-            ctx.webhookRouter.use(express_1.default.raw({ type: '*/*', limit: '50mb' }));
+            routeMiddleware.push(express_1.default.raw({ type: '*/*', limit: '50mb' }));
         }
         return new rxjs_1.Observable((subscriber) => {
             if (!ctx.webhookRouter) {
@@ -124,7 +125,7 @@ exports.webhookCompiler = {
                 }
             }
             // endpoint for sans user because I'm not quite sure how the dynamic routing works
-            ctx.webhookRouter[method](`/${trigger.id}`, (0, webhookmiddleware_js_1.createStaticWebhookMiddleware)({
+            ctx.webhookRouter[method](`/${trigger.id}`, ...routeMiddleware, (0, webhookmiddleware_js_1.createStaticWebhookMiddleware)({
                 id: trigger.id,
                 connName: trigger.options.connection,
                 organisationId: ctx.organisationId,
@@ -160,7 +161,7 @@ exports.webhookCompiler = {
                 });
             });
             // this endpoint will trigger the workflow for each activation given by the external user ID
-            ctx.webhookRouter[method](`/${trigger.id}/users/:userId`, (0, webhookmiddleware_js_1.createUserIdDynamicWebhookMiddleware)({
+            ctx.webhookRouter[method](`/${trigger.id}/users/:userId`, ...routeMiddleware, (0, webhookmiddleware_js_1.createUserIdDynamicWebhookMiddleware)({
                 id: trigger.id,
                 connName: trigger.options.connection,
                 organisationId: ctx.organisationId,
@@ -216,7 +217,7 @@ exports.webhookCompiler = {
                 });
             });
             // this endpoint will trigger the workflow only for the activation given by its ID
-            ctx.webhookRouter[method](`/${trigger.id}/activations/:activationId`, (0, webhookmiddleware_js_1.createActIdDynamicWebhookMiddleware)({
+            ctx.webhookRouter[method](`/${trigger.id}/activations/:activationId`, ...routeMiddleware, (0, webhookmiddleware_js_1.createActIdDynamicWebhookMiddleware)({
                 id: trigger.id,
                 organisationId: ctx.organisationId,
                 environmentId: Deno.env.get(constants_js_1.envVarEnvId) ?? '',

package/script/src/interpreter/memory/MemoryInterpreter.d.ts

@@ -37,6 +37,7 @@ export type MemoryInterpreterOptions = {
     skipVersoriCredentials?: boolean;
 };
 type Registration = {
+    triggerName: string;
     trigger$: Observable<ContextImpl<any, void>>;
     task$: ContextOperatorFunction<any, any, any>;
     localAbortController: AbortController;

package/script/src/interpreter/memory/MemoryInterpreter.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"MemoryInterpreter.d.ts","sourceRoot":"","sources":["../../../../src/src/interpreter/memory/MemoryInterpreter.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"MemoryInterpreter.d.ts","sourceRoot":"","sources":["../../../../src/src/interpreter/memory/MemoryInterpreter.ts"],"names":[],"mappings":"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"}

package/script/src/interpreter/memory/MemoryInterpreter.js

@@ -229,7 +229,10 @@ class MemoryInterpreter {
         if (!(workflow instanceof Workflow_js_1.WorkflowImpl)) {
             throw new Error('workflow is not an instance of WorkflowImpl');
         }
-        this.log.info('MemoryInterpreter.register', { workflow });
+        const triggerName = 'id' in workflow.trigger && typeof workflow.trigger.id === 'string'
+            ? workflow.trigger.id
+            : workflow.trigger.constructor.name;
+        this.log.info('MemoryInterpreter.register', { workflow, triggerName });
         const compilerContext = {
             compiler: this.compiler,
             log: this.log,
@@ -247,11 +250,12 @@ class MemoryInterpreter {
         const trigger$ = this.compiler.compileTrigger(compilerContext, workflow.trigger, combinedSignal);
         const task$ = this.compiler.compileTask(compilerContext, workflow.task);
         const registration = {
+            triggerName,
             trigger$,
             task$,
             localAbortController,
             sigintListener: () => {
-                this.log.info('Received SIGINT, shutting down workflow');
+                this.log.info('Received SIGINT, shutting down workflow', { triggerName });
                 localAbortController.abort();
             },
         };
@@ -279,16 +283,22 @@ class MemoryInterpreter {
             Deno.addSignalListener('SIGINT', registration.sigintListener);
             registration.subscription = registration.trigger$
                 .pipe((0, rxjs_1.tap)((ctx) => {
-                ctx.log.info('MemoryInterpreter.executionStarted', {});
+                ctx.log.info('MemoryInterpreter.executionStarted', {
+                    triggerName: registration.triggerName,
+                });
             }), (0, rxjs_1.mergeMap)((ctx) => (0, rxjs_1.of)(ctx).pipe(registration.task$, (0, rxjs_1.catchError)((err) => {
                 ctx.log.error('MemoryInterpreter.executionError', {
+                    triggerName: registration.triggerName,
                     error: err instanceof Error ? err.toString() : err,
                 });
                 try {
                     ctx.options.onError?.(ctx.withData(err));
                 }
                 catch (err) {
-                    ctx.log.error('MemoryInterpreter.onError Error: failed to call onError handler', { error: err instanceof Error ? err.toString() : err });
+                    ctx.log.error('MemoryInterpreter.onError Error: failed to call onError handler', {
+                        triggerName: registration.triggerName,
+                        error: err instanceof Error ? err.toString() : err,
+                    });
                     ctx.options.onError?.(ctx.withData({
                         message: 'Internal server error',
                         error: err instanceof Error ? err.toString() : err,
@@ -300,13 +310,17 @@ class MemoryInterpreter {
                 next: (ctx) => {
                     const durationMs = Date.now() - ctx.startTime.getTime();
                     ctx.log.info('MemoryInterpreter.executionCompleted', {
+                        triggerName: registration.triggerName,
                         durationMs,
                     });
                     try {
                         ctx.options.onSuccess?.(ctx);
                     }
                     catch (err) {
-                        ctx.log.error('MemoryInterpreter.onSuccessError: failed to call onSuccess handler', { error: err instanceof Error ? err.toString() : err });
+                        ctx.log.error('MemoryInterpreter.onSuccessError: failed to call onSuccess handler', {
+                            triggerName: registration.triggerName,
+                            error: err instanceof Error ? err.toString() : err,
+                        });
                         ctx.options.onSuccess?.(ctx.withData({
                             message: 'Internal server error',
                             error: err instanceof Error ? err.toString() : err,
@@ -316,12 +330,15 @@ class MemoryInterpreter {
                 },
                 error: (err) => {
                     this.log.error('MemoryInterpreter.error', {
+                        triggerName: registration.triggerName,
                         error: err instanceof Error ? err.toString() : err,
                     });
                     Deno.removeSignalListener('SIGINT', registration.sigintListener);
                 },
                 complete: () => {
-                    this.log.info('MemoryInterpreter.workflowCompleted');
+                    this.log.info('MemoryInterpreter.workflowCompleted', {
+                        triggerName: registration.triggerName,
+                    });
                     Deno.removeSignalListener('SIGINT', registration.sigintListener);
                 },
             });

package/script/src/interpreter/memory/compilers/catch.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"catch.d.ts","sourceRoot":"","sources":["../../../../../src/src/interpreter/memory/compilers/catch.ts"],"names":[],"mappings":"AAgBA,OAAO,EAAE,SAAS,EAAE,MAAM,iCAAiC,CAAC;AAG5D,OAAO,EAA2B,YAAY,EAAE,MAAM,YAAY,CAAC;AAoFnE,eAAO,MAAM,aAAa,EAAE,YAAY,CAAC,GAAG,EAAE,GAAG,EAAE,SAAS,CAAC,GAAG,EAAE,GAAG,CAAC,CAGrE,CAAC"}
+{"version":3,"file":"catch.d.ts","sourceRoot":"","sources":["../../../../../src/src/interpreter/memory/compilers/catch.ts"],"names":[],"mappings":"AAgBA,OAAO,EAAE,SAAS,EAAE,MAAM,iCAAiC,CAAC;AAG5D,OAAO,EAA2B,YAAY,EAAE,MAAM,YAAY,CAAC;AAsFnE,eAAO,MAAM,aAAa,EAAE,YAAY,CAAC,GAAG,EAAE,GAAG,EAAE,SAAS,CAAC,GAAG,EAAE,GAAG,CAAC,CAGrE,CAAC"}

package/script/src/interpreter/memory/compilers/catch.js

@@ -45,12 +45,12 @@ function compileCatch(compilerCtx, task) {
                         reason: 'error',
                         severity: 'high',
                     });
-                    return errorOperator((0, rxjs_1.of)(ctx.withData(new ExecutionError_js_1.ExecutionError(ctx, error.message, { cause: error }))));
+                    return errorOperator((0, rxjs_1.of)(ctx.withData(new ExecutionError_js_1.ExecutionError(ctx, error.message, { cause: error }), { recoveredFromCatch: true })));
                 }
                 compilerCtx.issueProvider.submitIssue({
                     annotations: {
-                        'error': error.message,
-                        'stack': error.stack || '',
+                        'error': String(error),
+                        'stack': '',
                         'workflowId': ctx.options.workflow?.id || ctx.workflow?.id || '',
                         'executionId': ctx.executionId,
                         'activationId': ctx.activation.id,
@@ -64,7 +64,7 @@ function compileCatch(compilerCtx, task) {
                 });
                 span.setAttribute('error', `${error}`);
                 span.end();
-                return errorOperator((0, rxjs_1.of)(ctx.withData(new ExecutionError_js_1.ExecutionError(ctx, `${error}`, { cause: error }))));
+                return errorOperator((0, rxjs_1.of)(ctx.withData(new ExecutionError_js_1.ExecutionError(ctx, `${error}`, { cause: error }), { recoveredFromCatch: true })));
             });
         }));
     }));

package/script/src/interpreter/memory/compilers/fn.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"fn.d.ts","sourceRoot":"","sources":["../../../../../src/src/interpreter/memory/compilers/fn.ts"],"names":[],"mappings":"AAgBA,OAAO,EAAE,MAAM,EAAE,MAAM,8BAA8B,CAAC;AAEtD,OAAO,EAA2B,YAAY,EAAE,MAAM,YAAY,CAAC;AA+BnE,eAAO,MAAM,UAAU,EAAE,YAAY,CAAC,GAAG,EAAE,GAAG,EAAE,MAAM,CAAC,GAAG,EAAE,GAAG,CAAC,CAG/D,CAAC"}
+{"version":3,"file":"fn.d.ts","sourceRoot":"","sources":["../../../../../src/src/interpreter/memory/compilers/fn.ts"],"names":[],"mappings":"AAgBA,OAAO,EAAE,MAAM,EAAE,MAAM,8BAA8B,CAAC;AAEtD,OAAO,EAA2B,YAAY,EAAE,MAAM,YAAY,CAAC;AAiCnE,eAAO,MAAM,UAAU,EAAE,YAAY,CAAC,GAAG,EAAE,GAAG,EAAE,MAAM,CAAC,GAAG,EAAE,GAAG,CAAC,CAG/D,CAAC"}

package/script/src/interpreter/memory/compilers/fn.js

@@ -22,12 +22,15 @@ function compileFn(compilerCtx, task) {
         return await compilerCtx.tracer.startActiveSpan(`fn-${task.id}`, async (span) => {
             span.setAttribute('task.id', task.id);
             span.setAttribute('execution.id', ctx.executionId);
-            if (typeof ctx.idx === 'number') {
+            try {
+                if (typeof ctx.idx === 'number') {
+                    return ctx.withData(await task._fn(ctx, ctx.idx));
+                }
+                return ctx.withData(await task._fn(ctx));
+            }
+            finally {
                 span.end();
-                return ctx.withData(await task._fn(ctx, ctx.idx));
             }
-            span.end();
-            return ctx.withData(await task._fn(ctx));
         });
     }));
 }

package/script/src/interpreter/memory/compilers/webhook.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"webhook.d.ts","sourceRoot":"","sources":["../../../../../src/src/interpreter/memory/compilers/webhook.ts"],"names":[],"mappings":"AA2BA,OAAO,EAAE,WAAW,EAAE,cAAc,EAAE,MAAM,yCAAyC,CAAC;AAGtF,OAAO,EAAE,eAAe,EAAE,MAAM,YAAY,CAAC;AAuD7C,eAAO,MAAM,eAAe,EAAE,eAAe,CAAC,WAAW,EAAE,cAAc,CA2SxE,CAAC"}
+{"version":3,"file":"webhook.d.ts","sourceRoot":"","sources":["../../../../../src/src/interpreter/memory/compilers/webhook.ts"],"names":[],"mappings":"AA2BA,OAAO,EAAE,WAAW,EAAE,cAAc,EAAE,MAAM,yCAAyC,CAAC;AAGtF,OAAO,EAAE,eAAe,EAAE,MAAM,YAAY,CAAC;AAuD7C,eAAO,MAAM,eAAe,EAAE,eAAe,CAAC,WAAW,EAAE,cAAc,CA0SxE,CAAC"}

package/script/src/interpreter/memory/compilers/webhook.js

@@ -102,12 +102,13 @@ exports.webhookCompiler = {
             },
             request: req,
         });
+        const routeMiddleware = [];
         if (!trigger.options.request?.rawBody) {
-            ctx.webhookRouter.use(express_1.default.json({ limit: '50mb', type: ['application/json', '*/*+json'] }));
-            ctx.webhookRouter.use((0, express_xml_bodyparser_1.default)(xml2jsDefaults));
+            routeMiddleware.push(express_1.default.json({ limit: '50mb', type: ['application/json', '*/*+json'] }));
+            routeMiddleware.push((0, express_xml_bodyparser_1.default)(xml2jsDefaults));
         }
         else {
-            ctx.webhookRouter.use(express_1.default.raw({ type: '*/*', limit: '50mb' }));
+            routeMiddleware.push(express_1.default.raw({ type: '*/*', limit: '50mb' }));
         }
         return new rxjs_1.Observable((subscriber) => {
             if (!ctx.webhookRouter) {
@@ -124,7 +125,7 @@ exports.webhookCompiler = {
                 }
             }
             // endpoint for sans user because I'm not quite sure how the dynamic routing works
-            ctx.webhookRouter[method](`/${trigger.id}`, (0, webhookmiddleware_js_1.createStaticWebhookMiddleware)({
+            ctx.webhookRouter[method](`/${trigger.id}`, ...routeMiddleware, (0, webhookmiddleware_js_1.createStaticWebhookMiddleware)({
                 id: trigger.id,
                 organisationId: ctx.organisationId,
                 environmentId: Deno.env.get(constants_js_1.envVarEnvId) ?? '',
@@ -160,7 +161,7 @@ exports.webhookCompiler = {
                 });
             });
             // this endpoint will trigger the workflow for each activation given by the external user ID
-            ctx.webhookRouter[method](`/${trigger.id}/users/:userId`, (0, webhookmiddleware_js_1.createUserIdDynamicWebhookMiddleware)({
+            ctx.webhookRouter[method](`/${trigger.id}/users/:userId`, ...routeMiddleware, (0, webhookmiddleware_js_1.createUserIdDynamicWebhookMiddleware)({
                 id: trigger.id,
                 connName: trigger.options.connection,
                 organisationId: ctx.organisationId,
@@ -216,7 +217,7 @@ exports.webhookCompiler = {
                 });
             });
             // this endpoint will trigger the workflow only for the activation given by its ID
-            ctx.webhookRouter[method](`/${trigger.id}/activations/:activationId`, (0, webhookmiddleware_js_1.createActIdDynamicWebhookMiddleware)({
+            ctx.webhookRouter[method](`/${trigger.id}/activations/:activationId`, ...routeMiddleware, (0, webhookmiddleware_js_1.createActIdDynamicWebhookMiddleware)({
                 id: trigger.id,
                 organisationId: ctx.organisationId,
                 environmentId: Deno.env.get(constants_js_1.envVarEnvId) ?? '',

package/script/src/interpreter/vanilla/ExecutionError.d.ts

@@ -1,10 +1,8 @@
 import { Context } from '../../context/Context.js';
 /**
  * ExecutionError wraps errors that occur during durable workflow execution, providing access to the context at the
- * time of the error. This is used with the {@link DurableInterpreter}.
+ * time of the error. This is used with the {@link VanillaInterpreter}.
  *
- * Note: When using the {@link MemoryInterpreter}, errors in `.catch()` handlers will be instances of the regular
- * `ExecutionError` instead.
  */
 export declare class ExecutionError extends Error {
     /**

package/script/src/interpreter/vanilla/ExecutionError.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"ExecutionError.d.ts","sourceRoot":"","sources":["../../../../src/src/interpreter/vanilla/ExecutionError.ts"],"names":[],"mappings":"AAaA,OAAO,EAAE,OAAO,EAAE,MAAM,0BAA0B,CAAC;AAEnD;;;;;;GAMG;AACH,qBAAa,cAAe,SAAQ,KAAK;IACrC;;OAEG;IACH,GAAG,EAAE,OAAO,CAAC,GAAG,CAAC,CAAC;IAElB;;;;;;OAMG;gBACS,GAAG,EAAE,OAAO,CAAC,GAAG,CAAC,EAAE,OAAO,EAAE,MAAM,EAAE,IAAI,CAAC,EAAE,YAAY;IAOnE,MAAM;;;;CAMT"}
+{"version":3,"file":"ExecutionError.d.ts","sourceRoot":"","sources":["../../../../src/src/interpreter/vanilla/ExecutionError.ts"],"names":[],"mappings":"AAaA,OAAO,EAAE,OAAO,EAAE,MAAM,0BAA0B,CAAC;AAEnD;;;;GAIG;AACH,qBAAa,cAAe,SAAQ,KAAK;IACrC;;OAEG;IACH,GAAG,EAAE,OAAO,CAAC,GAAG,CAAC,CAAC;IAElB;;;;;;OAMG;gBACS,GAAG,EAAE,OAAO,CAAC,GAAG,CAAC,EAAE,OAAO,EAAE,MAAM,EAAE,IAAI,CAAC,EAAE,YAAY;IAOnE,MAAM;;;;CAMT"}

package/script/src/interpreter/vanilla/ExecutionError.js

@@ -15,10 +15,8 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.ExecutionError = void 0;
 /**
  * ExecutionError wraps errors that occur during durable workflow execution, providing access to the context at the
- * time of the error. This is used with the {@link DurableInterpreter}.
+ * time of the error. This is used with the {@link VanillaInterpreter}.
  *
- * Note: When using the {@link MemoryInterpreter}, errors in `.catch()` handlers will be instances of the regular
- * `ExecutionError` instead.
  */
 class ExecutionError extends Error {
     /**

package/script/src/interpreter/vanilla/VanillaInterpreter.d.ts

@@ -38,6 +38,7 @@ export type VanillaInterpreterOptions = {
     skipVersoriCredentials?: boolean;
 };
 type Registration = {
+    triggerName: string;
     trigger$: Observable<VanillaContext<any, void>>;
     task$: ContextOperatorFunction<any, any, any>;
     localAbortController: AbortController;