@smythos/sre 1.7.20 → 1.7.41

package/src/subsystems/ObservabilityManager/Telemetry.service/connectors/OTel/OTel.class.ts

@@ -5,7 +5,7 @@ import { IAccessCandidate } from '@sre/types/ACL.types';
 import { TelemetryConnector } from '../../TelemetryConnector';
 import { AgentCallLog } from '@sre/types/AgentLogger.types';
 
-import { trace, context, SpanStatusCode, Tracer } from '@opentelemetry/api';
+import { trace, context, SpanStatusCode, Tracer, propagation } from '@opentelemetry/api';
 import { Logger as OTelLogger, logs, SeverityNumber } from '@opentelemetry/api-logs';
 import { OTelContextRegistry } from './OTelContextRegistry';
 import { HookService, THook } from '@sre/Core/HookService';
@@ -20,8 +20,9 @@ import { OTLPLogExporter } from '@opentelemetry/exporter-logs-otlp-http';
 import { IAgent } from '@sre/types/Agent.types';
 import { Conversation } from '@sre/helpers/Conversation.helper';
 import { TLLMEvent } from '@sre/types/LLM.types';
+import { AccessCandidate } from '@sre/Security/AccessControl/AccessCandidate.class';
 
-const outputLogger = Logger('OTelLog');
+const outputLogger = Logger('OTel');
 
 export type OTelLogConfig = {
     endpoint: string;
@@ -50,7 +51,7 @@ export type OTelLogConfig = {
      */
     redactFields?: string[];
 };
-
+const OTEL_DEBUG_LOGS = true;
 export class OTel extends TelemetryConnector {
     public name: string = 'OTel';
     public id: string;
@@ -61,6 +62,10 @@ export class OTel extends TelemetryConnector {
 
     constructor(protected _settings: OTelLogConfig) {
         super();
+        if (!_settings.endpoint) {
+            outputLogger.warn('OTel initialization skipped, endpoint is not set');
+            return;
+        }
 
         outputLogger.log(`Initializing Tracer ...`);
 
@@ -208,6 +213,8 @@ export class OTel extends TelemetryConnector {
 
         const createToolInfoHandler = function (hookContext) {
             return function (toolInfo: any) {
+                const accessCandidate = AccessCandidate.agent(hookContext?.agentId);
+                if (OTEL_DEBUG_LOGS) outputLogger.debug('createToolInfoHandler started', accessCandidate);
                 if (!hookContext.curLLMGenSpan || !hookContext.convSpan) return;
 
                 const modelId = toolInfo.model;
@@ -238,6 +245,7 @@ export class OTel extends TelemetryConnector {
 
                 hookContext.curLLMGenSpan.end();
                 delete hookContext.curLLMGenSpan;
+                if (OTEL_DEBUG_LOGS) outputLogger.debug('createToolInfoHandler completed', accessCandidate);
             };
         };
 
@@ -245,6 +253,8 @@ export class OTel extends TelemetryConnector {
             return function (data: any, reqInfo: any) {
                 if (!hookContext.convSpan) return;
                 if (hookContext.curLLMGenSpan) return;
+                const accessCandidate = AccessCandidate.agent(hookContext?.agentId);
+                if (OTEL_DEBUG_LOGS) outputLogger.debug('createDataHandler started', reqInfo?.requestId, accessCandidate);
 
                 const modelId = reqInfo.model;
                 const contextWindow = reqInfo.contextWindow;
@@ -273,6 +283,7 @@ export class OTel extends TelemetryConnector {
                         attributes: {
                             'agent.id': hookContext.agentId,
                             'conv.id': hookContext.processId,
+                            'team.id': hookContext.teamId,
                             'llm.model': modelId || 'unknown',
                         },
                     },
@@ -285,13 +296,15 @@ export class OTel extends TelemetryConnector {
                     'context.preview': JSON.stringify(lastContext).substring(0, 200),
                 });
                 hookContext.curLLMGenSpan = llmGenSpan;
+                if (OTEL_DEBUG_LOGS) outputLogger.debug('createDataHandler completed', reqInfo?.requestId, accessCandidate);
             };
         };
 
         const createRequestedHandler = function (hookContext) {
             return function (reqInfo: any) {
                 if (!hookContext.convSpan) return;
-
+                const accessCandidate = AccessCandidate.agent(hookContext?.agentId);
+                if (OTEL_DEBUG_LOGS) outputLogger.debug('createRequestedHandler started', reqInfo?.requestId, accessCandidate);
                 if (!hookContext.latencySpans) hookContext.latencySpans = {};
                 const contextWindow = reqInfo.contextWindow;
 
@@ -304,6 +317,7 @@ export class OTel extends TelemetryConnector {
                         attributes: {
                             'agent.id': hookContext.agentId,
                             'conv.id': hookContext.processId,
+                            'team.id': hookContext.teamId,
                             'request.id': reqInfo.requestId,
                             'llm.model': modelId || 'unknown',
                             'metric.type': 'ttfb',
@@ -317,21 +331,34 @@ export class OTel extends TelemetryConnector {
                     'context.preview': JSON.stringify(lastContext).substring(0, 200),
                 });
                 hookContext.latencySpans[reqInfo.requestId] = llmGenLatencySpan;
+                if (OTEL_DEBUG_LOGS) outputLogger.debug('createRequestedHandler completed', reqInfo?.requestId, accessCandidate);
             };
         };
         HookService.register(
             'Conversation.streamPrompt',
             async function (additionalContext, args) {
-                const conversation: Conversation = this.instance;
-                const processId = conversation.id;
+                const conversation: Conversation = this.instance; //this.instance.agentData.teamId // this.instance.agentData.parenparentTeamId //this.instance.agentData.planInfo.properties this.instance.agentData.planInfo.flags
+                const processId = conversation.storeId || conversation.id;
                 const agentId = conversation.agentId;
                 const message = typeof args === 'object' ? args?.message : args || null;
                 const hookContext: any = this.context;
+                const teamId = conversation.agentData.teamId;
+                const orgTier = 'standard';
+                const orgSlot = this.instance.agentData?.planInfo?.flags ? `standard/${teamId}` : undefined;
+                const agentData = conversation.agentData || {};
+                const isDebugSession = agentData.debugSessionEnabled || false;
+                const isTestDomain = agentData.usingTestDomain || false;
+                const sessionId = processId;
+                const workflowId = agentData?.workflowReqId || agentData?.workflowID || agentData?.workflowId || undefined;
+                const logTags = agentData?.sessionTag || (isDebugSession ? 'DEBUG' : undefined);
+
                 if (message == null) {
                     //this is a conversation step, will be handled by createRequestedHandler
 
                     return;
                 }
+                const accessCandidate = AccessCandidate.agent(agentId);
+                if (OTEL_DEBUG_LOGS) outputLogger.debug('Conversation.streamPrompt started', { processId, message }, accessCandidate);
 
                 const modelId = typeof conversation?.model === 'string' ? conversation?.model : conversation?.model?.modelId;
 
@@ -343,21 +370,44 @@ export class OTel extends TelemetryConnector {
                         'gen_ai.conversation.id': processId,
                         'gen_ai.request.model': modelId || 'unknown',
                         ////////////////////////////////
+                        'team.id': teamId,
+                        'org.tier': orgTier,
+                        'org.slot': orgSlot,
                         'agent.id': agentId,
                         'conv.id': processId,
                         'llm.model': modelId || 'unknown',
+                        'agent.debug': isDebugSession,
+                        'agent.isTest': isTestDomain,
+                        'session.id': sessionId,
+                        'workflow.id': workflowId,
                     },
                 });
                 hookContext.convSpan = convSpan;
+                hookContext.agentId = agentId;
+                hookContext.processId = processId;
+                hookContext.teamId = teamId;
+                hookContext.orgSlot = orgSlot;
+                hookContext.isDebugSession = isDebugSession;
+                hookContext.isTestDomain = isTestDomain;
+
+                // Inject trace context into conversation headers for distributed tracing
+                let headers = {};
+                const traceContext = trace.setSpan(context.active(), convSpan);
+                propagation.inject(traceContext, headers);
+                for (let [key, value] of Object.entries(headers)) {
+                    conversation.headers[key] = value as string;
+                }
+                if (OTEL_DEBUG_LOGS) {
+                    outputLogger.debug('Injected trace headers into conversation', { processId, headers });
+                }
 
                 hookContext.dataHandler = createDataHandler(hookContext);
                 conversation.on(TLLMEvent.Data, hookContext.dataHandler);
+
                 hookContext.requestedHandler = createRequestedHandler(hookContext);
                 conversation.on(TLLMEvent.Requested, hookContext.requestedHandler);
-                hookContext.agentId = agentId;
-                hookContext.processId = processId;
-                hookContext.toolInfoHandler = createToolInfoHandler(hookContext);
 
+                hookContext.toolInfoHandler = createToolInfoHandler(hookContext);
                 conversation.on(TLLMEvent.ToolInfo, hookContext.toolInfoHandler);
 
                 // Add start event
@@ -383,10 +433,19 @@ export class OTel extends TelemetryConnector {
                             span_id: spanCtx.spanId,
                             trace_flags: spanCtx.traceFlags,
 
+                            /////
+                            'team.id': teamId,
+                            'org.slot': orgSlot,
+
                             'agent.id': agentId,
                             'conv.id': processId,
                             'input.size': JSON.stringify(message || {}).length,
                             'input.preview': message.substring(0, 2000),
+                            'agent.debug': isDebugSession,
+                            'agent.isTest': isTestDomain,
+                            'session.id': sessionId,
+                            'workflow.id': workflowId,
+                            'log.tags': logTags,
                         },
                     });
                 });
@@ -398,10 +457,21 @@ export class OTel extends TelemetryConnector {
             'Conversation.streamPrompt',
             async function ({ result, args, error }) {
                 const conversation: Conversation = this.instance;
-                const processId = conversation.id;
+                const processId = conversation.storeId || conversation.id;
                 const agentId = conversation.agentId;
                 const message = typeof args?.[0] === 'object' ? args?.[0]?.message : args?.[0] || null;
                 const hookContext: any = this.context;
+                const teamId = conversation.agentData.teamId;
+                const orgTier = 'standard';
+                const orgSlot = this.instance.agentData?.planInfo?.flags ? `standard/${teamId}` : undefined;
+
+                const isDebugSession = hookContext.isDebugSession || conversation.agentData?.debugSessionEnabled || false;
+                const isTestDomain = hookContext.isTestDomain || conversation.agentData?.usingTestDomain || false;
+                const agentData = conversation.agentData || {};
+                const sessionId = processId;
+                const workflowId = agentData?.workflowReqId || agentData?.workflowID || agentData?.workflowId || undefined;
+                const logTags = agentData?.sessionTag || (isDebugSession ? 'DEBUG' : undefined);
+
                 if (message == null) {
                     return;
                 }
@@ -409,6 +479,9 @@ export class OTel extends TelemetryConnector {
                 const ctx = OTelContextRegistry.get(agentId, processId);
                 if (!ctx) return;
 
+                const accessCandidate = AccessCandidate.agent(agentId);
+                if (OTEL_DEBUG_LOGS) outputLogger.debug('Conversation.streamPrompt completed', { processId }, accessCandidate);
+
                 if (hookContext.curLLMGenSpan) {
                     hookContext.curLLMGenSpan.addEvent('llm.gen.content', {
                         'content.size': JSON.stringify(result || {}).length,
@@ -435,6 +508,14 @@ export class OTel extends TelemetryConnector {
                             'conv.id': processId,
                             'output.size': JSON.stringify(result || {}).length,
                             'output.preview': result.substring(0, 2000),
+                            'team.id': teamId,
+                            'org.tier': orgTier,
+                            'org.slot': orgSlot,
+                            'agent.debug': isDebugSession,
+                            'agent.isTest': isTestDomain,
+                            'session.id': sessionId,
+                            'workflow.id': workflowId,
+                            'log.tags': logTags,
                         },
                     });
                 });
@@ -456,11 +537,24 @@ export class OTel extends TelemetryConnector {
                 const conversationId = agent.conversationId || agent.agentRequest?.header('X-CONVERSATION-ID');
                 const processId = agentProcessId.split(':').shift();
 
+                const orgTier = 'standard';
+                const orgSlot = agent.data.planInfo?.flags ? `standard/${agent.data.teamId}` : undefined;
                 const agentId = agent.id;
                 const agentRequest = agent.agentRequest;
                 const teamId = agent.teamId;
                 const _hookContext: any = this.context;
 
+                const sessionId = agent.callerSessionId || undefined;
+                const workflowId = agent.agentRuntime?.workflowReqId || undefined;
+
+                const isDebugSession = agent.debugSessionEnabled || agent.agentRuntime?.debug || false;
+                const logTags = agent.sessionTag || (isDebugSession ? 'DEBUG' : undefined);
+                const isTestDomain = agent.usingTestDomain || false;
+                const domain = agent.domain || undefined;
+
+                const accessCandidate = AccessCandidate.agent(agentId);
+                if (OTEL_DEBUG_LOGS) outputLogger.debug('SREAgent.process started', { processId, agentProcessId, endpointPath }, accessCandidate);
+
                 const body = oTelInstance.prepareComponentData(agentRequest.body || {});
                 const query = oTelInstance.prepareComponentData(agentRequest.query || {});
                 const headers = oTelInstance.prepareComponentData(agentRequest.headers || {});
@@ -469,22 +563,50 @@ export class OTel extends TelemetryConnector {
                 const input = { body, query, headers, processInput: agentInput };
 
                 let convSpan;
-                const ctx = OTelContextRegistry.get(agentId, processId) || OTelContextRegistry.get(agentId, conversationId);
+                let parentContext = context.active();
+
+                //try reading ctx from local registry (local execution)
+                let ctx = OTelContextRegistry.get(agentId, processId) || OTelContextRegistry.get(agentId, conversationId);
 
                 if (ctx) {
                     convSpan = ctx.rootSpan;
                     _hookContext.otelSpan = convSpan;
+                    parentContext = trace.setSpan(context.active(), convSpan);
+                } else {
+                    // No local context found - try extracting from headers (remote execution)
+                    const extractedContext = propagation.extract(context.active(), agentRequest.headers);
+                    const extractedSpan = trace.getSpan(extractedContext);
+
+                    if (extractedSpan) {
+                        // Successfully extracted parent span from headers
+                        parentContext = extractedContext;
+                        if (OTEL_DEBUG_LOGS) {
+                            outputLogger.debug('SREAgent.process extracted remote parent context from headers', {
+                                processId,
+                                traceId: extractedSpan.spanContext().traceId,
+                            });
+                        }
+                    }
                 }
+
                 const agentSpan = tracer.startSpan(
                     'Agent.Skill',
                     {
                         attributes: {
                             'agent.id': agentId,
                             'team.id': teamId,
+                            'conv.id': conversationId,
                             'process.id': agentProcessId,
+                            'org.slot': orgSlot,
+                            'org.tier': orgTier,
+                            'session.id': sessionId,
+                            'workflow.id': workflowId,
+                            'agent.debug': isDebugSession,
+                            'agent.isTest': isTestDomain,
+                            'agent.domain': domain,
                         },
                     },
-                    convSpan ? trace.setSpan(context.active(), convSpan) : undefined
+                    parentContext
                 );
 
                 // Add start event
@@ -510,12 +632,22 @@ export class OTel extends TelemetryConnector {
                             trace_id: spanCtx.traceId,
                             span_id: spanCtx.spanId,
                             trace_flags: spanCtx.traceFlags,
-                            agentId,
-                            processId: agentProcessId,
+                            'agent.id': agentId,
+                            'process.id': agentProcessId,
                             input: agentInput,
                             body,
                             query,
                             headers,
+                            'team.id': teamId,
+                            'org.slot': orgSlot,
+                            'org.tier': orgTier,
+                            'conv.id': conversationId,
+                            'session.id': sessionId,
+                            'workflow.id': workflowId,
+                            'log.tags': logTags,
+                            'agent.debug': isDebugSession,
+                            'agent.isTest': isTestDomain,
+                            'agent.domain': domain,
                         },
                     } as any);
                 });
@@ -528,8 +660,20 @@ export class OTel extends TelemetryConnector {
             async function ({ result, error }) {
                 const agent = this.instance;
                 const agentProcessId = agent.agentRuntime.processID; // nested process has a subID that needs to be removed
+                const conversationId = agent.conversationId || agent.agentRequest?.header('X-CONVERSATION-ID');
                 const agentId = agent.id;
                 const _hookContext: any = this.context;
+                const teamId = agent.teamId;
+                const orgTier = 'standard';
+                const orgSlot = agent.data.planInfo?.flags ? `standard/${agent.data.teamId}` : undefined;
+
+                const sessionId = agent.callerSessionId || undefined;
+                const workflowId = agent.agentRuntime?.workflowReqId || undefined;
+
+                const isDebugSession = agent.debugSessionEnabled || agent.agentRuntime?.debug || false;
+                const logTags = agent.sessionTag || (isDebugSession ? 'DEBUG' : undefined);
+                const isTestDomain = agent.usingTestDomain || false;
+                const domain = agent.domain || undefined;
 
                 const ctx = OTelContextRegistry.get(agentId, agentProcessId);
                 if (!ctx) return;
@@ -537,6 +681,9 @@ export class OTel extends TelemetryConnector {
 
                 if (!agentSpan) return;
 
+                const accessCandidate = AccessCandidate.agent(agentId);
+                if (OTEL_DEBUG_LOGS) outputLogger.debug('SREAgent.process completed', { agentProcessId }, accessCandidate);
+
                 if (error) {
                     agentSpan.recordException(error);
                     agentSpan.setStatus({ code: SpanStatusCode.ERROR, message: error.message });
@@ -561,11 +708,21 @@ export class OTel extends TelemetryConnector {
                     trace_id: spanCtx.traceId,
                     span_id: spanCtx.spanId,
                     trace_flags: spanCtx.traceFlags,
-                    agentId,
-                    processId: agentProcessId,
+                    'agent.id': agentId,
+                    'process.id': agentProcessId,
                     hasError: !!error,
                     'error.message': error?.message,
                     'error.stack': error?.stack,
+                    'team.id': teamId,
+                    'org.slot': orgSlot,
+                    'org.tier': orgTier,
+                    'conv.id': conversationId,
+                    'session.id': sessionId,
+                    'workflow.id': workflowId,
+                    'log.tags': logTags,
+                    'agent.debug': isDebugSession,
+                    'agent.isTest': isTestDomain,
+                    'agent.domain': domain,
                 };
 
                 // Only include output if formatOutputForLog returns a value
@@ -603,6 +760,28 @@ export class OTel extends TelemetryConnector {
                 const componentType = settings.name;
                 const componentName = settings.displayName || settings.name;
                 const eventId = settings.eventId; // specific event id attached to this component execution
+                const accessCandidate = AccessCandidate.agent(agentId);
+                const teamId = agent.teamId;
+                const orgTier = 'standard';
+                const orgSlot = agent.data.planInfo?.flags ? `standard/${agent.data.teamId}` : undefined;
+
+                const componentData = agent.agentRuntime?.getComponentData?.(componentId);
+                const sourceId = componentData?.sourceId || 'AGENT';
+                const sourceComponentData = sourceId !== 'AGENT' ? agent.components?.[sourceId] : null;
+                const sourceName = sourceComponentData?.displayName || sourceComponentData?.name || sourceId;
+
+                const sessionId = agent.callerSessionId || undefined;
+                const workflowId = agent.agentRuntime?.workflowReqId || undefined;
+                const workflowStep = agent.agentRuntime?.curStep || undefined;
+
+                const isDebugSession = agent.debugSessionEnabled || agent.agentRuntime?.debug || false;
+                const logTags = agent.sessionTag || (isDebugSession ? 'DEBUG' : undefined);
+                const isTestDomain = agent.usingTestDomain || false;
+
+                const inputAction = input?.__action || undefined;
+                const inputStatus = input?.__status || undefined;
+
+                if (OTEL_DEBUG_LOGS) outputLogger.debug('Component.process started', { componentId, sourceId }, accessCandidate);
 
                 const ctx = OTelContextRegistry.get(agentId, processId);
                 const parentSpan = ctx?.rootSpan;
@@ -619,13 +798,23 @@ export class OTel extends TelemetryConnector {
                             'cmp.id': componentId,
                             'cmp.type': componentType,
                             'cmp.name': componentName,
+                            'team.id': teamId,
+                            'org.tier': orgTier,
+                            'org.slot': orgSlot,
+                            'source.id': sourceId,
+                            'source.name': sourceName,
+                            'session.id': sessionId,
+                            'workflow.id': workflowId,
+                            'workflow.step': workflowStep,
+                            'agent.debug': isDebugSession,
+                            'agent.isTest': isTestDomain,
                             ...compSettingsData,
                         },
                     },
                     parentSpan ? trace.setSpan(context.active(), parentSpan) : undefined
                 );
 
-                // Add event: Component started
+                // Add event: Component started - includes input.action and input.status for workflow tracking
                 const inputStr = JSON.stringify(input || {});
 
                 const compInputData = oTelInstance.prepareComponentData(input || {});
@@ -633,6 +822,8 @@ export class OTel extends TelemetryConnector {
                     'event.id': eventId,
                     'cmp.input.size': JSON.stringify(input || {}).length,
                     'cmp.input': JSON.stringify(compInputData),
+                    'input.action': inputAction,
+                    'input.status': inputStatus,
                 });
 
                 // Emit structured log with full details
@@ -650,6 +841,17 @@ export class OTel extends TelemetryConnector {
                             'cmp.type': componentType,
                             'cmp.name': componentName,
                             'cmp.input': input,
+                            'team.id': teamId,
+                            'org.slot': orgSlot,
+                            'org.tier': orgTier,
+                            'source.id': sourceId,
+                            'source.name': sourceName,
+                            'session.id': sessionId,
+                            'workflow.id': workflowId,
+                            'workflow.step': workflowStep,
+                            'log.tags': logTags,
+                            'agent.debug': isDebugSession,
+                            'agent.isTest': isTestDomain,
                         },
                     });
                 });
