@versori/run 0.5.0-alpha.2 → 0.5.0-alpha.4

package/script/src/internal/supervisor.js

@@ -13,19 +13,24 @@
  */
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.Fake = exports.enabled = void 0;
-exports.registerWebhooks = registerWebhooks;
+exports.signalReady = signalReady;
+exports.registerWorkflow = registerWorkflow;
 exports.sendTaskStartEvent = sendTaskStartEvent;
-exports.registerCrons = registerCrons;
 exports.mockAPIRequest = mockAPIRequest;
 const core_1 = require("@opentelemetry/core");
 const ConsoleLogger_js_1 = require("../observability/logging/ConsoleLogger.js");
-const supervisorURL = function () {
+const ChainTask_js_1 = require("../dsl/tasks/ChainTask.js");
+const ScheduleTrigger_js_1 = require("../dsl/triggers/ScheduleTrigger.js");
+const WebhookTrigger_js_1 = require("../dsl/triggers/WebhookTrigger.js");
+const DurableTrigger_js_1 = require("../dsl/triggers/DurableTrigger.js");
+const Task_js_1 = require("../dsl/Task.js");
+const supervisorURL = (function () {
     return Deno.env.get('RUN_SUPERVISOR_URL') || '';
-}();
-exports.enabled = function () {
+})();
+exports.enabled = (function () {
     return Deno.env.get('RUN_SUPERVISOR_URL') ? true : false;
-}();
-const flows = function () {
+})();
+const flows = (function () {
     try {
         const _cwd = Deno.cwd();
         const flowsFile = Deno.readTextFileSync(_cwd + '/versori-flow.json');
@@ -33,73 +38,127 @@ const flows = function () {
         const nodes = {};
         for (const node of flows.nodes) {
             nodes[node.id] = {
-                description: node.data.description,
-                steps: node.data.steps,
+                description: node?.data?.description,
+                steps: node?.data?.steps,
+                files: node?.data?.files[0]
             };
         }
         return nodes;
     }
-    catch (err) {
+    catch {
         return {};
     }
-}();
+})();
 const logger = new ConsoleLogger_js_1.ConsoleLogger('debug');
-async function registerWebhooks(webhooks) {
+function getTriggerData(workflow) {
+    if (workflow.trigger instanceof WebhookTrigger_js_1.WebhookTrigger) {
+        return {
+            id: workflow.trigger.id,
+            type: 'webhook',
+            method: workflow.trigger.options.method || 'post',
+        };
+    }
+    else if (workflow.trigger instanceof ScheduleTrigger_js_1.ScheduleTrigger) {
+        return {
+            id: workflow.trigger.id,
+            type: 'schedule',
+            schedule: workflow.trigger.schedule,
+        };
+    }
+    else if (workflow.trigger instanceof DurableTrigger_js_1.DurableWorkflowTrigger) {
+        return {
+            id: workflow.trigger.id,
+            type: 'durable',
+        };
+    }
+    return null;
+}
+function getTaskData(task) {
+    const rawType = task[Task_js_1.TaskType] ?? 'unknown';
+    const type = String(rawType).toLowerCase();
+    const taskId = String(task.id) ?? 'unknown';
+    return {
+        taskId,
+        type,
+    };
+}
+async function signalReady() {
     if (!exports.enabled) {
         return;
     }
     try {
-        await fetch(`${supervisorURL}/register-webhooks`, {
-            method: "POST",
-            body: JSON.stringify(Object.fromEntries(webhooks)),
-            headers: {
-                "Content-Type": "application/json",
-            },
+        await fetch(`${supervisorURL}/ready`, {
+            method: 'POST',
         });
     }
     catch (err) {
-        logger.error('Failed to register webhooks with supervisor', { error: err });
+        logger.error('Failed to signal ready to supervisor', { error: err });
     }
 }
-async function sendTaskStartEvent(taskId, span) {
+async function registerWorkflow(workflow) {
     if (!exports.enabled) {
         return;
     }
+    if (workflow.task instanceof ChainTask_js_1.ChainTask) {
+        const triggerData = getTriggerData(workflow);
+        if (!triggerData) {
+            logger.error('Unable to determine trigger data for workflow');
+            return;
+        }
+        const tasks = workflow.task.tasks.map((t) => getTaskData(t));
+        const data = {
+            workflowId: triggerData.id,
+            trigger: triggerData,
+            tasks,
+        };
+        try {
+            await fetch(`${supervisorURL}/register-workflow`, {
+                method: 'POST',
+                body: JSON.stringify(data),
+                headers: {
+                    'Content-Type': 'application/json',
+                },
+            });
+        }
+        catch (err) {
+            logger.error('Failed to register workflow with supervisor', { error: err });
+        }
+    }
+}
+async function sendTaskStartEvent(taskId, ctx, span) {
+    if (!exports.enabled) {
+        return ctx;
+    }
     const data = {
         taskId,
         spanId: span.spanContext().spanId,
         traceId: span.spanContext().traceId,
         startTime: new Date().toISOString(), // assuming current time as start time
+        executionId: ctx.executionId,
+        workflowId: ctx.workflowId || '',
     };
     try {
-        await fetch(`${supervisorURL}/tasks/start`, {
-            method: "POST",
+        const resp = await fetch(`${supervisorURL}/tasks/start`, {
+            method: 'POST',
             body: JSON.stringify(data),
             headers: {
-                "Content-Type": "application/json",
+                'Content-Type': 'application/json',
             },
         });
+        if (resp.ok) {
+            const bodyString = await resp.text();
+            if (!bodyString) {
+                return ctx;
+            }
+            // TODO: XML, CSV yada yada
+            const respData = JSON.parse(bodyString);
+            return ctx.withData(respData);
+        }
     }
     catch (err) {
         logger.error('Failed to send task start event to supervisor', { error: err });
     }
-}
-async function registerCrons(crons) {
-    if (!exports.enabled) {
-        return;
-    }
-    try {
-        await fetch(`${supervisorURL}/register-schedulers`, {
-            method: "POST",
-            body: JSON.stringify(Object.fromEntries(crons)),
-            headers: {
-                "Content-Type": "application/json",
-            },
-        });
-    }
-    catch (err) {
-        logger.error('Failed to register crons with supervisor', { error: err });
-    }
+    return ctx;
 }
 async function mockAPIRequest(info, cnx, options) {
     if (!exports.enabled) {
@@ -108,17 +167,17 @@ async function mockAPIRequest(info, cnx, options) {
     const mockRequest = {
         url: info.toString(),
         payload: options?.body || '',
-        method: options?.method || "GET",
+        method: options?.method || 'GET',
         headers: options?.headers,
         connection: cnx?.name,
         connectionId: cnx?.id,
     };
     try {
         const response = await fetch(`${supervisorURL}/ai/fake-fetch-call`, {
-            method: "POST",
+            method: 'POST',
             body: JSON.stringify(mockRequest),
             headers: {
-                "Content-Type": "application/json",
+                'Content-Type': 'application/json',
             },
         });
         if (!response.ok) {
@@ -134,7 +193,7 @@ async function mockAPIRequest(info, cnx, options) {
     }
 }
 function printableSpan(s) {
-    let span = {
+    const span = {
         name: s.name,
         startTime: (0, core_1.hrTimeToTimeStamp)(s.startTime),
         endTime: (0, core_1.hrTimeToTimeStamp)(s.endTime),
@@ -146,10 +205,11 @@ function printableSpan(s) {
         parentSpanContext: s.parentSpanContext,
         spanContext: s.spanContext(),
     };
-    const nodeDetail = flows[span.attributes['task.id']]; // I know I have coded all of those as string 
+    const nodeDetail = flows[span.attributes['task.id']]; // I know I have coded all of those as string
     if (nodeDetail) {
-        span.attributes['description'] = nodeDetail.description;
-        span.attributes['steps'] = nodeDetail.steps;
+        span.attributes['description'] = nodeDetail?.description || '';
+        span.attributes['steps'] = nodeDetail?.steps || '';
+        span.attributes['files'] = nodeDetail?.files || '';
     }
     return span;
 }
@@ -163,10 +223,10 @@ class Fake {
         const ss = spans.map(printableSpan);
         try {
             fetch(`${supervisorURL}/receive-spans`, {
-                method: "POST",
+                method: 'POST',
                 body: JSON.stringify({ spans: ss }),
                 headers: {
-                    "Content-Type": "application/json",
+                    'Content-Type': 'application/json',
                 },
             }).catch((err) => {
                 logger.error('Failed to send spans to supervisor', { error: err });

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

@@ -95,6 +95,7 @@ export declare class DurableInterpreter {
     private cronServer?;
     private shutdownServer?;
     private isShuttingDown;
+    private wfRegistration;
     constructor(log: Logger, compiler: ObservableCompiler, contextProvider: ContextProvider, webhookRouter: Router, cronRouter: Router, cronRegistry: Map<string, string>, webhookRegistry: WebhookRegistry, platformApi: PlatformApi, cnxFetchFactory: DirectConnectionFactory, cronProvider: CronProvider, tracer: Tracer, issue: IssueAPI, cfgReader: ConfigReader, queueProvider: QueueAPI, otelSDK?: NodeSDK | undefined);
     static newInstance(options?: DurableInterpreterOptions): Promise<DurableInterpreter>;
     register<O>(workflow: Workflow<O>, options?: DurableInterpreterOptions): Registration;

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

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

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

@@ -189,6 +189,13 @@ class DurableInterpreter {
             writable: true,
             value: false
         });
+        // Workflow registration promises only used when supervisor is enabled
+        Object.defineProperty(this, "wfRegistration", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: []
+        });
         if (typeof this.log === 'undefined') {
             // this captures the old way of instantiating the DurableInterpreter and provides an
             // error message back to the user to let them know they should use the new way.
@@ -292,6 +299,9 @@ class DurableInterpreter {
             },
         };
         this.registeredWorkflows.push(registration);
+        if (supervisor_js_1.enabled) {
+            this.wfRegistration.push((0, supervisor_js_1.registerWorkflow)(workflow));
+        }
         return registration;
     }
     async start() {
@@ -324,6 +334,7 @@ class DurableInterpreter {
                     span.setAttribute('error.message', err instanceof Error ? err.toString() : err);
                     span.setAttribute('execution.id', ctx.executionId);
                     span.setAttribute('result', 'fail');
+                    span.setAttribute('workflow.id', ctx.workflowId || 'unknown-workflow');
                     span.end();
                 });
                 try {
@@ -348,6 +359,7 @@ class DurableInterpreter {
                     this.tracer.startActiveSpan('done', (span) => {
                         span.setAttribute('execution.id', ctx.executionId);
                         span.setAttribute('result', 'pass');
+                        span.setAttribute('workflow.id', ctx.workflowId || 'unknown-workflow');
                         span.end();
                     });
                     try {
@@ -397,9 +409,6 @@ class DurableInterpreter {
             });
             throw new Error('Unable to register scheduler tasks with central cron provider');
         }
-        // register with supervisor
-        await (0, supervisor_js_1.registerCrons)(this.cronRegistry);
-        await (0, supervisor_js_1.registerWebhooks)(this.webhookRegistry);
         this.webhookServer = webhookApp.listen(port, () => {
             this.log.info(`Express server listening on port ${port}`);
         });
@@ -436,6 +445,10 @@ class DurableInterpreter {
             }
         };
         Deno.addSignalListener('SIGINT', this.shutdownServer);
+        if (supervisor_js_1.enabled) {
+            await Promise.all(this.wfRegistration);
+            await (0, supervisor_js_1.signalReady)();
+        }
         return new Promise((resolve) => {
             let serversClosed = 0;
             const totalServers = [this.webhookServer, this.cronServer].filter(Boolean).length;

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;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/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

@@ -27,6 +27,7 @@ function compileCatch(compilerCtx, task) {
                     span.setAttribute('task.type', 'catch');
                     span.setAttribute('type', 'task');
                     if (error instanceof Error) {
+                        span.setAttribute('status', 'fail');
                         span.recordException(error);
                         span.setAttribute('error.message', error.message);
                         span.setAttribute('error.stack', error.stack ?? '');
@@ -39,9 +40,10 @@ function compileCatch(compilerCtx, task) {
                             annotations: {
                                 'error': error.message,
                                 'stack': error.stack || '',
-                                'workflowId': ctx.options.workflowId || ctx.workflowId ||
-                                    '',
+                                'workflowId': ctx.options.workflowId || ctx.workflowId || '',
                                 'executionId': ctx.executionId,
+                                'activationId': ctx.activation.id,
+                                'activationExternalId': ctx.activation?.user.externalId,
                             },
                             reason: 'error',
                             severity: 'high',
@@ -53,16 +55,17 @@ function compileCatch(compilerCtx, task) {
                     });
                     compilerCtx.issueProvider.submitIssue({
                         annotations: {
-                            'error': error.message || '',
+                            'error': error.message,
                             'stack': error.stack || '',
-                            'workflowId': ctx.options.workflowId || ctx.workflowId ||
-                                '',
+                            'workflowId': ctx.options.workflowId || ctx.workflowId || '',
                             'executionId': ctx.executionId,
+                            'activationId': ctx.activation.id,
+                            'activationExternalId': ctx.activation?.user.externalId,
                         },
                         reason: 'error',
                         severity: 'low',
                     });
-                    span.setAttribute('error', `${error}`);
+                    span.setAttribute('status', 'fail');
                     span.end();
                     return errorOperator((0, rxjs_1.of)(ctx.withData(new ExecutionError_js_1.ExecutionError(ctx, `${error}`, { cause: 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":"AA+BA,OAAO,EAAE,MAAM,EAAE,MAAM,8BAA8B,CAAC;AAGtD,OAAO,EAA2B,YAAY,EAAE,MAAM,YAAY,CAAC;AA0CnE,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":"AA+BA,OAAO,EAAE,MAAM,EAAE,MAAM,8BAA8B,CAAC;AAGtD,OAAO,EAA2B,YAAY,EAAE,MAAM,YAAY,CAAC;AAuDnE,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

@@ -21,10 +21,12 @@ function compileFn(compilerCtx, task) {
         complete: () => compilerCtx.log.debug('fn.complete'),
     }), (0, rxjs_1.mergeMap)(async (ctx) => {
         return await compilerCtx.tracer.startActiveSpan(`fn-${task.id}`, async (span) => {
+            await (0, supervisor_js_1.sendTaskStartEvent)(task.id, span);
             span.setAttribute('task.id', task.id);
             span.setAttribute('type', 'task');
             span.setAttribute('task.type', 'fn');
             span.setAttribute('execution.id', ctx.executionId);
+            span.setAttribute('workflow.id', ctx.options.workflowId || 'unknown-workflow');
             try {
                 const spanContext = span.spanContext();
                 const ctxWithLogger = ctx.withLogger(ctx.log.child({ spanId: spanContext.spanId, traceId: spanContext.traceId }));
@@ -38,8 +40,19 @@ function compileFn(compilerCtx, task) {
                 if (supervisor_js_1.enabled) {
                     span.setAttribute('response.body', JSON.stringify(result.data));
                 }
+                span.setAttribute('status', 'pass');
                 return result;
             }
+            catch (error) {
+                if (error instanceof Error) {
+                    span.setAttribute('status', 'fail');
+                    span.recordException(error);
+                }
+                else {
+                    span.recordException(new Error(String(error)));
+                }
+                throw error;
+            }
             finally {
                 span.end();
             }

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

@@ -1 +1 @@
-{"version":3,"file":"http.d.ts","sourceRoot":"","sources":["../../../../../src/src/interpreter/durable/compilers/http.ts"],"names":[],"mappings":"AAqBA,OAAO,EAAmB,YAAY,EAAE,MAAM,gCAAgC,CAAC;AAG/E,OAAO,EAA2B,YAAY,EAAE,MAAM,YAAY,CAAC;AAuHnE,eAAO,MAAM,YAAY,EAAE,YAAY,CAAC,GAAG,EAAE,GAAG,EAAE,YAAY,CAAC,GAAG,EAAE,GAAG,EAAE,GAAG,CAAC,CAG5E,CAAC"}
+{"version":3,"file":"http.d.ts","sourceRoot":"","sources":["../../../../../src/src/interpreter/durable/compilers/http.ts"],"names":[],"mappings":"AAqBA,OAAO,EAAmB,YAAY,EAAE,MAAM,gCAAgC,CAAC;AAG/E,OAAO,EAA2B,YAAY,EAAE,MAAM,YAAY,CAAC;AA4HnE,eAAO,MAAM,YAAY,EAAE,YAAY,CAAC,GAAG,EAAE,GAAG,EAAE,YAAY,CAAC,GAAG,EAAE,GAAG,EAAE,GAAG,CAAC,CAG5E,CAAC"}

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

@@ -76,21 +76,25 @@ function compileHttp(compilerCtx, task) {
         complete: () => compilerCtx.log.debug('http.complete'),
     }), (0, rxjs_1.mergeMap)((ctx) => {
         return compilerCtx.tracer.startActiveSpan(`http-${task.id}`, async (span) => {
+            await (0, supervisor_js_1.sendTaskStartEvent)(task.id, span);
             span.setAttribute('task.id', task.id);
             span.setAttribute('task.type', 'http');
             span.setAttribute('type', 'task');
             span.setAttribute('execution.id', ctx.executionId);
             span.setAttribute('connection.name', task.opts.connection);
+            span.setAttribute('workflow.id', ctx.options.workflowId || 'unknown-workflow');
             const spanContext = span.spanContext();
             try {
                 const result = await http(ctx.withLogger(ctx.log.child({ spanId: spanContext.spanId, traceId: spanContext.traceId })));
                 if (supervisor_js_1.enabled) {
                     span.setAttribute('response.body', JSON.stringify(result.data));
                 }
+                span.setAttribute('status', 'pass');
                 return result;
             }
             catch (error) {
                 if (error instanceof Error) {
+                    span.setAttribute('status', 'fail');
                     span.recordException(error);
                 }
                 else {

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

@@ -1 +1 @@
-{"version":3,"file":"schedule.d.ts","sourceRoot":"","sources":["../../../../../src/src/interpreter/durable/compilers/schedule.ts"],"names":[],"mappings":"AAiBA,OAAO,EAAE,YAAY,EAAE,eAAe,EAAE,MAAM,0CAA0C,CAAC;AAQzF,OAAO,EAAE,eAAe,EAAE,MAAM,YAAY,CAAC;AAmJ7C,eAAO,MAAM,gBAAgB,EAAE,eAAe,CAAC,YAAY,EAAE,eAAe,CAG3E,CAAC"}
+{"version":3,"file":"schedule.d.ts","sourceRoot":"","sources":["../../../../../src/src/interpreter/durable/compilers/schedule.ts"],"names":[],"mappings":"AAiBA,OAAO,EAAE,YAAY,EAAE,eAAe,EAAE,MAAM,0CAA0C,CAAC;AAQzF,OAAO,EAAE,eAAe,EAAE,MAAM,YAAY,CAAC;AAqJ7C,eAAO,MAAM,gBAAgB,EAAE,eAAe,CAAC,YAAY,EAAE,eAAe,CAG3E,CAAC"}

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

@@ -55,7 +55,7 @@ function compileSchedule(ctx, trigger, signal) {
                         });
                         return;
                     }
-                    const executionCtx = ctx.contextProvider.create(activation[0], {});
+                    const executionCtx = ctx.contextProvider.create(activation[0], {}, { workflowId: trigger.id });
                     span.setAttribute('execution.id', executionCtx.executionId);
                     try {
                         subscriber.next(executionCtx);
@@ -87,7 +87,7 @@ function compileSchedule(ctx, trigger, signal) {
                     return;
                 }
                 activations.forEach((activation) => {
-                    const executionCtx = ctx.contextProvider.create(activation, {});
+                    const executionCtx = ctx.contextProvider.create(activation, {}, { workflowId: trigger.id });
                     try {
                         subscriber.next(executionCtx);
                     }

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,CAwTxE,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,CA2TxE,CAAC"}

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

@@ -90,6 +90,7 @@ exports.webhookCompiler = {
             onError = trigger.options.response.onError;
         }
         const ctxOptionsFn = (req, res) => ({
+            workflowId: trigger.id,
             onSuccess: (ctx) => {
                 if (isSync) {
                     sendResponse(res, onSuccess(ctx));
@@ -114,8 +115,10 @@ exports.webhookCompiler = {
             if (!ctx.webhookRouter) {
                 throw new Error('Router not available in compiler context');
             }
-            // add the webhook endpoint to the router
-            ctx.log.info('webhook endpoint added:', { trigger });
+            ctx.log.info('webhook endpoint added', {
+                id: trigger.id,
+                method,
+            });
             if (corsOptions) {
                 if (typeof corsOptions === 'boolean') {
                     ctx.webhookRouter.use((0, cors_1.default)());

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

@@ -88,6 +88,7 @@ export declare class MemoryInterpreter {
     private cronServer?;
     private shutdownServer?;
     private isShuttingDown;
+    private wfRegistration;
     constructor(log: Logger, compiler: ObservableCompiler, contextProvider: ContextProvider, webhookRouter: Router, cronRouter: Router, cronRegistry: Map<string, string>, webhookRegistry: WebhookRegistry, cnxFactory: DirectConnectionFactory, cronProvider: CronProvider, tracer: Tracer, issuesProvider: IssueAPI, cfgReader: ConfigReader, otelSDK?: NodeSDK | undefined);
     static newInstance(options?: MemoryInterpreterOptions): Promise<MemoryInterpreter>;
     register<O>(workflow: Workflow<O>, options?: MemoryInterpreterOptions): Registration;

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

@@ -173,6 +173,13 @@ class MemoryInterpreter {
             writable: true,
             value: false
         });
+        // Workflow registration promises only used when supervisor is enabled
+        Object.defineProperty(this, "wfRegistration", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: []
+        });
         if (typeof this.log === 'undefined') {
             // this captures the old way of instantiating the MemoryInterpreter and provides an
             // error message back to the user to let them know they should use the new way.
@@ -272,6 +279,9 @@ class MemoryInterpreter {
             },
         };
         this.registeredWorkflows.push(registration);
+        if (supervisor_js_1.enabled) {
+            this.wfRegistration.push((0, supervisor_js_1.registerWorkflow)(workflow));
+        }
         return registration;
     }
     async start() {
@@ -304,6 +314,7 @@ class MemoryInterpreter {
                     span.setAttribute('error.message', err instanceof Error ? err.toString() : err);
                     span.setAttribute('execution.id', ctx.executionId);
                     span.setAttribute('result', 'fail');
+                    span.setAttribute('workflow.id', ctx.workflowId || 'unknown-workflow');
                     span.end();
                 });
                 try {
@@ -328,6 +339,7 @@ class MemoryInterpreter {
                     this.tracer.startActiveSpan('done', (span) => {
                         span.setAttribute('execution.id', ctx.executionId);
                         span.setAttribute('result', 'pass');
+                        span.setAttribute('workflow.id', ctx.workflowId || 'unknown-workflow');
                         span.end();
                     });
                     try {
@@ -366,9 +378,6 @@ class MemoryInterpreter {
             });
             throw new Error('Unable to register scheduler tasks with central cron provider');
         }
-        // register with suopervisor
-        await (0, supervisor_js_1.registerCrons)(this.cronRegistry);
-        await (0, supervisor_js_1.registerWebhooks)(this.webhookRegistry);
         this.webhookServer = webhookApp.listen(port, () => {
             this.log.info(`Express server listening on port ${port}`);
         });
@@ -405,6 +414,10 @@ class MemoryInterpreter {
             }
         };
         Deno.addSignalListener('SIGINT', this.shutdownServer);
+        if (supervisor_js_1.enabled) {
+            await Promise.all(this.wfRegistration);
+            await (0, supervisor_js_1.signalReady)();
+        }
         return new Promise((resolve) => {
             let serversClosed = 0;
             const totalServers = [this.webhookServer, this.cronServer].filter(Boolean).length;

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;AAsFnE,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;AA0FnE,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

@@ -28,6 +28,7 @@ function compileCatch(compilerCtx, task) {
                 span.setAttribute('task.type', 'catch');
                 span.setAttribute('type', 'task');
                 if (error instanceof Error) {
+                    span.setAttribute('status', 'fail');
                     span.recordException(error);
                     span.setAttribute('error.message', error.message);
                     span.setAttribute('error.stack', error.stack ?? '');
@@ -40,9 +41,10 @@ function compileCatch(compilerCtx, task) {
                         annotations: {
                             'error': error.message,
                             'stack': error.stack || '',
-                            'workflowId': ctx.options.workflowId || ctx.workflowId ||
-                                '',
+                            'workflowId': ctx.options.workflowId || ctx.workflowId || '',
                             'executionId': ctx.executionId,
+                            'activationId': ctx.activation.id,
+                            'activationExternalId': ctx.activation?.user.externalId,
                         },
                         reason: 'error',
                         severity: 'high',
@@ -51,11 +53,12 @@ function compileCatch(compilerCtx, task) {
                 }
                 compilerCtx.issueProvider.submitIssue({
                     annotations: {
-                        'error': error.message || '',
+                        'error': error.message,
                         'stack': error.stack || '',
-                        'workflowId': ctx.options.workflowId || ctx.workflowId ||
-                            '',
+                        'workflowId': ctx.options.workflowId || ctx.workflowId || '',
                         'executionId': ctx.executionId,
+                        'activationId': ctx.activation.id,
+                        'activationExternalId': ctx.activation?.user.externalId,
                     },
                     reason: 'error',
                     severity: 'low',
@@ -63,6 +66,7 @@ function compileCatch(compilerCtx, task) {
                 ctx.log.error('execution has encountered an error', {
                     error: error,
                 });
+                span.setAttribute('status', 'fail');
                 span.setAttribute('error', `${error}`);
                 span.end();
                 return errorOperator((0, rxjs_1.of)(ctx.withData(new ExecutionError_js_1.ExecutionError(ctx, `${error}`, { cause: error }))));

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;AAGtD,OAAO,EAA2B,YAAY,EAAE,MAAM,YAAY,CAAC;AA6CnE,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;AAGtD,OAAO,EAA2B,YAAY,EAAE,MAAM,YAAY,CAAC;AAuDnE,eAAO,MAAM,UAAU,EAAE,YAAY,CAAC,GAAG,EAAE,GAAG,EAAE,MAAM,CAAC,GAAG,EAAE,GAAG,CAAC,CAG/D,CAAC"}