@microsoft/agents-a365-observability-hosting 0.1.0-preview.95 → 0.2.0-preview.1

package/dist/cjs/utils/ScopeUtils.d.ts

@@ -1,23 +1,21 @@
 import { TurnContext } from '@microsoft/agents-hosting';
-import { InvokeAgentScope, InferenceScope, ExecuteToolScope, AgentDetails, TenantDetails, CallerDetails, InferenceDetails, InvokeAgentDetails, ToolCallDetails } from '@microsoft/agents-a365-observability';
+import { SpanKind, TimeInput } from '@opentelemetry/api';
+import { InvokeAgentScope, InferenceScope, ExecuteToolScope, AgentDetails, UserDetails, InferenceDetails, ToolCallDetails, InvokeAgentScopeDetails } from '@microsoft/agents-a365-observability';
 /**
  * Unified utilities to populate scope tags from a TurnContext.
  * Provides common tag population and scope-specific helpers.
  */
 export declare class ScopeUtils {
     private static setInputMessageTags;
-    /**
-     * Derive tenant details from the TurnContext.
-     * @param turnContext Activity context
-     * @returns Tenant details if a recipient tenant id is present; otherwise undefined.
-     */
-    static deriveTenantDetails(turnContext: TurnContext): TenantDetails | undefined;
     /**
      * Derive target agent details from the activity recipient.
+     * Uses {@link resolveEmbodiedAgentIds} to resolve the agent ID and blueprint ID, which are only
+     * set for embodied (agentic) agents — see that function for the rationale.
      * @param turnContext Activity context
+     * @param authToken Auth token for resolving agent identity from token claims.
      * @returns Agent details built from recipient properties; otherwise undefined.
      */
-    static deriveAgentDetails(turnContext: TurnContext): AgentDetails | undefined;
+    static deriveAgentDetails(turnContext: TurnContext, authToken: string): AgentDetails | undefined;
     /**
      * Derive caller agent details from the activity from.
      * @param turnContext Activity context
@@ -25,11 +23,11 @@ export declare class ScopeUtils {
      */
     static deriveCallerAgent(turnContext: TurnContext): AgentDetails | undefined;
     /**
-     * Derive caller identity details (id, upn, name, tenant, client ip) from the activity from.
+     * Derive caller identity details (id, email, name, tenant) from the activity from.
      * @param turnContext Activity context
-     * @returns Caller details when available; otherwise undefined.
+     * @returns User details when available; otherwise undefined.
      */
-    static deriveCallerDetails(turnContext: TurnContext): CallerDetails | undefined;
+    static deriveCallerDetails(turnContext: TurnContext): UserDetails | undefined;
     /**
      * Derive conversation id from the TurnContext.
      * @param turnContext Activity context
@@ -37,47 +35,62 @@ export declare class ScopeUtils {
      */
     static deriveConversationId(turnContext: TurnContext): string | undefined;
     /**
-     * Derive source metadata (channel name and description/link) from the TurnContext.
+     * Derive channel (name and description) from the TurnContext.
      * @param turnContext Activity context
      * @returns Object with optional name and description fields.
      */
-    static deriveSourceMetadataObject(turnContext: TurnContext): {
+    static deriveChannelObject(turnContext: TurnContext): {
         name?: string;
         description?: string;
     };
     /**
      * Create an `InferenceScope` using `details` and values derived from the provided `TurnContext`.
-     * Derives `agentDetails`, `tenantDetails`, `conversationId`, and `sourceMetadata` (channel name/link) from context.
+     * Derives `conversationId` and `channel` (name/description) from context.
      * Also records input messages from the context if present.
      * @param details The inference call details (model, provider, tokens, etc.).
      * @param turnContext The current activity context to derive scope parameters from.
+     * @param authToken Auth token for resolving agent identity from token claims.
+     * @param startTime Optional explicit start time (ms epoch, Date, or HrTime).
+     * @param endTime Optional explicit end time (ms epoch, Date, or HrTime).
      * @returns A started `InferenceScope` enriched with context-derived parameters.
      */
-    static populateInferenceScopeFromTurnContext(details: InferenceDetails, turnContext: TurnContext): InferenceScope;
+    static populateInferenceScopeFromTurnContext(details: InferenceDetails, turnContext: TurnContext, authToken: string, startTime?: TimeInput, endTime?: TimeInput): InferenceScope;
     /**
      * Create an `InvokeAgentScope` using `details` and values derived from the provided `TurnContext`.
-     * Populates `conversationId` and `request.sourceMetadata` (channel name/link) in `details` from the `TurnContext`, overriding any existing values.
-     * Derives `tenantDetails`, `callerAgentDetails` (from caller), and `callerDetails` (from user).
-     * Also sets execution type and input messages from the context if present.
-     * @param details The invoke-agent call details to be augmented and used for the scope.
+     * Builds a separate `Request` with `conversationId` and `channel` from context.
+     * Merges agent identity from context into `details` via `buildInvokeAgentDetailsCore`.
+     * Derives `callerAgentDetails` (from caller) and `userDetails` (human caller).
+     * Also records input messages from the context if present.
+     * @param details The agent details to be augmented with context-derived identity.
      * @param turnContext The current activity context to derive scope parameters from.
+     * @param authToken Auth token for resolving agent identity from token claims.
+     * @param startTime Optional explicit start time (ms epoch, Date, or HrTime).
+     * @param endTime Optional explicit end time (ms epoch, Date, or HrTime).
+     * @param spanKind Optional span kind override. Defaults to `SpanKind.CLIENT`.
      * @returns A started `InvokeAgentScope` enriched with context-derived parameters.
      */
-    static populateInvokeAgentScopeFromTurnContext(details: InvokeAgentDetails, turnContext: TurnContext): InvokeAgentScope;
+    static populateInvokeAgentScopeFromTurnContext(details: AgentDetails, scopeDetails: InvokeAgentScopeDetails, turnContext: TurnContext, authToken: string, startTime?: TimeInput, endTime?: TimeInput, spanKind?: SpanKind): InvokeAgentScope;
     /**
-     * Build InvokeAgentDetails by merging provided details with agent info, conversation id and source metadata from the TurnContext.
-     * @param details Base invoke-agent details to augment
+     * Build agent details by merging provided details with agent info from the TurnContext.
+     * @param details Base agent details to augment
      * @param turnContext Activity context
-     * @returns New InvokeAgentDetails suitable for starting an InvokeAgentScope.
+     * @param authToken Auth token for resolving agent identity from token claims.
+     * @returns Merged AgentDetails with context-derived identity.
      */
-    static buildInvokeAgentDetails(details: InvokeAgentDetails, turnContext: TurnContext): InvokeAgentDetails;
+    static buildInvokeAgentDetails(details: AgentDetails, turnContext: TurnContext, authToken: string): AgentDetails;
+    private static buildInvokeAgentDetailsCore;
     /**
      * Create an `ExecuteToolScope` using `details` and values derived from the provided `TurnContext`.
-     * Derives `agentDetails`, `tenantDetails`, `conversationId`, and `sourceMetadata` (channel name/link) from context.
+     * Derives `conversationId` and `channel` (name/link) from context.
      * @param details The tool call details (name, type, args, call id, etc.).
      * @param turnContext The current activity context to derive scope parameters from.
+     * @param authToken Auth token for resolving agent identity from token claims.
+     * @param startTime Optional explicit start time (ms epoch, Date, or HrTime). Useful when recording a
+     *        tool call after execution has already completed.
+     * @param endTime Optional explicit end time (ms epoch, Date, or HrTime).
+     * @param spanKind Optional span kind override. Defaults to `SpanKind.INTERNAL`.
      * @returns A started `ExecuteToolScope` enriched with context-derived parameters.
      */
-    static populateExecuteToolScopeFromTurnContext(details: ToolCallDetails, turnContext: TurnContext): ExecuteToolScope;
+    static populateExecuteToolScopeFromTurnContext(details: ToolCallDetails, turnContext: TurnContext, authToken: string, startTime?: TimeInput, endTime?: TimeInput, spanKind?: SpanKind): ExecuteToolScope;
 }
 //# sourceMappingURL=ScopeUtils.d.ts.map

package/dist/cjs/utils/ScopeUtils.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"ScopeUtils.d.ts","sourceRoot":"","sources":["../../../src/utils/ScopeUtils.ts"],"names":[],"mappings":"AAKA,OAAO,EAAE,WAAW,EAAE,MAAM,2BAA2B,CAAC;AACxD,OAAO,EACL,gBAAgB,EAChB,cAAc,EACd,gBAAgB,EAChB,YAAY,EACZ,aAAa,EACb,aAAa,EACb,gBAAgB,EAChB,kBAAkB,EAClB,eAAe,EAEhB,MAAM,sCAAsC,CAAC;AAK9C;;;GAGG;AACH,qBAAa,UAAU;IAGrB,OAAO,CAAC,MAAM,CAAC,mBAAmB;IAUlC;;;;OAIG;WACW,mBAAmB,CAAC,WAAW,EAAE,WAAW,GAAG,aAAa,GAAG,SAAS;IAKtF;;;;OAIG;WACW,kBAAkB,CAAC,WAAW,EAAE,WAAW,GAAG,YAAY,GAAG,SAAS;IAapF;;;;OAIG;WACW,iBAAiB,CAAC,WAAW,EAAE,WAAW,GAAG,YAAY,GAAG,SAAS;IAcnF;;;;OAIG;WACW,mBAAmB,CAAC,WAAW,EAAE,WAAW,GAAG,aAAa,GAAG,SAAS;IAWtF;;;;OAIG;WACW,oBAAoB,CAAC,WAAW,EAAE,WAAW,GAAG,MAAM,GAAG,SAAS;IAIhF;;;;OAIG;WACW,0BAA0B,CAAC,WAAW,EAAE,WAAW,GAAG;QAAE,IAAI,CAAC,EAAE,MAAM,CAAC;QAAC,WAAW,CAAC,EAAE,MAAM,CAAA;KAAE;IAO3G;;;;;;;OAOG;IACH,MAAM,CAAC,qCAAqC,CAC1C,OAAO,EAAE,gBAAgB,EACzB,WAAW,EAAE,WAAW,GACvB,cAAc;IAkBjB;;;;;;;;OAQG;IACH,MAAM,CAAC,uCAAuC,CAC5C,OAAO,EAAE,kBAAkB,EAC3B,WAAW,EAAE,WAAW,GACvB,gBAAgB;IAenB;;;;;OAKG;WACW,uBAAuB,CAAC,OAAO,EAAE,kBAAkB,EAAE,WAAW,EAAE,WAAW,GAAG,kBAAkB;IAuBhH;;;;;;OAMG;IACH,MAAM,CAAC,uCAAuC,CAC5C,OAAO,EAAE,eAAe,EACxB,WAAW,EAAE,WAAW,GACvB,gBAAgB;CAcpB"}
+{"version":3,"file":"ScopeUtils.d.ts","sourceRoot":"","sources":["../../../src/utils/ScopeUtils.ts"],"names":[],"mappings":"AAKA,OAAO,EAAE,WAAW,EAAE,MAAM,2BAA2B,CAAC;AACxD,OAAO,EAAE,QAAQ,EAAE,SAAS,EAAE,MAAM,oBAAoB,CAAC;AACzD,OAAO,EACL,gBAAgB,EAChB,cAAc,EACd,gBAAgB,EAChB,YAAY,EACZ,WAAW,EAEX,gBAAgB,EAChB,eAAe,EAGf,uBAAuB,EACxB,MAAM,sCAAsC,CAAC;AAG9C;;;GAGG;AACH,qBAAa,UAAU;IAGrB,OAAO,CAAC,MAAM,CAAC,mBAAmB;IAalC;;;;;;;OAOG;WACW,kBAAkB,CAAC,WAAW,EAAE,WAAW,EAAE,SAAS,EAAE,MAAM,GAAG,YAAY,GAAG,SAAS;IAgBvG;;;;OAIG;WACW,iBAAiB,CAAC,WAAW,EAAE,WAAW,GAAG,YAAY,GAAG,SAAS;IAenF;;;;OAIG;WACW,mBAAmB,CAAC,WAAW,EAAE,WAAW,GAAG,WAAW,GAAG,SAAS;IAWpF;;;;OAIG;WACW,oBAAoB,CAAC,WAAW,EAAE,WAAW,GAAG,MAAM,GAAG,SAAS;IAIhF;;;;OAIG;WACW,mBAAmB,CAAC,WAAW,EAAE,WAAW,GAAG;QAAE,IAAI,CAAC,EAAE,MAAM,CAAC;QAAC,WAAW,CAAC,EAAE,MAAM,CAAA;KAAE;IAOpG;;;;;;;;;;OAUG;IACH,MAAM,CAAC,qCAAqC,CAC1C,OAAO,EAAE,gBAAgB,EACzB,WAAW,EAAE,WAAW,EACxB,SAAS,EAAE,MAAM,EACjB,SAAS,CAAC,EAAE,SAAS,EACrB,OAAO,CAAC,EAAE,SAAS,GAClB,cAAc;IAyBjB;;;;;;;;;;;;;OAaG;IACH,MAAM,CAAC,uCAAuC,CAC5C,OAAO,EAAE,YAAY,EACrB,YAAY,EAAE,uBAAuB,EACrC,WAAW,EAAE,WAAW,EACxB,SAAS,EAAE,MAAM,EACjB,SAAS,CAAC,EAAE,SAAS,EACrB,OAAO,CAAC,EAAE,SAAS,EACnB,QAAQ,CAAC,EAAE,QAAQ,GAClB,gBAAgB;IA+BnB;;;;;;OAMG;WACW,uBAAuB,CAAC,OAAO,EAAE,YAAY,EAAE,WAAW,EAAE,WAAW,EAAE,SAAS,EAAE,MAAM,GAAG,YAAY;IAIvH,OAAO,CAAC,MAAM,CAAC,2BAA2B;IAY1C;;;;;;;;;;;OAWG;IACH,MAAM,CAAC,uCAAuC,CAC5C,OAAO,EAAE,eAAe,EACxB,WAAW,EAAE,WAAW,EACxB,SAAS,EAAE,MAAM,EACjB,SAAS,CAAC,EAAE,SAAS,EACrB,OAAO,CAAC,EAAE,SAAS,EACnB,QAAQ,CAAC,EAAE,QAAQ,GAClB,gBAAgB;CAwBpB"}

