@dbos-inc/dbos-sdk 3.0.23-preview → 3.0.27-preview

package/dist/src/dbos.js

@@ -3,6 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.InitContext = exports.DBOS = exports.runInternalStep = exports.getExecutor = void 0;
 const context_1 = require("./context");
 const dbos_executor_1 = require("./dbos-executor");
+const workflow_1 = require("./workflow");
 const logs_1 = require("./telemetry/logs");
 const error_1 = require("./error");
 const config_1 = require("./dbos-runtime/config");
@@ -31,32 +32,6 @@ function httpApiDec(verb, url) {
         return descriptor;
     };
 }
-// Fill in any proxy functions with error-throwing stubs
-//  (Goal being to give a clearer error message)
-function augmentProxy(target, proxy) {
-    let proto = target;
-    while (proto && proto !== Object.prototype) {
-        for (const k of Reflect.ownKeys(proto)) {
-            if (typeof k === 'symbol')
-                continue;
-            if (k === 'constructor' || k === 'caller' || k === 'callee' || k === 'arguments')
-                continue; // Skip constructor
-            try {
-                // eslint-disable-next-line @typescript-eslint/no-explicit-any, @typescript-eslint/no-unsafe-member-access
-                if (typeof target[k] !== 'function')
-                    continue;
-                if (!Object.hasOwn(proxy, k)) {
-                    proxy[k] = (..._args) => {
-                        throw new error_1.DBOSNotRegisteredError(k, `${k} is not a registered DBOS function`);
-                    };
-                }
-            }
-            catch (e) { }
-        }
-        // eslint-disable-next-line @typescript-eslint/no-unsafe-assignment
-        proto = Object.getPrototypeOf(proto);
-    }
-}
 function getExecutor() {
     if (!dbos_executor_1.DBOSExecutor.globalInstance) {
         throw new error_1.DBOSExecutorNotInitializedError();
@@ -71,9 +46,7 @@ function runInternalStep(callback, funcName, childWFID) {
             return callback();
         }
         else if (DBOS.isInWorkflow()) {
-            const wfctx = (0, context_1.assertCurrentWorkflowContext)();
-            return dbos_executor_1.DBOSExecutor.globalInstance.runInternalStep(callback, funcName, DBOS.workflowID, // assume DBOS.workflowID is defined because of assertCurrentWorkflowContext call above
-            wfctx.functionIDGetIncrement(), childWFID);
+            return dbos_executor_1.DBOSExecutor.globalInstance.runInternalStep(callback, funcName, DBOS.workflowID, (0, context_1.functionIDGetIncrement)(), childWFID);
         }
         else {
             throw new error_1.DBOSInvalidWorkflowTransitionError(`Invalid call to \`${funcName}\` inside a \`transaction\` or \`procedure\``);
@@ -91,12 +64,7 @@ class DBOS {
     static conductor = undefined;
     static getDebugModeFromEnv() {
         const debugWorkflowId = process.env.DBOS_DEBUG_WORKFLOW_ID;
-        const isDebugging = debugWorkflowId !== undefined;
-        return isDebugging
-            ? process.env.DBOS_DEBUG_TIME_TRAVEL === 'true'
-                ? dbos_executor_1.DebugMode.TIME_TRAVEL
-                : dbos_executor_1.DebugMode.ENABLED
-            : dbos_executor_1.DebugMode.DISABLED;
+        return debugWorkflowId !== undefined;
     }
     /**
      * Set configuration of `DBOS` prior to `launch`
@@ -110,8 +78,8 @@ class DBOS {
     }
     static translateConfig() {
         if (DBOS.#dbosConfig && !(0, dbos_executor_1.isDeprecatedDBOSConfig)(DBOS.#dbosConfig)) {
-            const isDebugging = DBOS.getDebugModeFromEnv() !== dbos_executor_1.DebugMode.DISABLED;
-            [DBOS.#dbosConfig, DBOS.#runtimeConfig] = (0, config_1.translatePublicDBOSconfig)(DBOS.#dbosConfig, isDebugging);
+            const debugMode = DBOS.getDebugModeFromEnv();
+            [DBOS.#dbosConfig, DBOS.#runtimeConfig] = (0, config_1.translatePublicDBOSconfig)(DBOS.#dbosConfig, debugMode);
             if (process.env.DBOS__CLOUD === 'true') {
                 [DBOS.#dbosConfig, DBOS.#runtimeConfig] = (0, config_1.overwrite_config)(DBOS.#dbosConfig, DBOS.#runtimeConfig);
             }
@@ -174,14 +142,13 @@ class DBOS {
             return;
         }
         const debugMode = options?.debugMode ?? DBOS.getDebugModeFromEnv();
-        const isDebugging = debugMode !== dbos_executor_1.DebugMode.DISABLED;
         if (options?.conductorKey) {
             // Use a generated executor ID.
             utils_1.globalParams.executorID = (0, node_crypto_1.randomUUID)();
         }
         // Initialize the DBOS executor
         if (!DBOS.#dbosConfig) {
-            [DBOS.#dbosConfig, DBOS.#runtimeConfig] = (0, config_1.parseConfigFile)({ forceConsole: isDebugging });
+            [DBOS.#dbosConfig, DBOS.#runtimeConfig] = (0, config_1.parseConfigFile)({ forceConsole: debugMode });
         }
         else if (!(0, dbos_executor_1.isDeprecatedDBOSConfig)(DBOS.#dbosConfig)) {
             DBOS.translateConfig(); // This is a defensive measure for users who'd do DBOS.config = X instead of using DBOS.setConfig()
@@ -281,7 +248,7 @@ class DBOS {
             evtRcvr.logRegisteredEndpoints();
         }
         for (const lcl of (0, decorators_1.getLifecycleListeners)()) {
-            lcl.logRegisteredEndpoints();
+            lcl.logRegisteredEndpoints?.();
         }
     }
     /**
@@ -395,9 +362,9 @@ class DBOS {
     //////
     /** Get the current DBOS Logger, appropriate to the current context */
     static get logger() {
-        const ctx = (0, context_1.getCurrentDBOSContext)();
-        if (ctx)
-            return ctx.logger;
+        const lctx = (0, context_1.getCurrentContextStore)();
+        if (lctx?.logger)
+            return lctx.logger;
         const executor = dbos_executor_1.DBOSExecutor.globalInstance;
         if (executor)
             return executor.logger;
@@ -411,7 +378,7 @@ class DBOS {
     }
     /** Get the current DBOS tracing span, appropriate to the current context */
     static get span() {
-        return (0, context_1.getCurrentDBOSContext)()?.span ?? (0, context_1.getCurrentContextStore)()?.span;
+        return (0, context_1.getCurrentContextStore)()?.span;
     }
     /**
      * Get the current request object (such as an HTTP request)
@@ -419,7 +386,7 @@ class DBOS {
      *  and set it using `withTracedContext` or `runWithContext`
      */
     static requestObject() {
-        return (0, context_1.getCurrentDBOSContext)()?.request ?? (0, context_1.getCurrentContextStore)()?.request;
+        return (0, context_1.getCurrentContextStore)()?.request;
     }
     /** Get the current HTTP request (within `@DBOS.getApi` et al) */
     static getRequest() {
@@ -445,7 +412,7 @@ class DBOS {
     }
     /** Get the current workflow ID */
     static get workflowID() {
-        return (0, context_1.getCurrentContextStore)()?.workflowId ?? (0, context_1.getCurrentDBOSContext)()?.workflowUUID;
+        return (0, context_1.getCurrentContextStore)()?.workflowId;
     }
     /** Get the current step number, within the current workflow */
     static get stepID() {
@@ -464,15 +431,15 @@ class DBOS {
     }
     /** Get the current authenticated user */
     static get authenticatedUser() {
-        return (0, context_1.getCurrentDBOSContext)()?.authenticatedUser ?? (0, context_1.getCurrentContextStore)()?.authenticatedUser ?? '';
+        return (0, context_1.getCurrentContextStore)()?.authenticatedUser ?? '';
     }
     /** Get the roles granted to the current authenticated user */
     static get authenticatedRoles() {
-        return (0, context_1.getCurrentDBOSContext)()?.authenticatedRoles ?? (0, context_1.getCurrentContextStore)()?.authenticatedRoles ?? [];
+        return (0, context_1.getCurrentContextStore)()?.authenticatedRoles ?? [];
     }
     /** Get the role assumed by the current user giving authorization to execute the current function */
     static get assumedRole() {
-        return (0, context_1.getCurrentDBOSContext)()?.assumedRole ?? (0, context_1.getCurrentContextStore)()?.assumedRole ?? '';
+        return (0, context_1.getCurrentContextStore)()?.assumedRole ?? '';
     }
     /** @returns true if called from within a transaction, false otherwise */
     static isInTransaction() {
@@ -504,10 +471,10 @@ class DBOS {
     // sql session (various forms)
     /** @returns the current SQL client; only allowed within `@DBOS.transaction` functions */
     static get sqlClient() {
-        if (!DBOS.isInTransaction())
+        const c = (0, context_1.getCurrentContextStore)()?.sqlClient;
+        if (!DBOS.isInTransaction() || !c)
             throw new error_1.DBOSInvalidWorkflowTransitionError('Invalid use of `DBOS.sqlClient` outside of a `transaction`');
-        const ctx = (0, context_1.assertCurrentDBOSContext)();
-        return ctx.client;
+        return c;
     }
     /**
      * @returns the current PG SQL client;
@@ -583,11 +550,6 @@ class DBOS {
      * @param defaultValue - value to return if `key` does not exist in the configuration
      */
     static getConfig(key, defaultValue) {
-        const ctx = (0, context_1.getCurrentDBOSContext)();
-        if (ctx && defaultValue)
-            return ctx.getConfig(key, defaultValue);
-        if (ctx)
-            return ctx.getConfig(key);
         if (DBOS.#executor)
             return DBOS.#executor.getConfig(key, defaultValue);
         return defaultValue;
@@ -653,8 +615,7 @@ class DBOS {
                 return DBOS.#executor.getWorkflowStatus(workflowID);
             }
             else if (DBOS.isInWorkflow()) {
-                const wfctx = (0, context_1.assertCurrentWorkflowContext)();
-                return DBOS.#executor.getWorkflowStatus(workflowID, DBOS.workflowID, wfctx.functionIDGetIncrement());
+                return DBOS.#executor.getWorkflowStatus(workflowID, DBOS.workflowID, (0, context_1.functionIDGetIncrement)());
             }
             else {
                 throw new error_1.DBOSInvalidWorkflowTransitionError('Invalid call to `getWorkflowStatus` inside a `transaction` or `procedure`');
@@ -671,7 +632,7 @@ class DBOS {
     static async getResult(workflowID, timeoutSeconds) {
         let timerFuncID = undefined;
         if (DBOS.isWithinWorkflow() && timeoutSeconds !== undefined) {
-            timerFuncID = (0, context_1.assertCurrentWorkflowContext)().functionIDGetIncrement();
+            timerFuncID = (0, context_1.functionIDGetIncrement)();
         }
         return await runInternalStep(async () => {
             const rres = await dbos_executor_1.DBOSExecutor.globalInstance.systemDatabase.awaitWorkflowResult(workflowID, timeoutSeconds, DBOS.workflowID, timerFuncID);
@@ -695,7 +656,8 @@ class DBOS {
             if (!DBOS.isInWorkflow()) {
                 throw new error_1.DBOSInvalidWorkflowTransitionError('Invalid call to `retrieveWorkflow` inside a `transaction` or `step`');
             }
-            return (0, context_1.getCurrentDBOSContext)().retrieveWorkflow(workflowID);
+            const functionID = (0, context_1.functionIDGetIncrement)();
+            return new workflow_1.RetrievedHandle(dbos_executor_1.DBOSExecutor.globalInstance.systemDatabase, workflowID, DBOS.workflowID, functionID);
         }
         return DBOS.#executor.retrieveWorkflow(workflowID);
     }
@@ -789,7 +751,11 @@ class DBOS {
             if (DBOS.isInTransaction()) {
                 throw new error_1.DBOSInvalidWorkflowTransitionError('Invalid call to `DBOS.sleep` inside a `transaction`');
             }
-            return (0, context_1.getCurrentDBOSContext)().sleepms(durationMS);
+            const functionID = (0, context_1.functionIDGetIncrement)();
+            if (durationMS <= 0) {
+                return;
+            }
+            return await dbos_executor_1.DBOSExecutor.globalInstance.systemDatabase.durableSleepms(DBOS.workflowID, functionID, durationMS);
         }
         await (0, utils_1.sleepms)(durationMS);
     }
@@ -929,9 +895,9 @@ class DBOS {
             }
         }
         else {
-            let span = options.span;
-            if (!span) {
-                span = DBOS.#executor.tracer.startSpan('topContext', {
+            const span = options.span;
+            if (!options.span) {
+                options.span = DBOS.#executor.tracer.startSpan('topContext', {
                     operationUUID: options.idAssignedForNextWorkflow,
                     operationType: options.operationType,
                     authenticatedUser: options.authenticatedUser,
@@ -939,16 +905,12 @@ class DBOS {
                     authenticatedRoles: options.authenticatedRoles,
                 });
             }
-            const ctx = new context_1.DBOSContextImpl(options.operationCaller || 'topContext', span, DBOS.logger);
-            ctx.request = options.request || {};
-            ctx.authenticatedUser = options.authenticatedUser || '';
-            ctx.assumedRole = options.assumedRole || '';
-            ctx.authenticatedRoles = options.authenticatedRoles || [];
-            ctx.workflowUUID = options.idAssignedForNextWorkflow || '';
-            return (0, context_1.runWithTopContext)({
-                ...options,
-                ctx,
-            }, callback);
+            try {
+                return await (0, context_1.runWithTopContext)(options, callback);
+            }
+            finally {
+                options.span = span;
+            }
         }
     }
     static startWorkflow(target, params) {
@@ -980,104 +942,6 @@ class DBOS {
         };
         return new Proxy(target, handler);
     }
-    static invoke(object) {
-        if (!DBOS.isWithinWorkflow()) {
-            const pctx = (0, context_1.getCurrentContextStore)();
-            let span = pctx?.span;
-            if (!span) {
-                span = DBOS.#executor.tracer.startSpan(pctx?.operationCaller || 'transactionCaller', {
-                    operationType: pctx?.operationType,
-                    authenticatedUser: pctx?.authenticatedUser,
-                    assumedRole: pctx?.assumedRole,
-                    authenticatedRoles: pctx?.authenticatedRoles,
-                });
-            }
-            let parentCtx = undefined;
-            if (pctx) {
-                parentCtx = pctx.ctx;
-            }
-            if (!parentCtx) {
-                parentCtx = new context_1.DBOSContextImpl(pctx?.operationCaller || 'workflowCaller', span, DBOS.logger);
-                parentCtx.request = pctx?.request || {};
-                parentCtx.authenticatedUser = pctx?.authenticatedUser || '';
-                parentCtx.assumedRole = pctx?.assumedRole || '';
-                parentCtx.authenticatedRoles = pctx?.authenticatedRoles || [];
-            }
-            const wfParams = {
-                parentCtx,
-            };
-            // Run the temp workflow way...
-            if (typeof object === 'function') {
-                const ops = (0, decorators_1.getRegisteredOperations)(object);
-                const proxy = {};
-                for (const op of ops) {
-                    proxy[op.name] = op.txnConfig
-                        ? (...args) => dbos_executor_1.DBOSExecutor.globalInstance.transaction(op.registeredFunction, wfParams, ...args)
-                        : op.stepConfig
-                            ? (...args) => dbos_executor_1.DBOSExecutor.globalInstance.external(op.registeredFunction, wfParams, ...args)
-                            : op.procConfig
-                                ? (...args) => dbos_executor_1.DBOSExecutor.globalInstance.procedure(op.registeredFunction, wfParams, ...args)
-                                : op.workflowConfig
-                                    ? async (...args) => (await dbos_executor_1.DBOSExecutor.globalInstance.workflow(op.registeredFunction, wfParams, ...args)).getResult()
-                                    : (..._args) => {
-                                        throw new error_1.DBOSNotRegisteredError(op.name, `${op.name} is not a registered DBOS step, transaction, or procedure`);
-                                    };
-                }
-                augmentProxy(object, proxy);
-                return proxy;
-            }
-            else {
-                const targetInst = object;
-                const ops = (0, decorators_1.getRegisteredOperations)(targetInst);
-                const proxy = {};
-                for (const op of ops) {
-                    proxy[op.name] = op.txnConfig
-                        ? (...args) => dbos_executor_1.DBOSExecutor.globalInstance.transaction(op.registeredFunction, { ...wfParams, configuredInstance: targetInst }, ...args)
-                        : op.stepConfig
-                            ? (...args) => dbos_executor_1.DBOSExecutor.globalInstance.external(op.registeredFunction, { ...wfParams, configuredInstance: targetInst }, ...args)
-                            : op.workflowConfig
-                                ? async (...args) => (await dbos_executor_1.DBOSExecutor.globalInstance.workflow(op.registeredFunction, { ...wfParams, configuredInstance: targetInst }, ...args)).getResult()
-                                : (..._args) => {
-                                    throw new error_1.DBOSNotRegisteredError(op.name, `${op.name} is not a registered DBOS step or transaction`);
-                                };
-                }
-                augmentProxy(targetInst, proxy);
-                return proxy;
-            }
-        }
-        const wfctx = (0, context_1.assertCurrentWorkflowContext)();
-        if (typeof object === 'function') {
-            const ops = (0, decorators_1.getRegisteredOperations)(object);
-            const proxy = {};
-            for (const op of ops) {
-                proxy[op.name] = op.txnConfig
-                    ? (...args) => dbos_executor_1.DBOSExecutor.globalInstance.callTransactionFunction(op.registeredFunction, null, wfctx, ...args)
-                    : op.stepConfig
-                        ? (...args) => dbos_executor_1.DBOSExecutor.globalInstance.callStepFunction(op.registeredFunction, undefined, undefined, null, wfctx, ...args)
-                        : op.procConfig
-                            ? (...args) => dbos_executor_1.DBOSExecutor.globalInstance.callProcedureFunction(op.registeredFunction, wfctx, ...args)
-                            : (..._args) => {
-                                throw new error_1.DBOSNotRegisteredError(op.name, `${op.name} is not a registered DBOS step, transaction, or procedure`);
-                            };
-            }
-            augmentProxy(object, proxy);
-            return proxy;
-        }
-        else {
-            const targetInst = object;
-            const ops = (0, decorators_1.getRegisteredOperations)(targetInst);
-            const proxy = {};
-            for (const op of ops) {
-                proxy[op.name] = op.txnConfig
-                    ? (...args) => dbos_executor_1.DBOSExecutor.globalInstance.callTransactionFunction(op.registeredFunction, targetInst, wfctx, ...args)
-                    : op.stepConfig
-                        ? (...args) => dbos_executor_1.DBOSExecutor.globalInstance.callStepFunction(op.registeredFunction, undefined, undefined, targetInst, wfctx, ...args)
-                        : undefined;
-            }
-            augmentProxy(targetInst, proxy);
-            return proxy;
-        }
-    }
     /**
      * Send `message` on optional `topic` to the workflow with `destinationID`
      *  This can be done from inside or outside of DBOS workflow functions
@@ -1097,9 +961,10 @@ class DBOS {
             if (idempotencyKey) {
                 throw new error_1.DBOSInvalidWorkflowTransitionError('Invalid call to `DBOS.send` with an idempotency key from within a workflow');
             }
-            return (0, context_1.getCurrentDBOSContext)().send(destinationID, message, topic);
+            const functionID = (0, context_1.functionIDGetIncrement)();
+            return await dbos_executor_1.DBOSExecutor.globalInstance.systemDatabase.send(DBOS.workflowID, functionID, destinationID, utils_1.DBOSJSON.stringify(message), topic);
         }
-        return DBOS.#executor.send(destinationID, message, topic, idempotencyKey);
+        return DBOS.#executor.send(destinationID, message, topic, idempotencyKey); // Temp WF variant
     }
     /**
      * Receive a message on optional `topic` from within a workflow.
@@ -1116,9 +981,11 @@ class DBOS {
     static async recv(topic, timeoutSeconds) {
         if (DBOS.isWithinWorkflow()) {
             if (!DBOS.isInWorkflow()) {
-                throw new error_1.DBOSInvalidWorkflowTransitionError('Invalid call to `DBOS.setEvent` inside a `step` or `transaction`');
+                throw new error_1.DBOSInvalidWorkflowTransitionError('Invalid call to `DBOS.recv` inside a `step` or `transaction`');
             }
-            return (0, context_1.getCurrentDBOSContext)().recv(topic, timeoutSeconds);
+            const functionID = (0, context_1.functionIDGetIncrement)();
+            const timeoutFunctionID = (0, context_1.functionIDGetIncrement)();
+            return utils_1.DBOSJSON.parse(await dbos_executor_1.DBOSExecutor.globalInstance.systemDatabase.recv(DBOS.workflowID, functionID, timeoutFunctionID, topic, timeoutSeconds));
         }
         throw new error_1.DBOSInvalidWorkflowTransitionError('Attempt to call `DBOS.recv` outside of a workflow'); // Only workflows can recv
     }
@@ -1136,7 +1003,8 @@ class DBOS {
             if (!DBOS.isInWorkflow()) {
                 throw new error_1.DBOSInvalidWorkflowTransitionError('Invalid call to `DBOS.setEvent` inside a `step` or `transaction`');
             }
-            return (0, context_1.getCurrentDBOSContext)().setEvent(key, value);
+            const functionID = (0, context_1.functionIDGetIncrement)();
+            return dbos_executor_1.DBOSExecutor.globalInstance.systemDatabase.setEvent(DBOS.workflowID, functionID, key, utils_1.DBOSJSON.stringify(value));
         }
         throw new error_1.DBOSInvalidWorkflowTransitionError('Attempt to call `DBOS.setEvent` outside of a workflow'); // Only workflows can set event
     }
@@ -1157,7 +1025,14 @@ class DBOS {
             if (!DBOS.isInWorkflow()) {
                 throw new error_1.DBOSInvalidWorkflowTransitionError('Invalid call to `DBOS.getEvent` inside a `step` or `transaction`');
             }
-            return (0, context_1.getCurrentDBOSContext)().getEvent(workflowID, key, timeoutSeconds);
+            const functionID = (0, context_1.functionIDGetIncrement)();
+            const timeoutFunctionID = (0, context_1.functionIDGetIncrement)();
+            const params = {
+                workflowID: DBOS.workflowID,
+                functionID,
+                timeoutFunctionID,
+            };
+            return utils_1.DBOSJSON.parse(await dbos_executor_1.DBOSExecutor.globalInstance.systemDatabase.getEvent(workflowID, key, timeoutSeconds ?? dbos_executor_1.DBOSExecutor.defaultNotificationTimeoutSec, params));
         }
         return DBOS.#executor.getEvent(workflowID, key, timeoutSeconds);
     }
@@ -1221,46 +1096,39 @@ class DBOS {
             if (!DBOS.isInWorkflow()) {
                 throw new error_1.DBOSInvalidWorkflowTransitionError('Invalid call to a `workflow` function from within a `step` or `transaction`');
             }
-            const wfctx = (0, context_1.assertCurrentWorkflowContext)();
-            const funcId = wfctx.functionIDGetIncrement();
+            const pctx = (0, context_1.getCurrentContextStore)();
+            const pwfid = pctx.workflowId;
+            const funcId = (0, context_1.functionIDGetIncrement)();
             const wfParams = {
-                workflowUUID: wfId || wfctx.workflowUUID + '-' + funcId,
-                parentCtx: wfctx,
+                workflowUUID: wfId || pwfid + '-' + funcId,
                 configuredInstance: instance,
                 queueName,
                 timeoutMS,
                 // Detach child deadline if a null timeout is configured
-                deadlineEpochMS: params.timeoutMS === null || pctx?.workflowTimeoutMS === null ? undefined : wfctx.deadlineEpochMS,
+                deadlineEpochMS: params.timeoutMS === null || pctx?.workflowTimeoutMS === null ? undefined : pctx?.deadlineEpochMS,
                 enqueueOptions: params.enqueueOptions,
             };
-            return await invokeRegOp(wfParams, wfctx.workflowUUID, funcId);
+            return await invokeRegOp(wfParams, pwfid, funcId);
         }
         else {
             // Else, we setup a parent context that includes all the potential metadata the application could have set in DBOSLocalCtx
-            let parentCtx = undefined;
             if (pctx) {
                 // If pctx has no span, e.g., has not been setup through `withTracedContext`, set up a parent span for the workflow here.
-                const span = pctx.span ??
-                    DBOS.#executor.tracer.startSpan(pctx.operationCaller || 'workflowCaller', {
-                        operationUUID: wfId,
-                        operationType: pctx.operationType,
-                        authenticatedUser: pctx.authenticatedUser,
-                        assumedRole: pctx.assumedRole,
-                        authenticatedRoles: pctx.authenticatedRoles,
-                    });
-                parentCtx = new context_1.DBOSContextImpl(pctx.operationCaller || 'workflowCaller', span, DBOS.logger);
-                parentCtx.request = pctx.request ?? {};
-                parentCtx.authenticatedUser = pctx.authenticatedUser ?? '';
-                parentCtx.assumedRole = pctx.assumedRole ?? '';
-                parentCtx.authenticatedRoles = pctx.authenticatedRoles ?? [];
-                parentCtx.workflowUUID = wfId ?? '';
+                pctx.span =
+                    pctx.span ??
+                        DBOS.#executor.tracer.startSpan(pctx.operationCaller || 'workflowCaller', {
+                            operationUUID: wfId,
+                            operationType: pctx.operationType,
+                            authenticatedUser: pctx.authenticatedUser,
+                            assumedRole: pctx.assumedRole,
+                            authenticatedRoles: pctx.authenticatedRoles,
+                        });
             }
             const wfParams = {
                 workflowUUID: wfId,
                 queueName,
                 enqueueOptions: params.enqueueOptions,
                 configuredInstance: instance,
-                parentCtx,
                 timeoutMS,
             };
             return await invokeRegOp(wfParams, undefined, undefined);
@@ -1321,34 +1189,22 @@ class DBOS {
                     if (DBOS.isInStep()) {
                         throw new error_1.DBOSInvalidWorkflowTransitionError('Invalid call to a `transaction` function from within a `step`');
                     }
-                    const wfctx = (0, context_1.assertCurrentWorkflowContext)();
-                    return await dbos_executor_1.DBOSExecutor.globalInstance.callTransactionFunction(registration.registeredFunction, inst ?? null, wfctx, ...rawArgs);
+                    return await dbos_executor_1.DBOSExecutor.globalInstance.callTransactionFunction(registration.registeredFunction, inst ?? null, ...rawArgs);
                 }
                 const wfId = (0, context_1.getNextWFID)(undefined);
                 const pctx = (0, context_1.getCurrentContextStore)();
-                let span = pctx?.span;
-                if (!span) {
-                    span = DBOS.#executor.tracer.startSpan(pctx?.operationCaller || 'transactionCaller', {
-                        operationType: pctx?.operationType,
-                        authenticatedUser: pctx?.authenticatedUser,
-                        assumedRole: pctx?.assumedRole,
-                        authenticatedRoles: pctx?.authenticatedRoles,
-                    });
-                }
-                let parentCtx = undefined;
                 if (pctx) {
-                    parentCtx = pctx.ctx;
-                }
-                if (!parentCtx) {
-                    parentCtx = new context_1.DBOSContextImpl(pctx?.operationCaller || 'workflowCaller', span, DBOS.logger);
-                    parentCtx.request = pctx?.request || {};
-                    parentCtx.authenticatedUser = pctx?.authenticatedUser || '';
-                    parentCtx.assumedRole = pctx?.assumedRole || '';
-                    parentCtx.authenticatedRoles = pctx?.authenticatedRoles || [];
+                    pctx.span =
+                        pctx.span ??
+                            DBOS.#executor.tracer.startSpan(pctx?.operationCaller || 'transactionCaller', {
+                                operationType: pctx?.operationType,
+                                authenticatedUser: pctx?.authenticatedUser,
+                                assumedRole: pctx?.assumedRole,
+                                authenticatedRoles: pctx?.authenticatedRoles,
+                            });
                 }
                 const wfParams = {
                     configuredInstance: inst,
-                    parentCtx,
                     workflowUUID: wfId,
                 };
                 return await DBOS.#executor.transaction(registration.registeredFunction, wfParams, ...rawArgs);
@@ -1377,33 +1233,21 @@ class DBOS {
                     throw new Error('Stored procedures must be static');
                 }
                 if (DBOS.isWithinWorkflow()) {
-                    const wfctx = (0, context_1.assertCurrentWorkflowContext)();
-                    return await dbos_executor_1.DBOSExecutor.globalInstance.callProcedureFunction(registration.registeredFunction, wfctx, ...rawArgs);
+                    return await dbos_executor_1.DBOSExecutor.globalInstance.callProcedureFunction(registration.registeredFunction, ...rawArgs);
                 }
                 const wfId = (0, context_1.getNextWFID)(undefined);
                 const pctx = (0, context_1.getCurrentContextStore)();
-                let span = pctx?.span;
-                if (!span) {
-                    span = DBOS.#executor.tracer.startSpan(pctx?.operationCaller || 'transactionCaller', {
-                        operationType: pctx?.operationType,
-                        authenticatedUser: pctx?.authenticatedUser,
-                        assumedRole: pctx?.assumedRole,
-                        authenticatedRoles: pctx?.authenticatedRoles,
-                    });
-                }
-                let parentCtx = undefined;
                 if (pctx) {
-                    parentCtx = pctx.ctx;
-                }
-                if (!parentCtx) {
-                    parentCtx = new context_1.DBOSContextImpl(pctx?.operationCaller || 'workflowCaller', span, DBOS.logger);
-                    parentCtx.request = pctx?.request || {};
-                    parentCtx.authenticatedUser = pctx?.authenticatedUser || '';
-                    parentCtx.assumedRole = pctx?.assumedRole || '';
-                    parentCtx.authenticatedRoles = pctx?.authenticatedRoles || [];
+                    pctx.span =
+                        pctx.span ??
+                            DBOS.#executor.tracer.startSpan(pctx?.operationCaller || 'transactionCaller', {
+                                operationType: pctx?.operationType,
+                                authenticatedUser: pctx?.authenticatedUser,
+                                assumedRole: pctx?.assumedRole,
+                                authenticatedRoles: pctx?.authenticatedRoles,
+                            });
                 }
                 const wfParams = {
-                    parentCtx,
                     workflowUUID: wfId,
                 };
                 return await DBOS.#executor.procedure(registration.registeredFunction, wfParams, ...rawArgs);
@@ -1448,34 +1292,22 @@ class DBOS {
                         // There should probably be checks here about the compatibility of the StepConfig...
                         return registration.registeredFunction.call(this, ...rawArgs);
                     }
-                    const wfctx = (0, context_1.assertCurrentWorkflowContext)();
-                    return await dbos_executor_1.DBOSExecutor.globalInstance.callStepFunction(registration.registeredFunction, undefined, undefined, inst ?? null, wfctx, ...rawArgs);
+                    return await dbos_executor_1.DBOSExecutor.globalInstance.callStepFunction(registration.registeredFunction, undefined, undefined, inst ?? null, ...rawArgs);
                 }
                 const wfId = (0, context_1.getNextWFID)(undefined);
                 const pctx = (0, context_1.getCurrentContextStore)();
-                let span = pctx?.span;
-                if (!span) {
-                    span = DBOS.#executor.tracer.startSpan(pctx?.operationCaller || 'transactionCaller', {
-                        operationType: pctx?.operationType,
-                        authenticatedUser: pctx?.authenticatedUser,
-                        assumedRole: pctx?.assumedRole,
-                        authenticatedRoles: pctx?.authenticatedRoles,
-                    });
-                }
-                let parentCtx = undefined;
                 if (pctx) {
-                    parentCtx = pctx.ctx;
-                }
-                if (!parentCtx) {
-                    parentCtx = new context_1.DBOSContextImpl(pctx?.operationCaller || 'workflowCaller', span, DBOS.logger);
-                    parentCtx.request = pctx?.request || {};
-                    parentCtx.authenticatedUser = pctx?.authenticatedUser || '';
-                    parentCtx.assumedRole = pctx?.assumedRole || '';
-                    parentCtx.authenticatedRoles = pctx?.authenticatedRoles || [];
+                    pctx.span =
+                        pctx.span ??
+                            DBOS.#executor.tracer.startSpan(pctx?.operationCaller || 'transactionCaller', {
+                                operationType: pctx?.operationType,
+                                authenticatedUser: pctx?.authenticatedUser,
+                                assumedRole: pctx?.assumedRole,
+                                authenticatedRoles: pctx?.authenticatedRoles,
+                            });
                 }
                 const wfParams = {
                     configuredInstance: inst,
-                    parentCtx,
                     workflowUUID: wfId,
                 };
                 return await DBOS.#executor.external(registration.registeredFunction, wfParams, ...rawArgs);
@@ -1512,8 +1344,7 @@ class DBOS {
                     // There should probably be checks here about the compatibility of the StepConfig...
                     return func.call(this, ...rawArgs);
                 }
-                const wfctx = (0, context_1.assertCurrentWorkflowContext)();
-                return await dbos_executor_1.DBOSExecutor.globalInstance.callStepFunction(func, name, config, inst ?? null, wfctx, ...rawArgs);
+                return await dbos_executor_1.DBOSExecutor.globalInstance.callStepFunction(func, name, config, inst ?? null, ...rawArgs);
             }
             if ((0, context_1.getNextWFID)(undefined)) {
                 throw new error_1.DBOSInvalidWorkflowTransitionError(`Invalid call to step '${name}' outside of a workflow; with directive to start a workflow.`);
@@ -1540,8 +1371,7 @@ class DBOS {
                 // There should probably be checks here about the compatibility of the StepConfig...
                 return func();
             }
-            const wfctx = (0, context_1.assertCurrentWorkflowContext)();
-            return dbos_executor_1.DBOSExecutor.globalInstance.callStepFunction(func, name, config, null, wfctx);
+            return dbos_executor_1.DBOSExecutor.globalInstance.callStepFunction(func, name, config, null);
         }
         if ((0, context_1.getNextWFID)(undefined)) {
             throw new error_1.DBOSInvalidWorkflowTransitionError(`Invalid call to step '${name}' outside of a workflow; with directive to start a workflow.`);