@versori/run 0.5.0-alpha.3 → 0.5.0-alpha.5

package/esm/src/connection/internal/FetchBuilder.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"FetchBuilder.d.ts","sourceRoot":"","sources":["../../../../src/src/connection/internal/FetchBuilder.ts"],"names":[],"mappings":"AAgBA,OAAO,EAAE,SAAS,EAAE,kBAAkB,EAAE,MAAM,aAAa,CAAC;AAE5D,MAAM,MAAM,eAAe,GAAG;IAC1B,IAAI,EAAE,MAAM,CAAC;IACb,EAAE,CAAC,EAAE,MAAM,CAAC;IACZ,OAAO,CAAC,EAAE,MAAM,CAAC;CACpB,CAAA;AAED;;;;GAIG;AACH,qBAAa,YAAY;;IACrB,WAAW,EAAE,kBAAkB,EAAE,CAAC;gBAMtB,KAAK,EAAE,SAAS,EAAE,GAAG,EAAE,eAAe;IAalD,GAAG,CAAC,EAAE,EAAE,kBAAkB;IAI1B,KAAK,IAAI,SAAS;IAalB,oBAAoB,IAAI,SAAS;IAOjC,OAAO,CAAC,eAAe;IAiBvB,OAAO,CAAC,eAAe;CAyE1B"}
+{"version":3,"file":"FetchBuilder.d.ts","sourceRoot":"","sources":["../../../../src/src/connection/internal/FetchBuilder.ts"],"names":[],"mappings":"AAgBA,OAAO,EAAE,SAAS,EAAE,kBAAkB,EAAE,MAAM,aAAa,CAAC;AAE5D,MAAM,MAAM,eAAe,GAAG;IAC1B,IAAI,EAAE,MAAM,CAAC;IACb,EAAE,CAAC,EAAE,MAAM,CAAC;IACZ,OAAO,CAAC,EAAE,MAAM,CAAC;CACpB,CAAC;AAEF;;;;GAIG;AACH,qBAAa,YAAY;;IACrB,WAAW,EAAE,kBAAkB,EAAE,CAAC;gBAMtB,KAAK,EAAE,SAAS,EAAE,GAAG,EAAE,eAAe;IAelD,GAAG,CAAC,EAAE,EAAE,kBAAkB;IAI1B,KAAK,IAAI,SAAS;IAYlB,oBAAoB,IAAI,SAAS;IAOjC,OAAO,CAAC,eAAe;IAevB,OAAO,CAAC,eAAe;CAyF1B"}

package/esm/src/connection/internal/FetchBuilder.js

@@ -44,11 +44,12 @@ export class FetchBuilder {
         __classPrivateFieldSet(this, _FetchBuilder_base, fetch, "f");
         __classPrivateFieldSet(this, _FetchBuilder_cnx, cnx, "f");
         __classPrivateFieldSet(this, _FetchBuilder_tracer, opentelemetry.trace.getTracer('fetch-builder', '1.0.0'), "f");
+        const traceMiddleware = this.wrapWithTracing.bind(this);
         if (cnx.baseUrl) {
-            this.middlewares = [changeRequestbaseURLMiddleware(cnx)];
+            this.middlewares = [changeRequestbaseURLMiddleware(cnx), traceMiddleware];
         }
         else {
-            this.middlewares = [];
+            this.middlewares = [traceMiddleware];
         }
         this.supervisedFetch = this.supervisedFetch.bind(this);
     }
@@ -62,15 +63,14 @@ export class FetchBuilder {
             // order they were added
             fetch = this.middlewares[i](fetch);
         }
-        // Wrap the final fetch with OpenTelemetry tracing
-        return this.wrapWithTracing(fetch, false);
+        return fetch;
     }
     buildSupervisedFetch() {
         return this.supervisedFetch();
     }
     // during testing the user can choose to use a real connection or AI mock.
     // so in supervised mode this function is used instead of the normal build() function.
