@outputai/core 0.13.1-next.38c895c.0 → 0.13.1-next.41b143a.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@outputai/core",
-  "version": "0.13.1-next.38c895c.0",
+  "version": "0.13.1-next.41b143a.0",
   "description": "The core module of the output framework",
   "type": "module",
   "engines": {

package/src/worker/interceptors/activity.js

@@ -40,10 +40,13 @@ export class ActivityExecutionInterceptor {
 
   async execute( input, next ) {
     const activityInfo = activityInfoFn();
-    const { workflowExecution: { runId }, activityId, activityType, workflowType } = activityInfo;
+    const { workflowExecution: { runId }, activityId, attempt, activityType, workflowType } = activityInfo;
     const { traceInfo, workflowDetails } = headersToObject( input.headers );
     const outputActivityKind = this.activityKindMap.get( activityType );
     const workflowFilename = this.workflowsPathMap.get( workflowType );
+    // Retries reuse the same activityId, so the attempt is appended to keep each attempt a discrete trace entry.
+    // Also prefix with the runId to avoid conflict with child workflows.
+    const traceId = `${runId}:${activityId}:${attempt}`;
 
     if ( !outputActivityKind ) {
       throw new Error( `Activity interceptor: activity "${activityType}" was not registered.` );
@@ -58,7 +61,7 @@ export class ActivityExecutionInterceptor {
 
     // Adds context accessible information
     const storageContext = {
-      parentId: activityId,
+      parentId: traceId,
       outputActivityKind,
       activityInfo,
       workflowDetails,
@@ -67,7 +70,7 @@ export class ActivityExecutionInterceptor {
     };
 
     mainEventBus.emit( BusEventType.ACTIVITY_START, { activityInfo, workflowDetails, outputActivityKind } );
-    Tracing.addEventStart( { id: activityId, name: activityType, kind: outputActivityKind, parentId: runId, details: input.args[0], traceInfo } );
+    Tracing.addEventStart( { id: traceId, name: activityType, kind: outputActivityKind, parentId: runId, details: input.args[0], traceInfo } );
 
     try {
       // Sends heartbeat to communicate that activity is still alive
@@ -76,20 +79,20 @@ export class ActivityExecutionInterceptor {
       const output = await Storage.runWithContext( async _ => next( input ), storageContext );
 
       mainEventBus.emit( BusEventType.ACTIVITY_END, { activityInfo, workflowDetails, outputActivityKind } );
-      Tracing.addEventEnd( { id: activityId, details: output, traceInfo } );
+      Tracing.addEventEnd( { id: traceId, details: output, traceInfo } );
 
       return output;
 
     } catch ( error ) {
       // Record async completion handoff as a trace end without emitting a bus event.
       if ( error instanceof CompleteAsyncError ) {
-        Tracing.addEventEnd( { id: activityId, details: ActivitySpecialOutput.ASYNC_HANDOFF, traceInfo } );
+        Tracing.addEventEnd( { id: traceId, details: ActivitySpecialOutput.ASYNC_HANDOFF, traceInfo } );
         throw error;
       }
 
       const unwrappedError = error instanceof TransparentFatalError ? error.cause : error;
 
-      Tracing.addEventError( { id: activityId, details: unwrappedError, traceInfo } );
+      Tracing.addEventError( { id: traceId, details: unwrappedError, traceInfo } );
       mainEventBus.emit( BusEventType.ACTIVITY_ERROR, { activityInfo, workflowDetails, outputActivityKind, error: unwrappedError } );
 
       // Native Temporal errors are just re-thrown

package/src/worker/interceptors/activity.spec.js

@@ -8,6 +8,7 @@ const runWithContextMock = vi.hoisted( () => vi.fn().mockImplementation( async f
 const activityInfoMock = vi.hoisted( () => ( {
   workflowExecution: { workflowId: 'wf-1', runId: 'run-1' },
   activityId: 'act-1',
+  attempt: 1,
   activityType: 'myWorkflow#myStep',
   workflowType: 'myWorkflow'
 } ) );
@@ -87,6 +88,8 @@ describe( 'ActivityExecutionInterceptor', () => {
   beforeEach( () => {
     vi.clearAllMocks();
     activityInfoMock.workflowType = 'myWorkflow';
+    activityInfoMock.workflowExecution.runId = 'run-1';
+    activityInfoMock.attempt = 1;
     delete activityInfoMock.retryPolicy;
     vi.useFakeTimers();
     // Default: heartbeat enabled with 50ms interval for fast tests
@@ -114,19 +117,19 @@ describe( 'ActivityExecutionInterceptor', () => {
       { activityInfo: activityInfoMock, workflowDetails: workflowDetailsMock, outputActivityKind: 'step' }
     );
     expect( addEventStartMock ).toHaveBeenCalledWith( {
-      id: 'act-1',
+      id: 'run-1:act-1:1',
       name: 'myWorkflow#myStep',
       kind: 'step',
       parentId: 'run-1',
       details: { someInput: 'data' },
       traceInfo: traceInfoMock
     } );
-    expect( addEventEndMock ).toHaveBeenCalledWith( { id: 'act-1', details: { result: 'ok' }, traceInfo: traceInfoMock } );
+    expect( addEventEndMock ).toHaveBeenCalledWith( { id: 'run-1:act-1:1', details: { result: 'ok' }, traceInfo: traceInfoMock } );
     expect( addEventErrorMock ).not.toHaveBeenCalled();
     expect( runWithContextMock ).toHaveBeenCalledWith(
       expect.any( Function ),
       expect.objectContaining( {
-        parentId: 'act-1',
+        parentId: 'run-1:act-1:1',
         activityInfo: activityInfoMock,
         workflowDetails: workflowDetailsMock,
         outputActivityKind: 'step',
@@ -136,6 +139,37 @@ describe( 'ActivityExecutionInterceptor', () => {
     );
   } );
 
+  it( 'scopes trace ids by attempt so retries do not reuse the same id', async () => {
+    const { ActivityExecutionInterceptor } = await import( './activity.js' );
+    const interceptor = new ActivityExecutionInterceptor( { activities: makeActivities(), workflows: makeWorkflows() } );
+    activityInfoMock.attempt = 3;
+    const next = vi.fn().mockResolvedValue( { result: 'ok' } );
+
+    await expect( interceptor.execute( makeInput(), next ) ).resolves.toEqual( { result: 'ok' } );
+    expect( addEventStartMock ).toHaveBeenCalledWith( expect.objectContaining( { id: 'run-1:act-1:3', parentId: 'run-1' } ) );
+    expect( addEventEndMock ).toHaveBeenCalledWith( expect.objectContaining( { id: 'run-1:act-1:3' } ) );
+    expect( runWithContextMock ).toHaveBeenCalledWith(
+      expect.any( Function ),
+      expect.objectContaining( { parentId: 'run-1:act-1:3' } )
+    );
+  } );
+
+  it( 'scopes trace ids by run so a child workflow reusing an activityId gets a distinct id', async () => {
+    const { ActivityExecutionInterceptor } = await import( './activity.js' );
+    const interceptor = new ActivityExecutionInterceptor( { activities: makeActivities(), workflows: makeWorkflows() } );
+    const next = vi.fn().mockResolvedValue( { result: 'ok' } );
+
+    // Temporal numbers activityIds per run, so a parent and its child both reach the same 'act-1' on attempt 1.
+    await interceptor.execute( makeInput(), next );
+    activityInfoMock.workflowExecution.runId = 'run-2';
+    await interceptor.execute( makeInput(), next );
+
+    expect( addEventStartMock.mock.calls.map( ( [ { id, parentId } ] ) => ( { id, parentId } ) ) ).toEqual( [
+      { id: 'run-1:act-1:1', parentId: 'run-1' },
+      { id: 'run-2:act-1:1', parentId: 'run-2' }
+    ] );
+  } );
+
   it( 'wraps native errors with serialized details', async () => {
     const { ActivityExecutionInterceptor } = await import( './activity.js' );
     const interceptor = new ActivityExecutionInterceptor( { activities: makeActivities(), workflows: makeWorkflows() } );
@@ -210,7 +244,7 @@ describe( 'ActivityExecutionInterceptor', () => {
         }
       } ]
     } );
-    expect( addEventErrorMock ).toHaveBeenCalledWith( { id: 'act-1', details: cause, traceInfo: traceInfoMock } );
+    expect( addEventErrorMock ).toHaveBeenCalledWith( { id: 'run-1:act-1:1', details: cause, traceInfo: traceInfoMock } );
     expect( mainEventBusEmitMock ).toHaveBeenCalledWith( BusEventType.ACTIVITY_ERROR, {
       activityInfo: activityInfoMock,
       workflowDetails: workflowDetailsMock,
@@ -226,7 +260,7 @@ describe( 'ActivityExecutionInterceptor', () => {
     const next = vi.fn().mockRejectedValue( error );
 
     await expect( interceptor.execute( makeInput(), next ) ).rejects.toBe( error );
-    expect( addEventErrorMock ).toHaveBeenCalledWith( { id: 'act-1', details: error, traceInfo: traceInfoMock } );
+    expect( addEventErrorMock ).toHaveBeenCalledWith( { id: 'run-1:act-1:1', details: error, traceInfo: traceInfoMock } );
     expect( mainEventBusEmitMock ).toHaveBeenCalledWith( BusEventType.ACTIVITY_ERROR, {
       activityInfo: activityInfoMock,
       workflowDetails: workflowDetailsMock,
@@ -245,7 +279,7 @@ describe( 'ActivityExecutionInterceptor', () => {
     expect( mainEventBusEmitMock ).toHaveBeenCalledWith( BusEventType.ACTIVITY_START, expect.any( Object ) );
     expect( mainEventBusEmitMock ).toHaveBeenCalledTimes( 1 );
     expect( addEventEndMock ).toHaveBeenCalledWith( {
-      id: 'act-1',
+      id: 'run-1:act-1:1',
       details: ActivitySpecialOutput.ASYNC_HANDOFF,
       traceInfo: traceInfoMock
     } );

package/src/worker/sinks.js

@@ -65,7 +65,7 @@ export const sinks = {
   trace: {
     start: {
       fn: ( workflowInfo, { id, name, kind, details } ) =>
-        Tracing.addEventStart( { id, kind, name, details, parentId: workflowInfo.parent?.runId, traceInfo: workflowInfo.memo.traceInfo } ),
+        Tracing.addEventStart( { id, kind, name, details, parentId: workflowInfo.runId, traceInfo: workflowInfo.memo.traceInfo } ),
       callDuringReplay: false
     },
 

package/src/worker/sinks.spec.js

@@ -167,7 +167,7 @@ describe( 'worker/sinks', () => {
     expect( addEventErrorMock ).not.toHaveBeenCalled();
   } );
 
-  it( 'trace.start records trace start events with workflow parent context', async () => {
+  it( 'trace.start parents trace start events on the current workflow, not its parent workflow', async () => {
     const { sinks } = await import( './sinks.js' );
 
     sinks.trace.start.fn( workflowInfo, {
@@ -182,7 +182,7 @@ describe( 'worker/sinks', () => {
       kind: ComponentType.STEP,
       name: 'myStep',
       details: { input: true },
-      parentId: 'parent-run-1',
+      parentId: 'run-1',
       traceInfo: { traceId: 'trace-1' }
     } );
   } );