@hatchet-dev/typescript-sdk 1.13.1 → 1.14.0

package/v1/client/features/crons.d.ts

@@ -1,7 +1,7 @@
 import { CronWorkflows, CronWorkflowsList } from '../../../clients/rest/generated/data-contracts';
 import { z } from 'zod';
-import { Workflow } from '../../../workflow';
 import { BaseWorkflowDeclaration } from '../..';
+import type { LegacyWorkflow } from '../../../legacy/legacy-transformer';
 import { HatchetClient } from '../client';
 import { WorkflowsClient } from './workflows';
 /**
@@ -52,7 +52,7 @@ export declare class CronClient {
      * @returns A promise that resolves to the created CronWorkflows object.
      * @throws Will throw an error if the input is invalid or the API call fails.
      */
-    create(workflow: string | Workflow | BaseWorkflowDeclaration<any, any>, cron: CreateCronInput): Promise<CronWorkflows>;
+    create(workflow: string | BaseWorkflowDeclaration<any, any> | LegacyWorkflow, cron: CreateCronInput): Promise<CronWorkflows>;
     /**
      * Deletes an existing Cron Trigger.
      * @param cron - The Cron Trigger ID as a string or CronWorkflows object.
@@ -65,7 +65,7 @@ export declare class CronClient {
      * @returns A promise that resolves to a CronWorkflowsList object.
      */
     list(query: Parameters<typeof this.api.cronWorkflowList>[1] & {
-        workflow?: string | Workflow | BaseWorkflowDeclaration<any, any>;
+        workflow?: string | BaseWorkflowDeclaration<any, any> | LegacyWorkflow;
     }): Promise<CronWorkflowsList>;
     /**
      * Retrieves a specific Cron Trigger by its ID.

package/v1/client/features/crons.js

@@ -68,7 +68,7 @@ class CronClient {
     create(workflow, cron) {
         return __awaiter(this, void 0, void 0, function* () {
             var _a, _b, _c;
-            const workflowId = (0, apply_namespace_1.applyNamespace)((0, workflows_1.workflowNameString)(workflow), this.namespace);
+            const workflowId = (0, apply_namespace_1.applyNamespace)((0, workflows_1.workflowNameString)(workflow), this.namespace).toLowerCase();
             // Validate cron input with zod schema
             try {
                 const parsedCron = exports.CreateCronTriggerSchema.parse(cron);
@@ -112,7 +112,7 @@ class CronClient {
         return __awaiter(this, void 0, void 0, function* () {
             const { workflow } = query, rest = __rest(query, ["workflow"]);
             if (workflow) {
-                const workflowId = yield this.workflows.getWorkflowIdFromName((0, apply_namespace_1.applyNamespace)((0, workflows_1.workflowNameString)(workflow), this.namespace));
+                const workflowId = yield this.workflows.getWorkflowIdFromName((0, apply_namespace_1.applyNamespace)((0, workflows_1.workflowNameString)(workflow), this.namespace).toLowerCase());
                 rest.workflowId = workflowId;
             }
             const response = yield this.api.cronWorkflowList(this.tenantId, rest);

package/v1/client/features/schedules.js

@@ -73,7 +73,7 @@ class ScheduleClient {
     create(workflow, cron) {
         return __awaiter(this, void 0, void 0, function* () {
             var _a, _b, _c;
-            const workflowId = (0, apply_namespace_1.applyNamespace)((0, workflows_1.workflowNameString)(workflow), this.namespace);
+            const workflowId = (0, apply_namespace_1.applyNamespace)((0, workflows_1.workflowNameString)(workflow), this.namespace).toLowerCase();
             // Validate cron input with zod schema
             try {
                 const parsedCron = exports.CreateScheduledRunTriggerSchema.parse(cron);
@@ -144,7 +144,7 @@ class ScheduleClient {
         return __awaiter(this, void 0, void 0, function* () {
             const { workflow } = query, rest = __rest(query, ["workflow"]);
             if (workflow) {
-                const workflowId = yield this.workflows.getWorkflowIdFromName((0, apply_namespace_1.applyNamespace)((0, workflows_1.workflowNameString)(workflow), this.namespace));
+                const workflowId = yield this.workflows.getWorkflowIdFromName((0, apply_namespace_1.applyNamespace)((0, workflows_1.workflowNameString)(workflow), this.namespace).toLowerCase());
                 rest.workflowId = workflowId;
             }
             const response = yield this.api.workflowScheduledList(this.tenantId, rest);

package/v1/client/features/workflows.d.ts

@@ -1,7 +1,7 @@
-import { Workflow } from '../../../workflow';
 import { BaseWorkflowDeclaration, WorkflowDefinition } from '../..';
+import type { LegacyWorkflow } from '../../../legacy/legacy-transformer';
 import { HatchetClient } from '../client';
-export declare const workflowNameString: (workflow: string | Workflow | WorkflowDefinition | BaseWorkflowDeclaration<any, any>) => string;
+export declare const workflowNameString: (workflow: string | WorkflowDefinition | BaseWorkflowDeclaration<any, any> | LegacyWorkflow) => string;
 /**
  * WorkflowsClient is used to list and manage workflows
  */
