@vertesia/workflow 1.0.0-dev.20260225.024852Z → 1.0.0-dev.20260227.112605Z

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vertesia/workflow",
-  "version": "1.0.0-dev.20260225.024852Z",
+  "version": "1.0.0-dev.20260227.112605Z",
   "type": "module",
   "description": "Vertesia workflow DSL",
   "main": "./lib/esm/index.js",
@@ -43,11 +43,11 @@
     "tmp": "^0.2.4",
     "tmp-promise": "^3.0.3",
     "yaml": "^2.6.0",
-    "@vertesia/api-fetch-client": "1.0.0-dev.20260225.024852Z",
     "@llumiverse/common": "1.0.0-dev.20260224.234313Z",
-    "@vertesia/common": "1.0.0-dev.20260225.024852Z",
-    "@vertesia/client": "1.0.0-dev.20260225.024852Z",
-    "@vertesia/memory": "1.0.0-dev.20260225.024852Z"
+    "@vertesia/client": "1.0.0-dev.20260227.112605Z",
+    "@vertesia/common": "1.0.0-dev.20260227.112605Z",
+    "@vertesia/memory": "1.0.0-dev.20260227.112605Z",
+    "@vertesia/api-fetch-client": "1.0.0-dev.20260227.112605Z"
   },
   "ts_dual_module": {
     "outDir": "lib",

package/src/activities/chunkDocument.ts

@@ -1,4 +1,4 @@
-import { log } from "@temporalio/activity";
+import { ApplicationFailure, log } from "@temporalio/activity";
 import { DSLActivityExecutionPayload, DSLActivitySpec } from "@vertesia/common";
 import { setupActivity } from "../dsl/setup/ActivityContext.js";
 import { DocPart } from "../utils/chunks.js";
@@ -79,10 +79,37 @@ export async function chunkDocument(payload: DSLActivityExecutionPayload<ChunkDo
     const lines = document.text.split('\n')
     const instrumented = lines.map((l, i) => `{%${i}%}${l}`).join('\n')
 
-    const res = await executeInteractionFromActivity(client, interactionName, params, {
-        objectId: objectId,
-        content: instrumented
-    });
+    let res;
+    try {
+        res = await executeInteractionFromActivity(client, interactionName, params, {
+            objectId: objectId,
+            content: instrumented
+        });
+    } catch (error: any) {
+        log.error(`Failed to chunk document ${objectId}`, { error, retryable: error.retryable });
+        
+        // Check retryability and convert to ApplicationFailure for Temporal
+        const isRetryable = error.retryable !== undefined 
+            ? error.retryable !== false
+            : undefined;
+        
+        if (isRetryable !== undefined) {
+            if (isRetryable) {
+                throw ApplicationFailure.create({
+                    message: `Document chunking failed for ${objectId}: ${error.message}`,
+                    nonRetryable: false,
+                });
+            } else {
+                throw ApplicationFailure.create({
+                    message: `Non-retryable document chunking failed for ${objectId}: ${error.message}`,
+                    nonRetryable: true,
+                });
+            }
+        }
+        
+        // Unknown retryability - rethrow
+        throw error;
+    }
 
     const jsonResult = res.result.object();
 

package/src/activities/executeInteraction.ts

@@ -1,5 +1,5 @@
-import { CompletionResult, ModelOptions } from "@llumiverse/common";
-import { activityInfo, log } from "@temporalio/activity";
+import { CompletionResult, ModelOptions, LlumiverseError } from "@llumiverse/common";
+import { activityInfo, ApplicationFailure, log } from "@temporalio/activity";
 import { VertesiaClient } from "@vertesia/client";
 import { NodeStreamSource } from "@vertesia/client/node";
 import {
@@ -208,9 +208,32 @@ export async function executeInteraction(payload: DSLActivityExecutionPayload<Ex
         } else if (error.message.includes("modelId: Path `modelId` is required")) {
             //issue with the input data, don't retry
             throw new ActivityParamInvalidError("model", payload.activity, error.message);
-        } else {
-            throw new Error(`Interaction Execution failed ${interactionName}: ${error.message}`);
         }
+        
+        // Check retryability from error object (set by executeInteractionFromActivity)
+        // or from LlumiverseError instance (direct driver errors in some paths)
+        const isRetryable = error.retryable !== undefined 
+            ? error.retryable !== false  // Treat undefined as retryable
+            : (error instanceof LlumiverseError ? error.retryable !== false : undefined);
+        
+        if (isRetryable !== undefined) {
+            if (isRetryable) {
+                log.debug('Marking error as retryable', { interactionName, errorCode: error.errorCode });
+                throw ApplicationFailure.create({
+                    message: `Interaction Execution failed ${interactionName}: ${error.message}`,
+                    nonRetryable: false,
+                });
+            } else {
+                log.debug('Marking error as non-retryable', { interactionName, errorCode: error.errorCode });
+                throw ApplicationFailure.create({
+                    message: `Non-retryable Interaction Execution failed ${interactionName}: ${error.message}`,
+                    nonRetryable: true,
+                });
+            }
+        }
+        
+        // Unknown retryability - rethrow as generic error (Temporal will use default retry policy)
+        throw new Error(`Interaction Execution failed ${interactionName}: ${error.message}`);
     }
 }
 
@@ -293,7 +316,16 @@ export async function executeInteractionFromActivity(
 
     if (res.error || res.status === ExecutionRunStatus.failed) {
         log.error(`Error executing interaction ${interactionName}`, { error: res.error });
-        throw new Error(`Interaction Execution failed ${interactionName}: ${res.error}`);
+        
+        // Create error with retryability information
+        const errorMessage = `Interaction Execution failed ${interactionName}: ${res.error?.message || 'Unknown error'}`;
+        const error = new Error(errorMessage);
+        
+        // Attach retryable property so the catch block can access it
+        (error as any).retryable = res.error?.retryable;
+        (error as any).errorCode = res.error?.code;
+        
+        throw error;
     }
 
     return res;

package/src/activities/generateDocumentProperties.ts

@@ -1,4 +1,4 @@
-import { log } from "@temporalio/activity";
+import { ApplicationFailure, log } from "@temporalio/activity";
 import { DSLActivityExecutionPayload, DSLActivitySpec } from "@vertesia/common";
 import { setupActivity } from "../dsl/setup/ActivityContext.js";
 import { TruncateSpec, truncByMaxTokens } from "../utils/tokens.js";
@@ -72,18 +72,43 @@ export async function generateDocumentProperties(
         payload.debug_mode ? { params } : undefined,
     );
 
-    const infoRes = await executeInteractionFromActivity(
-        client,
-        interactionName,
-        {
-            ...params,
-            include_previous_error: true,
-            result_schema: type.object_schema,
-            validate_result: type.strict_mode,
-        },
-        promptData,
-        payload.debug_mode ?? false,
-    );
+    let infoRes;
+    try {
+        infoRes = await executeInteractionFromActivity(
+            client,
+            interactionName,
+            {
+                ...params,
+                include_previous_error: true,
+                result_schema: type.object_schema,
+                validate_result: type.strict_mode,
+            },
+            promptData,
+            payload.debug_mode ?? false,
+        );
+    } catch (error: any) {
+        log.error(`Failed to extract document properties for ${objectId}`, { error, retryable: error.retryable });
+        
+        const isRetryable = error.retryable !== undefined 
+            ? error.retryable !== false
+            : undefined;
+        
+        if (isRetryable !== undefined) {
+            if (isRetryable) {
+                throw ApplicationFailure.create({
+                    message: `Document property extraction failed for ${objectId}: ${error.message}`,
+                    nonRetryable: false,
+                });
+            } else {
+                throw ApplicationFailure.create({
+                    message: `Non-retryable document property extraction failed for ${objectId}: ${error.message}`,
+                    nonRetryable: true,
+                });
+            }
+        }
+        
+        throw error;
+    }
 
     const getText = () => {
         if (doc.text) {

package/src/activities/generateOrAssignContentType.ts

@@ -1,4 +1,4 @@
-import { log } from "@temporalio/activity";
+import { ApplicationFailure, log } from "@temporalio/activity";
 import {
   ContentObjectTypeItem,
   CreateContentObjectTypePayload,
@@ -122,16 +122,41 @@ export async function generateOrAssignContentType(
     existing_types.filter((t) => !t.tags?.includes("system")),
   );
 
-  const res = await executeInteractionFromActivity(
-    client,
-    interactionName,
-    params,
-    {
-      existing_types,
-      content,
-      image: fileRef,
-    },
-  );
+  let res;
+  try {
+    res = await executeInteractionFromActivity(
+      client,
+      interactionName,
+      params,
+      {
+        existing_types,
+        content,
+        image: fileRef,
+      },
+    );
+  } catch (error: any) {
+    log.error(`Failed to select document type`, { error, retryable: error.retryable });
+    
+    const isRetryable = error.retryable !== undefined 
+      ? error.retryable !== false
+      : undefined;
+    
+    if (isRetryable !== undefined) {
+      if (isRetryable) {
+        throw ApplicationFailure.create({
+          message: `Document type selection failed: ${error.message}`,
+          nonRetryable: false,
+        });
+      } else {
+        throw ApplicationFailure.create({
+          message: `Non-retryable document type selection failed: ${error.message}`,
+          nonRetryable: true,
+        });
+      }
+    }
+    
+    throw error;
+  }
 
   const jsonResult = res.result.object();
 
@@ -184,17 +209,42 @@ async function generateNewType(
     params.interactionNames?.generateMetadataModel ??
     INT_GENERATE_METADATA_MODEL;
 
-  const genTypeRes = await executeInteractionFromActivity(
-    client,
-    interactionName,
-    params,
-    {
-      existing_types,
-      content: content,
-      human_context: project?.configuration?.human_context ?? undefined,
-      image: fileRef ? fileRef : undefined,
-    },
-  );
+  let genTypeRes;
+  try {
+    genTypeRes = await executeInteractionFromActivity(
+      client,
+      interactionName,
+      params,
+      {
+        existing_types,
+        content: content,
+        human_context: project?.configuration?.human_context ?? undefined,
+        image: fileRef ? fileRef : undefined,
+      },
+    );
+  } catch (error: any) {
+    log.error(`Failed to generate new document type`, { error, retryable: error.retryable });
+    
+    const isRetryable = error.retryable !== undefined 
+      ? error.retryable !== false
+      : undefined;
+    
+    if (isRetryable !== undefined) {
+      if (isRetryable) {
+        throw ApplicationFailure.create({
+          message: `Document type generation failed: ${error.message}`,
+          nonRetryable: false,
+        });
+      } else {
+        throw ApplicationFailure.create({
+          message: `Non-retryable document type generation failed: ${error.message}`,
+          nonRetryable: true,
+        });
+      }
+    }
+    
+    throw error;
+  }
 
   const jsonResult = genTypeRes.result.object();
 

package/src/conversion/mutool.test.ts

@@ -1,15 +1,12 @@
-import { MockActivityEnvironment, TestWorkflowEnvironment } from '@temporalio/testing';
+import { MockActivityEnvironment } from '@temporalio/testing';
 import fs from 'fs';
 import path from 'path';
 import { beforeAll, expect, test } from 'vitest';
 import { mutoolPdfToText, pdfExtractPages, pdfToImages } from './mutool.js';
 
-
-let testEnv: TestWorkflowEnvironment;
 let activityContext: MockActivityEnvironment;
 
 beforeAll(async () => {
-  testEnv = await TestWorkflowEnvironment.createLocal();
   activityContext = new MockActivityEnvironment();
 });
 

package/src/conversion/pandoc.test.ts

@@ -1,15 +1,12 @@
-import { MockActivityEnvironment, TestWorkflowEnvironment } from '@temporalio/testing';
+import { MockActivityEnvironment } from '@temporalio/testing';
 import fs from 'fs';
 import path from 'path';
 import { beforeAll, expect, test } from 'vitest';
 import { markdownWithPandoc } from '../conversion/pandoc';
 
-
-let testEnv: TestWorkflowEnvironment;
 let activityContext: MockActivityEnvironment;
 
 beforeAll(async () => {
-    testEnv = await TestWorkflowEnvironment.createLocal();
     activityContext = new MockActivityEnvironment();
 });
 

package/src/dsl/workflow-exec-child.test.ts

@@ -1,6 +1,6 @@
 import * as protos from '@temporalio/proto';
 import { TestWorkflowEnvironment } from '@temporalio/testing';
-import { Worker } from '@temporalio/worker';
+import { Worker, bundleWorkflowCode, type WorkflowBundleWithSourceMap } from '@temporalio/worker';
 import { ContentEventName, DSLActivityExecutionPayload, DSLWorkflowExecutionPayload, DSLWorkflowStep } from '@vertesia/common';
 import { afterAll, beforeAll, describe, expect, test } from 'vitest';
 import { dslWorkflow } from './dsl-workflow.js';
@@ -119,6 +119,7 @@ const steps3: DSLWorkflowStep[] = [
 describe('DSL Workflow with child workflows', () => {
 
     let testEnv: TestWorkflowEnvironment;
+    let workflowBundle: WorkflowBundleWithSourceMap;
 
     beforeAll(async () => {
         testEnv = await TestWorkflowEnvironment.createLocal();
@@ -133,7 +134,10 @@ describe('DSL Workflow with child workflows', () => {
                 InitiatedBy: protos.temporal.api.enums.v1.IndexedValueType.INDEXED_VALUE_TYPE_KEYWORD,
             },
         });
-    });
+        workflowBundle = await bundleWorkflowCode({
+            workflowsPath: new URL('./test/test-child-workflow.ts', import.meta.url).pathname,
+        });
+    }, 60_000);
 
     afterAll(async () => {
         await testEnv?.teardown();
@@ -148,7 +152,7 @@ describe('DSL Workflow with child workflows', () => {
         const worker = await Worker.create({
             connection: nativeConnection,
             taskQueue,
-            workflowsPath: new URL("./test/test-child-workflow.ts", import.meta.url).pathname,
+            workflowBundle,
             activities: { sayHelloFromParent, prepareResult },
         });
 
@@ -173,7 +177,7 @@ describe('DSL Workflow with child workflows', () => {
             }
         }
 
-        let result = await worker.runUntil(client.workflow.execute(dslWorkflow, {
+        const result = await worker.runUntil(client.workflow.execute(dslWorkflow, {
             args: [payload],
             workflowId: 'test',
             taskQueue,
@@ -192,7 +196,7 @@ describe('DSL Workflow with child workflows', () => {
         const worker = await Worker.create({
             connection: nativeConnection,
             taskQueue,
-            workflowsPath: new URL("./test/test-child-workflow.ts", import.meta.url).pathname,
+            workflowBundle,
             activities: { sayHelloFromParent, prepareResult, sayHelloFromDSLChild },
         });
 
@@ -217,7 +221,7 @@ describe('DSL Workflow with child workflows', () => {
             }
         }
 
-        let result = await worker.runUntil(client.workflow.execute(dslWorkflow, {
+        const result = await worker.runUntil(client.workflow.execute(dslWorkflow, {
             args: [payload],
             workflowId: 'test',
             taskQueue,
@@ -236,7 +240,7 @@ describe('DSL Workflow with child workflows', () => {
         const worker = await Worker.create({
             connection: nativeConnection,
             taskQueue,
-            workflowsPath: new URL("./test/test-child-workflow.ts", import.meta.url).pathname,
+            workflowBundle,
             activities: { sayHelloFromParent, prepareResult, sayHelloFromDSLChild },
         });
 
@@ -261,7 +265,7 @@ describe('DSL Workflow with child workflows', () => {
             }
         }
 
-        let result = await worker.runUntil(client.workflow.execute(dslWorkflow, {
+        const result = await worker.runUntil(client.workflow.execute(dslWorkflow, {
             args: [payload],
             workflowId: 'test-vars',
             taskQueue,

package/src/dsl/workflow-fetch.test.ts

@@ -1,7 +1,7 @@
+import { TestWorkflowEnvironment } from '@temporalio/testing';
+import { Worker, bundleWorkflowCode, type WorkflowBundleWithSourceMap } from '@temporalio/worker';
 import { VertesiaClient } from '@vertesia/client';
 import { ContentEventName, DSLActivityExecutionPayload, DSLActivitySpec, DSLWorkflowExecutionPayload, FindPayload } from '@vertesia/common';
-import { TestWorkflowEnvironment } from '@temporalio/testing';
-import { Worker } from '@temporalio/worker';
 import { afterAll, beforeAll, describe, expect, it } from 'vitest';
 import { dslWorkflow } from './dsl-workflow.js';
 import { setupActivity } from "./setup/ActivityContext.js";
@@ -77,10 +77,14 @@ const activities: DSLActivitySpec[] = [
 describe('DSL Workflow', () => {
 
     let testEnv: TestWorkflowEnvironment;
+    let workflowBundle: WorkflowBundleWithSourceMap;
 
     beforeAll(async () => {
         testEnv = await TestWorkflowEnvironment.createLocal();
-    });
+        workflowBundle = await bundleWorkflowCode({
+            workflowsPath: new URL('./dsl-workflow.ts', import.meta.url).pathname,
+        });
+    }, 60_000);
 
     afterAll(async () => {
         await testEnv?.teardown();
@@ -95,7 +99,7 @@ describe('DSL Workflow', () => {
         const worker = await Worker.create({
             connection: nativeConnection,
             taskQueue,
-            workflowsPath: new URL("./dsl-workflow.ts", import.meta.url).pathname,
+            workflowBundle,
             activities: { sayMessage },
         });
 
@@ -105,7 +109,6 @@ describe('DSL Workflow', () => {
             vars: {},
             account_id: '123',
             project_id: '123',
-            timestamp: Date.now(),
             wf_rule_name: 'test',
             auth_token: process.env.VERTESIA_KEY || 'eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJpc3MiOiJodHRwOi8vbW9jay10b2tlbi1zZXJ2ZXIiLCJzdWIiOiJ0ZXN0In0.signature',
             config: {
@@ -121,7 +124,7 @@ describe('DSL Workflow', () => {
             }
         }
 
-        let result = await worker.runUntil(client.workflow.execute(dslWorkflow, {
+        const result = await worker.runUntil(client.workflow.execute(dslWorkflow, {
             args: [payload],
             workflowId: 'test',
             taskQueue,

package/src/dsl/workflow-import.test.ts

@@ -1,12 +1,12 @@
-import { ContentEventName, DSLActivityExecutionPayload, DSLActivitySpec, DSLWorkflowExecutionPayload } from '@vertesia/common';
 import { TestWorkflowEnvironment } from '@temporalio/testing';
-import { Worker } from '@temporalio/worker';
+import { Worker, bundleWorkflowCode, type WorkflowBundleWithSourceMap } from '@temporalio/worker';
+import { ContentEventName, DSLActivityExecutionPayload, DSLActivitySpec, DSLWorkflowExecutionPayload } from '@vertesia/common';
 import { afterAll, beforeAll, describe, expect, it } from 'vitest';
 import { dslWorkflow } from './dsl-workflow.js';
 import { setupActivity } from "./setup/ActivityContext.js";
 
 
-async function testImportedVars(payload: DSLActivityExecutionPayload) {
+async function testImportedVars(payload: DSLActivityExecutionPayload<Record<string, any>>) {
     const { params } = await setupActivity(payload);
     if (!params.object_name) throw new Error('object_name is required');
     console.log('!!!!!!!!!!@@@@@@@@@@@@@@!!!!!!!!!!!!!!', params.object_name);
@@ -28,10 +28,14 @@ const activities: DSLActivitySpec[] = [
 describe('DSL Workflow import vars', () => {
 
     let testEnv: TestWorkflowEnvironment;
+    let workflowBundle: WorkflowBundleWithSourceMap;
 
     beforeAll(async () => {
         testEnv = await TestWorkflowEnvironment.createLocal();
-    });
+        workflowBundle = await bundleWorkflowCode({
+            workflowsPath: new URL('./dsl-workflow.ts', import.meta.url).pathname,
+        });
+    }, 60_000);
 
     afterAll(async () => {
         await testEnv?.teardown();
@@ -49,7 +53,7 @@ describe('DSL Workflow import vars', () => {
         const worker = await Worker.create({
             connection: nativeConnection,
             taskQueue,
-            workflowsPath: new URL("./dsl-workflow.ts", import.meta.url).pathname,
+            workflowBundle,
             activities: { testImportedVars },
         });
 
@@ -59,7 +63,6 @@ describe('DSL Workflow import vars', () => {
             vars: {},
             account_id: '123',
             project_id: '123',
-            timestamp: Date.now(),
             wf_rule_name: 'test',
             auth_token: process.env.VERTESIA_KEY || 'eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJpc3MiOiJodHRwOi8vbW9jay10b2tlbi1zZXJ2ZXIiLCJzdWIiOiJ0ZXN0In0.signature',
             config: {
@@ -75,7 +78,7 @@ describe('DSL Workflow import vars', () => {
             }
         }
 
-        let result = await worker.runUntil(client.workflow.execute(dslWorkflow, {
+        const result = await worker.runUntil(client.workflow.execute(dslWorkflow, {
             args: [payload],
             workflowId: 'test',
             taskQueue,

package/src/dsl/workflow.test.ts

@@ -1,22 +1,22 @@
 import * as protos from '@temporalio/proto';
 import { TestWorkflowEnvironment } from '@temporalio/testing';
-import { Worker } from '@temporalio/worker';
+import { Worker, bundleWorkflowCode, type WorkflowBundleWithSourceMap } from '@temporalio/worker';
 import { ContentEventName, DSLActivityExecutionPayload, DSLActivitySpec, DSLWorkflowExecutionPayload } from '@vertesia/common';
 import { afterAll, beforeAll, describe, expect, it } from 'vitest';
 import { dslWorkflow } from './dsl-workflow.js';
 import { setupActivity } from "./setup/ActivityContext.js";
 
-async function sayHello(payload: DSLActivityExecutionPayload): Promise<string> {
+async function sayHello(payload: DSLActivityExecutionPayload<Record<string, any>>): Promise<string> {
     const { params } = await setupActivity(payload);
     return params.lang === 'fr' ? "Bonjour" : "Hello";
 }
 
-async function sayName(payload: DSLActivityExecutionPayload): Promise<string> {
+async function sayName(payload: DSLActivityExecutionPayload<Record<string, any>>): Promise<string> {
     const { params } = await setupActivity(payload);
     return params.lang === 'fr' ? "Monde" : "World";
 }
 
-async function sayGreeting(payload: DSLActivityExecutionPayload): Promise<string> {
+async function sayGreeting(payload: DSLActivityExecutionPayload<Record<string, any>>): Promise<string> {
     const { params } = await setupActivity(payload);
     return `${params.hello}, ${params.name}!`;
 }
@@ -50,6 +50,7 @@ const activities: DSLActivitySpec[] = [
 describe('DSL Workflow', () => {
 
     let testEnv: TestWorkflowEnvironment;
+    let workflowBundle: WorkflowBundleWithSourceMap;
 
     beforeAll(async () => {
         testEnv = await TestWorkflowEnvironment.createLocal();
@@ -64,7 +65,10 @@ describe('DSL Workflow', () => {
                 InitiatedBy: protos.temporal.api.enums.v1.IndexedValueType.INDEXED_VALUE_TYPE_KEYWORD,
             },
         });
-    });
+        workflowBundle = await bundleWorkflowCode({
+            workflowsPath: new URL('./dsl-workflow.ts', import.meta.url).pathname,
+        });
+    }, 60_000);
 
     afterAll(async () => {
         await testEnv?.teardown();
@@ -79,7 +83,7 @@ describe('DSL Workflow', () => {
         const worker = await Worker.create({
             connection: nativeConnection,
             taskQueue,
-            workflowsPath: new URL("./dsl-workflow.ts", import.meta.url).pathname,
+            workflowBundle,
             activities: { sayHello, sayName, sayGreeting },
         });
 
@@ -89,7 +93,6 @@ describe('DSL Workflow', () => {
             vars: {},
             account_id: '123',
             project_id: '123',
-            timestamp: Date.now(),
             wf_rule_name: 'test',
             auth_token: process.env.VERTESIA_KEY || 'eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJpc3MiOiJodHRwOi8vbW9jay10b2tlbi1zZXJ2ZXIiLCJzdWIiOiJ0ZXN0In0.signature',
             config: {
@@ -105,7 +108,7 @@ describe('DSL Workflow', () => {
             }
         }
 
-        let result = await worker.runUntil(client.workflow.execute(dslWorkflow, {
+        const result = await worker.runUntil(client.workflow.execute(dslWorkflow, {
             args: [payload],
             workflowId: 'test',
             taskQueue,