@smythos/sre 1.6.13 → 1.7.1

package/src/subsystems/MemoryManager/LLMContext.ts

@@ -25,7 +25,7 @@ export class LLMContext {
     public contextLength: number;
 
     private _messages: any[] = [];
-    public get messages() {        
+    public get messages() {
         return this._messages;
     }
 
@@ -36,16 +36,11 @@ export class LLMContext {
      *
      * @param source a messages[] object, or smyth file system uri (smythfs://...)
      */
-    constructor(
-        private llmInference,
-        _systemPrompt: string = '',
-        llmContextStore?: ILLMContextStore,
-    ) {
+    constructor(private llmInference, _systemPrompt: string = '', llmContextStore?: ILLMContextStore) {
         this._llmCache = new LLMCache(AccessCandidate.team(this.llmInference.teamId));
         //this._systemPrompt = _systemPrompt;
         this.systemPrompt = _systemPrompt;
 
-        
         if (llmContextStore) {
             this._llmContextStore = llmContextStore;
             this._llmContextStore.load().then((messages) => {
@@ -57,7 +52,7 @@ export class LLMContext {
 
     private push(...message: any[]) {
         this._messages.push(...message);
-        
+
         if (this._llmContextStore) {
             this._llmContextStore.save(this._messages);
         }

package/src/subsystems/MemoryManager/RuntimeContext.ts

@@ -92,11 +92,11 @@ export class RuntimeContext extends EventEmitter {
     private initRuntimeContext() {
         if (this._runtimeFileReady) return;
 
-        const endpointDBGCall = this.runtime.xDebugId?.startsWith('dbg-'); //weak check for debug session, we need to improve this
+        //const endpointDBGCall = this.runtime.xDebugId?.startsWith('dbg-'); //weak check for debug session, we need to improve this
         console.debug('Init Agent Context', this.ctxFile, AccessCandidate.agent(this.runtime.agent.id));
         const agent = this.runtime.agent;
-        let method = (agent.agentRequest.method || 'POST').toUpperCase();
-        const endpoint = agent.endpoints?.[agent.agentRequest.path]?.[method];
+        //let method = (agent.agentRequest.method || 'POST').toUpperCase();
+        //const endpoint = agent.endpoints?.[agent.agentRequest.path]?.[method];
 
         let ctxData: any = {};
 
@@ -115,12 +115,13 @@ export class RuntimeContext extends EventEmitter {
                             ctx: { active: false, name: ctxData.components[cptId].name },
                         };
 
-                        const cpt = ctxData.components[cptId];
-                        //if this debug session was initiated from an endpoint, we mark the endpoint component as active
-                        if (endpoint && endpoint.id != undefined && cpt.id == endpoint.id && endpointDBGCall) {
-                            //cpt.dbg.active = true;
-                            cpt.ctx.active = true;
-                        }
+                        // //TODO : the endpoint initialization logic should be moved to the AgentRuntime class
+                        // const cpt = ctxData.components[cptId];
+                        // //if this debug session was initiated from an endpoint, we mark the endpoint component as active
+                        // if (endpoint && endpoint.id != undefined && cpt.id == endpoint.id && endpointDBGCall) {
+                        //     //cpt.dbg.active = true;
+                        //     cpt.ctx.active = true;
+                        // }
                     }
 
                     await this._cacheConnector

package/src/subsystems/Security/Credentials/Credentials.class.ts

@@ -0,0 +1 @@
+export class Credentials {}

package/src/subsystems/Security/Credentials/ManagedOAuth2Credentials.class.ts

@@ -0,0 +1,106 @@
+import { ConnectorService } from '@sre/Core/ConnectorsService';
+import { Credentials } from './Credentials.class';
+import { AccessCandidate } from '../AccessControl/AccessCandidate.class';
+
+export class ManagedOAuth2Credentials extends Credentials {
+    #accessToken: string;
+    #refreshToken: string;
+    #expiresIn: number;
+    #scope: string;
+    #tokenUrl: string;
+    #service: string;
+    #clientId: string;
+    #clientSecret: string;
+
+    public get accessToken(): string {
+        return this.#accessToken;
+    }
+    public get refreshToken(): string {
+        return this.#refreshToken;
+    }
+    public get expiresIn(): number {
+        return this.#expiresIn;
+    }
+    public get scope(): string {
+        return this.#scope;
+    }
+    public get tokenUrl(): string {
+        return this.#tokenUrl;
+    }
+    public get service(): string {
+        return this.#service;
+    }
+
+    private constructor(data: any) {
+        super();
+        this.parseData(data);
+    }
+
+    static async load(keyId: string, candidate: AccessCandidate): Promise<ManagedOAuth2Credentials> {
+        const managedVault = ConnectorService.getManagedVaultConnector();
+        const result = await managedVault.requester(candidate).get(keyId);
+        const data = typeof result === 'object' ? result : JSON.parse(result || '{}');
+
+        return new ManagedOAuth2Credentials(data);
+    }
+
+    private parseData(data: any) {
+        //SRE v1.0 format
+
+        //SRE v1.5.0+ format
+        if (!data.auth_data || !data.auth_settings) throw new Error('oAuth2Manager:Invalid data format');
+
+        this.#accessToken = data.auth_data.primary;
+        this.#refreshToken = data.auth_data.secondary;
+        this.#expiresIn = data.auth_data.expires_in;
+        this.#scope = data.auth_settings.scope;
+        this.#tokenUrl = data.auth_settings.tokenURL;
+        this.#service = data.auth_settings.service;
+        this.#clientId = data.auth_settings.clientID;
+        this.#clientSecret = data.auth_settings.clientSecret;
+    }
+
+    /**
+     * Get a fresh access token using the refresh token
+     */
+    public async refreshAccessToken() {
+        console.log('Refreshing access token...');
+
+        const tokenUrl = this.#tokenUrl;
+        const body = new URLSearchParams({
+            client_id: this.#clientId,
+            client_secret: this.#clientSecret,
+            refresh_token: this.#refreshToken,
+            grant_type: 'refresh_token',
+        });
+
+        try {
+            const res = await fetch(tokenUrl, {
+                method: 'POST',
+                headers: {
+                    'Content-Type': 'application/x-www-form-urlencoded',
+                },
+                body: body.toString(),
+            });
+
+            const text = await res.text();
+            let json: any;
+            try {
+                json = JSON.parse(text);
+            } catch {
+                throw new Error(`Invalid JSON response: ${text}`);
+            }
+
+            if (!res.ok) {
+                const errorMsg = json.error_description || json.error?.message || json.error || text;
+                throw new Error(`HTTP ${res.status}: ${errorMsg}`);
+            }
+
+            this.#accessToken = json.access_token;
+            this.#expiresIn = Date.now() + json.expires_in * 1000;
+            return this.#accessToken;
+        } catch (error: any) {
+            throw new Error(`Failed to refresh access token: ${error.message}`);
+        }
+    }
+}

package/src/subsystems/Security/Vault.service/connectors/JSONFileVault.class.ts

@@ -51,12 +51,12 @@ export class JSONFileVault extends VaultConnector {
         const relativeSearchLocations = ['vault.json', 'vault/vault.json', '.sre/vault.json'];
         found = findValidResourcePath(relativeSearchLocations, (dir, success, nextDir) => {
             if (!success) {
-                logger.warn('Vault file not found in:', nextDir);
+                logger.warn('Vault file not found in:', dir);
             }
         });
 
         if (found) {
-            logger.warn('Using alternative vault file found in : ', found);
+            logger.warn('Found a Vault file in : ', found, ' I will use this one.');
             return found;
         }
 

package/src/types/Agent.types.ts

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

package/src/types/LLM.types.ts

@@ -387,8 +387,8 @@ export type TLLMMessageBlock = {
         | Array<Anthropic.TextBlockParam | Anthropic.ImageBlockParam | Anthropic.ToolUseBlockParam | Anthropic.ToolResultBlockParam>;
     parts?: {
         text?: string;
-        functionCall?: { name: string; args: string };
-        functionResponse?: { name: string; response: { name: string; content: string } };
+        functionCall?: { name: string; args: string | Record<string, any> };
+        functionResponse?: { name: string; response: any };
     }[]; // for Google Vertex AI
     tool_calls?: ToolData[];
 };

package/src/types/SRE.types.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;
@@ -30,6 +31,7 @@ export type TServiceRegistry = {
     Component?: ComponentService;
     ModelsProvider?: ModelsProviderService;
     Code?: CodeService;
+    Scheduler?: SchedulerService;
 };
 
 export enum TConnectorService {
@@ -48,6 +50,7 @@ export enum TConnectorService {
     Component = 'Component',
     ModelsProvider = 'ModelsProvider',
     Code = 'Code',
+    Scheduler = 'Scheduler',
 }
 
 export type SREConnectorConfig = {