@@ -17,8 +17,8 @@ export declare class WorkflowsClient {
      * @param workflow - The workflow name, ID, or object.
      * @returns The workflow ID as a string.
      */
-    getWorkflowIdFromName(workflow: string | Workflow | WorkflowDefinition | BaseWorkflowDeclaration<any, any>): Promise<string>;
-    get(workflow: string | BaseWorkflowDeclaration<any, any> | Workflow): Promise<import("../../../clients/rest/generated/data-contracts").Workflow>;
+    getWorkflowIdFromName(workflow: string | WorkflowDefinition | BaseWorkflowDeclaration<any, any> | LegacyWorkflow): Promise<string>;
+    get(workflow: string | BaseWorkflowDeclaration<any, any> | LegacyWorkflow): Promise<import("../../../clients/rest/generated/data-contracts").Workflow>;
     list(opts?: Parameters<typeof this.api.workflowList>[1]): Promise<import("../../../clients/rest/generated/data-contracts").WorkflowList>;
-    delete(workflow: string | BaseWorkflowDeclaration<any, any> | Workflow): Promise<void>;
+    delete(workflow: string | BaseWorkflowDeclaration<any, any> | LegacyWorkflow): Promise<void>;
 }

package/v1/client/features/workflows.js

@@ -10,15 +10,20 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.WorkflowsClient = exports.workflowNameString = void 0;
+const legacy_transformer_1 = require("../../../legacy/legacy-transformer");
 const uuid_1 = require("../../../util/uuid");
 const workflowNameString = (workflow) => {
     if (typeof workflow === 'string') {
         return workflow;
     }
-    if (typeof workflow === 'object' && 'id' in workflow) {
+    if (typeof workflow === 'object' && 'name' in workflow) {
+        return workflow.name;
+    }
+    if ((0, legacy_transformer_1.isLegacyWorkflow)(workflow)) {
+        (0, legacy_transformer_1.warnLegacyWorkflow)();
         return workflow.id;
     }
-    return workflow.name;
+    throw new Error('Invalid workflow: must be a string, Workflow object, or WorkflowDefinition object');
 };
 exports.workflowNameString = workflowNameString;
 /**
@@ -52,12 +57,6 @@ class WorkflowsClient {
                 if (typeof workflow === 'object' && 'name' in workflow) {
                     return workflow.name;
                 }
-                if (typeof workflow === 'object' && 'id' in workflow) {
-                    if (!workflow.id) {
-                        throw new Error('Workflow ID is required');
-                    }
-                    return workflow.id;
-                }
                 throw new Error('Invalid workflow: must be a string, Workflow object, or WorkflowDefinition object');
             })();
             if (!(0, uuid_1.isValidUUID)(str)) {

package/v1/client/worker/context.d.ts

@@ -6,10 +6,10 @@ import WorkflowRunRef from '../../../util/workflow-run-ref';
 import { Conditions } from '../../conditions';
 import { CreateWorkflowDurableTaskOpts, CreateWorkflowTaskOpts } from '../../task';
 import { OutputType } from '../../types';
-import { Workflow } from '../../../workflow';
 import { HatchetClient } from '../..';
-import { ContextWorker, NextStep } from '../../../step';
-import { V1Worker } from './worker-internal';
+import { WorkerLabels } from '../../../clients/dispatcher/dispatcher-client';
+import { NextStep } from '../../../legacy/step';
+import { InternalWorker } from './worker-internal';
 import { Duration } from '../duration';
 type TriggerData = Record<string, Record<string, any>>;
 type ChildRunOpts = RunOpts & {
@@ -28,6 +28,35 @@ interface ContextData<T, K> {
     user_data: K;
     step_run_errors: Record<string, string>;
 }
+/**
+ * ContextWorker is a wrapper around the V1Worker class that provides a more user-friendly interface for the worker from the context of a run.
+ */
+export declare class ContextWorker {
+    private worker;
+    constructor(worker: InternalWorker);
+    /**
+     * Gets the ID of the worker.
+     * @returns The ID of the worker.
+     */
+    id(): string | undefined;
+    /**
+     * Checks if the worker has a registered workflow.
+     * @param workflowName - The name of the workflow to check.
+     * @returns True if the workflow is registered, otherwise false.
+     */
+    hasWorkflow(workflowName: string): boolean;
+    /**
+     * Gets the current state of the worker labels.
+     * @returns The labels of the worker.
+     */
+    labels(): WorkerLabels;
+    /**
+     * Upserts the a set of labels on the worker.
+     * @param labels - The labels to upsert.
+     * @returns A promise that resolves when the labels have been upserted.
+     */
+    upsertLabels(labels: WorkerLabels): Promise<WorkerLabels>;
+}
 export declare class Context<T, K = {}> {
     data: ContextData<T, K>;
     input: T;
@@ -39,9 +68,19 @@ export declare class Context<T, K = {}> {
     _logger: Logger;
     spawnIndex: number;
     streamIndex: number;
-    constructor(action: Action, v1: HatchetClient, worker: V1Worker);
+    constructor(action: Action, v1: HatchetClient, worker: InternalWorker);
     get abortController(): AbortController;
     get cancelled(): boolean;
+    protected throwIfCancelled(): void;
+    /**
+     * Helper for broad `catch` blocks so cancellation isn't accidentally swallowed.
+     *
+     * Example:
+     * ```ts
+     * try { ... } catch (e) { ctx.rethrowIfCancelled(e); ... }
+     * ```
+     */
+    rethrowIfCancelled(err: unknown): void;
     cancel(): Promise<void>;
     /**
      * Retrieves the output of a parent task.
@@ -165,7 +204,7 @@ export declare class Context<T, K = {}> {
      * @returns A list of workflow run references to the enqueued runs.
      */
     bulkRunNoWaitChildren<Q extends JsonObject = any, P extends JsonObject = any>(children: Array<{
-        workflow: string | Workflow | WorkflowV1<Q, P>;
+        workflow: string | WorkflowV1<Q, P>;
         input: Q;
         options?: ChildRunOpts;
     }>): Promise<WorkflowRunRef<P>[]>;
@@ -175,7 +214,7 @@ export declare class Context<T, K = {}> {
      * @returns A list of results from the children workflows.
      */
     bulkRunChildren<Q extends JsonObject = any, P extends JsonObject = any>(children: Array<{
-        workflow: string | Workflow | WorkflowV1<Q, P>;
+        workflow: string | WorkflowV1<Q, P>;
         input: Q;
         options?: ChildRunOpts;
     }>): Promise<P[]>;
@@ -187,7 +226,7 @@ export declare class Context<T, K = {}> {
      * @param options - An options object containing key, sticky, priority, and additionalMetadata.
      * @returns The result of the workflow.
      */
-    runChild<Q extends JsonObject, P extends JsonObject>(workflow: string | Workflow | WorkflowV1<Q, P> | TaskWorkflowDeclaration<Q, P>, input: Q, options?: ChildRunOpts): Promise<P>;
+    runChild<Q extends JsonObject, P extends JsonObject>(workflow: string | WorkflowV1<Q, P> | TaskWorkflowDeclaration<Q, P>, input: Q, options?: ChildRunOpts): Promise<P>;
     /**
      * Enqueues a new workflow without waiting for its result.
      *
@@ -196,7 +235,7 @@ export declare class Context<T, K = {}> {
      * @param options - An options object containing key, sticky, priority, and additionalMetadata.
      * @returns A reference to the spawned workflow run.
      */
-    runNoWaitChild<Q extends JsonObject, P extends JsonObject>(workflow: string | Workflow | WorkflowV1<Q, P>, input: Q, options?: ChildRunOpts): Promise<WorkflowRunRef<P>>;
+    runNoWaitChild<Q extends JsonObject, P extends JsonObject>(workflow: string | WorkflowV1<Q, P>, input: Q, options?: ChildRunOpts): Promise<WorkflowRunRef<P>>;
     /**
      * Retrieves additional metadata associated with the current workflow run.
      * @returns A record of metadata key-value pairs.
@@ -246,7 +285,7 @@ export declare class Context<T, K = {}> {
      * @deprecated Use bulkRunNoWaitChildren or bulkRunChildren instead.
      */
     spawnWorkflows<Q extends JsonObject = any, P extends JsonObject = any>(workflows: Array<{
-        workflow: string | Workflow | WorkflowV1<Q, P>;
+        workflow: string | WorkflowV1<Q, P>;
         input: Q;
         options?: ChildRunOpts;
     }>): Promise<WorkflowRunRef<P>[]>;
@@ -259,7 +298,7 @@ export declare class Context<T, K = {}> {
      * @returns A reference to the spawned workflow run.
      * @deprecated Use runChild or runNoWaitChild instead.
      */
-    spawnWorkflow<Q extends JsonObject, P extends JsonObject>(workflow: string | Workflow | WorkflowV1<Q, P> | TaskWorkflowDeclaration<Q, P>, input: Q, options?: ChildRunOpts): Promise<WorkflowRunRef<P>>;
+    spawnWorkflow<Q extends JsonObject, P extends JsonObject>(workflow: string | WorkflowV1<Q, P> | TaskWorkflowDeclaration<Q, P>, input: Q, options?: ChildRunOpts): Promise<WorkflowRunRef<P>>;
     _incrementStreamIndex(): number;
 }
 export declare class DurableContext<T, K = {}> extends Context<T, K> {

package/v1/client/worker/context.js

@@ -12,7 +12,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.DurableContext = exports.Context = void 0;
+exports.DurableContext = exports.Context = exports.ContextWorker = void 0;
 /* eslint-disable no-underscore-dangle */
 /* eslint-disable max-classes-per-file */
 const declaration_1 = require("../../declaration");
@@ -21,8 +21,47 @@ const parse_1 = require("../../../util/parse");
 const conditions_1 = require("../../conditions");
 const transformer_1 = require("../../conditions/transformer");
 const condition_1 = require("../../../protoc/v1/shared/condition");
-const step_1 = require("../../../step");
 const apply_namespace_1 = require("../../../util/apply-namespace");
+const abort_error_1 = require("../../../util/abort-error");
+/**
+ * ContextWorker is a wrapper around the V1Worker class that provides a more user-friendly interface for the worker from the context of a run.
+ */
+class ContextWorker {
+    constructor(worker) {
+        this.worker = worker;
+    }
+    /**
+     * Gets the ID of the worker.
+     * @returns The ID of the worker.
+     */
+    id() {
+        return this.worker.workerId;
+    }
+    /**
+     * Checks if the worker has a registered workflow.
+     * @param workflowName - The name of the workflow to check.
+     * @returns True if the workflow is registered, otherwise false.
+     */
+    hasWorkflow(workflowName) {
+        return !!this.worker.workflow_registry.find((workflow) => 'id' in workflow ? workflow.id === workflowName : workflow.name === workflowName);
+    }
+    /**
+     * Gets the current state of the worker labels.
+     * @returns The labels of the worker.
+     */
+    labels() {
+        return this.worker.labels;
+    }
+    /**
+     * Upserts the a set of labels on the worker.
+     * @param labels - The labels to upsert.
+     * @returns A promise that resolves when the labels have been upserted.
+     */
+    upsertLabels(labels) {
+        return this.worker.upsertLabels(labels);
+    }
+}
+exports.ContextWorker = ContextWorker;
 class Context {
     constructor(action, v1, worker) {
         // @deprecated use ctx.abortController instead
@@ -35,7 +74,7 @@ class Context {
             this.data = data;
             this.action = action;
             this.v1 = v1;
-            this.worker = new step_1.ContextWorker(worker);
+            this.worker = new ContextWorker(worker);
             this._logger = v1.config.logger(`Context Logger`, v1.config.log_level);
             // if this is a getGroupKeyRunId, the data is the workflow input
             if (action.getGroupKeyRunId !== '') {
@@ -56,6 +95,22 @@ class Context {
     get cancelled() {
         return this.controller.signal.aborted;
     }
+    throwIfCancelled() {
+        if (this.abortController.signal.aborted) {
+            throw (0, abort_error_1.createAbortError)('Operation cancelled by AbortSignal');
+        }
+    }
+    /**
+     * Helper for broad `catch` blocks so cancellation isn't accidentally swallowed.
+     *
+     * Example:
+     * ```ts
+     * try { ... } catch (e) { ctx.rethrowIfCancelled(e); ... }
+     * ```
+     */
+    rethrowIfCancelled(err) {
+        (0, abort_error_1.rethrowIfAborted)(err);
+    }
     cancel() {
         return __awaiter(this, void 0, void 0, function* () {
             yield this.v1.runs.cancel({
@@ -263,7 +318,7 @@ class Context {
                 this._logger.warn('cannot refresh timeout from context without stepRunId');
                 return;
             }
-            yield this.v1._v0.dispatcher.refreshTimeout(incrementBy, taskRunExternalId);
+            yield this.v1.dispatcher.refreshTimeout(incrementBy, taskRunExternalId);
         });
     }
     /**
@@ -273,7 +328,7 @@ class Context {
      */
     releaseSlot() {
         return __awaiter(this, void 0, void 0, function* () {
-            yield this.v1._v0.dispatcher.client.releaseSlot({
+            yield this.v1.dispatcher.client.releaseSlot({
                 taskRunExternalId: this.action.taskRunExternalId,
             });
         });
@@ -292,16 +347,17 @@ class Context {
                 return;
             }
             const index = this._incrementStreamIndex();
-            yield this.v1._v0.event.putStream(taskRunExternalId, data, index);
+            yield this.v1.events.putStream(taskRunExternalId, data, index);
         });
     }
     spawnOptions(workflow, options) {
+        this.throwIfCancelled();
         let workflowName;
         if (typeof workflow === 'string') {
             workflowName = workflow;
         }
         else {
-            workflowName = workflow.id;
+            workflowName = workflow.name;
         }
         const opts = options || {};
         const { sticky } = opts;
@@ -309,7 +365,7 @@ class Context {
             throw new hatchet_error_1.default(`Cannot run with sticky: workflow ${workflowName} is not registered on the worker`);
         }
         const { workflowRunId, taskRunExternalId } = this.action;
-        const finalOpts = Object.assign(Object.assign({}, options), { parentId: workflowRunId, parentTaskRunExternalId: taskRunExternalId, childIndex: this.spawnIndex, childKey: options === null || options === void 0 ? void 0 : options.key, desiredWorkerId: sticky ? this.worker.id() : undefined, _standaloneTaskName: workflow instanceof declaration_1.TaskWorkflowDeclaration ? workflow._standalone_task_name : undefined });
+        const finalOpts = Object.assign(Object.assign({}, opts), { parentId: workflowRunId, parentTaskRunExternalId: taskRunExternalId, childIndex: this.spawnIndex, childKey: options === null || options === void 0 ? void 0 : options.key, desiredWorkerId: sticky ? this.worker.id() : undefined, _standaloneTaskName: workflow instanceof declaration_1.TaskWorkflowDeclaration ? workflow._standalone_task_name : undefined });
         this.spawnIndex += 1;
         return { workflowName, opts: finalOpts };
     }
@@ -318,6 +374,7 @@ class Context {
         return this.v1.admin.runWorkflow(workflowName, input, opts);
     }
     spawnBulk(children) {
+        this.throwIfCancelled();
         const workflows = children.map((child) => {
             const { workflowName, opts } = this.spawnOptions(child.workflow, child.options);
             return { workflowName, input: child.input, options: opts };
@@ -331,7 +388,12 @@ class Context {
      */
     bulkRunNoWaitChildren(children) {
         return __awaiter(this, void 0, void 0, function* () {
-            return this.spawnBulk(children);
+            const refs = yield this.spawnBulk(children);
+            refs.forEach((ref) => {
+                // eslint-disable-next-line no-param-reassign
+                ref.defaultSignal = this.abortController.signal;
+            });
+            return refs;
         });
     }
     /**
@@ -356,6 +418,9 @@ class Context {
     runChild(workflow, input, options) {
         return __awaiter(this, void 0, void 0, function* () {
             const run = yield this.spawn(workflow, input, options);
+            // Ensure waiting for the child result aborts when this task is cancelled.
+            // eslint-disable-next-line no-param-reassign
+            run.defaultSignal = this.abortController.signal;
             return run.output;
         });
     }
@@ -370,6 +435,7 @@ class Context {
     runNoWaitChild(workflow, input, options) {
         return __awaiter(this, void 0, void 0, function* () {
             const ref = yield this.spawn(workflow, input, options);
+            ref.defaultSignal = this.abortController.signal;
             return ref;
         });
     }
@@ -460,6 +526,7 @@ class Context {
      */
     spawnWorkflows(workflows) {
         return __awaiter(this, void 0, void 0, function* () {
+            this.throwIfCancelled();
             const { workflowRunId, taskRunExternalId } = this.action;
             const workflowRuns = workflows.map(({ workflow, input, options }) => {
                 let workflowName;
@@ -467,18 +534,22 @@ class Context {
                     workflowName = workflow;
                 }
                 else {
-                    workflowName = workflow.id;
+                    workflowName = workflow.name;
                 }
-                const name = (0, apply_namespace_1.applyNamespace)(workflowName, this.v1.config.namespace);
+                const name = (0, apply_namespace_1.applyNamespace)(workflowName, this.v1.config.namespace).toLowerCase();
                 const opts = options || {};
                 const { sticky } = opts;
                 if (sticky && !this.worker.hasWorkflow(name)) {
                     throw new hatchet_error_1.default(`Cannot run with sticky: workflow ${name} is not registered on the worker`);
                 }
+                // `signal` must never be sent over the wire.
+                const optsWithoutSignal = Object.assign({}, opts);
+                // eslint-disable-next-line @typescript-eslint/no-explicit-any
+                delete optsWithoutSignal.signal;
                 const resp = {
                     workflowName: name,
                     input,
-                    options: Object.assign(Object.assign({}, opts), { parentId: workflowRunId, parentTaskRunExternalId: taskRunExternalId, childIndex: this.spawnIndex, desiredWorkerId: sticky ? this.worker.id() : undefined }),
+                    options: Object.assign(Object.assign({}, optsWithoutSignal), { parentId: workflowRunId, parentTaskRunExternalId: taskRunExternalId, childIndex: this.spawnIndex, desiredWorkerId: sticky ? this.worker.id() : undefined }),
                 };
                 this.spawnIndex += 1;
                 return resp;
@@ -488,7 +559,7 @@ class Context {
                 let resp = [];
                 for (let i = 0; i < workflowRuns.length; i += batchSize) {
                     const batch = workflowRuns.slice(i, i + batchSize);
-                    const batchResp = yield this.v1._v0.admin.runWorkflows(batch);
+                    const batchResp = yield this.v1.admin.runWorkflows(batch);
                     resp = resp.concat(batchResp);
                 }
                 const res = [];
@@ -518,22 +589,23 @@ class Context {
      */
     spawnWorkflow(workflow, input, options) {
         return __awaiter(this, void 0, void 0, function* () {
+            this.throwIfCancelled();
             const { workflowRunId, taskRunExternalId } = this.action;
             let workflowName = '';
             if (typeof workflow === 'string') {
                 workflowName = workflow;
             }
             else {
-                workflowName = workflow.id;
+                workflowName = workflow.name;
             }
-            const name = (0, apply_namespace_1.applyNamespace)(workflowName, this.v1.config.namespace);
+            const name = (0, apply_namespace_1.applyNamespace)(workflowName, this.v1.config.namespace).toLowerCase();
             const opts = options || {};
             const { sticky } = opts;
             if (sticky && !this.worker.hasWorkflow(name)) {
                 throw new hatchet_error_1.default(`cannot run with sticky: workflow ${name} is not registered on the worker`);
             }
             try {
-                const resp = yield this.v1._v0.admin.runWorkflow(name, input, Object.assign({ parentId: workflowRunId, parentTaskRunExternalId: taskRunExternalId, childIndex: this.spawnIndex, desiredWorkerId: sticky ? this.worker.id() : undefined }, opts));
+                const resp = yield this.v1.admin.runWorkflow(name, input, Object.assign({ parentId: workflowRunId, parentTaskRunExternalId: taskRunExternalId, childIndex: this.spawnIndex, desiredWorkerId: sticky ? this.worker.id() : undefined }, opts));
                 this.spawnIndex += 1;
                 if (workflow instanceof declaration_1.TaskWorkflowDeclaration) {
                     resp._standaloneTaskName = workflow._standalone_task_name;
@@ -576,20 +648,20 @@ class DurableContext extends Context {
      */
     waitFor(conditions) {
         return __awaiter(this, void 0, void 0, function* () {
+            this.throwIfCancelled();
             const pbConditions = (0, transformer_1.conditionsToPb)((0, conditions_1.Render)(condition_1.Action.CREATE, conditions));
             // eslint-disable-next-line no-plusplus
             const key = `waitFor-${this.waitKey++}`;
-            yield this.v1._v0.durableListener.registerDurableEvent({
+            yield this.v1.durableListener.registerDurableEvent({
                 taskId: this.action.taskRunExternalId,
                 signalKey: key,
                 sleepConditions: pbConditions.sleepConditions,
                 userEventConditions: pbConditions.userEventConditions,
             });
-            const listener = this.v1._v0.durableListener.subscribe({
+            const event = yield this.v1.durableListener.result({
                 taskId: this.action.taskRunExternalId,
                 signalKey: key,
-            });
-            const event = yield listener.get();
+            }, { signal: this.abortController.signal });
             // Convert event.data from Uint8Array to string if needed
             const eventData = event.data instanceof Uint8Array ? new TextDecoder().decode(event.data) : event.data;
             const res = JSON.parse(eventData);

package/v1/client/worker/deprecated/legacy-v1-worker.d.ts

@@ -4,10 +4,10 @@
  */
 import { ActionListener } from '../../../../clients/dispatcher/action-listener';
 import { HatchetClient } from '../../..';
-import { V1Worker } from '../worker-internal';
-export declare class LegacyV1Worker extends V1Worker {
+import { InternalWorker } from '../worker-internal';
+export declare class LegacyV1Worker extends InternalWorker {
     private _legacySlotCount;
-    constructor(client: HatchetClient, options: ConstructorParameters<typeof V1Worker>[1], legacySlots: number);
+    constructor(client: HatchetClient, options: ConstructorParameters<typeof InternalWorker>[1], legacySlots: number);
     /**
      * Override registration to use the legacy `slots` proto field.
      */

package/v1/client/worker/deprecated/legacy-v1-worker.js

@@ -16,7 +16,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.LegacyV1Worker = void 0;
 const worker_internal_1 = require("../worker-internal");
 const legacy_registration_1 = require("./legacy-registration");
-class LegacyV1Worker extends worker_internal_1.V1Worker {
+class LegacyV1Worker extends worker_internal_1.InternalWorker {
     constructor(client, options, legacySlots) {
         super(client, options);
         this._legacySlotCount = legacySlots;
@@ -26,7 +26,7 @@ class LegacyV1Worker extends worker_internal_1.V1Worker {
      */
     createListener() {
         return __awaiter(this, void 0, void 0, function* () {
-            return (0, legacy_registration_1.legacyGetActionListener)(this.client._v0.dispatcher, {
+            return (0, legacy_registration_1.legacyGetActionListener)(this.client.dispatcher, {
                 workerName: this.name,
                 services: ['default'],
                 actions: Object.keys(this.action_registry),

package/v1/client/worker/deprecated/legacy-worker.js

@@ -18,10 +18,12 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.LegacyDualWorker = void 0;
 exports.isLegacyEngine = isLegacyEngine;
+/* eslint-disable no-underscore-dangle */
 const nice_grpc_1 = require("nice-grpc");
 const declaration_1 = require("../../../declaration");
 const legacy_v1_worker_1 = require("./legacy-v1-worker");
 const deprecation_1 = require("./deprecation");
+const legacy_transformer_1 = require("../../../../legacy/legacy-transformer");
 const DEFAULT_DEFAULT_SLOTS = 100;
 const DEFAULT_DURABLE_SLOTS = 1000;
 /** The date when slot_config support was released. */
@@ -40,10 +42,10 @@ const LEGACY_ENGINE_MESSAGE = 'Connected to an older Hatchet engine that does no
 function isLegacyEngine(v1) {
     return __awaiter(this, void 0, void 0, function* () {
         try {
-            const version = yield v1._v0.dispatcher.getVersion();
+            const version = yield v1.dispatcher.getVersion();
             // If the version is empty or older than the minimum, treat as legacy
             if (!version || (0, deprecation_1.semverLessThan)(version, MIN_SLOT_CONFIG_VERSION)) {
-                const logger = v1._v0.config.logger('Worker', v1._v0.config.log_level);
+                const logger = v1.config.logger('Worker', v1.config.log_level);
                 (0, deprecation_1.emitDeprecationNotice)('legacy-engine', LEGACY_ENGINE_MESSAGE, LEGACY_ENGINE_START, logger, {
                     errorDays: 180,
                 });
@@ -53,7 +55,7 @@ function isLegacyEngine(v1) {
         }
         catch (e) {
             if ((e === null || e === void 0 ? void 0 : e.code) === nice_grpc_1.Status.UNIMPLEMENTED) {
-                const logger = v1._v0.config.logger('Worker', v1._v0.config.log_level);
+                const logger = v1.config.logger('Worker', v1.config.log_level);
                 (0, deprecation_1.emitDeprecationNotice)('legacy-engine', LEGACY_ENGINE_MESSAGE, LEGACY_ENGINE_START, logger, {
                     errorDays: 180,
                 });
@@ -105,16 +107,16 @@ class LegacyDualWorker {
             for (const wf of options.workflows || []) {
                 if (wf instanceof declaration_1.BaseWorkflowDeclaration) {
                     if (wf.definition._durableTasks.length > 0 && durableWorker) {
-                        yield durableWorker.registerWorkflowV1(wf);
-                        durableWorker.registerDurableActionsV1(wf.definition);
+                        yield durableWorker.registerWorkflow(wf);
+                        durableWorker.registerDurableActions(wf.definition);
                     }
                     else {
-                        yield nonDurable.registerWorkflowV1(wf);
+                        yield nonDurable.registerWorkflow(wf);
                     }
                 }
                 else {
                     // fallback to v0 client for backwards compatibility
-                    yield nonDurable.registerWorkflow(wf);
+                    yield nonDurable.registerWorkflow((0, legacy_transformer_1.transformLegacyWorkflow)(wf));
                 }
             }
             return legacyWorker;

package/v1/client/worker/slot-utils.d.ts

@@ -1,13 +1,13 @@
-import { Workflow as V0Workflow } from '../../../workflow';
 import { BaseWorkflowDeclaration } from '../../declaration';
+import type { LegacyWorkflow } from '../../../legacy/legacy-transformer';
 import { SlotConfig } from '../../slot-types';
 export interface WorkerSlotOptions {
     /** (optional) Maximum number of concurrent runs on this worker, defaults to 100 */
     slots?: number;
     /** (optional) Maximum number of concurrent durable tasks, defaults to 1,000 */
     durableSlots?: number;
-    /** (optional) Array of workflows to register */
-    workflows?: BaseWorkflowDeclaration<any, any>[] | V0Workflow[];
+    /** (optional) Array of workflows to register (supports both v1 and legacy workflow formats) */
+    workflows?: Array<BaseWorkflowDeclaration<any, any> | LegacyWorkflow>;
     /** @deprecated Use slots instead */
     maxRuns?: number;
 }