@versori/run 0.4.7 → 0.5.0-alpha.2

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

@@ -25,6 +25,7 @@ function compileCatch(compilerCtx, task) {
                 return compilerCtx.tracer.startActiveSpan(`catch`, (span) => {
                     span.setAttribute('execution.id', ctx.executionId);
                     span.setAttribute('task.type', 'catch');
+                    span.setAttribute('type', 'task');
                     if (error instanceof Error) {
                         span.recordException(error);
                         span.setAttribute('error.message', error.message);
@@ -38,10 +39,9 @@ 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,12 +53,11 @@ 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',

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":"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"}

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

@@ -15,19 +15,34 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.fnCompiler = void 0;
 const rxjs_1 = require("rxjs");
 const FnTask_js_1 = require("../../../dsl/tasks/FnTask.js");
+const supervisor_js_1 = require("../../../internal/supervisor.js");
 function compileFn(compilerCtx, task) {
     return (src) => src.pipe((0, rxjs_1.tap)({
         complete: () => compilerCtx.log.debug('fn.complete'),
     }), (0, rxjs_1.mergeMap)(async (ctx) => {
         return await compilerCtx.tracer.startActiveSpan(`fn-${task.id}`, async (span) => {
             span.setAttribute('task.id', task.id);
+            span.setAttribute('type', 'task');
+            span.setAttribute('task.type', 'fn');
             span.setAttribute('execution.id', ctx.executionId);
-            if (typeof ctx.idx === 'number') {
+            try {
+                const spanContext = span.spanContext();
+                const ctxWithLogger = ctx.withLogger(ctx.log.child({ spanId: spanContext.spanId, traceId: spanContext.traceId }));
+                let result;
+                if (typeof ctx.idx === 'number') {
+                    result = ctx.withData(await task._fn(ctxWithLogger, ctx.idx));
+                }
+                else {
+                    result = ctx.withData(await task._fn(ctxWithLogger));
+                }
+                if (supervisor_js_1.enabled) {
+                    span.setAttribute('response.body', JSON.stringify(result.data));
+                }
+                return result;
+            }
+            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/http.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"http.d.ts","sourceRoot":"","sources":["../../../../../src/src/interpreter/durable/compilers/http.ts"],"names":[],"mappings":"AAiBA,OAAO,EAAmB,YAAY,EAAE,MAAM,gCAAgC,CAAC;AAE/E,OAAO,EAA2B,YAAY,EAAE,MAAM,YAAY,CAAC;AAwFnE,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;AAuHnE,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

@@ -15,18 +15,32 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.httpCompiler = void 0;
 const rxjs_1 = require("rxjs");
 const operators_1 = require("rxjs/operators");
-const HttpTask_js_1 = require("../../../dsl/tasks/HttpTask.js");
 const DynamicFetchFactory_js_1 = require("../../../connection/DynamicFetchFactory.js");
+const FetchBuilder_js_1 = require("../../../connection/internal/FetchBuilder.js");
 const StaticFetchFactory_js_1 = require("../../../connection/StaticFetchFactory.js");
+const HttpTask_js_1 = require("../../../dsl/tasks/HttpTask.js");
+const supervisor_js_1 = require("../../../internal/supervisor.js");
 function compileHttp(compilerCtx, task) {
     const cnxMap = compilerCtx.configReader.getCnxMapping(task.opts.connection);
     let fetchFactory;
     if (!cnxMap) {
-        compilerCtx.log.error(`Connection ${task.opts.connection} not found, using default fetch with no credentials`);
-        fetchFactory = Promise.resolve(new StaticFetchFactory_js_1.StaticFetchFactory(globalThis.fetch));
+        compilerCtx.log.warn(`Connection ${task.opts.connection} not found, using default fetch with no credentials`);
+        if (supervisor_js_1.enabled) {
+            // missing connection map and we are in supervised mode, so we use the fake fetcher
+            fetchFactory = Promise.resolve(new StaticFetchFactory_js_1.StaticFetchFactory(new FetchBuilder_js_1.FetchBuilder(globalThis.fetch, { name: task.opts.connection }).buildSupervisedFetch()));
+        }
+        else {
+            // missing connection map and not in supervised mode, so we use global fetch
+            fetchFactory = Promise.resolve(new StaticFetchFactory_js_1.StaticFetchFactory(globalThis.fetch));
+        }
     }
     else if (cnxMap.dynamic) {
-        fetchFactory = Promise.resolve(new DynamicFetchFactory_js_1.DynamicFetchFactory(compilerCtx.cnxFactory, compilerCtx.platformApi, compilerCtx.organisationId, cnxMap.templateId));
+        if (cnxMap.mockWithAI) {
+            fetchFactory = Promise.resolve(new StaticFetchFactory_js_1.StaticFetchFactory(new FetchBuilder_js_1.FetchBuilder(globalThis.fetch, { name: task.opts.connection }).buildSupervisedFetch()));
+        }
+        else {
+            fetchFactory = Promise.resolve(new DynamicFetchFactory_js_1.DynamicFetchFactory(compilerCtx.cnxFactory, compilerCtx.platformApi, compilerCtx.organisationId, cnxMap.templateId));
+        }
     }
     else {
         fetchFactory = compilerCtx.platformApi.getConnection({
@@ -36,8 +50,21 @@ function compileHttp(compilerCtx, task) {
             },
             throwOnError: true,
         })
-            .then(({ data }) => Promise.all([compilerCtx.cnxFactory.fetcher(data), data.baseUrl ?? '']))
-            .then(([fetcher, baseUrl]) => new StaticFetchFactory_js_1.StaticFetchFactory(fetcher, baseUrl));
+            .then(({ data }) => {
+            if (cnxMap.mockWithAI) {
+                // use the fake fetcher that calls the supervisor to generate a mock reponse
+                return new StaticFetchFactory_js_1.StaticFetchFactory(new FetchBuilder_js_1.FetchBuilder(globalThis.fetch, data).buildSupervisedFetch());
+            }
+            return Promise.all([compilerCtx.cnxFactory.fetcher(data), data.baseUrl ?? ''])
+                .then(([fetcher, baseUrl]) => new StaticFetchFactory_js_1.StaticFetchFactory(fetcher, baseUrl));
+        })
+            .catch((err) => {
+            compilerCtx.log.error(`Failed to get connection ${task.opts.connection}`, err);
+            if (supervisor_js_1.enabled) {
+                return new StaticFetchFactory_js_1.StaticFetchFactory(new FetchBuilder_js_1.FetchBuilder(globalThis.fetch, { name: task.opts.connection }).build());
+            }
+            throw err;
+        });
     }
     async function http(ctx) {
         const [fetch, baseUrl] = await fetchFactory.then((ff) => Promise.all([ff.fetcher(ctx), ff.baseUrl(ctx)]));
@@ -51,10 +78,16 @@ function compileHttp(compilerCtx, task) {
         return compilerCtx.tracer.startActiveSpan(`http-${task.id}`, async (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);
+            const spanContext = span.spanContext();
             try {
-                return await http(ctx);
+                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));
+                }
+                return result;
             }
             catch (error) {
                 if (error instanceof Error) {

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":"AAuBA,OAAO,EAAE,YAAY,EAAE,eAAe,EAAE,MAAM,0CAA0C,CAAC;AAEzF,OAAO,EAAE,eAAe,EAAE,MAAM,YAAY,CAAC;AAkJ7C,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;AAmJ7C,eAAO,MAAM,gBAAgB,EAAE,eAAe,CAAC,YAAY,EAAE,eAAe,CAG3E,CAAC"}

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

@@ -14,8 +14,8 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.scheduleCompiler = void 0;
 const rxjs_1 = require("rxjs");
-const constants_js_1 = require("../../../dsl/http/versori/constants.js");
 const ScheduleTrigger_js_1 = require("../../../dsl/triggers/ScheduleTrigger.js");
+const constants_js_1 = require("../../../internal/constants.js");
 function compileSchedule(ctx, trigger, signal) {
     return new rxjs_1.Observable((subscriber) => {
         // Add HTTP endpoint for manual triggering
@@ -106,6 +106,7 @@ function compileSchedule(ctx, trigger, signal) {
             await ctx.tracer.startActiveSpan(`schedule-${trigger.id}`, async (span) => {
                 span.setAttribute('task.id', trigger.id);
                 span.setAttribute('task.type', 'schedule');
+                span.setAttribute('type', 'task');
                 span.setAttribute('schedule', trigger.schedule);
                 span.setAttribute('project.id', projectId);
                 span.setAttribute('environment.id', environmentId);

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":"AA0BA,OAAO,EAAE,WAAW,EAAE,cAAc,EAAE,MAAM,yCAAyC,CAAC;AAEtF,OAAO,EAAE,eAAe,EAAE,MAAM,YAAY,CAAC;AAyD7C,eAAO,MAAM,eAAe,EAAE,eAAe,CAAC,WAAW,EAAE,cAAc,CA2SxE,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,CAwTxE,CAAC"}

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

@@ -18,12 +18,12 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.webhookCompiler = void 0;
 const cors_1 = __importDefault(require("cors"));
 const express_1 = __importDefault(require("express"));
+const express_xml_bodyparser_1 = __importDefault(require("express-xml-bodyparser"));
 const promises_1 = require("node:stream/promises");
 const rxjs_1 = require("rxjs");
 const webhookmiddleware_js_1 = require("../../../dsl/http/versori/webhookmiddleware.js");
 const WebhookTrigger_js_1 = require("../../../dsl/triggers/WebhookTrigger.js");
 const constants_js_1 = require("../../../internal/constants.js");
-const express_xml_bodyparser_1 = __importDefault(require("express-xml-bodyparser"));
 const xml2jsDefaults = {
     explicitArray: false,
     normalize: false,
@@ -109,6 +109,7 @@ exports.webhookCompiler = {
         else {
             ctx.webhookRouter.use(express_1.default.raw({ type: '*/*', limit: '50mb' }));
         }
+        ctx.webhookRegistry.set(trigger.id, { method, path: `/${trigger.id}`, options: trigger.options });
         return new rxjs_1.Observable((subscriber) => {
             if (!ctx.webhookRouter) {
                 throw new Error('Router not available in compiler context');
@@ -137,8 +138,11 @@ exports.webhookCompiler = {
                 await ctx.tracer.startActiveSpan(`webhook-${trigger.id}`, (span) => {
                     span.setAttribute('task.id', trigger.id);
                     span.setAttribute('task.type', 'webhook');
+                    span.setAttribute('type', 'task');
                     const staticActivation = res.locals.activation;
-                    const executionCtx = ctx.contextProvider.create(staticActivation, req.body, ctxOptionsFn(req, res));
+                    let executionCtx = ctx.contextProvider.create(staticActivation, req.body, ctxOptionsFn(req, res));
+                    const spanContext = span.spanContext();
+                    executionCtx = executionCtx.withLogger(executionCtx.log.child({ spanId: spanContext.spanId, traceId: spanContext.traceId }));
                     span.setAttribute('execution.id', executionCtx.executionId);
                     try {
                         subscriber.next(executionCtx);
@@ -173,6 +177,7 @@ exports.webhookCompiler = {
                 await ctx.tracer.startActiveSpan(`webhook-${trigger.id}`, (span) => {
                     span.setAttribute('task.id', trigger.id);
                     span.setAttribute('task.type', 'webhook');
+                    span.setAttribute('type', 'task');
                     span.setAttribute('user.id', req.params.userId);
                     const userId = req.params.userId;
                     const activation = res.locals.activation;
@@ -189,7 +194,9 @@ exports.webhookCompiler = {
                         span.end();
                         return;
                     }
-                    const executionCtx = ctx.contextProvider.create(activation, req.body, ctxOptionsFn(req, res));
+                    let executionCtx = ctx.contextProvider.create(activation, req.body, ctxOptionsFn(req, res));
+                    const spanContext = span.spanContext();
+                    executionCtx = executionCtx.withLogger(executionCtx.log.child({ spanId: spanContext.spanId, traceId: spanContext.traceId }));
                     span.setAttribute('execution.id', executionCtx.executionId);
                     const errors = [];
                     try {
@@ -228,6 +235,7 @@ exports.webhookCompiler = {
             }), async (req, res) => {
                 await ctx.tracer.startActiveSpan(`webhook-${trigger.id}`, (span) => {
                     span.setAttribute('task.id', trigger.id);
+                    span.setAttribute('type', 'task');
                     span.setAttribute('task.type', 'webhook');
                     span.setAttribute('activation.id', req.params.activationId);
                     const activation = res.locals.activation;
@@ -243,7 +251,9 @@ exports.webhookCompiler = {
                         span.end();
                         return;
                     }
-                    const activationCtx = ctx.contextProvider.create(activation, req.body, ctxOptionsFn(req, res));
+                    let activationCtx = ctx.contextProvider.create(activation, req.body, ctxOptionsFn(req, res));
+                    const spanContext = span.spanContext();
+                    activationCtx = activationCtx.withLogger(activationCtx.log.child({ spanId: spanContext.spanId, traceId: spanContext.traceId }));
                     span.setAttribute('execution.id', activationCtx.executionId);
                     try {
                         subscriber.next(activationCtx);

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

@@ -43,6 +43,11 @@ type Registration = {
     sigintListener: () => void;
     subscription?: Subscription;
 };
+type WebhookRegistry = Map<string, {
+    method: string;
+    path: string;
+    options: any;
+}>;
 /**
  * MemoryInterpreter is the default interpreter for executing Versori workflows. It handles registration and execution
  * of workflows triggered by schedules and webhooks.
@@ -71,6 +76,7 @@ export declare class MemoryInterpreter {
     private readonly webhookRouter;
     private readonly cronRouter;
     private cronRegistry;
+    private webhookRegistry;
     private readonly cnxFactory;
     private readonly cronProvider;
     private readonly tracer;
@@ -82,7 +88,7 @@ export declare class MemoryInterpreter {
     private cronServer?;
     private shutdownServer?;
     private isShuttingDown;
-    constructor(log: Logger, compiler: ObservableCompiler, contextProvider: ContextProvider, webhookRouter: Router, cronRouter: Router, cronRegistry: Map<string, string>, cnxFactory: DirectConnectionFactory, cronProvider: CronProvider, tracer: Tracer, issuesProvider: IssueAPI, cfgReader: ConfigReader, otelSDK?: NodeSDK | undefined);
+    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;
     start(): Promise<void>;

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

@@ -29,14 +29,15 @@ const configloader_js_1 = require("../../dsl/http/versori/configloader.js");
 const cronapi_js_1 = require("../../dsl/http/versori/cronapi.js");
 const Workflow_js_1 = require("../../dsl/Workflow.js");
 const constants_js_1 = require("../../internal/constants.js");
+const supervisor_js_1 = require("../../internal/supervisor.js");
 const Issues_js_1 = require("../../issues/Issues.js");
 const MemoryKeyValueProvider_js_1 = require("../../kv/memory/MemoryKeyValueProvider.js");
 const NatsKeyValueProvider_js_1 = require("../../kv/nats/NatsKeyValueProvider.js");
 const ConsoleLogger_js_1 = require("../../observability/logging/ConsoleLogger.js");
 const PlatformApi_js_1 = require("../../services/platform/PlatformApi.js");
 const ObservableCompiler_js_1 = require("./ObservableCompiler.js");
-function getKVProvider(runLocal) {
-    if (runLocal) {
+function getKVProvider() {
+    if (supervisor_js_1.enabled) {
         return Promise.resolve(new MemoryKeyValueProvider_js_1.MemoryKeyValueProvider());
     }
     return NatsKeyValueProvider_js_1.NatsKeyValueProvider.fromEnv();
@@ -63,7 +64,7 @@ function getKVProvider(runLocal) {
  * ```
  */
 class MemoryInterpreter {
-    constructor(log, compiler, contextProvider, webhookRouter, cronRouter, cronRegistry, cnxFactory, cronProvider, tracer, issuesProvider, cfgReader, otelSDK) {
+    constructor(log, compiler, contextProvider, webhookRouter, cronRouter, cronRegistry, webhookRegistry, cnxFactory, cronProvider, tracer, issuesProvider, cfgReader, otelSDK) {
         Object.defineProperty(this, "log", {
             enumerable: true,
             configurable: true,
@@ -100,6 +101,12 @@ class MemoryInterpreter {
             writable: true,
             value: cronRegistry
         });
+        Object.defineProperty(this, "webhookRegistry", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: webhookRegistry
+        });
         Object.defineProperty(this, "cnxFactory", {
             enumerable: true,
             configurable: true,
@@ -184,7 +191,6 @@ class MemoryInterpreter {
         const otelTracesURL = Deno.env.get(constants_js_1.envVarOtelTracesURL);
         let otelSDK;
         const configReader = configloader_js_1.VersoriConfigReader.fromEnv(log);
-        const runLocal = Deno.env.get(constants_js_1.envVarLocalRun) === 'true';
         await waitForReady(log);
         // Do NOT change those attributes, they are used by the API to filter on
         const resource = (0, resources_1.resourceFromAttributes)({
@@ -206,20 +212,29 @@ class MemoryInterpreter {
             log.info('Starting OpenTelemetry SDK');
             otelSDK.start();
         }
+        else if (supervisor_js_1.enabled) {
+            otelSDK = new sdk_node_1.NodeSDK({
+                traceExporter: new supervisor_js_1.Fake(),
+                serviceName: serviceName,
+                resource: resource,
+            });
+            log.info('Starting Testing OpenTelemetry SDK');
+            otelSDK.start();
+        }
         const tracer = api_1.default.trace.getTracer(serviceName, version);
         const connectionFactory = DirectConnectionFactory_js_1.DirectConnectionFactory.fromEnv(log);
         const issuesProvider = new Issues_js_1.IssueImpl(log);
         if (options.contextProvider) {
             // no need to set up a key-value provider if options.contextProvider is already
             // initialised.
-            return new MemoryInterpreter(log, compiler, options.contextProvider, express_1.default.Router(), express_1.default.Router(), new Map(), DirectConnectionFactory_js_1.DirectConnectionFactory.fromEnv(log), cronapi_js_1.CronAPIClient.fromEnv(), tracer, issuesProvider, configReader, otelSDK);
+            return new MemoryInterpreter(log, compiler, options.contextProvider, express_1.default.Router(), express_1.default.Router(), new Map(), new Map(), connectionFactory, cronapi_js_1.CronAPIClient.fromEnv(), tracer, issuesProvider, configReader, otelSDK);
         }
-        const kvp = await getKVProvider(runLocal);
+        const kvp = await getKVProvider();
         const platformApi = PlatformApi_js_1.PlatformApiImpl.fromEnv();
         const organisationId = Deno.env.get(constants_js_1.envVarOrgId) || 'development';
         const environmentId = Deno.env.get(constants_js_1.envVarEnvId) || 'development';
         const ctxProvider = new ContextProvider_js_1.ContextProviderImpl(log, kvp, new CredentialsProvider_js_1.CredentialsProviderImpl(connectionFactory.credentials, connectionFactory.tokens, connectionFactory.oauth1, configReader, platformApi), platformApi, organisationId, environmentId, issuesProvider);
-        return new MemoryInterpreter(log, compiler, ctxProvider, express_1.default.Router(), express_1.default.Router(), new Map(), connectionFactory, cronapi_js_1.CronAPIClient.fromEnv(), tracer, issuesProvider, configReader, otelSDK);
+        return new MemoryInterpreter(log, compiler, ctxProvider, express_1.default.Router(), express_1.default.Router(), new Map(), new Map(), connectionFactory, cronapi_js_1.CronAPIClient.fromEnv(), tracer, issuesProvider, configReader, otelSDK);
     }
     register(workflow, options) {
         const localAbortController = new AbortController();
@@ -238,6 +253,7 @@ class MemoryInterpreter {
             cnxFactory: this.cnxFactory,
             platformApi: PlatformApi_js_1.PlatformApiImpl.fromEnv(),
             webhookRouter: this.webhookRouter,
+            webhookRegistry: this.webhookRegistry,
             cronRouter: this.cronRouter,
             cronRegistry: this.cronRegistry,
             configReader: this.cfgReader,
@@ -258,9 +274,9 @@ class MemoryInterpreter {
         this.registeredWorkflows.push(registration);
         return registration;
     }
-    start() {
-        const port = Deno.env.get('PORT') || 3000;
-        const cronPort = Deno.env.get('CRON_PORT') || 3001;
+    async start() {
+        const port = Deno.env.get(constants_js_1.envPort) || 3000;
+        const cronPort = Deno.env.get(constants_js_1.envCronPort) || 3001;
         const webhookApp = (0, express_1.default)();
         const cronApp = (0, express_1.default)();
         cronApp.use(express_1.default.json());
@@ -284,6 +300,12 @@ class MemoryInterpreter {
                 ctx.log.error('MemoryInterpreter.executionError', {
                     error: err instanceof Error ? err.toString() : err,
                 });
+                this.tracer.startActiveSpan('done', (span) => {
+                    span.setAttribute('error.message', err instanceof Error ? err.toString() : err);
+                    span.setAttribute('execution.id', ctx.executionId);
+                    span.setAttribute('result', 'fail');
+                    span.end();
+                });
                 try {
                     ctx.options.onError?.(ctx.withData(err));
                 }
@@ -303,6 +325,11 @@ class MemoryInterpreter {
                         durationMs,
                         data: ctx.data,
                     });
+                    this.tracer.startActiveSpan('done', (span) => {
+                        span.setAttribute('execution.id', ctx.executionId);
+                        span.setAttribute('result', 'pass');
+                        span.end();
+                    });
                     try {
                         ctx.options.onSuccess?.(ctx);
                     }
@@ -339,6 +366,9 @@ 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}`);
         });
@@ -358,6 +388,7 @@ class MemoryInterpreter {
             if (this.cronServer) {
                 this.cronServer.close();
             }
+            this.otelSDK?.shutdown();
             // Remove all signal listeners
             for (const registration of this.registeredWorkflows) {
                 Deno.removeSignalListener('SIGINT', registration.sigintListener);
@@ -411,7 +442,7 @@ class MemoryInterpreter {
 }
 exports.MemoryInterpreter = MemoryInterpreter;
 async function waitForReady(log) {
-    const readyCheckUrl = Deno.env.get('READY_CHECK_URL');
+    const readyCheckUrl = Deno.env.get(constants_js_1.envReadyCheckURL);
     if (!readyCheckUrl) {
         return Promise.resolve();
     }

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

@@ -1,6 +1,7 @@
 import { Tracer } from '@opentelemetry/api';
 import { Router } from 'express';
 import { Observable, OperatorFunction } from 'rxjs';
+import { ConnectionFactory } from '../../connection/types.js';
 import { ContextImpl } from '../../context/Context.js';
 import { ContextProvider } from '../../context/ContextProvider.js';
 import { ConfigReader } from '../../dsl/http/types.js';
@@ -10,7 +11,6 @@ import { IssueAPI } from '../../issues/Issues.js';
 import { Logger } from '../../observability/logging/Logger.js';
 import { PlatformApi } from '../../services/platform/PlatformApi.js';
 import { ContextOperatorFunction, TaskCompiler, TriggerCompiler } from './compilers/types.js';
-import { ConnectionFactory } from '../../connection/types.js';
 export type CompilerContext = {
     compiler: ObservableCompiler;
     log: Logger;
@@ -23,6 +23,11 @@ export type CompilerContext = {
     issueProvider: IssueAPI;
     configReader: ConfigReader;
     cronRegistry: Map<string, string>;
+    webhookRegistry: Map<string, {
+        method: string;
+        path: string;
+        options: any;
+    }>;
     organisationId: string;
 };
 export type CompilerFunc<In = any, Out = any, T extends Task<In, Out> = Task<In, Out>> = (ctx: CompilerContext, task: T) => OperatorFunction<In, Out>;

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

@@ -1 +1 @@
-{"version":3,"file":"ObservableCompiler.d.ts","sourceRoot":"","sources":["../../../../src/src/interpreter/memory/ObservableCompiler.ts"],"names":[],"mappings":"AAaA,OAAO,EAAE,MAAM,EAAE,MAAM,oBAAoB,CAAC;AAC5C,OAAO,EAAE,MAAM,EAAE,MAAM,SAAS,CAAC;AACjC,OAAO,EAAE,UAAU,EAAE,gBAAgB,EAAE,MAAM,MAAM,CAAC;AAEpD,OAAO,EAAE,WAAW,EAAE,MAAM,0BAA0B,CAAC;AACvD,OAAO,EAAE,eAAe,EAAE,MAAM,kCAAkC,CAAC;AACnE,OAAO,EAAE,YAAY,EAAE,MAAM,yBAAyB,CAAC;AACvD,OAAO,EAAE,IAAI,EAAY,MAAM,mBAAmB,CAAC;AACnD,OAAO,EAAE,OAAO,EAAe,MAAM,sBAAsB,CAAC;AAC5D,OAAO,EAAE,QAAQ,EAAE,MAAM,wBAAwB,CAAC;AAClD,OAAO,EAAE,MAAM,EAAE,MAAM,uCAAuC,CAAC;AAC/D,OAAO,EAAE,WAAW,EAAE,MAAM,wCAAwC,CAAC;AASrE,OAAO,EAAE,uBAAuB,EAAE,YAAY,EAAE,eAAe,EAAE,MAAM,sBAAsB,CAAC;AAG9F,OAAO,EAAE,iBAAiB,EAAE,MAAM,2BAA2B,CAAC;AAE9D,MAAM,MAAM,eAAe,GAAG;IAC1B,QAAQ,EAAE,kBAAkB,CAAC;IAC7B,GAAG,EAAE,MAAM,CAAC;IACZ,MAAM,EAAE,MAAM,CAAC;IACf,eAAe,EAAE,eAAe,CAAC;IACjC,UAAU,EAAE,iBAAiB,CAAC;IAC9B,WAAW,EAAE,WAAW,CAAC;IACzB,aAAa,EAAE,MAAM,CAAC;IACtB,UAAU,EAAE,MAAM,CAAC;IACnB,aAAa,EAAE,QAAQ,CAAC;IACxB,YAAY,EAAE,YAAY,CAAC;IAC3B,YAAY,EAAE,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IAClC,cAAc,EAAE,MAAM,CAAC;CAC1B,CAAC;AAEF,MAAM,MAAM,YAAY,CAAC,EAAE,GAAG,GAAG,EAAE,GAAG,GAAG,GAAG,EAAE,CAAC,SAAS,IAAI,CAAC,EAAE,EAAE,GAAG,CAAC,GAAG,IAAI,CAAC,EAAE,EAAE,GAAG,CAAC,IAAI,CACrF,GAAG,EAAE,eAAe,EACpB,IAAI,EAAE,CAAC,KACN,gBAAgB,CAAC,EAAE,EAAE,GAAG,CAAC,CAAC;AAE/B,qBAAa,kBAAkB;IAC3B,OAAO,CAAC,aAAa,CAAkD;IACvE,OAAO,CAAC,gBAAgB,CAAgD;;IAgBxE,WAAW,CAAC,EAAE,GAAG,GAAG,EAAE,GAAG,GAAG,GAAG,EAAE,KAAK,GAAG,IAAI,EACzC,GAAG,EAAE,eAAe,EACpB,IAAI,EAAE,IAAI,CAAC,EAAE,EAAE,GAAG,CAAC,GACpB,uBAAuB,CAAC,EAAE,EAAE,GAAG,EAAE,KAAK,CAAC;IAe1C,cAAc,CAAC,GAAG,GAAG,GAAG,EAAE,CAAC,SAAS,OAAO,CAAC,GAAG,CAAC,GAAG,OAAO,CAAC,GAAG,CAAC,EAC3D,GAAG,EAAE,eAAe,EACpB,OAAO,EAAE,CAAC,EACV,MAAM,EAAE,WAAW,GACpB,UAAU,CAAC,WAAW,CAAC,GAAG,EAAE,IAAI,CAAC,CAAC;IAerC,YAAY,CAAC,EAAE,EAAE,GAAG,EAAE,CAAC,SAAS,IAAI,CAAC,EAAE,EAAE,GAAG,CAAC,EAAE,QAAQ,EAAE,YAAY,CAAC,EAAE,EAAE,GAAG,EAAE,CAAC,CAAC;IAKjF,eAAe,CAAC,GAAG,EAAE,CAAC,SAAS,OAAO,CAAC,GAAG,CAAC,EAAE,QAAQ,EAAE,eAAe,CAAC,GAAG,EAAE,CAAC,CAAC;CAIjF"}
+{"version":3,"file":"ObservableCompiler.d.ts","sourceRoot":"","sources":["../../../../src/src/interpreter/memory/ObservableCompiler.ts"],"names":[],"mappings":"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"}

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

@@ -22,8 +22,11 @@ function compileCatch(compilerCtx, task) {
     return (src) => src.pipe((0, rxjs_1.mergeMap)((ctx) => {
         return baseOperator((0, rxjs_1.of)(ctx)).pipe((0, rxjs_1.catchError)((error) => {
             return compilerCtx.tracer.startActiveSpan(`catch`, (span) => {
+                // TODO: do we even want this here? Can't be async in here I believe
+                // await sendTaskStartEvent(task.id, span);
                 span.setAttribute('execution.id', ctx.executionId);
                 span.setAttribute('task.type', 'catch');
+                span.setAttribute('type', 'task');
                 if (error instanceof Error) {
                     span.recordException(error);
                     span.setAttribute('error.message', error.message);
@@ -37,10 +40,9 @@ 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',
@@ -49,12 +51,11 @@ 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',

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;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"}

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

@@ -1,33 +1,37 @@
 "use strict";
-/*
- * Copyright (c) 2025 Versori Group Inc
- *
- * Use of this software is governed by the Business Source License 1.1
- * included in the LICENSE file at the root of this repository.
- *
- * Change Date: 2029-01-01
- * Change License: Apache License, Version 2.0
- *
- * As of the Change Date, in accordance with the Business Source License,
- * use of this software will be governed by the Apache License, Version 2.0.
- */
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.fnCompiler = void 0;
 const rxjs_1 = require("rxjs");
 const FnTask_js_1 = require("../../../dsl/tasks/FnTask.js");
+const supervisor_js_1 = require("../../../internal/supervisor.js");
 function compileFn(compilerCtx, task) {
     return (src) => src.pipe((0, rxjs_1.tap)({
         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);
-            if (typeof ctx.idx === 'number') {
+            try {
+                let result;
+                const spanContext = span.spanContext();
+                const ctxWithLogger = ctx.withLogger(ctx.log.child({ spanId: spanContext.spanId, traceId: spanContext.traceId }));
+                if (typeof ctx.idx === 'number') {
+                    result = ctx.withData(await task._fn(ctxWithLogger, ctx.idx));
+                }
+                else {
+                    result = ctx.withData(await task._fn(ctxWithLogger));
+                }
+                if (supervisor_js_1.enabled) {
+                    span.setAttribute('response.body', JSON.stringify(result.data));
+                }
+                return result;
+            }
+            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/http.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"http.d.ts","sourceRoot":"","sources":["../../../../../src/src/interpreter/memory/compilers/http.ts"],"names":[],"mappings":"AAoBA,OAAO,EAAmB,YAAY,EAAE,MAAM,gCAAgC,CAAC;AAE/E,OAAO,EAA2B,YAAY,EAAE,MAAM,YAAY,CAAC;AAqFnE,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/memory/compilers/http.ts"],"names":[],"mappings":"AAqBA,OAAO,EAAmB,YAAY,EAAE,MAAM,gCAAgC,CAAC;AAG/E,OAAO,EAA2B,YAAY,EAAE,MAAM,YAAY,CAAC;AAyHnE,eAAO,MAAM,YAAY,EAAE,YAAY,CAAC,GAAG,EAAE,GAAG,EAAE,YAAY,CAAC,GAAG,EAAE,GAAG,EAAE,GAAG,CAAC,CAG5E,CAAC"}