@@ -676,6 +878,25 @@ export class OTel extends TelemetryConnector {
                 const componentId = settings.id || 'unknown';
                 const componentType = settings.name;
                 const componentName = settings.displayName || settings.name;
+                const teamId = agent.teamId;
+                const orgTier = 'standard';
+                const orgSlot = agent.data.planInfo?.flags ? `standard/${agent.data.teamId}` : undefined;
+
+                const componentData = agent.agentRuntime?.getComponentData?.(componentId);
+                const sourceId = componentData?.sourceId || 'AGENT';
+                const sourceComponentData = sourceId !== 'AGENT' ? agent.components?.[sourceId] : null;
+                const sourceName = sourceComponentData?.displayName || sourceComponentData?.name || sourceId;
+
+                const sessionId = agent.callerSessionId || undefined;
+                const workflowId = agent.agentRuntime?.workflowReqId || undefined;
+                const workflowStep = agent.agentRuntime?.curStep || undefined;
+
+                const isDebugSession = agent.debugSessionEnabled || agent.agentRuntime?.debug || false;
+                const logTags = agent.sessionTag || (isDebugSession ? 'DEBUG' : undefined);
+                const isTestDomain = agent.usingTestDomain || false;
+
+                const accessCandidate = AccessCandidate.agent(agentId);
+                if (OTEL_DEBUG_LOGS) outputLogger.debug('Component.process completed', { componentId }, accessCandidate);
 
                 if (error) {
                     // Capture error details
@@ -710,6 +931,17 @@ export class OTel extends TelemetryConnector {
                                 'error.type': error.name,
                                 'error.message': error.message,
                                 'error.stack': error.stack, // ← Full stack in logs
+                                'team.id': teamId,
+                                'org.slot': orgSlot,
+                                'org.tier': orgTier,
+                                'source.id': sourceId,
+                                'source.name': sourceName,
+                                'session.id': sessionId,
+                                'workflow.id': workflowId,
+                                'workflow.step': workflowStep,
+                                'log.tags': logTags,
+                                'agent.debug': isDebugSession,
+                                'agent.isTest': isTestDomain,
                             },
                         });
                     });
