skedyul 1.7.5 → 1.7.7

package/dist/esm/index.mjs

@@ -1901,6 +1901,31 @@ var SetupStepDefinitionSchema = z8.object({
   listenToEnv: z8.boolean().optional(),
   capabilities: z8.array(z8.string()).optional()
 });
+var BatchPaginationSchema = z8.object({
+  hasMore: z8.boolean(),
+  page: z8.number().int().optional(),
+  total: z8.number().int().optional(),
+  nextCursor: z8.union([z8.string(), z8.number()]).optional(),
+  limit: z8.number().int().positive().optional()
+});
+var BatchOperationSetupResultSchema = z8.object({
+  state: z8.record(z8.string(), z8.unknown()).optional(),
+  total: z8.number().int().nonnegative().optional()
+});
+var BatchOperationIterateResultSchema = z8.object({
+  items: z8.array(z8.record(z8.string(), z8.unknown())),
+  pagination: BatchPaginationSchema,
+  state: z8.record(z8.string(), z8.unknown()).optional()
+});
+var BatchOperationDefinitionSchema = z8.object({
+  handle: z8.string(),
+  label: z8.string(),
+  description: z8.string().optional(),
+  entity: z8.string(),
+  maxConcurrent: z8.number().int().positive().optional(),
+  pageSize: z8.number().int().positive().optional(),
+  icon: z8.string().optional()
+});
 var ProvisionConfigSchema = z8.object({
   env: EnvSchemaSchema.optional(),
   /** INTERNAL model definitions (app-owned, not visible to users) */
@@ -1915,7 +1940,9 @@ var ProvisionConfigSchema = z8.object({
   navigation: NavigationConfigSchema.optional(),
   pages: z8.array(PageDefinitionSchema).optional(),
   /** Install setup checklist steps (opt-in) */
-  setup: z8.array(SetupStepDefinitionSchema).optional()
+  setup: z8.array(SetupStepDefinitionSchema).optional(),
+  /** Batch operations for imports, syncs, and long-running tasks */
+  batchOperations: z8.array(BatchOperationDefinitionSchema).optional()
 });
 var SkedyulConfigSchema = z8.object({
   name: z8.string(),
@@ -5437,6 +5464,107 @@ async function handleMcpBatchRoute(req, ctx) {
     }
   };
 }
+async function handleBatchOperationRoute(req, ctx) {
+  const bodyResult = parseJsonBody(req);
+  if (!bodyResult.success) {
+    return bodyResult.error;
+  }
+  const body = bodyResult.data;
+  const registry = ctx.batchOperationRegistry;
+  if (!registry) {
+    return {
+      status: 404,
+      body: {
+        success: false,
+        error: "No batch operations registered"
+      }
+    };
+  }
+  const operation = registry[body.handle];
+  if (!operation) {
+    return {
+      status: 404,
+      body: {
+        success: false,
+        error: `Batch operation not found: ${body.handle}`
+      }
+    };
+  }
+  const log = {
+    info: (message, meta) => {
+      console.log(`[batch:${body.handle}] ${message}`, meta ?? "");
+    },
+    warn: (message, meta) => {
+      console.warn(`[batch:${body.handle}] ${message}`, meta ?? "");
+    },
+    error: (message, meta) => {
+      console.error(`[batch:${body.handle}] ${message}`, meta ?? "");
+    }
+  };
+  try {
+    if (body.method === "setup") {
+      if (!operation.setup) {
+        return {
+          status: 200,
+          body: {
+            success: true,
+            result: { state: {}, total: void 0 }
+          }
+        };
+      }
+      const result = await operation.setup({
+        workplaceId: body.workplaceId,
+        appInstallationId: body.appInstallationId,
+        appId: body.appId,
+        input: body.input,
+        log
+      });
+      return {
+        status: 200,
+        body: {
+          success: true,
+          result
+        }
+      };
+    }
+    if (body.method === "iterate") {
+      const result = await operation.iterate({
+        workplaceId: body.workplaceId,
+        appInstallationId: body.appInstallationId,
+        appId: body.appId,
+        input: body.input,
+        state: body.state,
+        page: body.page,
+        cursor: body.cursor,
+        limit: body.limit,
+        log
+      });
+      return {
+        status: 200,
+        body: {
+          success: true,
+          result
+        }
+      };
+    }
+    return {
+      status: 400,
+      body: {
+        success: false,
+        error: `Unknown method: ${body.method}`
+      }
+    };
+  } catch (err) {
+    log.error("Batch operation failed", { error: err });
+    return {
+      status: 500,
+      body: {
+        success: false,
+        error: err instanceof Error ? err.message : String(err)
+      }
+    };
+  }
+}
 function createNotFoundResponse() {
   return {
     status: 404,
@@ -5516,6 +5644,9 @@ async function routeRequest(req, ctx) {
     if (req.path === "/mcp/batch" && req.method === "POST") {
       return handleMcpBatchRoute(req, ctx);
     }
+    if (req.path === "/batch-operation" && req.method === "POST") {
+      return handleBatchOperationRoute(req, ctx);
+    }
     return createNotFoundResponse();
   } catch (err) {
     return createErrorResponse2(err);
@@ -5557,11 +5688,13 @@ function createDedicatedServerInstance(config, tools, callTool, state, mcpServer
   const defaultHeaders = getDefaultHeaders(config.cors);
   const registry = config.tools;
   const webhookRegistry = config.webhooks;
+  const batchOperationRegistry = config.batchOperations;
   const ctx = {
     config,
     tools,
     registry,
     webhookRegistry,
+    batchOperationRegistry,
     callTool,
     state,
     mcpServer,
@@ -5676,12 +5809,14 @@ function createServerlessInstance(config, tools, callTool, state, mcpServer) {
   const defaultHeaders = getDefaultHeaders(config.cors);
   const registry = config.tools;
   const webhookRegistry = config.webhooks;
+  const batchOperationRegistry = config.batchOperations;
   let hasLoggedStartup = false;
   const ctx = {
     config,
     tools,
     registry,
     webhookRegistry,
+    batchOperationRegistry,
     callTool,
     state,
     mcpServer,
@@ -5979,6 +6114,9 @@ function defineNavigation(navigation) {
 function defineSetupStep(step) {
   return step;
 }
+function defineBatchOperation(operation) {
+  return operation;
+}
 
 // src/config/schema-loader.ts
 import * as fs4 from "fs";
@@ -8027,7 +8165,15 @@ var WaitInputRelativeSchema = z15.object({
   mode: z15.literal("relative"),
   amount: z15.number(),
   unit: WaitUnitSchema,
-  windows: z15.array(TimeWindowSlotSchema).optional()
+  windows: z15.array(TimeWindowSlotSchema).optional(),
+  /**
+   * Optional ISO datetime to use as the base for the relative delay instead of
+   * wall-clock `now`. Used for cadence chaining (schedule relative to a prior
+   * message's scheduledAt). `waitTime` is still measured from wall-clock `now`.
+   */
+  from: z15.union([z15.string(), z15.date()]).optional().describe(
+    "ISO datetime base for the relative delay (e.g. previous message scheduledAt)"
+  )
 });
 var WaitInputAbsoluteSchema = z15.object({
   mode: z15.literal("absolute"),
@@ -8140,10 +8286,12 @@ function calculateWaitTime(step, now) {
       };
     }
     case "relative": {
+      const baseTime = step.from != null ? new Date(step.from).getTime() : nowTime;
+      const baseDate = new Date(baseTime);
       if (!step.amount && (!step.windows || step.windows.length === 0)) {
         return {
-          waitTime: 0,
-          scheduledAt: now
+          waitTime: Math.max(0, baseTime - nowTime),
+          scheduledAt: baseDate
         };
       }
       let relativeDelay = 0;
@@ -8182,17 +8330,18 @@ function calculateWaitTime(step, now) {
         }
       }
       if (!step.windows || step.windows.length === 0) {
+        const scheduledAt = new Date(baseTime + relativeDelay);
         return {
-          waitTime: relativeDelay,
-          scheduledAt: new Date(nowTime + relativeDelay)
+          waitTime: Math.max(0, scheduledAt.getTime() - nowTime),
+          scheduledAt
         };
       }
-      const targetDate = new Date(nowTime + relativeDelay);
+      const targetDate = new Date(baseTime + relativeDelay);
       for (const window of step.windows) {
         if (isTimeInWindowSlot(targetDate, window)) {
           return {
-            waitTime: relativeDelay,
-            scheduledAt: new Date(nowTime + relativeDelay)
+            waitTime: Math.max(0, targetDate.getTime() - nowTime),
+            scheduledAt: targetDate
           };
         }
       }
@@ -8237,8 +8386,8 @@ function calculateWaitTime(step, now) {
           msUntilWindowStart = daysMs + hoursAdjustment + minutesAdjustment;
         }
         const windowStartTimeMs = targetDate.getTime() + msUntilWindowStart;
-        const sameLocalDayAsNow = getLocalDateKey(now, tz) === getLocalDateKey(targetDate, tz);
-        const windowScheduledTime = sameLocalDayAsNow ? new Date(windowStartTimeMs + relativeDelay) : new Date(windowStartTimeMs);
+        const sameLocalDayAsBase = getLocalDateKey(baseDate, tz) === getLocalDateKey(targetDate, tz);
+        const windowScheduledTime = sameLocalDayAsBase ? new Date(windowStartTimeMs + relativeDelay) : new Date(windowStartTimeMs);
         const waitFromNow = windowScheduledTime.getTime() - nowTime;
         if (waitFromNow < earliestWaitFromNow) {
           earliestWaitFromNow = waitFromNow;
@@ -8412,6 +8561,10 @@ export {
   AssociationSchema,
   AuthenticationError,
   BaseEventPayloadSchema,
+  BatchOperationDefinitionSchema,
+  BatchOperationIterateResultSchema,
+  BatchOperationSetupResultSchema,
+  BatchPaginationSchema,
   BreadcrumbItemSchema,
   CRMCardinalitySchema,
   CRMContextSchema2 as CRMContextSchema,
@@ -8664,6 +8817,7 @@ export {
   src_default as default,
   defaultShouldRetry,
   defineAgent,
+  defineBatchOperation,
   defineChannel,
   defineConfig,
   defineEntity,

package/dist/index.d.ts

@@ -16,7 +16,7 @@ declare const _default: {
     z: typeof z;
 };
 export default _default;
-export { defineConfig, defineModel, defineEntity, defineChannel, definePage, defineWorkflow, defineAgent, defineEnv, defineNavigation, defineSetupStep, getAllEnvKeys, getRequiredInstallEnvKeys, } from './config';
+export { defineConfig, defineModel, defineEntity, defineChannel, definePage, defineWorkflow, defineAgent, defineEnv, defineNavigation, defineSetupStep, defineBatchOperation, getAllEnvKeys, getRequiredInstallEnvKeys, } from './config';
 export { queuedFetch, requeue, resolveQueue, createQueueHandle, queuedFetchResponse, registerQueueConfig, runWithRateLimitExecutionContext, getRateLimitExecutionContext, defaultShouldRetry, QueueContextError, QueueNotFoundError, QueuedFetchExhaustedError, RequeueOutsideContextError, RateLimitBackendError, RateLimitExceededError, } from './ratelimit';
 export type { QueueInput, QueueSelector, Lease, QueueLimits, ResolvedQueue, RateLimitExecutionContext, RateLimitBackend, QueueScope, QueueConfig, SerializableQueueConfig, QueueRegistry, } from './ratelimit';
 export { sequencer, allow as sequencerAllow, acquire as sequencerAcquire, release as sequencerRelease, resolveSequencer, createSequencerHandle, registerSequencerConfig, clearRegisteredSequencerConfig, getSequencerConfig, getSequencerDefinitions, resetSequencerBackendForTests, memorySequencerBackend, platformSequencerBackend, SequencerContextError, SequencerNotFoundError, SequencerBackendError, SequencerLockError, } from './sequencer';

package/dist/index.js

@@ -42,6 +42,10 @@ __export(index_exports, {
   AssociationSchema: () => AssociationSchema,
   AuthenticationError: () => AuthenticationError,
   BaseEventPayloadSchema: () => BaseEventPayloadSchema,
+  BatchOperationDefinitionSchema: () => BatchOperationDefinitionSchema,
+  BatchOperationIterateResultSchema: () => BatchOperationIterateResultSchema,
+  BatchOperationSetupResultSchema: () => BatchOperationSetupResultSchema,
+  BatchPaginationSchema: () => BatchPaginationSchema,
   BreadcrumbItemSchema: () => BreadcrumbItemSchema,
   CRMCardinalitySchema: () => CRMCardinalitySchema,
   CRMContextSchema: () => CRMContextSchema2,
@@ -294,6 +298,7 @@ __export(index_exports, {
   default: () => index_default,
   defaultShouldRetry: () => defaultShouldRetry,
   defineAgent: () => defineAgent,
+  defineBatchOperation: () => defineBatchOperation,
   defineChannel: () => defineChannel,
   defineConfig: () => defineConfig,
   defineEntity: () => defineEntity,
@@ -2275,6 +2280,31 @@ var SetupStepDefinitionSchema = import_v48.z.object({
   listenToEnv: import_v48.z.boolean().optional(),
   capabilities: import_v48.z.array(import_v48.z.string()).optional()
 });
+var BatchPaginationSchema = import_v48.z.object({
+  hasMore: import_v48.z.boolean(),
+  page: import_v48.z.number().int().optional(),
+  total: import_v48.z.number().int().optional(),
+  nextCursor: import_v48.z.union([import_v48.z.string(), import_v48.z.number()]).optional(),
+  limit: import_v48.z.number().int().positive().optional()
+});
+var BatchOperationSetupResultSchema = import_v48.z.object({
+  state: import_v48.z.record(import_v48.z.string(), import_v48.z.unknown()).optional(),
+  total: import_v48.z.number().int().nonnegative().optional()
+});
+var BatchOperationIterateResultSchema = import_v48.z.object({
+  items: import_v48.z.array(import_v48.z.record(import_v48.z.string(), import_v48.z.unknown())),
+  pagination: BatchPaginationSchema,
+  state: import_v48.z.record(import_v48.z.string(), import_v48.z.unknown()).optional()
+});
+var BatchOperationDefinitionSchema = import_v48.z.object({
+  handle: import_v48.z.string(),
+  label: import_v48.z.string(),
+  description: import_v48.z.string().optional(),
+  entity: import_v48.z.string(),
+  maxConcurrent: import_v48.z.number().int().positive().optional(),
+  pageSize: import_v48.z.number().int().positive().optional(),
+  icon: import_v48.z.string().optional()
+});
 var ProvisionConfigSchema = import_v48.z.object({
   env: EnvSchemaSchema.optional(),
   /** INTERNAL model definitions (app-owned, not visible to users) */
@@ -2289,7 +2319,9 @@ var ProvisionConfigSchema = import_v48.z.object({
   navigation: NavigationConfigSchema.optional(),
   pages: import_v48.z.array(PageDefinitionSchema).optional(),
   /** Install setup checklist steps (opt-in) */
-  setup: import_v48.z.array(SetupStepDefinitionSchema).optional()
+  setup: import_v48.z.array(SetupStepDefinitionSchema).optional(),
+  /** Batch operations for imports, syncs, and long-running tasks */
+  batchOperations: import_v48.z.array(BatchOperationDefinitionSchema).optional()
 });
 var SkedyulConfigSchema = import_v48.z.object({
   name: import_v48.z.string(),
@@ -5811,6 +5843,107 @@ async function handleMcpBatchRoute(req, ctx) {
     }
   };
 }
+async function handleBatchOperationRoute(req, ctx) {
+  const bodyResult = parseJsonBody(req);
+  if (!bodyResult.success) {
+    return bodyResult.error;
+  }
+  const body = bodyResult.data;
+  const registry = ctx.batchOperationRegistry;
+  if (!registry) {
+    return {
+      status: 404,
+      body: {
+        success: false,
+        error: "No batch operations registered"
+      }
+    };
+  }
+  const operation = registry[body.handle];
+  if (!operation) {
+    return {
+      status: 404,
+      body: {
+        success: false,
+        error: `Batch operation not found: ${body.handle}`
+      }
+    };
+  }
+  const log = {
+    info: (message, meta) => {
+      console.log(`[batch:${body.handle}] ${message}`, meta ?? "");
+    },
+    warn: (message, meta) => {
+      console.warn(`[batch:${body.handle}] ${message}`, meta ?? "");
+    },
+    error: (message, meta) => {
+      console.error(`[batch:${body.handle}] ${message}`, meta ?? "");
+    }
+  };
+  try {
+    if (body.method === "setup") {
+      if (!operation.setup) {
+        return {
+          status: 200,
+          body: {
+            success: true,
+            result: { state: {}, total: void 0 }
+          }
+        };
+      }
+      const result = await operation.setup({
+        workplaceId: body.workplaceId,
+        appInstallationId: body.appInstallationId,
+        appId: body.appId,
+        input: body.input,
+        log
+      });
+      return {
+        status: 200,
+        body: {
+          success: true,
+          result
+        }
+      };
+    }
+    if (body.method === "iterate") {
+      const result = await operation.iterate({
+        workplaceId: body.workplaceId,
+        appInstallationId: body.appInstallationId,
+        appId: body.appId,
+        input: body.input,
+        state: body.state,
+        page: body.page,
+        cursor: body.cursor,
+        limit: body.limit,
+        log
+      });
+      return {
+        status: 200,
+        body: {
+          success: true,
+          result
+        }
+      };
+    }
+    return {
+      status: 400,
+      body: {
+        success: false,
+        error: `Unknown method: ${body.method}`
+      }
+    };
+  } catch (err) {
+    log.error("Batch operation failed", { error: err });
+    return {
+      status: 500,
+      body: {
+        success: false,
+        error: err instanceof Error ? err.message : String(err)
+      }
+    };
+  }
+}
 function createNotFoundResponse() {
   return {
     status: 404,
@@ -5890,6 +6023,9 @@ async function routeRequest(req, ctx) {
     if (req.path === "/mcp/batch" && req.method === "POST") {
       return handleMcpBatchRoute(req, ctx);
     }
+    if (req.path === "/batch-operation" && req.method === "POST") {
+      return handleBatchOperationRoute(req, ctx);
+    }
     return createNotFoundResponse();
   } catch (err) {
     return createErrorResponse2(err);
@@ -5931,11 +6067,13 @@ function createDedicatedServerInstance(config, tools, callTool, state, mcpServer
   const defaultHeaders = getDefaultHeaders(config.cors);
   const registry = config.tools;
   const webhookRegistry = config.webhooks;
+  const batchOperationRegistry = config.batchOperations;
   const ctx = {
     config,
     tools,
     registry,
     webhookRegistry,
+    batchOperationRegistry,
     callTool,
     state,
     mcpServer,
@@ -6050,12 +6188,14 @@ function createServerlessInstance(config, tools, callTool, state, mcpServer) {
   const defaultHeaders = getDefaultHeaders(config.cors);
   const registry = config.tools;
   const webhookRegistry = config.webhooks;
+  const batchOperationRegistry = config.batchOperations;
   let hasLoggedStartup = false;
   const ctx = {
     config,
     tools,
     registry,
     webhookRegistry,
+    batchOperationRegistry,
     callTool,
     state,
     mcpServer,
@@ -6353,6 +6493,9 @@ function defineNavigation(navigation) {
 function defineSetupStep(step) {
   return step;
 }
+function defineBatchOperation(operation) {
+  return operation;
+}
 
 // src/config/schema-loader.ts
 var fs4 = __toESM(require("fs"));
@@ -8401,7 +8544,15 @@ var WaitInputRelativeSchema = import_v413.z.object({
   mode: import_v413.z.literal("relative"),
   amount: import_v413.z.number(),
   unit: WaitUnitSchema,
-  windows: import_v413.z.array(TimeWindowSlotSchema).optional()
+  windows: import_v413.z.array(TimeWindowSlotSchema).optional(),
+  /**
+   * Optional ISO datetime to use as the base for the relative delay instead of
+   * wall-clock `now`. Used for cadence chaining (schedule relative to a prior
+   * message's scheduledAt). `waitTime` is still measured from wall-clock `now`.
+   */
+  from: import_v413.z.union([import_v413.z.string(), import_v413.z.date()]).optional().describe(
+    "ISO datetime base for the relative delay (e.g. previous message scheduledAt)"
+  )
 });
 var WaitInputAbsoluteSchema = import_v413.z.object({
   mode: import_v413.z.literal("absolute"),
@@ -8514,10 +8665,12 @@ function calculateWaitTime(step, now) {
       };
     }
     case "relative": {
+      const baseTime = step.from != null ? new Date(step.from).getTime() : nowTime;
+      const baseDate = new Date(baseTime);
       if (!step.amount && (!step.windows || step.windows.length === 0)) {
         return {
-          waitTime: 0,
-          scheduledAt: now
+          waitTime: Math.max(0, baseTime - nowTime),
+          scheduledAt: baseDate
         };
       }
       let relativeDelay = 0;
@@ -8556,17 +8709,18 @@ function calculateWaitTime(step, now) {
         }
       }
       if (!step.windows || step.windows.length === 0) {
+        const scheduledAt = new Date(baseTime + relativeDelay);
         return {
-          waitTime: relativeDelay,
-          scheduledAt: new Date(nowTime + relativeDelay)
+          waitTime: Math.max(0, scheduledAt.getTime() - nowTime),
+          scheduledAt
         };
       }
-      const targetDate = new Date(nowTime + relativeDelay);
+      const targetDate = new Date(baseTime + relativeDelay);
       for (const window of step.windows) {
         if (isTimeInWindowSlot(targetDate, window)) {
           return {
-            waitTime: relativeDelay,
-            scheduledAt: new Date(nowTime + relativeDelay)
+            waitTime: Math.max(0, targetDate.getTime() - nowTime),
+            scheduledAt: targetDate
           };
         }
       }
@@ -8611,8 +8765,8 @@ function calculateWaitTime(step, now) {
           msUntilWindowStart = daysMs + hoursAdjustment + minutesAdjustment;
         }
         const windowStartTimeMs = targetDate.getTime() + msUntilWindowStart;
-        const sameLocalDayAsNow = getLocalDateKey(now, tz) === getLocalDateKey(targetDate, tz);
-        const windowScheduledTime = sameLocalDayAsNow ? new Date(windowStartTimeMs + relativeDelay) : new Date(windowStartTimeMs);
+        const sameLocalDayAsBase = getLocalDateKey(baseDate, tz) === getLocalDateKey(targetDate, tz);
+        const windowScheduledTime = sameLocalDayAsBase ? new Date(windowStartTimeMs + relativeDelay) : new Date(windowStartTimeMs);
         const waitFromNow = windowScheduledTime.getTime() - nowTime;
         if (waitFromNow < earliestWaitFromNow) {
           earliestWaitFromNow = waitFromNow;
@@ -8787,6 +8941,10 @@ var index_default = { z: import_v414.z };
   AssociationSchema,
   AuthenticationError,
   BaseEventPayloadSchema,
+  BatchOperationDefinitionSchema,
+  BatchOperationIterateResultSchema,
+  BatchOperationSetupResultSchema,
+  BatchPaginationSchema,
   BreadcrumbItemSchema,
   CRMCardinalitySchema,
   CRMContextSchema,
@@ -9038,6 +9196,7 @@ var index_default = { z: import_v414.z };
   cron,
   defaultShouldRetry,
   defineAgent,
+  defineBatchOperation,
   defineChannel,
   defineConfig,
   defineEntity,

package/dist/scheduling/calculateWaitTime.d.ts

@@ -9,8 +9,10 @@
 import type { WaitInputType, CalculateWaitTimeResult } from './types-workflow';
 /**
  * Calculate the wait time for a wait step
- * @param step The input parameters for the wait step
- * @param now The current date/time
+ * @param step The input parameters for the wait step. Relative mode may include
+ *   optional `from` (ISO datetime / Date) as the base for the delay instead of `now`.
+ * @param now Wall-clock current date/time. Used as the default relative base and
+ *   always used to compute `waitTime` (ms until `scheduledAt`).
  * @returns The time to wait in milliseconds and the scheduled date
  */
 export declare function calculateWaitTime(step: WaitInputType, now: Date): CalculateWaitTimeResult;

package/dist/scheduling/index.js

@@ -128,10 +128,12 @@ function calculateWaitTime(step, now) {
       };
     }
     case "relative": {
+      const baseTime = step.from != null ? new Date(step.from).getTime() : nowTime;
+      const baseDate = new Date(baseTime);
       if (!step.amount && (!step.windows || step.windows.length === 0)) {
         return {
-          waitTime: 0,
-          scheduledAt: now
+          waitTime: Math.max(0, baseTime - nowTime),
+          scheduledAt: baseDate
         };
       }
       let relativeDelay = 0;
@@ -170,17 +172,18 @@ function calculateWaitTime(step, now) {
         }
       }
       if (!step.windows || step.windows.length === 0) {
+        const scheduledAt = new Date(baseTime + relativeDelay);
         return {
-          waitTime: relativeDelay,
-          scheduledAt: new Date(nowTime + relativeDelay)
+          waitTime: Math.max(0, scheduledAt.getTime() - nowTime),
+          scheduledAt
         };
       }
-      const targetDate = new Date(nowTime + relativeDelay);
+      const targetDate = new Date(baseTime + relativeDelay);
       for (const window of step.windows) {
         if (isTimeInWindowSlot(targetDate, window)) {
           return {
-            waitTime: relativeDelay,
-            scheduledAt: new Date(nowTime + relativeDelay)
+            waitTime: Math.max(0, targetDate.getTime() - nowTime),
+            scheduledAt: targetDate
           };
         }
       }
@@ -225,8 +228,8 @@ function calculateWaitTime(step, now) {
           msUntilWindowStart = daysMs + hoursAdjustment + minutesAdjustment;
         }
         const windowStartTimeMs = targetDate.getTime() + msUntilWindowStart;
-        const sameLocalDayAsNow = getLocalDateKey(now, tz) === getLocalDateKey(targetDate, tz);
-        const windowScheduledTime = sameLocalDayAsNow ? new Date(windowStartTimeMs + relativeDelay) : new Date(windowStartTimeMs);
+        const sameLocalDayAsBase = getLocalDateKey(baseDate, tz) === getLocalDateKey(targetDate, tz);
+        const windowScheduledTime = sameLocalDayAsBase ? new Date(windowStartTimeMs + relativeDelay) : new Date(windowStartTimeMs);
         const waitFromNow = windowScheduledTime.getTime() - nowTime;
         if (waitFromNow < earliestWaitFromNow) {
           earliestWaitFromNow = waitFromNow;