@smythos/sre 1.6.14 → 1.7.5

package/dist/types/subsystems/IO/VectorDB.service/connectors/RAMVecrtorDB.class.d.ts

@@ -2,7 +2,7 @@ import { ACL } from '@sre/Security/AccessControl/ACL.class';
 import { IAccessCandidate } from '@sre/types/ACL.types';
 import { AccessRequest } from '@sre/Security/AccessControl/AccessRequest.class';
 import { VectorDBConnector, DeleteTarget } from '../VectorDBConnector';
-import { DatasourceDto, IStorageVectorDataSource, IStorageVectorNamespace, IVectorDataSourceDto, QueryOptions, VectorsResultData } from '@sre/types/VectorDB.types';
+import { DatasourceDto, IStorageVectorDataSource, IStorageVectorNamespace, IVectorDataSourceDto, QueryOptions, VectorDBResult, VectorsResultData } from '@sre/types/VectorDB.types';
 import { BaseEmbedding, TEmbeddings } from '../embed/BaseEmbedding';
 export type RAMVectorDBConfig = {
     /**
@@ -38,7 +38,7 @@ export declare class RAMVectorDB extends VectorDBConnector {
     protected listNamespaces(acRequest: AccessRequest): Promise<IStorageVectorNamespace[]>;
     protected deleteNamespace(acRequest: AccessRequest, namespace: string): Promise<void>;
     protected search(acRequest: AccessRequest, namespace: string, query: string | number[], options?: QueryOptions): Promise<VectorsResultData>;
-    protected insert(acRequest: AccessRequest, namespace: string, sourceWrapper: IVectorDataSourceDto | IVectorDataSourceDto[]): Promise<string[]>;
+    protected insert(acRequest: AccessRequest, namespace: string, sourceWrapper: IVectorDataSourceDto | IVectorDataSourceDto[]): Promise<VectorDBResult[]>;
     protected delete(acRequest: AccessRequest, namespace: string, deleteTarget: DeleteTarget): Promise<void>;
     protected createDatasource(acRequest: AccessRequest, namespace: string, datasource: DatasourceDto): Promise<IStorageVectorDataSource>;
     protected deleteDatasource(acRequest: AccessRequest, namespace: string, datasourceId: string): Promise<void>;

package/dist/types/subsystems/IO/VectorDB.service/embed/BaseEmbedding.d.ts

@@ -2,26 +2,29 @@ import { IVectorDataSourceDto, Source } from '@sre/types/VectorDB.types';
 import { SupportedProviders, SupportedModels } from './index';
 import { AccessCandidate } from '@sre/Security/AccessControl/AccessCandidate.class';
 export type TEmbeddings = {
-    provider: SupportedProviders;
-    model: SupportedModels[SupportedProviders];
+    provider?: SupportedProviders;
+    model?: SupportedModels[SupportedProviders];
     credentials?: {
         apiKey: string;
     };
-    params?: {
-        dimensions?: number;
-        timeout?: number;
-        chunkSize?: number;
-        stripNewLines?: boolean;
-    };
+    dimensions?: number;
+    timeout?: number;
+    chunkSize?: number;
+    chunkOverlap?: number;
+    batchSize?: number;
+    stripNewLines?: boolean;
+    params?: any;
 };
 type SupportedSources = 'text' | 'vector' | 'url';
 export declare abstract class BaseEmbedding {
     model: string;
     modelName: string;
     chunkSize: number;
+    chunkOverlap: number;
     stripNewLines: boolean;
     dimensions?: number;
     timeout?: number;
+    batchSize: number;
     constructor(fields?: Partial<TEmbeddings>);
     /**
      * Embed multiple texts and return their vector representations
@@ -35,6 +38,10 @@ export declare abstract class BaseEmbedding {
      * Utility method to chunk arrays into smaller batches
      */
     protected chunkArr<T>(arr: T[], sizePerChunk: number): T[][];
+    chunkText(text: string, { chunkSize, chunkOverlap }: {
+        chunkSize?: number;
+        chunkOverlap?: number;
+    }): string[];
     /**
      * Utility method to process multiple texts based on stripNewLines setting
      */
@@ -48,7 +55,7 @@ export declare abstract class BaseEmbedding {
             datasourceId: string;
             datasourceLabel: string;
             acl: string;
-            user_metadata?: string;
+            user_metadata?: string | Record<string, any>;
         };
         id: string;
     }[]>;

