@hotmeshio/hotmesh 0.10.1 → 0.11.0

package/README.md

@@ -11,7 +11,7 @@ npm install @hotmeshio/hotmesh
 ## Use HotMesh for
 
 - **Durable pipelines** — Orchestrate long-running, multi-step pipelines transactionally.
-- **Temporal alternative** — The `Durable` module provides a Temporal-compatible API (`Client`, `Worker`, `proxyActivities`, `sleepFor`, `startChild`, signals) that runs directly on Postgres. No app server required.
+- **Familiar Temporal syntax** — The `Durable` module provides a Temporal-compatible API (`Client`, `Worker`, `proxyActivities`, `sleepFor`, `startChild`, signals) that runs directly on Postgres. No app server required.
 - **Distributed state machines** — Build stateful applications where every component can [fail and recover](https://github.com/hotmeshio/sdk-typescript/blob/main/services/collator/README.md).
 - **AI and training pipelines** — Multi-step AI workloads where each stage is expensive and must not be repeated on failure. A crashed pipeline resumes from the last committed step, not from the beginning.
 

package/build/modules/errors.d.ts

@@ -52,6 +52,8 @@ declare class DurableChildError extends Error {
     parentWorkflowId: string;
     workflowId: string;
     workflowTopic: string;
+    taskQueue: string;
+    workflowName: string;
     type: string;
     constructor(params: DurableChildErrorType);
 }

package/build/modules/errors.js

@@ -54,6 +54,8 @@ class DurableChildError extends Error {
         this.arguments = params.arguments;
         this.workflowId = params.workflowId;
         this.workflowTopic = params.workflowTopic;
+        this.taskQueue = params.taskQueue;
+        this.workflowName = params.workflowName;
         this.parentWorkflowId = params.parentWorkflowId;
         this.expire = params.expire;
         this.persistent = params.persistent;

package/build/modules/key.js

@@ -143,7 +143,7 @@ class KeyService {
             case 'v':
                 return 'versions';
             case 'x':
-                return id === '' ? 'streams' : 'stream_topics';
+                return id === '' ? 'engine_streams' : 'worker_streams';
             case 'hooks':
                 return 'signal_patterns';
             case 'signals':
@@ -174,7 +174,8 @@ class KeyService {
                 return 's';
             case 'versions':
                 return 'v';
-            case 'streams':
+            case 'engine_streams':
+            case 'worker_streams':
                 return 'x';
             case 'signal_patterns':
                 return 'hooks';

package/build/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@hotmeshio/hotmesh",
-    "version": "0.10.1",
+    "version": "0.11.0",
     "description": "Permanent-Memory Workflows & AI Agents",
     "main": "./build/index.js",
     "types": "./build/index.d.ts",
@@ -46,6 +46,8 @@
         "test:durable:sleep": "vitest run tests/durable/sleep/postgres.test.ts",
         "test:durable:signal": "vitest run tests/durable/signal/postgres.test.ts",
         "test:durable:unknown": "vitest run tests/durable/unknown/postgres.test.ts",
+        "test:durable:exporter": "HMSH_LOGLEVEL=info vitest run tests/durable/exporter",
+        "test:durable:exporter:debug": "EXPORT_DEBUG=1 HMSH_LOGLEVEL=error vitest run tests/durable/basic/postgres.test.ts",
         "test:dba": "vitest run tests/dba",
         "test:cycle": "vitest run tests/functional/cycle",
         "test:functional": "vitest run tests/functional",

package/build/services/activities/worker.js

@@ -189,6 +189,15 @@ class Worker extends activity_1.Activity {
     }
     async execActivity(transaction) {
         const topic = pipe_1.Pipe.resolve(this.config.subtype, this.context);
+        // Extract workflow name from job data (set by durable client) or derive from subscribes
+        const jobData = this.context.data;
+        let wfn = jobData?.workflowName || '';
+        if (!wfn && this.config.subscribes) {
+            // Fallback: derive from subscribes by removing topic prefix
+            wfn = this.config.subscribes.startsWith(`${topic}-`)
+                ? this.config.subscribes.substring(topic.length + 1)
+                : this.config.subscribes;
+        }
         const streamData = {
             metadata: {
                 guid: (0, utils_1.guid)(),
@@ -197,6 +206,7 @@ class Worker extends activity_1.Activity {
                 dad: this.metadata.dad,
                 aid: this.metadata.aid,
                 topic,
+                wfn,
                 spn: this.context['$self'].output.metadata.l1s,
                 trc: this.context.metadata.trc,
             },

package/build/services/dba/index.d.ts

@@ -11,8 +11,9 @@ import { PostgresClientType } from '../../types/postgres';
  * | Table | What accumulates |
  * |---|---|
  * | `{appId}.jobs` | Completed/expired jobs with `expired_at` set |
- * | `{appId}.jobs_attributes` | Execution artifacts (`adata`, `hmark`, `jmark`, `status`, `other`) that are only needed during workflow execution |
- * | `{appId}.streams` | Processed stream messages with `expired_at` set |
+ * | `{appId}.jobs_attributes` | Execution artifacts (`adata`, `hmark`, `status`, `other`) that are only needed during workflow execution |
+ * | `{appId}.engine_streams` | Processed engine stream messages with `expired_at` set |
+ * | `{appId}.worker_streams` | Processed worker stream messages with `expired_at` set |
  *
  * The `DBA` service addresses this with two methods:
  *
@@ -22,10 +23,29 @@ import { PostgresClientType } from '../../types/postgres';
  * - {@link DBA.deploy | deploy()} — Pre-deploys the Postgres function
  *   (e.g., during CI/CD migrations) without running a prune.
  *
- * ## Independent cron schedules (TypeScript)
+ * ## Attribute stripping preserves export history
+ *
+ * Stripping removes `adata`, `hmark`, `status`, and `other` attributes
+ * from completed jobs while preserving:
+ * - `jdata` — workflow return data
+ * - `udata` — user-searchable data
+ * - `jmark` — timeline markers needed for Temporal-compatible export
+ *
+ * Set `keepHmark: true` to also preserve `hmark` (activity state markers).
+ *
+ * ## Entity-scoped pruning
  *
- * Each table can be targeted independently, allowing different retention
- * windows and schedules:
+ * Use `entities` to restrict pruning/stripping to specific entity types
+ * (e.g., `['book', 'author']`). Use `pruneTransient` to delete expired
+ * jobs with no entity (`entity IS NULL`).
+ *
+ * ## Idempotent stripping with `pruned_at`
+ *
+ * After stripping, jobs are marked with `pruned_at = NOW()`. Subsequent
+ * prune calls skip already-pruned jobs, making the operation idempotent
+ * and efficient for repeated scheduling.
+ *
+ * ## Independent cron schedules (TypeScript)
  *
  * @example
  * ```typescript
@@ -38,7 +58,6 @@ import { PostgresClientType } from '../../types/postgres';
  * };
  *
  * // Cron 1 — Nightly: strip execution artifacts from completed jobs
- * //          Keeps all jobs and their jdata/udata; keeps all streams.
  * await DBA.prune({
  *   appId: 'myapp', connection,
  *   jobs: false, streams: false, attributes: true,
@@ -51,29 +70,34 @@ import { PostgresClientType } from '../../types/postgres';
  *   jobs: false, streams: true,
  * });
  *
- * // Cron 3 — Weekly: remove expired jobs older than 30 days
+ * // Cron 3 — Weekly: remove expired 'book' jobs older than 30 days
  * await DBA.prune({
  *   appId: 'myapp', connection,
  *   expire: '30 days',
  *   jobs: true, streams: false,
+ *   entities: ['book'],
+ * });
+ *
+ * // Cron 4 — Weekly: remove transient (no entity) expired jobs
+ * await DBA.prune({
+ *   appId: 'myapp', connection,
+ *   expire: '7 days',
+ *   jobs: false, streams: false,
+ *   pruneTransient: true,
  * });
  * ```
  *
  * ## Direct SQL (schedulable via pg_cron)
  *
  * The underlying Postgres function can be called directly, without
- * the TypeScript SDK. Schedule it via `pg_cron`, `crontab`, or any
- * SQL client:
+ * the TypeScript SDK. The first 4 parameters are backwards-compatible:
  *
  * ```sql
  * -- Strip attributes only (keep all jobs and streams)
  * SELECT * FROM myapp.prune('0 seconds', false, false, true);
  *
- * -- Prune streams older than 24 hours (keep jobs)
- * SELECT * FROM myapp.prune('24 hours', false, true, false);
- *
- * -- Prune expired jobs older than 30 days (keep streams)
- * SELECT * FROM myapp.prune('30 days', true, false, false);
+ * -- Prune only 'book' entity jobs older than 30 days
+ * SELECT * FROM myapp.prune('30 days', true, false, false, ARRAY['book']);
  *
  * -- Prune everything older than 7 days and strip attributes
  * SELECT * FROM myapp.prune('7 days', true, true, true);
@@ -98,6 +122,12 @@ declare class DBA {
         client: PostgresClientType;
         release: () => Promise<void>;
     }>;
+    /**
+     * Returns migration SQL for the `pruned_at` column.
+     * Handles existing deployments that lack the column.
+     * @private
+     */
+    static getMigrationSQL(schema: string): string;
     /**
      * Returns the SQL for the server-side `prune()` function.
      * @private
@@ -105,7 +135,8 @@ declare class DBA {
     static getPruneFunctionSQL(schema: string): string;
     /**
      * Deploys the `prune()` Postgres function into the target schema.
-     * Idempotent — uses `CREATE OR REPLACE` and can be called repeatedly.
+     * Also runs schema migrations (e.g., adding `pruned_at` column).
+     * Idempotent — uses `CREATE OR REPLACE` and `IF NOT EXISTS`.
      *
      * The function is automatically deployed when {@link DBA.prune} is called,
      * but this method is exposed for explicit control (e.g., CI/CD
@@ -138,12 +169,15 @@ declare class DBA {
      *
      * Operations (each enabled individually):
      * 1. **jobs** — Hard-deletes expired jobs older than the retention
-     *    window (FK CASCADE removes their attributes automatically)
+     *    window (FK CASCADE removes their attributes automatically).
+     *    Scoped by `entities` when set.
      * 2. **streams** — Hard-deletes expired stream messages older than
      *    the retention window
      * 3. **attributes** — Strips non-essential attributes (`adata`,
-     *    `hmark`, `jmark`, `status`, `other`) from completed jobs,
-     *    retaining only `jdata` and `udata`
+     *    `hmark`, `status`, `other`) from completed, un-pruned jobs.
+     *    Preserves `jdata`, `udata`, and `jmark`. Marks stripped
+     *    jobs with `pruned_at` for idempotency.
+     * 4. **pruneTransient** — Deletes expired jobs with `entity IS NULL`
      *
      * @param options - Prune configuration
      * @returns Counts of deleted/stripped rows
@@ -153,7 +187,7 @@ declare class DBA {
      * import { Client as Postgres } from 'pg';
      * import { DBA } from '@hotmeshio/hotmesh';
      *
-     * // Strip attributes only — keep all jobs and streams
+     * // Strip attributes from 'book' entities only
      * await DBA.prune({
      *   appId: 'myapp',
      *   connection: {
@@ -163,6 +197,7 @@ declare class DBA {
      *   jobs: false,
      *   streams: false,
      *   attributes: true,
+     *   entities: ['book'],
      * });
      * ```
      */

package/build/services/dba/index.js

@@ -14,8 +14,9 @@ const postgres_1 = require("../connector/providers/postgres");
  * | Table | What accumulates |
  * |---|---|
  * | `{appId}.jobs` | Completed/expired jobs with `expired_at` set |
- * | `{appId}.jobs_attributes` | Execution artifacts (`adata`, `hmark`, `jmark`, `status`, `other`) that are only needed during workflow execution |
- * | `{appId}.streams` | Processed stream messages with `expired_at` set |
+ * | `{appId}.jobs_attributes` | Execution artifacts (`adata`, `hmark`, `status`, `other`) that are only needed during workflow execution |
+ * | `{appId}.engine_streams` | Processed engine stream messages with `expired_at` set |
+ * | `{appId}.worker_streams` | Processed worker stream messages with `expired_at` set |
  *
  * The `DBA` service addresses this with two methods:
  *
@@ -25,10 +26,29 @@ const postgres_1 = require("../connector/providers/postgres");
  * - {@link DBA.deploy | deploy()} — Pre-deploys the Postgres function
  *   (e.g., during CI/CD migrations) without running a prune.
  *
- * ## Independent cron schedules (TypeScript)
+ * ## Attribute stripping preserves export history
+ *
+ * Stripping removes `adata`, `hmark`, `status`, and `other` attributes
+ * from completed jobs while preserving:
+ * - `jdata` — workflow return data
+ * - `udata` — user-searchable data
+ * - `jmark` — timeline markers needed for Temporal-compatible export
+ *
+ * Set `keepHmark: true` to also preserve `hmark` (activity state markers).
+ *
+ * ## Entity-scoped pruning
+ *
+ * Use `entities` to restrict pruning/stripping to specific entity types
+ * (e.g., `['book', 'author']`). Use `pruneTransient` to delete expired
+ * jobs with no entity (`entity IS NULL`).
  *
- * Each table can be targeted independently, allowing different retention
- * windows and schedules:
+ * ## Idempotent stripping with `pruned_at`
+ *
+ * After stripping, jobs are marked with `pruned_at = NOW()`. Subsequent
+ * prune calls skip already-pruned jobs, making the operation idempotent
+ * and efficient for repeated scheduling.
+ *
+ * ## Independent cron schedules (TypeScript)
  *
  * @example
  * ```typescript
@@ -41,7 +61,6 @@ const postgres_1 = require("../connector/providers/postgres");
  * };
  *
  * // Cron 1 — Nightly: strip execution artifacts from completed jobs
- * //          Keeps all jobs and their jdata/udata; keeps all streams.
  * await DBA.prune({
  *   appId: 'myapp', connection,
  *   jobs: false, streams: false, attributes: true,
@@ -54,29 +73,34 @@ const postgres_1 = require("../connector/providers/postgres");
  *   jobs: false, streams: true,
  * });
  *
- * // Cron 3 — Weekly: remove expired jobs older than 30 days
+ * // Cron 3 — Weekly: remove expired 'book' jobs older than 30 days
  * await DBA.prune({
  *   appId: 'myapp', connection,
  *   expire: '30 days',
  *   jobs: true, streams: false,
+ *   entities: ['book'],
+ * });
+ *
+ * // Cron 4 — Weekly: remove transient (no entity) expired jobs
+ * await DBA.prune({
+ *   appId: 'myapp', connection,
+ *   expire: '7 days',
+ *   jobs: false, streams: false,
+ *   pruneTransient: true,
  * });
  * ```
  *
  * ## Direct SQL (schedulable via pg_cron)
  *
  * The underlying Postgres function can be called directly, without
- * the TypeScript SDK. Schedule it via `pg_cron`, `crontab`, or any
- * SQL client:
+ * the TypeScript SDK. The first 4 parameters are backwards-compatible:
  *
  * ```sql
  * -- Strip attributes only (keep all jobs and streams)
  * SELECT * FROM myapp.prune('0 seconds', false, false, true);
  *
- * -- Prune streams older than 24 hours (keep jobs)
- * SELECT * FROM myapp.prune('24 hours', false, true, false);
- *
- * -- Prune expired jobs older than 30 days (keep streams)
- * SELECT * FROM myapp.prune('30 days', true, false, false);
+ * -- Prune only 'book' entity jobs older than 30 days
+ * SELECT * FROM myapp.prune('30 days', true, false, false, ARRAY['book']);
  *
  * -- Prune everything older than 7 days and strip attributes
  * SELECT * FROM myapp.prune('7 days', true, true, true);
@@ -121,6 +145,20 @@ class DBA {
             release: async () => { },
         };
     }
+    /**
+     * Returns migration SQL for the `pruned_at` column.
+     * Handles existing deployments that lack the column.
+     * @private
+     */
+    static getMigrationSQL(schema) {
+        return `
+      ALTER TABLE ${schema}.jobs
+      ADD COLUMN IF NOT EXISTS pruned_at TIMESTAMP WITH TIME ZONE;
+
+      CREATE INDEX IF NOT EXISTS idx_jobs_pruned_at
+      ON ${schema}.jobs (pruned_at) WHERE pruned_at IS NULL;
+    `;
+    }
     /**
      * Returns the SQL for the server-side `prune()` function.
      * @private
@@ -131,12 +169,17 @@ class DBA {
         retention INTERVAL DEFAULT INTERVAL '7 days',
         prune_jobs BOOLEAN DEFAULT TRUE,
         prune_streams BOOLEAN DEFAULT TRUE,
-        strip_attributes BOOLEAN DEFAULT FALSE
+        strip_attributes BOOLEAN DEFAULT FALSE,
+        entity_list TEXT[] DEFAULT NULL,
+        prune_transient BOOLEAN DEFAULT FALSE,
+        keep_hmark BOOLEAN DEFAULT FALSE
       )
       RETURNS TABLE(
         deleted_jobs BIGINT,
         deleted_streams BIGINT,
-        stripped_attributes BIGINT
+        stripped_attributes BIGINT,
+        deleted_transient BIGINT,
+        marked_pruned BIGINT
       )
       LANGUAGE plpgsql
       AS $$
@@ -144,40 +187,84 @@ class DBA {
         v_deleted_jobs BIGINT := 0;
         v_deleted_streams BIGINT := 0;
         v_stripped_attributes BIGINT := 0;
+        v_deleted_transient BIGINT := 0;
+        v_marked_pruned BIGINT := 0;
+        v_temp_count BIGINT := 0;
       BEGIN
         -- 1. Hard-delete expired jobs older than the retention window.
         --    FK CASCADE on jobs_attributes handles attribute cleanup.
+        --    Optionally scoped to an entity allowlist.
         IF prune_jobs THEN
           DELETE FROM ${schema}.jobs
           WHERE expired_at IS NOT NULL
-            AND expired_at < NOW() - retention;
+            AND expired_at < NOW() - retention
+            AND (entity_list IS NULL OR entity = ANY(entity_list));
           GET DIAGNOSTICS v_deleted_jobs = ROW_COUNT;
         END IF;
 
-        -- 2. Hard-delete expired stream messages older than the retention window.
+        -- 2. Hard-delete transient (entity IS NULL) expired jobs.
+        IF prune_transient THEN
+          DELETE FROM ${schema}.jobs
+          WHERE entity IS NULL
+            AND expired_at IS NOT NULL
+            AND expired_at < NOW() - retention;
+          GET DIAGNOSTICS v_deleted_transient = ROW_COUNT;
+        END IF;
+
+        -- 3. Hard-delete expired stream messages older than the retention window.
+        --    Deletes from both engine_streams and worker_streams tables.
         IF prune_streams THEN
-          DELETE FROM ${schema}.streams
+          DELETE FROM ${schema}.engine_streams
           WHERE expired_at IS NOT NULL
             AND expired_at < NOW() - retention;
           GET DIAGNOSTICS v_deleted_streams = ROW_COUNT;
+
+          DELETE FROM ${schema}.worker_streams
+          WHERE expired_at IS NOT NULL
+            AND expired_at < NOW() - retention;
+          GET DIAGNOSTICS v_temp_count = ROW_COUNT;
+          v_deleted_streams := v_deleted_streams + v_temp_count;
         END IF;
 
-        -- 3. Optionally strip execution artifacts from completed, live jobs.
-        --    Retains jdata (workflow return data) and udata (searchable data).
+        -- 4. Strip execution artifacts from completed, live, un-pruned jobs.
+        --    Always preserves: jdata, udata, jmark (timeline/export history).
+        --    Optionally preserves: hmark (when keep_hmark is true).
         IF strip_attributes THEN
-          DELETE FROM ${schema}.jobs_attributes
-          WHERE job_id IN (
+          WITH target_jobs AS (
+            SELECT id FROM ${schema}.jobs
+            WHERE status = 0
+              AND is_live = TRUE
+              AND pruned_at IS NULL
+              AND (entity_list IS NULL OR entity = ANY(entity_list))
+          ),
+          deleted AS (
+            DELETE FROM ${schema}.jobs_attributes
+            WHERE job_id IN (SELECT id FROM target_jobs)
+              AND type NOT IN ('jdata', 'udata', 'jmark')
+              AND (keep_hmark = FALSE OR type <> 'hmark')
+            RETURNING job_id
+          )
+          SELECT COUNT(*) INTO v_stripped_attributes FROM deleted;
+
+          -- Mark pruned jobs so they are skipped on future runs.
+          WITH target_jobs AS (
             SELECT id FROM ${schema}.jobs
             WHERE status = 0
               AND is_live = TRUE
+              AND pruned_at IS NULL
+              AND (entity_list IS NULL OR entity = ANY(entity_list))
           )
-          AND type NOT IN ('jdata', 'udata');
-          GET DIAGNOSTICS v_stripped_attributes = ROW_COUNT;
+          UPDATE ${schema}.jobs
+          SET pruned_at = NOW()
+          WHERE id IN (SELECT id FROM target_jobs);
+          GET DIAGNOSTICS v_marked_pruned = ROW_COUNT;
         END IF;
 
         deleted_jobs := v_deleted_jobs;
         deleted_streams := v_deleted_streams;
         stripped_attributes := v_stripped_attributes;
+        deleted_transient := v_deleted_transient;
+        marked_pruned := v_marked_pruned;
         RETURN NEXT;
       END;
       $$;
@@ -185,7 +272,8 @@ class DBA {
     }
     /**
      * Deploys the `prune()` Postgres function into the target schema.
-     * Idempotent — uses `CREATE OR REPLACE` and can be called repeatedly.
+     * Also runs schema migrations (e.g., adding `pruned_at` column).
+     * Idempotent — uses `CREATE OR REPLACE` and `IF NOT EXISTS`.
      *
      * The function is automatically deployed when {@link DBA.prune} is called,
      * but this method is exposed for explicit control (e.g., CI/CD
@@ -214,6 +302,7 @@ class DBA {
         const schema = DBA.safeName(appId);
         const { client, release } = await DBA.getClient(connection);
         try {
+            await client.query(DBA.getMigrationSQL(schema));
             await client.query(DBA.getPruneFunctionSQL(schema));
         }
         finally {
@@ -227,12 +316,15 @@ class DBA {
      *
      * Operations (each enabled individually):
      * 1. **jobs** — Hard-deletes expired jobs older than the retention
-     *    window (FK CASCADE removes their attributes automatically)
+     *    window (FK CASCADE removes their attributes automatically).
+     *    Scoped by `entities` when set.
      * 2. **streams** — Hard-deletes expired stream messages older than
      *    the retention window
      * 3. **attributes** — Strips non-essential attributes (`adata`,
-     *    `hmark`, `jmark`, `status`, `other`) from completed jobs,
-     *    retaining only `jdata` and `udata`
+     *    `hmark`, `status`, `other`) from completed, un-pruned jobs.
+     *    Preserves `jdata`, `udata`, and `jmark`. Marks stripped
+     *    jobs with `pruned_at` for idempotency.
+     * 4. **pruneTransient** — Deletes expired jobs with `entity IS NULL`
      *
      * @param options - Prune configuration
      * @returns Counts of deleted/stripped rows
@@ -242,7 +334,7 @@ class DBA {
      * import { Client as Postgres } from 'pg';
      * import { DBA } from '@hotmeshio/hotmesh';
      *
-     * // Strip attributes only — keep all jobs and streams
+     * // Strip attributes from 'book' entities only
      * await DBA.prune({
      *   appId: 'myapp',
      *   connection: {
@@ -252,6 +344,7 @@ class DBA {
      *   jobs: false,
      *   streams: false,
      *   attributes: true,
+     *   entities: ['book'],
      * });
      * ```
      */
@@ -261,15 +354,20 @@ class DBA {
         const jobs = options.jobs ?? true;
         const streams = options.streams ?? true;
         const attributes = options.attributes ?? false;
+        const entities = options.entities ?? null;
+        const pruneTransient = options.pruneTransient ?? false;
+        const keepHmark = options.keepHmark ?? false;
         await DBA.deploy(options.connection, options.appId);
         const { client, release } = await DBA.getClient(options.connection);
         try {
-            const result = await client.query(`SELECT * FROM ${schema}.prune($1::interval, $2::boolean, $3::boolean, $4::boolean)`, [expire, jobs, streams, attributes]);
+            const result = await client.query(`SELECT * FROM ${schema}.prune($1::interval, $2::boolean, $3::boolean, $4::boolean, $5::text[], $6::boolean, $7::boolean)`, [expire, jobs, streams, attributes, entities, pruneTransient, keepHmark]);
             const row = result.rows[0];
             return {
                 jobs: Number(row.deleted_jobs),
                 streams: Number(row.deleted_streams),
                 attributes: Number(row.stripped_attributes),
+                transient: Number(row.deleted_transient),
+                marked: Number(row.marked_pruned),
             };
         }
         finally {

package/build/services/durable/client.js

@@ -145,6 +145,8 @@ class ClientService {
                     parentWorkflowId: options.parentWorkflowId,
                     workflowId: options.workflowId || hotmesh_1.HotMesh.guid(),
                     workflowTopic: workflowTopic,
+                    taskQueue: taskQueueName,
+                    workflowName: workflowName,
                     backoffCoefficient: options.config?.backoffCoefficient || enums_1.HMSH_DURABLE_EXP_BACKOFF,
                     maximumAttempts: options.config?.maximumAttempts || enums_1.HMSH_DURABLE_MAX_ATTEMPTS,
                     maximumInterval: (0, utils_1.s)(options.config?.maximumInterval || enums_1.HMSH_DURABLE_MAX_INTERVAL),
@@ -186,11 +188,14 @@ class ClientService {
              */
             hook: async (options) => {
                 const taskQueue = options.taskQueue ?? options.entity;
-                const workflowTopic = `${taskQueue}-${options.entity ?? options.workflowName}`;
+                const hookWorkflowName = options.entity ?? options.workflowName;
+                const workflowTopic = `${taskQueue}-${hookWorkflowName}`;
                 const payload = {
                     arguments: [...options.args],
                     id: options.workflowId,
                     workflowTopic,
+                    taskQueue,
+                    workflowName: hookWorkflowName,
                     backoffCoefficient: options.config?.backoffCoefficient || enums_1.HMSH_DURABLE_EXP_BACKOFF,
                     maximumAttempts: options.config?.maximumAttempts || enums_1.HMSH_DURABLE_MAX_ATTEMPTS,
                     maximumInterval: (0, utils_1.s)(options.config?.maximumInterval || enums_1.HMSH_DURABLE_MAX_INTERVAL),