-    // and it will make the desition on using mock or real at runtime at the cost of performance 
+    // and it will make the decision on using mock or real at runtime at the cost of performance
     supervisedFetch() {
         return (input, init) => {
             let fetch = (input, init) => {
@@ -81,35 +81,40 @@ export class FetchBuilder {
                 // order they were added
                 fetch = this.middlewares[i](fetch);
             }
-            const traced = this.wrapWithTracing(fetch, true);
-            return traced(input, init);
+            return fetch(input, init);
         };
     }
-    wrapWithTracing(fetch, mock) {
+    wrapWithTracing(fetch) {
         const connectionId = __classPrivateFieldGet(this, _FetchBuilder_cnx, "f")?.id || '';
         const connectionName = __classPrivateFieldGet(this, _FetchBuilder_cnx, "f")?.name || '';
         return (input, init) => {
             const url = getUrl(input);
-            return __classPrivateFieldGet(this, _FetchBuilder_tracer, "f").startActiveSpan(`fetch ${url}`, async (span) => {
+            return __classPrivateFieldGet(this, _FetchBuilder_tracer, "f").startActiveSpan(`fetch ${connectionName}/${connectionId}`, async (span) => {
                 // Set span attributes
                 span.setAttribute('http.url', url);
                 span.setAttribute('type', 'fetch');
                 span.setAttribute('connection.id', connectionId);
                 span.setAttribute('connection.name', connectionName);
-                span.setAttribute('isMocked', mock);
-                if (init?.method) {
-                    span.setAttribute('http.method', init.method);
-                }
+                span.setAttribute('isConnected', connectionId !== '');
                 try {
                     const response = await fetch(input, init);
                     if (supervisorEnabled) {
+                        if (init?.method) {
+                            span.setAttribute('http.method', init.method);
+                        }
+                        else {
+                            span.setAttribute('http.method', 'GET');
+                        }
                         // when we are in supervisor mode, we need to store the response body in the span attribute
                         // this will be shown the end-user in some UI in the future(the future is now)
                         const body = await response.clone().arrayBuffer();
                         // if response is text/* or json we store the body as a string, otherwise we store it as a base64 string
                         const contentType = response.headers.get('Content-Type');
                         span.setAttribute('response.content_type', contentType || '');
-                        if (contentType && (contentType.startsWith('text/') || contentType.startsWith('application/json'))) {
+                        span.setAttribute('request.headers', JSON.stringify(init?.headers || {}));
+                        if (contentType &&
+                            (contentType.startsWith('text/') ||
+                                contentType.startsWith('application/json'))) {
                             span.setAttribute('response.body', new TextDecoder().decode(body));
                         }
                         else {

package/esm/src/dsl/http/versori/webhookmiddleware.js

@@ -63,7 +63,7 @@ export function createStaticWebhookMiddleware(opts) {
         next();
     };
     if (opts.connName === undefined) {
-        opts.log.warn(`No connection ID found for webhook, accepting any requests which is unsecure!`, { webhookId: opts.id });
+        opts.log.warn(`No connection ID found for webhook, accepting any requests which is insecure!`, { webhookId: opts.id });
         return staticMiddleware;
     }
     // TODO(@teo): move db access to outside of the middleware??? (genuine question - not instruction)
@@ -131,7 +131,7 @@ export function createActIdDynamicWebhookMiddleware(opts) {
         next();
     };
     if (!opts.connName) {
-        opts.log.warn(`No template ID found for webhook, accepting any requests which is unsecure!`, { webhookId: opts.id });
+        opts.log.warn(`No template ID found for webhook, accepting any requests which is insecure!`, { webhookId: opts.id });
         return staticMiddleware;
     }
     return async (req, res, next) => {
@@ -195,7 +195,7 @@ export function createUserIdDynamicWebhookMiddleware(opts) {
         next();
     };
     if (!opts.connName) {
-        opts.log.warn(`No template ID found for webhook, accepting any requests which is unsecure!`, { webhookId: opts.id });
+        opts.log.warn(`No template ID found for webhook, accepting any requests which is insecure!`, { webhookId: opts.id });
         return staticMiddleware;
     }
     return async (req, res, next) => {

package/esm/src/internal/InternalAuth.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"InternalAuth.d.ts","sourceRoot":"","sources":["../../../src/src/internal/InternalAuth.ts"],"names":[],"mappings":"AAoBA,KAAK,kBAAkB,GAAG;IAAE,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,CAAA;CAAE,CAAC;AAEpD,qBAAa,YAAY;IACrB,OAAO,CAAC,QAAQ,CAAS;IACzB,OAAO,CAAC,YAAY,CAAS;IAC7B,OAAO,CAAC,aAAa,CAAS;IAE9B,OAAO,CAAC,WAAW,CAAS;IAC5B,OAAO,CAAC,SAAS,CAAS;;IA2BpB,aAAa,IAAI,OAAO,CAAC,kBAAkB,CAAC;CAsBrD"}
+{"version":3,"file":"InternalAuth.d.ts","sourceRoot":"","sources":["../../../src/src/internal/InternalAuth.ts"],"names":[],"mappings":"AAoBA,KAAK,kBAAkB,GAAG;IAAE,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,CAAA;CAAE,CAAC;AAEpD,qBAAa,YAAY;IACrB,OAAO,CAAC,QAAQ,CAAS;IACzB,OAAO,CAAC,YAAY,CAAS;IAC7B,OAAO,CAAC,aAAa,CAAS;IAE9B,OAAO,CAAC,WAAW,CAAS;IAC5B,OAAO,CAAC,SAAS,CAAS;;IAyBpB,aAAa,IAAI,OAAO,CAAC,kBAAkB,CAAC;CAsBrD"}

package/esm/src/internal/InternalAuth.js

@@ -51,7 +51,6 @@ export class InternalAuth {
         if (Deno.env.get(envVarInternalToken)) {
             this.accessToken = Deno.env.get(envVarInternalToken) || '';
             this.expiresAt = Date.now() + 365 * 24 * 60 * 60 * 1000; // expires in 1 year
-            console.log(`Using static token provided by ${envVarInternalToken}`);
             return;
         }
         if (!this.clientId || !this.clientSecret || !this.tokenEndpoint) {

package/esm/src/internal/supervisor.d.ts

@@ -1,21 +1,17 @@
-import { Span } from '@opentelemetry/api';
 import { ExportResult } from '@opentelemetry/core';
 import { ReadableSpan, SpanExporter } from '@opentelemetry/sdk-trace-node';
+import { Span } from '@opentelemetry/api';
+import { ContextImpl } from '../context/Context.js';
+import { WorkflowImpl } from '../dsl/Workflow.js';
 export declare const enabled: boolean;
-type Webhooks = Map<string, {
-    method: string;
-    path: string;
-    options: any;
-}>;
-type Crons = Map<string, string>;
 type MockConnection = {
     name: string;
     id?: string;
     baseUrl?: string;
 };
-export declare function registerWebhooks(webhooks: Webhooks): Promise<void>;
-export declare function sendTaskStartEvent(taskId: string, span: Span): Promise<void>;
-export declare function registerCrons(crons: Crons): Promise<void>;
+export declare function signalReady(): Promise<void>;
+export declare function registerWorkflow<I, O>(workflow: WorkflowImpl<I, O>): Promise<void>;
+export declare function sendTaskStartEvent<I, O>(taskId: string, ctx: ContextImpl<I, O>, span: Span): Promise<ContextImpl<I, O>>;
 export declare function mockAPIRequest(info: RequestInfo | URL, cnx?: MockConnection, options?: RequestInit): Promise<Response>;
 export declare class Fake implements SpanExporter {
     constructor();

package/esm/src/internal/supervisor.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"supervisor.d.ts","sourceRoot":"","sources":["../../../src/src/internal/supervisor.ts"],"names":[],"mappings":"AAaA,OAAO,EAAE,IAAI,EAAE,MAAM,oBAAoB,CAAC;AAC1C,OAAO,EAAE,YAAY,EAA6D,MAAM,qBAAqB,CAAC;AAC9G,OAAO,EAAE,YAAY,EAAE,YAAY,EAAE,MAAM,+BAA+B,CAAC;AAO3E,eAAO,MAAM,OAAO,SAEjB,CAAA;AAyBH,KAAK,QAAQ,GAAG,GAAG,CAAC,MAAM,EAAE;IAAE,MAAM,EAAE,MAAM,CAAC;IAAC,IAAI,EAAE,MAAM,CAAC;IAAC,OAAO,EAAE,GAAG,CAAA;CAAE,CAAC,CAAC;AAC5E,KAAK,KAAK,GAAG,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;AAEjC,KAAK,cAAc,GAAG;IAClB,IAAI,EAAE,MAAM,CAAC;IACb,EAAE,CAAC,EAAE,MAAM,CAAC;IACZ,OAAO,CAAC,EAAE,MAAM,CAAC;CACpB,CAAA;AAED,wBAAsB,gBAAgB,CAAC,QAAQ,EAAE,QAAQ,GAAG,OAAO,CAAC,IAAI,CAAC,CAgBxE;AAED,wBAAsB,kBAAkB,CAAC,MAAM,EAAE,MAAM,EAAE,IAAI,EAAE,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC,CAuBlF;AAED,wBAAsB,aAAa,CAAC,KAAK,EAAE,KAAK,GAAG,OAAO,CAAC,IAAI,CAAC,CAgB/D;AAED,wBAAsB,cAAc,CAAC,IAAI,EAAE,WAAW,GAAG,GAAG,EAAE,GAAG,CAAC,EAAE,cAAc,EAAE,OAAO,CAAC,EAAE,WAAW,GAAG,OAAO,CAAC,QAAQ,CAAC,CAoC5H;AAyBD,qBAAa,IAAK,YAAW,YAAY;;IAOrC,MAAM,CAAC,KAAK,EAAE,YAAY,EAAE,EAAE,cAAc,EAAE,CAAC,MAAM,EAAE,YAAY,KAAK,IAAI,GAAG,IAAI;IAmBnF,QAAQ,IAAI,OAAO,CAAC,IAAI,CAAC;IAIzB,UAAU,IAAI,OAAO,CAAC,IAAI,CAAC;CAG9B"}
+{"version":3,"file":"supervisor.d.ts","sourceRoot":"","sources":["../../../src/src/internal/supervisor.ts"],"names":[],"mappings":"AAaA,OAAO,EACH,YAAY,EAIf,MAAM,qBAAqB,CAAC;AAC7B,OAAO,EAAE,YAAY,EAAE,YAAY,EAAE,MAAM,+BAA+B,CAAC;AAE3E,OAAO,EAAE,IAAI,EAAE,MAAM,oBAAoB,CAAC;AAC1C,OAAO,EAAE,WAAW,EAAE,MAAM,uBAAuB,CAAC;AACpD,OAAO,EAAE,YAAY,EAAE,MAAM,oBAAoB,CAAC;AA2ClD,eAAO,MAAM,OAAO,SAEhB,CAAC;AA2BL,KAAK,cAAc,GAAG;IAClB,IAAI,EAAE,MAAM,CAAC;IACb,EAAE,CAAC,EAAE,MAAM,CAAC;IACZ,OAAO,CAAC,EAAE,MAAM,CAAC;CACpB,CAAC;AA0DF,wBAAsB,WAAW,IAAI,OAAO,CAAC,IAAI,CAAC,CAYjD;AAED,wBAAsB,gBAAgB,CAAC,CAAC,EAAE,CAAC,EAAE,QAAQ,EAAE,YAAY,CAAC,CAAC,EAAE,CAAC,CAAC,GAAG,OAAO,CAAC,IAAI,CAAC,CA0BxF;AAED,wBAAsB,kBAAkB,CAAC,CAAC,EAAE,CAAC,EACzC,MAAM,EAAE,MAAM,EACd,GAAG,EAAE,WAAW,CAAC,CAAC,EAAE,CAAC,CAAC,EACtB,IAAI,EAAE,IAAI,GACX,OAAO,CAAC,WAAW,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAwC5B;AAED,wBAAsB,cAAc,CAChC,IAAI,EAAE,WAAW,GAAG,GAAG,EACvB,GAAG,CAAC,EAAE,cAAc,EACpB,OAAO,CAAC,EAAE,WAAW,GACtB,OAAO,CAAC,QAAQ,CAAC,CAoCnB;AA0BD,qBAAa,IAAK,YAAW,YAAY;;IAOrC,MAAM,CAAC,KAAK,EAAE,YAAY,EAAE,EAAE,cAAc,EAAE,CAAC,MAAM,EAAE,YAAY,KAAK,IAAI,GAAG,IAAI;IAmBnF,QAAQ,IAAI,OAAO,CAAC,IAAI,CAAC;IAIzB,UAAU,IAAI,OAAO,CAAC,IAAI,CAAC;CAG9B"}

package/esm/src/internal/supervisor.js

@@ -10,15 +10,25 @@
  * 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.
  */
-import { ExportResultCode, hrTimeToMilliseconds, hrTimeToTimeStamp } from '@opentelemetry/core';
+import { ExportResultCode, hrTimeToMilliseconds, hrTimeToTimeStamp, } from '@opentelemetry/core';
 import { ConsoleLogger } from '../observability/logging/ConsoleLogger.js';
-const supervisorURL = function () {
+import { ChainTask } from '../dsl/tasks/ChainTask.js';
+import { ScheduleTrigger } from '../dsl/triggers/ScheduleTrigger.js';
+import { WebhookTrigger } from '../dsl/triggers/WebhookTrigger.js';
+import { DurableWorkflowTrigger } from '../dsl/triggers/DurableTrigger.js';
+import { TaskType } from '../dsl/Task.js';
+import { CatchTask } from '../dsl/tasks/CatchTask.js';
+import { FnTask } from '../dsl/tasks/FnTask.js';
+import { HttpTaskImpl } from '../dsl/tasks/HttpTask.js';
+import { BackgroundTask } from '../dsl/tasks/BackgroundTask.js';
+import { ParallelTask } from '../dsl/tasks/ParallelTask.js';
+const supervisorURL = (function () {
     return Deno.env.get('RUN_SUPERVISOR_URL') || '';
-}();
-export const enabled = function () {
+})();
+export const 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');
@@ -26,8 +36,9 @@ 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;
@@ -35,64 +46,140 @@ const flows = function () {
     catch {
         return {};
     }
-}();
+})();
 const logger = new ConsoleLogger('debug');
-export async function registerWebhooks(webhooks) {
+function getTriggerData(workflow) {
+    if (workflow.trigger instanceof WebhookTrigger) {
+        return {
+            id: workflow.trigger.id,
+            type: 'webhook',
+            method: workflow.trigger.options.method || 'post',
+        };
+    }
+    else if (workflow.trigger instanceof ScheduleTrigger) {
+        return {
+            id: workflow.trigger.id,
+            type: 'schedule',
+            schedule: workflow.trigger.schedule,
+        };
+    }
+    else if (workflow.trigger instanceof DurableWorkflowTrigger) {
+        return {
+            id: workflow.trigger.id,
+            type: 'durable',
+        };
+    }
+    return null;
+}
+function getTaskData(task) {
+    let taskData = [];
+    if (task instanceof ChainTask) {
+        taskData = task.tasks.map((t) => getTaskData(t)).flat();
+    }
+    else if (task instanceof CatchTask) {
+        taskData = [...getTaskData(task._base), ...getTaskData(task._errorHandler)];
+    }
+    else if (task instanceof BackgroundTask) {
+        taskData = getTaskData(task._base);
+    }
+    else if (task instanceof ParallelTask) {
+        // I'm not sure if this is correct, but I don't think there are any ParallelTasks out in the wild yet
+        taskData = [...getTaskData(task._base), ...getTaskData(task._each)];
+    }
+    else if (task instanceof FnTask) {
+        taskData.push({
+            taskId: task.id,
+            type: task[TaskType].toLowerCase(),
+        });
+    }
+    else if (task instanceof HttpTaskImpl) {
+        taskData.push({
+            taskId: task.id,
+            type: task[TaskType].toLowerCase(),
+        });
+    }
+    else {
+        // yolo
+        taskData.push({
+            taskId: String(task.id || 'unknown'),
+            type: task[TaskType].toLowerCase(),
+        });
+    }
+    return taskData;
+}
+export async function signalReady() {
     if (!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 });
     }
 }
-export async function sendTaskStartEvent(taskId, span) {
+export async function registerWorkflow(workflow) {
     if (!enabled) {
         return;
     }
+    const triggerData = getTriggerData(workflow);
+    const tasks = getTaskData(workflow.task);
+    try {
+        if (triggerData) {
+            const data = {
+                workflowId: triggerData.id,
+                trigger: triggerData,
+                tasks,
+            };
+            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 });
+    }
+}
+export async function sendTaskStartEvent(taskId, ctx, span) {
+    if (!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 });
     }
-}
-export async function registerCrons(crons) {
-    if (!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;
 }
 export async function mockAPIRequest(info, cnx, options) {
     if (!enabled) {
@@ -101,17 +188,17 @@ export 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) {
@@ -139,10 +226,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;
 }
@@ -156,10 +244,10 @@ export 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/esm/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/esm/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/esm/src/interpreter/durable/DurableInterpreter.js

@@ -23,7 +23,7 @@ import { VersoriConfigReader } from '../../dsl/http/versori/configloader.js';
 import { CronAPIClient } from '../../dsl/http/versori/cronapi.js';
 import { WorkflowImpl } from '../../dsl/Workflow.js';
 import { envCronPort, envPort, envReadyCheckURL, envVarEnvId, envVarEnvironmentName, envVarOrgId, envVarOrgSlug, envVarOtelTracesURL, envVarProjectId, envVarSDKApiBaseURL, envVarVersion } from '../../internal/constants.js';
-import { Fake, registerCrons, registerWebhooks, enabled as supervisorEnabled } from '../../internal/supervisor.js';
+import { Fake, registerWorkflow, signalReady, enabled as supervisorEnabled } from '../../internal/supervisor.js';
 import { IssueImpl } from '../../issues/Issues.js';
 import { MemoryKeyValueProvider } from '../../kv/memory/MemoryKeyValueProvider.js';
 import { SDKKeyValueProvider } from '../../kv/sdk/SDKKeyValueProvider.js';
@@ -183,6 +183,13 @@ export 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.
@@ -286,6 +293,9 @@ export class DurableInterpreter {
             },
         };
         this.registeredWorkflows.push(registration);
+        if (supervisorEnabled) {
+            this.wfRegistration.push(registerWorkflow(workflow));
+        }
         return registration;
     }
     async start() {
@@ -318,6 +328,7 @@ export 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 {
@@ -342,6 +353,7 @@ export 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 {
@@ -391,9 +403,6 @@ export class DurableInterpreter {
             });
             throw new Error('Unable to register scheduler tasks with central cron provider');
         }
-        // register with supervisor
-        await registerCrons(this.cronRegistry);
-        await registerWebhooks(this.webhookRegistry);
         this.webhookServer = webhookApp.listen(port, () => {
             this.log.info(`Express server listening on port ${port}`);
         });
@@ -430,6 +439,10 @@ export class DurableInterpreter {
             }
         };
         Deno.addSignalListener('SIGINT', this.shutdownServer);
+        if (supervisorEnabled) {
+            await Promise.all(this.wfRegistration);
+            await signalReady();
+        }
         return new Promise((resolve) => {
             let serversClosed = 0;
             const totalServers = [this.webhookServer, this.cronServer].filter(Boolean).length;

package/esm/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;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/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/esm/src/interpreter/durable/compilers/catch.js

@@ -24,6 +24,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 ?? '');
@@ -61,7 +62,7 @@ function compileCatch(compilerCtx, task) {
                         reason: 'error',
                         severity: 'low',
                     });
-                    span.setAttribute('error', `${error}`);
+                    span.setAttribute('status', 'fail');
                     span.end();
                     return errorOperator(of(ctx.withData(new ExecutionError(ctx, `${error}`, { cause: error }))));
                 });

package/esm/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;AAoDnE,eAAO,MAAM,UAAU,EAAE,YAAY,CAAC,GAAG,EAAE,GAAG,EAAE,MAAM,CAAC,GAAG,EAAE,GAAG,CAAC,CAG/D,CAAC"}

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

@@ -10,18 +10,18 @@
  * 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.
  */
-import { mergeMap, tap } from 'rxjs';
+import { mergeMap } from 'rxjs';
 import { FnTask } from '../../../dsl/tasks/FnTask.js';
-import { enabled as supervisorEnabled } from '../../../internal/supervisor.js';
+import { sendTaskStartEvent, enabled as supervisorEnabled } from '../../../internal/supervisor.js';
 function compileFn(compilerCtx, task) {
-    return (src) => src.pipe(tap({
-        complete: () => compilerCtx.log.debug('fn.complete'),
-    }), mergeMap(async (ctx) => {
+    return (src) => src.pipe(mergeMap(async (ctx) => {
         return await compilerCtx.tracer.startActiveSpan(`fn-${task.id}`, async (span) => {
+            await sendTaskStartEvent(task.id, ctx, 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 }));
@@ -35,8 +35,19 @@ function compileFn(compilerCtx, task) {
                 if (supervisorEnabled) {
                     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/esm/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;AAyHnE,eAAO,MAAM,YAAY,EAAE,YAAY,CAAC,GAAG,EAAE,GAAG,EAAE,YAAY,CAAC,GAAG,EAAE,GAAG,EAAE,GAAG,CAAC,CAG5E,CAAC"}