package/dist/types/subsystems/IO/VectorDB.service/embed/index.d.ts

@@ -1,6 +1,7 @@
 import { OpenAIEmbeds } from './OpenAIEmbedding';
 import { GoogleEmbeds } from './GoogleEmbedding';
 import { TEmbeddings } from './BaseEmbedding';
+import { TLLMModel } from '@sre/types/LLM.types';
 declare const supportedProviders: {
     readonly OpenAI: {
         readonly embedder: typeof OpenAIEmbeds;
@@ -16,6 +17,8 @@ export type SupportedModels = {
     [K in SupportedProviders]: (typeof supportedProviders)[K]['models'][number];
 };
 export declare class EmbeddingsFactory {
-    static create(provider: SupportedProviders, config: TEmbeddings): OpenAIEmbeds | GoogleEmbeds;
+    static create(provider?: SupportedProviders, config?: TEmbeddings & {
+        model?: SupportedModels[SupportedProviders] | TLLMModel;
+    }): OpenAIEmbeds | GoogleEmbeds;
 }
 export {};

package/dist/types/subsystems/LLMManager/LLM.inference.d.ts

@@ -7,6 +7,7 @@ type TPromptParams = {
     contextWindow?: any[];
     files?: any[];
     params: TLLMParams;
+    onFallback?: (data: any) => void;
 };
 export declare class LLMInference {
     private model;
@@ -16,8 +17,41 @@ export declare class LLMInference {
     static getInstance(model: string | TLLMModel, candidate: AccessCandidate): Promise<LLMInference>;
     static user(candidate: AccessCandidate): any;
     get connector(): LLMConnector;
-    prompt({ query, contextWindow, files, params }: TPromptParams, isInFallback?: boolean): Promise<any>;
-    promptStream({ query, contextWindow, files, params }: TPromptParams, isInFallback?: boolean): Promise<any>;
+    prompt({ query, contextWindow, files, params, onFallback }: TPromptParams, isInFallback?: boolean): Promise<any>;
+    promptStream({ query, contextWindow, files, params, onFallback }: TPromptParams, isInFallback?: boolean): Promise<any>;
+    /**
+     * Creates a safe, minimal set of parameters when switching to a fallback LLM provider.
+     *
+     * **Why this exists:**
+     * Model settings persist in the component's configuration data, even when you switch models.
+     * This can cause issues when fallback models run with settings the user can't see or track.
+     *
+     * **Real-world scenario:**
+     * 1. User configures a GPT-5 model and sets `reasoning_effort: "high"`
+     * 2. This setting gets saved to the component's configuration
+     * 3. User switches to a custom model (e.g., for cost savings)
+     * 4. The UI now shows custom model options - GPT-5 options are hidden
+     * 5. **BUT**: `reasoning_effort: "high"` is STILL in the config data!
+     * 6. Custom model has GPT-5 as its fallback
+     * 7. Primary custom model fails → automatically switches to GPT-5 fallback
+     * 8. GPT-5 fallback runs with the hidden `reasoning_effort: "high"` setting
+     * 9. `reasoning_effort: "high"` requires a high `max_tokens` value
+     * 10. If `max_tokens` is too low → the request fails
+     *
+     * **The impact:**
+     * Users can't track response quality properly because they don't know what configuration
+     * the fallback model is using. The UI doesn't show fallback model settings, so users have
+     * no visibility into how responses are being generated.
+     *
+     * **What this function does:**
+     * Strips out provider-specific settings when falling back, using only universal parameters.
+     * This ensures predictable behavior. (Note: A more robust solution would be showing fallback
+     * configuration in the UI, but for now this handles it at the parameter level.)
+     *
+     * @param params - The full set of LLM parameters from the original request
+     * @returns A filtered parameter object with only provider-agnostic, safe parameters
+     */
+    private getSafeFallbackParams;
     /**
      * Executes fallback logic for custom models when the primary model fails.
      * This method checks if a fallback model is configured and invokes the appropriate LLM method.

package/dist/types/subsystems/LLMManager/LLM.service/connectors/Perplexity.class.d.ts

@@ -69,14 +69,11 @@ export declare class PerplexityConnector extends LLMConnector {
             text?: string;
             functionCall?: {
                 name: string;
-                args: string;
+                args: string | Record<string, any>;
             };
             functionResponse?: {
                 name: string;
-                response: {
-                    name: string;
-                    content: string;
-                };
+                response: any;
             };
         }[];
         tool_calls?: ToolData[];

package/dist/types/subsystems/LLMManager/LLM.service/connectors/openai/OpenAIConnector.class.d.ts

@@ -14,7 +14,7 @@ export declare class OpenAIConnector extends LLMConnector {
      * Determine the appropriate interface type based on context and capabilities
      */
     private getInterfaceType;
-    protected getClient(params: ILLMRequestContext): Promise<OpenAI>;
+    protected getClient(context: ILLMRequestContext): Promise<OpenAI>;
     protected request({ acRequest, body, context }: ILLMRequestFuncParams): Promise<TLLMChatResponse>;
     protected streamRequest({ acRequest, body, context }: ILLMRequestFuncParams): Promise<EventEmitter>;
     protected imageGenRequest({ acRequest, body, context }: ILLMRequestFuncParams): Promise<OpenAI.ImagesResponse>;
@@ -44,14 +44,11 @@ export declare class OpenAIConnector extends LLMConnector {
             text?: string;
             functionCall?: {
                 name: string;
-                args: string;
+                args: string | Record<string, any>;
             };
             functionResponse?: {
                 name: string;
-                response: {
-                    name: string;
-                    content: string;
-                };
+                response: any;
             };
         }[];
         tool_calls?: ToolData[];

package/dist/types/subsystems/LLMManager/LLM.service/connectors/openai/apiInterfaces/ResponsesApiInterface.d.ts

@@ -108,12 +108,19 @@ export declare class ResponsesApiInterface extends OpenAIApiInterface {
      * Upload files to storage
      */
     private uploadFiles;
+    /**
+     * Upload file to OpenAI Files API
+     * Similar to GoogleAI's uploadFile implementation
+     */
+    private uploadFile;
     /**
      * Process image files with Responses API specific formatting
+     * Uses OpenAI Files API for uploading images
      */
     private processImageData;
     /**
      * Process document files with Responses API specific formatting
+     * Uses OpenAI Files API for uploading documents
      */
     private processDocumentData;
     /**

package/dist/types/subsystems/LLMManager/LLM.service/connectors/xAI.class.d.ts

@@ -104,14 +104,11 @@ export declare class xAIConnector extends LLMConnector {
             text?: string;
             functionCall?: {
                 name: string;
-                args: string;
+                args: string | Record<string, any>;
             };
             functionResponse?: {
                 name: string;
-                response: {
-                    name: string;
-                    content: string;
-                };
+                response: any;
             };
         }[];
         tool_calls?: ToolData[];

package/dist/types/types/Agent.types.d.ts

@@ -25,6 +25,7 @@ export interface IAgent {
     sessionTag: any;
     callerSessionId: any;
     apiBasePath: any;
+    triggerBasePath: any;
     agentRuntime: AgentRuntime | any;
     usingTestDomain: any;
     domain: any;

package/dist/types/types/LLM.types.d.ts

@@ -71,7 +71,32 @@ export type TToolsInfo = {
     xai: TxAIToolsInfo;
 };
 export type TSearchContextSize = 'low' | 'medium' | 'high';
-export type TLLMParams = {
+type TLLMToolConfig = {
+    toolsConfig?: {
+        tools?: OpenAI.ChatCompletionTool[] | OpenAI.Responses.Tool[] | OpenAI.Responses.WebSearchTool[];
+        tool_choice?: TLLMToolChoice;
+    };
+};
+type TLLMThinkingConfig = {
+    thinking?: {
+        type: 'enabled' | 'disabled';
+        budget_tokens: number;
+    };
+    maxThinkingTokens?: number;
+};
+type TLLMReasoningConfig = {
+    useReasoning?: boolean;
+    /**
+     * Controls the level of effort the model will put into reasoning
+     * For GPT-OSS models (20B, 120B): "low" | "medium" | "high"
+     * For Qwen 3 32B: "none" | "default"
+     */
+    reasoningEffort?: 'none' | 'default' | OpenAIReasoningEffort;
+    max_output_tokens?: number;
+    verbosity?: OpenAI.Responses.ResponseCreateParams['text']['verbosity'];
+    abortSignal?: AbortSignal;
+};
+type TLLMTextGenConfig = {
     model: TLLMModel | string;
     prompt?: string;
     messages?: any[];
@@ -83,31 +108,16 @@ export type TLLMParams = {
     frequencyPenalty?: number;
     presencePenalty?: number;
     responseFormat?: any;
-    modelInfo?: TCustomLLMModel;
-    files?: BinaryInput[];
-    toolsConfig?: {
-        tools?: OpenAI.ChatCompletionTool[] | OpenAI.Responses.Tool[] | OpenAI.Responses.WebSearchTool[];
-        tool_choice?: TLLMToolChoice;
-    };
-    baseURL?: string;
-    size?: OpenAI.Images.ImageGenerateParams['size'] | OpenAI.Images.ImageEditParams['size'];
-    quality?: 'standard' | 'hd';
-    n?: number;
-    style?: 'vivid' | 'natural';
-    cache?: boolean;
-    agentId?: string;
-    teamId?: string;
-    thinking?: {
-        type: 'enabled' | 'disabled';
-        budget_tokens: number;
-    };
-    maxThinkingTokens?: number;
+} & TLLMToolConfig & TLLMThinkingConfig & TLLMReasoningConfig;
+type TLLMWebSearchConfig = {
     useWebSearch?: boolean;
     webSearchContextSize?: TSearchContextSize;
     webSearchCity?: string;
     webSearchCountry?: string;
     webSearchRegion?: string;
     webSearchTimezone?: string;
+};
+type TLLMSearchConfig = {
     useSearch?: boolean;
     searchMode?: 'auto' | 'on' | 'off';
     returnCitations?: boolean;
@@ -124,17 +134,27 @@ export type TLLMParams = {
     safeSearch?: boolean;
     fromDate?: string;
     toDate?: string;
-    useReasoning?: boolean;
-    /**
-     * Controls the level of effort the model will put into reasoning
-     * For GPT-OSS models (20B, 120B): "low" | "medium" | "high"
-     * For Qwen 3 32B: "none" | "default"
-     */
-    reasoningEffort?: 'none' | 'default' | OpenAIReasoningEffort;
-    max_output_tokens?: number;
-    verbosity?: OpenAI.Responses.ResponseCreateParams['text']['verbosity'];
-    abortSignal?: AbortSignal;
+} & TLLMWebSearchConfig;
+type TLLMMiscConfig = {
+    maxContextWindowLength?: number;
+    useContextWindow?: boolean;
+    passthrough?: boolean;
+};
+type TLLMRuntimeContext = {
+    modelInfo?: TCustomLLMModel;
+    files?: BinaryInput[];
+    baseURL?: string;
+    cache?: boolean;
+    agentId?: string;
+    teamId?: string;
+};
+type TLLMImageGenConfig = {
+    size?: OpenAI.Images.ImageGenerateParams['size'] | OpenAI.Images.ImageEditParams['size'];
+    quality?: 'standard' | 'hd';
+    n?: number;
+    style?: 'vivid' | 'natural';
 };
+export type TLLMParams = TLLMTextGenConfig & TLLMSearchConfig & TLLMImageGenConfig & TLLMMiscConfig & TLLMRuntimeContext;
 export type TLLMPreparedParams = TLLMParams & {
     body: any;
     modelEntryName?: string;
@@ -341,14 +361,11 @@ export type TLLMMessageBlock = {
         text?: string;
         functionCall?: {
             name: string;
-            args: string;
+            args: string | Record<string, any>;
         };
         functionResponse?: {
             name: string;
-            response: {
-                name: string;
-                content: string;
-            };
+            response: any;
         };
     }[];
     tool_calls?: ToolData[];
@@ -425,7 +442,9 @@ export declare enum TLLMEvent {
     /** Tokens usage information */
     Usage = "usage",
     /** Interrupted : emitted when the response is interrupted before completion */
-    Interrupted = "interrupted"
+    Interrupted = "interrupted",
+    /** Fallback : emitted when the response is using a fallback model */
+    Fallback = "fallback"
 }
 export interface ILLMRequestContext {
     modelEntryName: string;
@@ -481,3 +500,4 @@ export interface TGoogleAIRequestBody {
     toolConfig?: any;
 }
 export type TLLMRequestBody = TOpenAIRequestBody | TAnthropicRequestBody | TGoogleAIRequestBody | ConverseCommandInput;
+export {};

package/dist/types/types/SRE.types.d.ts

@@ -13,6 +13,7 @@ import { LogService } from '@sre/IO/Log.service';
 import { ComponentService } from '@sre/AgentManager/Component.service';
 import { ModelsProviderService } from '@sre/LLMManager/ModelsProvider.service';
 import { CodeService } from '@sre/ComputeManager/Code.service';
+import { SchedulerService } from '@sre/AgentManager/Scheduler.service';
 export type TServiceRegistry = {
     Storage?: StorageService;
     VectorDB?: VectorDBService;
@@ -29,6 +30,7 @@ export type TServiceRegistry = {
     Component?: ComponentService;
     ModelsProvider?: ModelsProviderService;
     Code?: CodeService;
+    Scheduler?: SchedulerService;
 };
 export declare enum TConnectorService {
     Storage = "Storage",
@@ -45,7 +47,8 @@ export declare enum TConnectorService {
     Log = "Log",
     Component = "Component",
     ModelsProvider = "ModelsProvider",
-    Code = "Code"
+    Code = "Code",
+    Scheduler = "Scheduler"
 }
 export type SREConnectorConfig = {
     Connector: string;

package/dist/types/types/VectorDB.types.d.ts

@@ -3,16 +3,17 @@ export type VectorDBMetadata = {
     datasourceId: string;
     datasourceLabel: string;
     acl: string;
-    user_metadata?: string;
+    user_metadata?: string | Record<string, any>;
     text?: string;
 };
-export type VectorsResultData = {
+export type VectorDBResult = {
     id: string;
     score?: number;
     values: number[];
     text: string;
     metadata?: Record<string, any>;
-}[];
+};
+export type VectorsResultData = VectorDBResult[];
 export interface NsKnownMetadata {
     isOnCustomStorage?: boolean;
     [key: string]: any;
@@ -37,6 +38,7 @@ export interface IStorageVectorDataSource {
     metadata: string;
     text?: string;
     vectorIds: string[];
+    vectorInfo?: VectorDBResult[];
     id: string;
     candidateId: string;
     candidateRole: string;
@@ -65,4 +67,5 @@ export interface DatasourceDto {
     chunkOverlap?: number;
     label?: string;
     id?: string;
+    returnFullVectorInfo?: boolean;
 }

package/dist/types/utils/string.utils.d.ts

@@ -22,7 +22,3 @@ export declare const kebabToCapitalize: (input: any) => any;
  * @param input
  */
 export declare const identifyMimetypeFromString: (input: string) => "application/json" | "text/plain" | "application/xml" | "text/html" | "text/css" | "text/csv" | "text/markdown" | "" | "image/svg+xml" | "application/javascript" | "application/yaml" | "application/sql";
-export declare function chunkText(text: string, { chunkSize, chunkOverlap, }?: {
-    chunkSize?: number;
-    chunkOverlap?: number;
-}): string[];

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@smythos/sre",
-  "version": "1.6.14",
+  "version": "1.7.5",
   "description": "Smyth Runtime Environment",
   "author": "Alaa-eddine KADDOURI",
   "license": "MIT",
@@ -31,6 +31,7 @@
     "@types/express": "^4.17.23",
     "@types/lodash": "^4.17.10",
     "@types/node": "^20.19.0",
+    "@types/ws": "^8.18.1",
     "cross-env": "^7.0.3",
     "ctix": "^2.7.1",
     "dependency-cruiser": "^16.3.3",
@@ -59,11 +60,12 @@
     "@pinecone-database/pinecone": "^3.0.0",
     "@runware/sdk-js": "^1.1.36",
     "@smithy/smithy-client": "^4.4.3",
-    "@zilliz/milvus2-sdk-node": "^2.5.11",
+    "@zilliz/milvus2-sdk-node": "^2.6.2",
     "acorn": "^8.14.1",
     "axios": "^1.7.2",
     "chokidar": "^4.0.3",
     "dayjs": "^1.11.11",
+    "domutils": "^3.2.2",
     "dotenv": "^16.4.5",
     "eventsource": "^3.0.2",
     "express": "^4.21.2",
@@ -71,6 +73,7 @@
     "form-data": "^4.0.3",
     "gpt-tokenizer": "^2.2.1",
     "groq-sdk": "^0.6.1",
+    "htmlparser2": "^10.0.0",
     "image-size": "^1.1.1",
     "ioredis": "^5.4.1",
     "isbinaryfile": "^5.0.2",
@@ -90,6 +93,7 @@
     "socks-proxy-agent": "^8.0.4",
     "winston": "^3.13.0",
     "winston-transport": "^4.7.0",
+    "ws": "^8.18.3",
     "xxhashjs": "^0.2.2",
     "zip-lib": "^1.1.2"
   },

package/src/Components/APICall/OAuth.helper.ts

@@ -7,8 +7,9 @@ import axios, { AxiosRequestConfig } from 'axios';
 import { Logger } from '@sre/helpers/Log.helper';
 import { ConnectorService } from '@sre/Core/ConnectorsService';
 import { AccessCandidate } from '@sre/Security/AccessControl/AccessCandidate.class';
-import { TemplateString } from '@sre/helpers/TemplateString.helper';
+import { Match, TemplateString } from '@sre/helpers/TemplateString.helper';
 import { SystemEvents } from '@sre/Core/SystemEvents';
+import { cloneDeep } from 'lodash';
 
 const console = Logger('OAuth.helper');
 let managedVault: any;
@@ -49,11 +50,9 @@ export function extractAdditionalParamsForOAuth1(reqConfig: AxiosRequestConfig =
 
     // Headers might be an object or array of objects
     if (Array.isArray(headers)) {
-        const contentTypeHeader = headers.find(h =>
-            Object.keys(h).some(k => k.toLowerCase() === 'content-type')
-        );
+        const contentTypeHeader = headers.find((h) => Object.keys(h).some((k) => k.toLowerCase() === 'content-type'));
         if (contentTypeHeader) {
-            const key = Object.keys(contentTypeHeader).find(k => k.toLowerCase() === 'content-type');
+            const key = Object.keys(contentTypeHeader).find((k) => k.toLowerCase() === 'content-type');
             contentType = contentTypeHeader[key];
         }
     } else {
@@ -83,9 +82,7 @@ export function extractAdditionalParamsForOAuth1(reqConfig: AxiosRequestConfig =
             console.debug('OAuth1: Including form parameters in signature:', Object.keys(formParams));
             additionalParams = { ...additionalParams, ...formParams };
         }
-    } else if (contentType.includes(REQUEST_CONTENT_TYPES.json) ||
-        contentType.includes('application/') ||
-        contentType.includes('text/')) {
+    } else if (contentType.includes(REQUEST_CONTENT_TYPES.json) || contentType.includes('application/') || contentType.includes('text/')) {
         // For JSON and other non-form data, use oauth_body_hash
         if (reqConfig.data && method !== 'GET' && method !== 'HEAD') {
             let bodyString = '';
@@ -110,8 +107,7 @@ export function extractAdditionalParamsForOAuth1(reqConfig: AxiosRequestConfig =
                 // Only include string values, exclude Files/Blobs
                 if (typeof value === 'string') {
                     additionalParams[key] = value;
-                } else if (typeof value === 'object' && value !== null &&
-                    ('size' in value || 'type' in value)) {
+                } else if (typeof value === 'object' && value !== null && ('size' in value || 'type' in value)) {
                     // Skip binary data (Files, Blobs, etc.)
                     continue;
                 } else {
@@ -123,8 +119,7 @@ export function extractAdditionalParamsForOAuth1(reqConfig: AxiosRequestConfig =
     } else if (!contentType && (method === 'POST' || method === 'PUT' || method === 'PATCH')) {
         // No content type specified but has data
         if (reqConfig.data) {
-            const bodyString = typeof reqConfig.data === 'string' ?
-                reqConfig.data : JSON.stringify(reqConfig.data);
+            const bodyString = typeof reqConfig.data === 'string' ? reqConfig.data : JSON.stringify(reqConfig.data);
             const hash = crypto.createHash('sha1').update(bodyString).digest('base64');
             additionalParams['oauth_body_hash'] = hash;
         }
@@ -165,9 +160,10 @@ export const buildOAuth1Header = (url, method, oauth1Credentials, additionalPara
         data: additionalParams, // Parameters should be in data field for oauth-1.0a library
     };
 
-    const token = oauth1Credentials.token && oauth1Credentials.token !== '' ?
-        { key: oauth1Credentials.token, secret: oauth1Credentials.tokenSecret || '' } :
-        null;
+    const token =
+        oauth1Credentials.token && oauth1Credentials.token !== ''
+            ? { key: oauth1Credentials.token, secret: oauth1Credentials.tokenSecret || '' }
+            : null;
 
     const signedRequest = oauth.authorize(requestData, token);
     return oauth.toHeader(signedRequest);
@@ -190,24 +186,25 @@ export const retrieveOAuthTokens = async (agent, config) => {
             // Check if it's new structure (has auth_data and auth_settings) or old structure
             const isNewStructure = tokensData.auth_data !== undefined && tokensData.auth_settings !== undefined;
 
+            //* Resolve vault keys inside auth_data
+            if (isNewStructure) {
+                await Promise.all(
+                    Object.keys(tokensData.auth_settings).map(async (key) => {
+                        if (typeof tokensData.auth_settings[key] !== 'string') return;
+                        tokensData.auth_settings[key] = await TemplateString(tokensData.auth_settings[key]).parseTeamKeysAsync(agent.teamId)
+                            .asyncResult;
+                    })
+                );
+            }
+
             // Extract tokens based on structure
-            const primaryToken = isNewStructure
-                ? tokensData.auth_data?.primary
-                : tokensData.primary;
-            const secondaryToken = isNewStructure
-                ? tokensData.auth_data?.secondary
-                : tokensData.secondary;
-            const expiresIn = isNewStructure
-                ? tokensData.auth_data?.expires_in
-                : tokensData.expires_in;
+            const primaryToken = isNewStructure ? tokensData.auth_data?.primary : tokensData.primary;
+            const secondaryToken = isNewStructure ? tokensData.auth_data?.secondary : tokensData.secondary;
+            const expiresIn = isNewStructure ? tokensData.auth_data?.expires_in : tokensData.expires_in;
 
             // Extract settings based on structure
-            const type = isNewStructure
-                ? tokensData.auth_settings?.type
-                : (tokensData.type || tokensData.oauth_info?.type);
-            const service = isNewStructure
-                ? tokensData.auth_settings?.service
-                : tokensData.oauth_info?.service;
+            const type = isNewStructure ? tokensData.auth_settings?.type : tokensData.type || tokensData.oauth_info?.type;
+            const service = isNewStructure ? tokensData.auth_settings?.service : tokensData.oauth_info?.service;
 
             // Add warning logs for OAuth2
             if (type === 'oauth2' && service !== 'oauth2_client_credentials') {
@@ -353,8 +350,6 @@ const getKeyIdsFromTemplateVars = (str: string): string[] => {
 };
 
 async function getClientCredentialToken(tokensData, logger, keyId, oauthTokens, config, agent, isNewStructure = false) {
-
-
     const logAndThrowError = (message) => {
         logger.debug(message);
         throw new Error(message);
@@ -399,7 +394,7 @@ async function getClientCredentialToken(tokensData, logger, keyId, oauthTokens,
                     auth_data: {
                         ...(tokensData?.auth_data || {}),
                         primary: newAccessToken,
-                        expires_in: expirationTimestamp.toString()
+                        expires_in: expirationTimestamp.toString(),
                     },
                     auth_settings: {
                         ...(tokensData?.auth_settings || {}),
@@ -416,7 +411,7 @@ async function getClientCredentialToken(tokensData, logger, keyId, oauthTokens,
                 updatedData = {
                     ...tokensData,
                     primary: newAccessToken,
-                    expires_in: expirationTimestamp.toString()
+                    expires_in: expirationTimestamp.toString(),
                 };
                 // Ensure required fields are present for old structure
                 if (!updatedData.type) updatedData.type = 'oauth2';
@@ -428,7 +423,7 @@ async function getClientCredentialToken(tokensData, logger, keyId, oauthTokens,
                         service: 'oauth2_client_credentials',
                         tokenURL,
                         clientID,
-                        clientSecret
+                        clientSecret,
                     };
                 }
             }