@@ -739,6 +971,17 @@ export class OTel extends TelemetryConnector {
                         'process.id': processId,
                         'event.id': eventId,
                         'cmp.output': result,
+                        'team.id': teamId,
+                        'org.slot': orgSlot,
+                        'org.tier': orgTier,
+                        'source.id': sourceId,
+                        'source.name': sourceName,
+                        'session.id': sessionId,
+                        'workflow.id': workflowId,
+                        'workflow.step': workflowStep,
+                        'log.tags': logTags,
+                        'agent.debug': isDebugSession,
+                        'agent.isTest': isTestDomain,
                     };
 
                     // Only include output if formatOutputForLog returns a value

package/src/subsystems/Security/Account.service/AccountConnector.ts

@@ -10,7 +10,7 @@ export interface ISmythAccountRequest {
     getCandidateTeam(): Promise<string | undefined>;
     getAllTeamSettings(): Promise<KeyValueObject>;
     getAllUserSettings(): Promise<KeyValueObject>;
-    getTeamSetting(settingKey: string): Promise<string>;
+    getTeamSetting(settingKey: string, group?: string): Promise<string>;
     getUserSetting(settingKey: string): Promise<string>;
     getAgentSetting(settingKey: string): Promise<string>;
     getTeam(): Promise<string>;
@@ -25,7 +25,7 @@ export abstract class AccountConnector extends Connector {
             getAllUserSettings: async () => this.getAllUserSettings(candidate.readRequest, candidate.id),
             getUserSetting: async (settingKey: string) => this.getUserSetting(candidate.readRequest, candidate.id, settingKey),
             getAllTeamSettings: async () => this.getAllTeamSettings(candidate.readRequest, candidate.id),
-            getTeamSetting: async (settingKey: string) => this.getTeamSetting(candidate.readRequest, candidate.id, settingKey),
+            getTeamSetting: async (settingKey: string, group?: string) => this.getTeamSetting(candidate.readRequest, candidate.id, settingKey, group),
             isTeamMember: async (teamId: string) => this.isTeamMember(teamId, candidate),
             getCandidateTeam: async () => this.getCandidateTeam(candidate),
             getTeam: async () => this.getCandidateTeam(candidate),
@@ -38,7 +38,7 @@ export abstract class AccountConnector extends Connector {
     public abstract getCandidateTeam(candidate: IAccessCandidate): Promise<string | undefined>;
     public abstract getAllTeamSettings(acRequest: AccessRequest, teamId: string): Promise<KeyValueObject>;
     public abstract getAllUserSettings(acRequest: AccessRequest, accountId: string): Promise<KeyValueObject>;
-    public abstract getTeamSetting(acRequest: AccessRequest, teamId: string, settingKey: string): Promise<string>;
+    public abstract getTeamSetting(acRequest: AccessRequest, teamId: string, settingKey: string, group?: string): Promise<string>;
     public abstract getUserSetting(acRequest: AccessRequest, accountId: string, settingKey: string): Promise<string>;
     public abstract getAgentSetting(acRequest: AccessRequest, agentId: string, settingKey: string): Promise<string>;
 }