package/dist/cjs/utils/ScopeUtils.js

@@ -21,30 +21,27 @@ class ScopeUtils {
     // ----------------------
     // Context-derived helpers
     // ----------------------
-    /**
-     * Derive tenant details from the TurnContext.
-     * @param turnContext Activity context
-     * @returns Tenant details if a recipient tenant id is present; otherwise undefined.
-     */
-    static deriveTenantDetails(turnContext) {
-        const tenantId = turnContext?.activity?.recipient?.tenantId;
-        return tenantId ? { tenantId } : undefined;
-    }
     /**
      * Derive target agent details from the activity recipient.
+     * Uses {@link resolveEmbodiedAgentIds} to resolve the agent ID and blueprint ID, which are only
+     * set for embodied (agentic) agents — see that function for the rationale.
      * @param turnContext Activity context
+     * @param authToken Auth token for resolving agent identity from token claims.
      * @returns Agent details built from recipient properties; otherwise undefined.
      */
-    static deriveAgentDetails(turnContext) {
+    static deriveAgentDetails(turnContext, authToken) {
         const recipient = turnContext?.activity?.recipient;
         if (!recipient)
             return undefined;
+        const { agentId, agentBlueprintId } = (0, TurnContextUtils_1.resolveEmbodiedAgentIds)(turnContext, authToken);
         return {
-            agentId: recipient.agenticAppId,
+            agentId,
             agentName: recipient.name,
             agentAUID: recipient.aadObjectId,
+            agentBlueprintId,
+            agentEmail: turnContext?.activity?.getAgenticUser?.(),
             agentDescription: recipient.role,
-            tenantId: recipient.tenantId
+            tenantId: turnContext?.activity?.getAgenticTenantId?.()
         };
     }
     /**
@@ -62,22 +59,23 @@ class ScopeUtils {
             agentAUID: from.aadObjectId,
             agentDescription: from.role,
             tenantId: from.tenantId,
-            agentId: from.agenticAppId
+            agentId: from.agenticAppId,
+            agentEmail: from.agenticUserId
         };
     }
     /**
-     * Derive caller identity details (id, upn, name, tenant, client ip) from the activity from.
+     * Derive caller identity details (id, email, name, tenant) from the activity from.
      * @param turnContext Activity context
-     * @returns Caller details when available; otherwise undefined.
+     * @returns User details when available; otherwise undefined.
      */
     static deriveCallerDetails(turnContext) {
         const from = turnContext?.activity?.from;
         if (!from)
             return undefined;
         return {
-            callerId: from.aadObjectId,
-            callerUpn: from.agenticUserId,
-            callerName: from.name,
+            userId: from.aadObjectId,
+            userEmail: from.agenticUserId,
+            userName: from.name,
             tenantId: from.tenantId,
         };
     }
@@ -90,11 +88,11 @@ class ScopeUtils {
         return turnContext?.activity?.conversation?.id;
     }
     /**
-     * Derive source metadata (channel name and description/link) from the TurnContext.
+     * Derive channel (name and description) from the TurnContext.
      * @param turnContext Activity context
      * @returns Object with optional name and description fields.
      */
-    static deriveSourceMetadataObject(turnContext) {
+    static deriveChannelObject(turnContext) {
         return {
             name: turnContext?.activity?.channelId,
             description: turnContext?.activity?.channelIdSubChannel
@@ -102,95 +100,122 @@ class ScopeUtils {
     }
     /**
      * Create an `InferenceScope` using `details` and values derived from the provided `TurnContext`.
-     * Derives `agentDetails`, `tenantDetails`, `conversationId`, and `sourceMetadata` (channel name/link) from context.
+     * Derives `conversationId` and `channel` (name/description) from context.
      * Also records input messages from the context if present.
      * @param details The inference call details (model, provider, tokens, etc.).
      * @param turnContext The current activity context to derive scope parameters from.
+     * @param authToken Auth token for resolving agent identity from token claims.
+     * @param startTime Optional explicit start time (ms epoch, Date, or HrTime).
+     * @param endTime Optional explicit end time (ms epoch, Date, or HrTime).
      * @returns A started `InferenceScope` enriched with context-derived parameters.
      */
-    static populateInferenceScopeFromTurnContext(details, turnContext) {
-        const agent = ScopeUtils.deriveAgentDetails(turnContext);
-        const tenant = ScopeUtils.deriveTenantDetails(turnContext);
+    static populateInferenceScopeFromTurnContext(details, turnContext, authToken, startTime, endTime) {
+        const agent = ScopeUtils.deriveAgentDetails(turnContext, authToken);
+        const caller = ScopeUtils.deriveCallerDetails(turnContext);
         const conversationId = ScopeUtils.deriveConversationId(turnContext);
-        const sourceMetadata = ScopeUtils.deriveSourceMetadataObject(turnContext);
+        const channel = ScopeUtils.deriveChannelObject(turnContext);
         if (!agent) {
             throw new Error('populateInferenceScopeFromTurnContext: Missing agent details on TurnContext (recipient)');
         }
-        if (!tenant) {
-            throw new Error('populateInferenceScopeFromTurnContext: Missing tenant details on TurnContext (recipient)');
-        }
-        const scope = agents_a365_observability_1.InferenceScope.start(details, agent, tenant, conversationId, sourceMetadata);
+        const hasChannel = channel.name !== undefined || channel.description !== undefined;
+        const request = {
+            conversationId,
+            ...(hasChannel ? { channel: { name: channel.name, description: channel.description } } : {}),
+        };
+        const spanDetails = (startTime || endTime)
+            ? { startTime, endTime }
+            : undefined;
+        const scope = agents_a365_observability_1.InferenceScope.start(request, details, agent, caller, spanDetails);
         this.setInputMessageTags(scope, turnContext);
         return scope;
     }
     /**
      * Create an `InvokeAgentScope` using `details` and values derived from the provided `TurnContext`.
-     * Populates `conversationId` and `request.sourceMetadata` (channel name/link) in `details` from the `TurnContext`, overriding any existing values.
-     * Derives `tenantDetails`, `callerAgentDetails` (from caller), and `callerDetails` (from user).
-     * Also sets execution type and input messages from the context if present.
-     * @param details The invoke-agent call details to be augmented and used for the scope.
+     * Builds a separate `Request` with `conversationId` and `channel` from context.
+     * Merges agent identity from context into `details` via `buildInvokeAgentDetailsCore`.
+     * Derives `callerAgentDetails` (from caller) and `userDetails` (human caller).
+     * Also records input messages from the context if present.
+     * @param details The agent details to be augmented with context-derived identity.
      * @param turnContext The current activity context to derive scope parameters from.
+     * @param authToken Auth token for resolving agent identity from token claims.
+     * @param startTime Optional explicit start time (ms epoch, Date, or HrTime).
+     * @param endTime Optional explicit end time (ms epoch, Date, or HrTime).
+     * @param spanKind Optional span kind override. Defaults to `SpanKind.CLIENT`.
      * @returns A started `InvokeAgentScope` enriched with context-derived parameters.
      */
-    static populateInvokeAgentScopeFromTurnContext(details, turnContext) {
-        const tenant = ScopeUtils.deriveTenantDetails(turnContext);
+    static populateInvokeAgentScopeFromTurnContext(details, scopeDetails, turnContext, authToken, startTime, endTime, spanKind) {
         const callerAgent = ScopeUtils.deriveCallerAgent(turnContext);
         const caller = ScopeUtils.deriveCallerDetails(turnContext);
-        const invokeAgentDetails = ScopeUtils.buildInvokeAgentDetails(details, turnContext);
-        if (!tenant) {
-            throw new Error('populateInvokeAgentScopeFromTurnContext: Missing tenant details on TurnContext (recipient)');
-        }
-        const scope = agents_a365_observability_1.InvokeAgentScope.start(invokeAgentDetails, tenant, callerAgent, caller);
+        const conversationId = ScopeUtils.deriveConversationId(turnContext);
+        const channel = ScopeUtils.deriveChannelObject(turnContext);
+        // Merge agent identity from TurnContext into details.details
+        const agentDetails = ScopeUtils.buildInvokeAgentDetailsCore(details, turnContext, authToken);
+        // Build the request with channel and conversationId from context
+        const hasChannel = channel.name !== undefined || channel.description !== undefined;
+        const request = {
+            conversationId,
+            ...(hasChannel ? { channel: { name: channel.name, description: channel.description } } : {}),
+        };
+        // Build caller info with both human caller and caller agent details
+        const callerDetails = {
+            userDetails: caller,
+            callerAgentDetails: callerAgent,
+        };
+        const spanDetailsObj = (startTime || endTime || spanKind)
+            ? { startTime, endTime, spanKind }
+            : undefined;
+        const scope = agents_a365_observability_1.InvokeAgentScope.start(request, scopeDetails, agentDetails, callerDetails, spanDetailsObj);
         this.setInputMessageTags(scope, turnContext);
         return scope;
     }
     /**
-     * Build InvokeAgentDetails by merging provided details with agent info, conversation id and source metadata from the TurnContext.
-     * @param details Base invoke-agent details to augment
+     * Build agent details by merging provided details with agent info from the TurnContext.
+     * @param details Base agent details to augment
      * @param turnContext Activity context
-     * @returns New InvokeAgentDetails suitable for starting an InvokeAgentScope.
+     * @param authToken Auth token for resolving agent identity from token claims.
+     * @returns Merged AgentDetails with context-derived identity.
      */
-    static buildInvokeAgentDetails(details, turnContext) {
-        const agent = ScopeUtils.deriveAgentDetails(turnContext);
-        const srcMetaFromContext = ScopeUtils.deriveSourceMetadataObject(turnContext);
-        const executionTypePair = (0, TurnContextUtils_1.getExecutionTypePair)(turnContext);
-        const baseRequest = details.request ?? {};
-        const baseSource = baseRequest.sourceMetadata ?? {};
-        const mergedSourceMetadata = {
-            ...baseSource,
-            ...(srcMetaFromContext.name !== undefined ? { name: srcMetaFromContext.name } : {}),
-            ...(srcMetaFromContext.description !== undefined ? { description: srcMetaFromContext.description } : {}),
-        };
-        return {
+    static buildInvokeAgentDetails(details, turnContext, authToken) {
+        return ScopeUtils.buildInvokeAgentDetailsCore(details, turnContext, authToken);
+    }
+    static buildInvokeAgentDetailsCore(details, turnContext, authToken) {
+        const derivedAgentDetails = ScopeUtils.deriveAgentDetails(turnContext, authToken);
+        // Merge derived agent identity into details
+        const mergedAgent = {
             ...details,
-            ...agent,
-            conversationId: ScopeUtils.deriveConversationId(turnContext),
-            request: {
-                ...baseRequest,
-                executionType: executionTypePair.length > 0 ? executionTypePair[0][1] : baseRequest.executionType,
-                sourceMetadata: mergedSourceMetadata
-            }
+            ...(derivedAgentDetails ?? {}),
         };
+        return mergedAgent;
     }
     /**
      * Create an `ExecuteToolScope` using `details` and values derived from the provided `TurnContext`.
-     * Derives `agentDetails`, `tenantDetails`, `conversationId`, and `sourceMetadata` (channel name/link) from context.
+     * Derives `conversationId` and `channel` (name/link) from context.
      * @param details The tool call details (name, type, args, call id, etc.).
      * @param turnContext The current activity context to derive scope parameters from.
+     * @param authToken Auth token for resolving agent identity from token claims.
+     * @param startTime Optional explicit start time (ms epoch, Date, or HrTime). Useful when recording a
+     *        tool call after execution has already completed.
+     * @param endTime Optional explicit end time (ms epoch, Date, or HrTime).
+     * @param spanKind Optional span kind override. Defaults to `SpanKind.INTERNAL`.
      * @returns A started `ExecuteToolScope` enriched with context-derived parameters.
      */
-    static populateExecuteToolScopeFromTurnContext(details, turnContext) {
-        const agent = ScopeUtils.deriveAgentDetails(turnContext);
-        const tenant = ScopeUtils.deriveTenantDetails(turnContext);
+    static populateExecuteToolScopeFromTurnContext(details, turnContext, authToken, startTime, endTime, spanKind) {
+        const agent = ScopeUtils.deriveAgentDetails(turnContext, authToken);
+        const caller = ScopeUtils.deriveCallerDetails(turnContext);
         const conversationId = ScopeUtils.deriveConversationId(turnContext);
-        const sourceMetadata = ScopeUtils.deriveSourceMetadataObject(turnContext);
+        const channel = ScopeUtils.deriveChannelObject(turnContext);
         if (!agent) {
             throw new Error('populateExecuteToolScopeFromTurnContext: Missing agent details on TurnContext (recipient)');
         }
-        if (!tenant) {
-            throw new Error('populateExecuteToolScopeFromTurnContext: Missing tenant details on TurnContext (recipient)');
-        }
-        const scope = agents_a365_observability_1.ExecuteToolScope.start(details, agent, tenant, conversationId, sourceMetadata);
+        const hasChannel = channel.name !== undefined || channel.description !== undefined;
+        const request = {
+            conversationId,
+            ...(hasChannel ? { channel: { name: channel.name, description: channel.description } } : {}),
+        };
+        const spanDetailsObj = (startTime || endTime || spanKind)
+            ? { startTime, endTime, spanKind }
+            : undefined;
+        const scope = agents_a365_observability_1.ExecuteToolScope.start(request, details, agent, caller, spanDetailsObj);
         return scope;
     }
 }

package/dist/cjs/utils/ScopeUtils.js.map

@@ -1 +1 @@
-{"version":3,"file":"ScopeUtils.js","sourceRoot":"","sources":["../../../src/utils/ScopeUtils.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"ScopeUtils.js","sourceRoot":"","sources":["../../../src/utils/ScopeUtils.ts"],"names":[],"mappings":";AAAA,iFAAiF;AACjF,uCAAuC;AACvC,kCAAkC;AAClC,iFAAiF;;;AAIjF,oFAY8C;AAC9C,yDAA6D;AAE7D;;;GAGG;AACH,MAAa,UAAU;IAGb,MAAM,CAAC,mBAAmB,CAChC,KAAwC,EACxC,WAAwB;QAExB,IAAI,WAAW,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;YAChC,KAAK,CAAC,mBAAmB,CAAC,CAAC,WAAW,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC,CAAC;QACzD,CAAC;QACD,OAAO,KAAK,CAAC;IACf,CAAC;IAED,yBAAyB;IACzB,0BAA0B;IAC1B,yBAAyB;IACzB;;;;;;;OAOG;IACI,MAAM,CAAC,kBAAkB,CAAC,WAAwB,EAAE,SAAiB;QAC1E,MAAM,SAAS,GAAG,WAAW,EAAE,QAAQ,EAAE,SAAS,CAAC;QACnD,IAAI,CAAC,SAAS;YAAE,OAAO,SAAS,CAAC;QACjC,MAAM,EAAE,OAAO,EAAE,gBAAgB,EAAE,GAAG,IAAA,0CAAuB,EAAC,WAAW,EAAE,SAAS,CAAC,CAAC;QACtF,OAAO;YACL,OAAO;YACP,SAAS,EAAE,SAAS,CAAC,IAAI;YACzB,SAAS,EAAE,SAAS,CAAC,WAAW;YAChC,gBAAgB;YAChB,UAAU,EAAE,WAAW,EAAE,QAAQ,EAAE,cAAc,EAAE,EAAE;YACrD,gBAAgB,EAAE,SAAS,CAAC,IAAI;YAChC,QAAQ,EAAE,WAAW,EAAE,QAAQ,EAAE,kBAAkB,EAAE,EAAE;SACxC,CAAC;IACpB,CAAC;IAGD;;;;OAIG;IACI,MAAM,CAAC,iBAAiB,CAAC,WAAwB;QACtD,MAAM,IAAI,GAAG,WAAW,EAAE,QAAQ,EAAE,IAAI,CAAC;QACzC,IAAI,CAAC,IAAI;YAAE,OAAO,SAAS,CAAC;QAC5B,OAAO;YACL,gBAAgB,EAAE,IAAI,CAAC,qBAAqB;YAC5C,SAAS,EAAE,IAAI,CAAC,IAAI;YACpB,SAAS,EAAE,IAAI,CAAC,WAAW;YAC3B,gBAAgB,EAAE,IAAI,CAAC,IAAI;YAC3B,QAAQ,EAAE,IAAI,CAAC,QAAQ;YACvB,OAAO,EAAE,IAAI,CAAC,YAAY;YAC1B,UAAU,EAAE,IAAI,CAAC,aAAa;SACf,CAAC;IACpB,CAAC;IAGD;;;;OAIG;IACI,MAAM,CAAC,mBAAmB,CAAC,WAAwB;QACxD,MAAM,IAAI,GAAG,WAAW,EAAE,QAAQ,EAAE,IAAI,CAAC;QACzC,IAAI,CAAC,IAAI;YAAE,OAAO,SAAS,CAAC;QAC5B,OAAO;YACL,MAAM,EAAE,IAAI,CAAC,WAAW;YACxB,SAAS,EAAE,IAAI,CAAC,aAAa;YAC7B,QAAQ,EAAE,IAAI,CAAC,IAAI;YACnB,QAAQ,EAAE,IAAI,CAAC,QAAQ;SACT,CAAC;IACnB,CAAC;IAED;;;;OAIG;IACI,MAAM,CAAC,oBAAoB,CAAC,WAAwB;QACzD,OAAO,WAAW,EAAE,QAAQ,EAAE,YAAY,EAAE,EAAE,CAAC;IACjD,CAAC;IAED;;;;OAIG;IACI,MAAM,CAAC,mBAAmB,CAAC,WAAwB;QACxD,OAAO;YACL,IAAI,EAAE,WAAW,EAAE,QAAQ,EAAE,SAAS;YACtC,WAAW,EAAE,WAAW,EAAE,QAAQ,EAAE,mBAAyC;SAC9E,CAAC;IACJ,CAAC;IAED;;;;;;;;;;OAUG;IACH,MAAM,CAAC,qCAAqC,CAC1C,OAAyB,EACzB,WAAwB,EACxB,SAAiB,EACjB,SAAqB,EACrB,OAAmB;QAEnB,MAAM,KAAK,GAAG,UAAU,CAAC,kBAAkB,CAAC,WAAW,EAAE,SAAS,CAAC,CAAC;QACpE,MAAM,MAAM,GAAG,UAAU,CAAC,mBAAmB,CAAC,WAAW,CAAC,CAAC;QAC3D,MAAM,cAAc,GAAG,UAAU,CAAC,oBAAoB,CAAC,WAAW,CAAC,CAAC;QACpE,MAAM,OAAO,GAAG,UAAU,CAAC,mBAAmB,CAAC,WAAW,CAAC,CAAC;QAE5D,IAAI,CAAC,KAAK,EAAE,CAAC;YACX,MAAM,IAAI,KAAK,CAAC,yFAAyF,CAAC,CAAC;QAC7G,CAAC;QAED,MAAM,UAAU,GAAG,OAAO,CAAC,IAAI,KAAK,SAAS,IAAI,OAAO,CAAC,WAAW,KAAK,SAAS,CAAC;QACnF,MAAM,OAAO,GAAY;YACvB,cAAc;YACd,GAAG,CAAC,UAAU,CAAC,CAAC,CAAC,EAAE,OAAO,EAAE,EAAE,IAAI,EAAE,OAAO,CAAC,IAAI,EAAE,WAAW,EAAE,OAAO,CAAC,WAAW,EAAE,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;SAC7F,CAAC;QAEF,MAAM,WAAW,GAA4B,CAAC,SAAS,IAAI,OAAO,CAAC;YACjE,CAAC,CAAC,EAAE,SAAS,EAAE,OAAO,EAAE;YACxB,CAAC,CAAC,SAAS,CAAC;QAEd,MAAM,KAAK,GAAG,0CAAc,CAAC,KAAK,CAAC,OAAO,EAAE,OAAO,EAAE,KAAK,EAAE,MAAM,EAAE,WAAW,CAAC,CAAC;QACjF,IAAI,CAAC,mBAAmB,CAAC,KAAK,EAAE,WAAW,CAAC,CAAC;QAC7C,OAAO,KAAK,CAAC;IACf,CAAC;IAED;;;;;;;;;;;;;OAaG;IACH,MAAM,CAAC,uCAAuC,CAC5C,OAAqB,EACrB,YAAqC,EACrC,WAAwB,EACxB,SAAiB,EACjB,SAAqB,EACrB,OAAmB,EACnB,QAAmB;QAEnB,MAAM,WAAW,GAAG,UAAU,CAAC,iBAAiB,CAAC,WAAW,CAAC,CAAC;QAC9D,MAAM,MAAM,GAAG,UAAU,CAAC,mBAAmB,CAAC,WAAW,CAAC,CAAC;QAC3D,MAAM,cAAc,GAAG,UAAU,CAAC,oBAAoB,CAAC,WAAW,CAAC,CAAC;QACpE,MAAM,OAAO,GAAG,UAAU,CAAC,mBAAmB,CAAC,WAAW,CAAC,CAAC;QAE5D,6DAA6D;QAC7D,MAAM,YAAY,GAAG,UAAU,CAAC,2BAA2B,CAAC,OAAO,EAAE,WAAW,EAAE,SAAS,CAAC,CAAC;QAE7F,iEAAiE;QACjE,MAAM,UAAU,GAAG,OAAO,CAAC,IAAI,KAAK,SAAS,IAAI,OAAO,CAAC,WAAW,KAAK,SAAS,CAAC;QACnF,MAAM,OAAO,GAAY;YACvB,cAAc;YACd,GAAG,CAAC,UAAU,CAAC,CAAC,CAAC,EAAE,OAAO,EAAE,EAAE,IAAI,EAAE,OAAO,CAAC,IAAI,EAAE,WAAW,EAAE,OAAO,CAAC,WAAW,EAAE,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;SAC7F,CAAC;QAEF,oEAAoE;QACpE,MAAM,aAAa,GAAkB;YACnC,WAAW,EAAE,MAAM;YACnB,kBAAkB,EAAE,WAAW;SAChC,CAAC;QAEF,MAAM,cAAc,GAA4B,CAAC,SAAS,IAAI,OAAO,IAAI,QAAQ,CAAC;YAChF,CAAC,CAAC,EAAE,SAAS,EAAE,OAAO,EAAE,QAAQ,EAAE;YAClC,CAAC,CAAC,SAAS,CAAC;QAEd,MAAM,KAAK,GAAG,4CAAgB,CAAC,KAAK,CAAC,OAAO,EAAE,YAAY,EAAE,YAAY,EAAE,aAAa,EAAE,cAAc,CAAC,CAAC;QACzG,IAAI,CAAC,mBAAmB,CAAC,KAAK,EAAE,WAAW,CAAC,CAAC;QAC7C,OAAO,KAAK,CAAC;IACf,CAAC;IAED;;;;;;OAMG;IACI,MAAM,CAAC,uBAAuB,CAAC,OAAqB,EAAE,WAAwB,EAAE,SAAiB;QACtG,OAAO,UAAU,CAAC,2BAA2B,CAAC,OAAO,EAAE,WAAW,EAAE,SAAS,CAAC,CAAC;IACjF,CAAC;IAEO,MAAM,CAAC,2BAA2B,CAAC,OAAqB,EAAE,WAAwB,EAAE,SAAiB;QAC3G,MAAM,mBAAmB,GAAG,UAAU,CAAC,kBAAkB,CAAC,WAAW,EAAE,SAAS,CAAC,CAAC;QAElF,4CAA4C;QAC5C,MAAM,WAAW,GAAiB;YAChC,GAAG,OAAO;YACV,GAAG,CAAC,mBAAmB,IAAI,EAAE,CAAC;SAC/B,CAAC;QAEF,OAAO,WAAW,CAAC;IACrB,CAAC;IAED;;;;;;;;;;;OAWG;IACH,MAAM,CAAC,uCAAuC,CAC5C,OAAwB,EACxB,WAAwB,EACxB,SAAiB,EACjB,SAAqB,EACrB,OAAmB,EACnB,QAAmB;QAEnB,MAAM,KAAK,GAAG,UAAU,CAAC,kBAAkB,CAAC,WAAW,EAAE,SAAS,CAAC,CAAC;QACpE,MAAM,MAAM,GAAG,UAAU,CAAC,mBAAmB,CAAC,WAAW,CAAC,CAAC;QAC3D,MAAM,cAAc,GAAG,UAAU,CAAC,oBAAoB,CAAC,WAAW,CAAC,CAAC;QACpE,MAAM,OAAO,GAAG,UAAU,CAAC,mBAAmB,CAAC,WAAW,CAAC,CAAC;QAE5D,IAAI,CAAC,KAAK,EAAE,CAAC;YACX,MAAM,IAAI,KAAK,CAAC,2FAA2F,CAAC,CAAC;QAC/G,CAAC;QAED,MAAM,UAAU,GAAG,OAAO,CAAC,IAAI,KAAK,SAAS,IAAI,OAAO,CAAC,WAAW,KAAK,SAAS,CAAC;QACnF,MAAM,OAAO,GAAY;YACvB,cAAc;YACd,GAAG,CAAC,UAAU,CAAC,CAAC,CAAC,EAAE,OAAO,EAAE,EAAE,IAAI,EAAE,OAAO,CAAC,IAAI,EAAE,WAAW,EAAE,OAAO,CAAC,WAAW,EAAE,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;SAC7F,CAAC;QAEF,MAAM,cAAc,GAA4B,CAAC,SAAS,IAAI,OAAO,IAAI,QAAQ,CAAC;YAChF,CAAC,CAAC,EAAE,SAAS,EAAE,OAAO,EAAE,QAAQ,EAAE;YAClC,CAAC,CAAC,SAAS,CAAC;QAEd,MAAM,KAAK,GAAG,4CAAgB,CAAC,KAAK,CAAC,OAAO,EAAE,OAAO,EAAE,KAAK,EAAE,MAAM,EAAE,cAAc,CAAC,CAAC;QACtF,OAAO,KAAK,CAAC;IACf,CAAC;CAEF;AAlQD,gCAkQC"}

package/dist/cjs/utils/TurnContextUtils.d.ts

@@ -2,33 +2,41 @@ import { TurnContext } from '@microsoft/agents-hosting';
 /**
  * Extracts caller-related OpenTelemetry baggage pairs from the TurnContext.
  * @param turnContext The current TurnContext (activity context)
- * @returns Array of [key, value] pairs for caller identity and tenant
+ * @returns Array of [key, value] pairs for caller identity
  */
 export declare function getCallerBaggagePairs(turnContext: TurnContext): Array<[string, string]>;
 /**
- * Extracts the execution type baggage key-value pair based on caller and recipient agentic status.
- * @param turnContext The current TurnContext (activity context)
- * @returns Array of [key, value] for execution type
+ * Resolves the agent instance ID and blueprint ID for embodied (agentic) agents only.
+ * For the non-embodied agent case, we cannot reliably determine whether the token contains an app ID,
+ * or whether the app ID present in the token claims actually corresponds to this agent. Therefore,
+ * we only set agentId and agentBlueprintId for embodied (agentic) agents.
+ * @param turnContext Activity context
+ * @param authToken Auth token for resolving blueprint ID from token claims.
+ * @returns Object with agentId and agentBlueprintId, both undefined for non-embodied agents.
  */
-export declare function getExecutionTypePair(turnContext: TurnContext): Array<[string, string]>;
+export declare function resolveEmbodiedAgentIds(turnContext: TurnContext, authToken: string): {
+    agentId: string | undefined;
+    agentBlueprintId: string | undefined;
+};
 /**
  * Extracts agent/recipient-related OpenTelemetry baggage pairs from the TurnContext.
  * @param turnContext The current TurnContext (activity context)
+ * @param authToken Optional auth token for resolving agent blueprint ID from token claims.
  * @returns Array of [key, value] pairs for agent identity and description
  */
-export declare function getTargetAgentBaggagePairs(turnContext: TurnContext): Array<[string, string]>;
+export declare function getTargetAgentBaggagePairs(turnContext: TurnContext, authToken?: string): Array<[string, string]>;
 /**
- * Extracts the tenant ID baggage key-value pair, attempting to retrieve from ChannelData if necessary.
+ * Extracts the tenant ID baggage key-value pair using the Activity's getAgenticTenantId() helper.
  * @param turnContext The current TurnContext (activity context)
  * @returns Array of [key, value] for tenant ID
  */
 export declare function getTenantIdPair(turnContext: TurnContext): Array<[string, string]>;
 /**
- * Extracts source metadata baggage pairs from the TurnContext.
+ * Extracts channel baggage pairs from the TurnContext.
  * @param turnContext The current TurnContext (activity context)
- * @returns Array of [key, value] pairs for channel name and link
+ * @returns Array of [key, value] pairs for channel name and subchannel description
  */
-export declare function getSourceMetadataBaggagePairs(turnContext: TurnContext): Array<[string, string]>;
+export declare function getChannelBaggagePairs(turnContext: TurnContext): Array<[string, string]>;
 /**
  * Extracts conversation ID and item link baggage key-value pairs from the provided turn context.
  * @param turnContext The current TurnContext (activity context)

package/dist/cjs/utils/TurnContextUtils.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"TurnContextUtils.d.ts","sourceRoot":"","sources":["../../../src/utils/TurnContextUtils.ts"],"names":[],"mappings":"AAKA,OAAO,EAAE,WAAW,EAAE,MAAM,2BAA2B,CAAC;AAcxD;;;;GAIG;AACH,wBAAgB,qBAAqB,CAAC,WAAW,EAAE,WAAW,GAAG,KAAK,CAAC,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC,CAevF;AAED;;;;GAIG;AACH,wBAAgB,oBAAoB,CAAC,WAAW,EAAE,WAAW,GAAG,KAAK,CAAC,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC,CAkBtF;AAED;;;;GAIG;AACH,wBAAgB,0BAA0B,CAAC,WAAW,EAAE,WAAW,GAAG,KAAK,CAAC,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC,CAgB5F;AAED;;;;GAIG;AACH,wBAAgB,eAAe,CAAC,WAAW,EAAE,WAAW,GAAG,KAAK,CAAC,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC,CAoBjF;AAED;;;;GAIG;AACH,wBAAgB,6BAA6B,CAAC,WAAW,EAAE,WAAW,GAAG,KAAK,CAAC,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC,CAS/F;AAED;;;;GAIG;AACH,wBAAgB,iCAAiC,CAAC,WAAW,EAAE,WAAW,GAAG,KAAK,CAAC,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC,CAWnG"}
+{"version":3,"file":"TurnContextUtils.d.ts","sourceRoot":"","sources":["../../../src/utils/TurnContextUtils.ts"],"names":[],"mappings":"AAKA,OAAO,EAAE,WAAW,EAAE,MAAM,2BAA2B,CAAC;AAcxD;;;;GAIG;AACH,wBAAgB,qBAAqB,CAAC,WAAW,EAAE,WAAW,GAAG,KAAK,CAAC,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC,CAcvF;AAED;;;;;;;;GAQG;AACH,wBAAgB,uBAAuB,CAAC,WAAW,EAAE,WAAW,EAAE,SAAS,EAAE,MAAM,GAAG;IAAE,OAAO,EAAE,MAAM,GAAG,SAAS,CAAC;IAAC,gBAAgB,EAAE,MAAM,GAAG,SAAS,CAAA;CAAE,CAQ1J;AAED;;;;;GAKG;AACH,wBAAgB,0BAA0B,CAAC,WAAW,EAAE,WAAW,EAAE,SAAS,CAAC,EAAE,MAAM,GAAG,KAAK,CAAC,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC,CAgBhH;AAED;;;;GAIG;AACH,wBAAgB,eAAe,CAAC,WAAW,EAAE,WAAW,GAAG,KAAK,CAAC,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC,CAGjF;AAED;;;;GAIG;AACH,wBAAgB,sBAAsB,CAAC,WAAW,EAAE,WAAW,GAAG,KAAK,CAAC,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC,CASxF;AAED;;;;GAIG;AACH,wBAAgB,iCAAiC,CAAC,WAAW,EAAE,WAAW,GAAG,KAAK,CAAC,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC,CAWnG"}