@ixo/common 1.1.2 → 1.1.4

package/dist/services/session-manager/session-manager.service.js

@@ -1,7 +1,7 @@
 import { Logger } from '@ixo/logger';
 import { MatrixManager } from '@ixo/matrix';
 import { getMatrixHomeServerCroppedForDid } from '@ixo/oracles-chain-client';
-import { getChatOpenAiModel } from '../../ai/index.js';
+import { getChatOpenAiModel, getLLMProvider, getOpenRouterChatModel, getProviderConfig, } from '../../ai/index.js';
 export class SessionManagerService {
     syncService;
     matrixManger;
@@ -18,17 +18,25 @@ export class SessionManagerService {
         if (messages.length === 0) {
             return 'Untitled';
         }
-        const llm = getChatOpenAiModel({
-            model: 'meta-llama/llama-3.1-8b-instruct',
-            temperature: 0.3,
-            apiKey: process.env.OPEN_ROUTER_API_KEY,
-            timeout: 20 * 1000 * 60,
-            configuration: {
-                baseURL: 'https://openrouter.ai/api/v1',
-            },
-        });
-        const response = await llm.invoke(`Based on this messages messages, Add a title for this convo and only based on the messages? MAKE SURE TO ONLY RESPOND WITH THE TITLE. 
-      
+        const provider = getLLMProvider();
+        const config = getProviderConfig();
+        const llm = provider === 'openrouter'
+            ? getOpenRouterChatModel({
+                model: 'meta-llama/llama-3.1-8b-instruct',
+                temperature: 0.3,
+                timeout: 60_000,
+            })
+            : getChatOpenAiModel({
+                model: 'meta-llama/Meta-Llama-3.1-8B-Instruct',
+                temperature: 0.3,
+                apiKey: config.apiKey,
+                timeout: 60_000,
+                configuration: {
+                    baseURL: config.baseURL,
+                },
+            });
+        const response = await llm.invoke(`Based on this messages messages, Add a title for this convo and only based on the messages? MAKE SURE TO ONLY RESPOND WITH THE TITLE.
+
       ## RESPONSE FORMAT
       ONLY RESPOND WITH THE TITLE not anything else that title will be saved to the store directly from your response so generated based on the messages.
 
@@ -81,7 +89,7 @@ ___________________________________________________________
         db.prepare('UPDATE sessions SET last_processed_count = ? WHERE session_id = ?').run(lastProcessedCount, sessionId);
         return;
     }
-    async syncSessionSet({ sessionId, did, messages, oracleEntityDid, oracleName, roomId: _roomId, lastProcessedCount, oracleDid, userContext, slackThreadTs, }) {
+    async syncSessionSet({ sessionId, did, messages, oracleEntityDid, oracleName, roomId, lastProcessedCount, oracleDid, userContext, slackThreadTs, }) {
         const db = await this.syncService.getUserDatabase(did);
         const selectedSession = await this.getSession(sessionId, did, false);
         if (!selectedSession) {
@@ -96,12 +104,13 @@ ___________________________________________________________
                 oracleEntityDid,
                 oracleDid,
                 userContext,
+                roomId,
                 slackThreadTs,
             };
             db.prepare(`
         INSERT INTO sessions (
-          session_id, title, last_updated_at, created_at, oracle_name, 
-          oracle_did, oracle_entity_did, last_processed_count, 
+          session_id, title, last_updated_at, created_at, oracle_name,
+          oracle_did, oracle_entity_did, last_processed_count,
           user_context, room_id, slack_thread_ts
         )
         VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)
@@ -118,6 +127,18 @@ ___________________________________________________________
                 messages,
             })
             : selectedSession.title;
+        if (allowTitleUpdate && roomId && title) {
+            this.matrixManger
+                .editMessage({
+                messageId: sessionId,
+                roomId,
+                message: title,
+                isOracleAdmin: true,
+            })
+                .catch((err) => {
+                Logger.error('Failed to update conversation title in Matrix:', err);
+            });
+        }
         const lastUpdatedAt = new Date().toISOString();
         const updatedSession = {
             ...selectedSession,
@@ -127,7 +148,7 @@ ___________________________________________________________
             slackThreadTs,
         };
         db.prepare(`
-      UPDATE sessions 
+      UPDATE sessions
       SET title = ?, last_updated_at = ?, last_processed_count = ?, slack_thread_ts = ?
       WHERE session_id = ?
     `).run(updatedSession.title ?? null, lastUpdatedAt, updatedSession.lastProcessedCount ?? null, updatedSession.slackThreadTs ?? null, sessionId);
@@ -136,11 +157,11 @@ ___________________________________________________________
     async getSession(sessionId, did, throwOnNotFound = true) {
         const db = await this.syncService.getUserDatabase(did);
         const row = db
-            .prepare(`SELECT 
+            .prepare(`SELECT
           session_id, title, last_updated_at, created_at, oracle_name,
           oracle_did, oracle_entity_did, last_processed_count,
           user_context, room_id, slack_thread_ts
-         FROM sessions 
+         FROM sessions
          WHERE session_id = ?`)
             .get(sessionId);
         const selectedSession = row
@@ -172,16 +193,29 @@ ___________________________________________________________
         const db = await this.syncService.getUserDatabase(listSessionsDto.did);
         const limit = listSessionsDto.limit ?? 20;
         const offset = listSessionsDto.offset ?? 0;
-        const rows = db
-            .prepare(`SELECT 
+        const hasRoomFilter = !!listSessionsDto.roomId;
+        const sql = hasRoomFilter
+            ? `SELECT
+          session_id, title, last_updated_at, created_at, oracle_name,
+          oracle_did, oracle_entity_did, last_processed_count,
+          user_context, room_id, slack_thread_ts,
+          COUNT(*) OVER() as total
+         FROM sessions
+         WHERE room_id = ?
+         ORDER BY last_updated_at DESC
+         LIMIT ? OFFSET ?`
+            : `SELECT
           session_id, title, last_updated_at, created_at, oracle_name,
           oracle_did, oracle_entity_did, last_processed_count,
           user_context, room_id, slack_thread_ts,
           COUNT(*) OVER() as total
-         FROM sessions 
+         FROM sessions
          ORDER BY last_updated_at DESC
-         LIMIT ? OFFSET ?`)
-            .all(limit, offset);
+         LIMIT ? OFFSET ?`;
+        const params = hasRoomFilter
+            ? [listSessionsDto.roomId, limit, offset]
+            : [limit, offset];
+        const rows = db.prepare(sql).all(...params);
         const total = rows[0]?.total ?? 0;
         const sessions = rows.map((row) => ({
             sessionId: row.session_id,
@@ -200,30 +234,41 @@ ___________________________________________________________
         }));
         return { sessions, total };
     }
-    async createSession(createSessionDto) {
+    async createSession(createSessionDto, overrideEventId) {
         const userHomeServer = createSessionDto.homeServer ||
             (await getMatrixHomeServerCroppedForDid(createSessionDto.did));
-        const { roomId } = await this.matrixManger.getOracleRoomIdWithHomeServer({
-            userDid: createSessionDto.did,
-            oracleEntityDid: createSessionDto.oracleEntityDid,
-            userHomeServer,
-        });
+        let roomId = createSessionDto.roomId;
+        if (!roomId) {
+            const resolved = await this.matrixManger.getOracleRoomIdWithHomeServer({
+                userDid: createSessionDto.did,
+                oracleEntityDid: createSessionDto.oracleEntityDid,
+                userHomeServer,
+            });
+            roomId = resolved.roomId;
+        }
         if (!roomId) {
             throw new Error('Room ID not found');
         }
-        const eventId = await this.matrixManger.sendMessage({
-            message: 'New Conversation Started',
-            roomId,
-            isOracleAdmin: true,
-        });
+        const eventId = overrideEventId ??
+            (await this.matrixManger.sendMessage({
+                message: 'New Conversation Started',
+                roomId,
+                isOracleAdmin: true,
+            }));
         let userContext;
-        if (this.memoryEngineService) {
+        if (this.memoryEngineService &&
+            (createSessionDto.ucanInvocation ||
+                (createSessionDto.oracleToken && createSessionDto.userToken))) {
             try {
                 Logger.debug('Gathering user context from Memory Engine');
                 userContext = await this.memoryEngineService.gatherUserContext({
                     oracleDid: createSessionDto.oracleDid,
-                    userDid: createSessionDto.did,
                     roomId,
+                    oracleToken: createSessionDto.oracleToken ?? '',
+                    userToken: createSessionDto.userToken ?? '',
+                    oracleHomeServer: createSessionDto.oracleHomeServer ?? '',
+                    userHomeServer: createSessionDto.userHomeServer ?? '',
+                    ucanInvocation: createSessionDto.ucanInvocation,
                 });
             }
             catch (error) {

package/dist/services/session-manager/session-manager.service.js.map

@@ -1 +1 @@
-{"version":3,"file":"session-manager.service.js","sourceRoot":"","sources":["../../../src/services/session-manager/session-manager.service.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"session-manager.service.js","sourceRoot":"","sources":["../../../src/services/session-manager/session-manager.service.ts"],"names":[],"mappings":"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"}

package/dist/utils/get-user-subscription.d.ts

@@ -16,6 +16,7 @@ export interface GetUserSubscriptionParams {
     network: 'mainnet' | 'testnet' | 'devnet';
     bearerToken: string;
     subscriptionUrl?: string;
+    authType?: 'ucan';
 }
-export declare const getUserSubscription: ({ bearerToken, network, subscriptionUrl: _subscriptionUrl, }: GetUserSubscriptionParams) => Promise<GetMySubscriptionsResponseDto | null>;
+export declare const getUserSubscription: ({ bearerToken, network, subscriptionUrl: _subscriptionUrl, authType, }: GetUserSubscriptionParams) => Promise<GetMySubscriptionsResponseDto | null>;
 //# sourceMappingURL=get-user-subscription.d.ts.map

package/dist/utils/get-user-subscription.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"get-user-subscription.d.ts","sourceRoot":"","sources":["../../src/utils/get-user-subscription.ts"],"names":[],"mappings":"AAEA,eAAO,MAAM,2BAA2B,GACtC,SAAS,SAAS,GAAG,SAAS,GAAG,QAAQ,WAO1C,CAAC;AAEF,MAAM,WAAW,mBAAmB;IAClC,wBAAwB,CAAC,EAAE,MAAM,CAAC;IAElC,8BAA8B,CAAC,EAAE,MAAM,CAAC;CACzC;AAED,MAAM,WAAW,6BAA6B;IAC5C,gBAAgB,EAAE,mBAAmB,CAAC;IACtC,WAAW,EAAE,MAAM,CAAC;IACpB,eAAe,EAAE,MAAM,CAAC;IACxB,YAAY,EAAE,MAAM,CAAC;IACrB,WAAW,EAAE,MAAM,CAAC;IACpB,MAAM,EAAE,QAAQ,GAAG,UAAU,GAAG,YAAY,GAAG,OAAO,CAAC;IACvD,YAAY,EAAE,MAAM,CAAC;CACtB;AAMD,MAAM,WAAW,yBAAyB;IACxC,OAAO,EAAE,SAAS,GAAG,SAAS,GAAG,QAAQ,CAAC;IAC1C,WAAW,EAAE,MAAM,CAAC;IACpB,eAAe,CAAC,EAAE,MAAM,CAAC;CAC1B;AAED,eAAO,MAAM,mBAAmB,GAAU,8DAIvC,yBAAyB,KAAG,OAAO,CAAC,6BAA6B,GAAG,IAAI,CAyC1E,CAAC"}
+{"version":3,"file":"get-user-subscription.d.ts","sourceRoot":"","sources":["../../src/utils/get-user-subscription.ts"],"names":[],"mappings":"AAEA,eAAO,MAAM,2BAA2B,GACtC,SAAS,SAAS,GAAG,SAAS,GAAG,QAAQ,WAO1C,CAAC;AAEF,MAAM,WAAW,mBAAmB;IAClC,wBAAwB,CAAC,EAAE,MAAM,CAAC;IAElC,8BAA8B,CAAC,EAAE,MAAM,CAAC;CACzC;AAED,MAAM,WAAW,6BAA6B;IAC5C,gBAAgB,EAAE,mBAAmB,CAAC;IACtC,WAAW,EAAE,MAAM,CAAC;IACpB,eAAe,EAAE,MAAM,CAAC;IACxB,YAAY,EAAE,MAAM,CAAC;IACrB,WAAW,EAAE,MAAM,CAAC;IACpB,MAAM,EAAE,QAAQ,GAAG,UAAU,GAAG,YAAY,GAAG,OAAO,CAAC;IACvD,YAAY,EAAE,MAAM,CAAC;CACtB;AAMD,MAAM,WAAW,yBAAyB;IACxC,OAAO,EAAE,SAAS,GAAG,SAAS,GAAG,QAAQ,CAAC;IAC1C,WAAW,EAAE,MAAM,CAAC;IACpB,eAAe,CAAC,EAAE,MAAM,CAAC;IAEzB,QAAQ,CAAC,EAAE,MAAM,CAAC;CACnB;AAED,eAAO,MAAM,mBAAmB,GAAU,wEAKvC,yBAAyB,KAAG,OAAO,CAAC,6BAA6B,GAAG,IAAI,CA6C1E,CAAC"}

package/dist/utils/get-user-subscription.js

@@ -6,19 +6,23 @@ export const getSubscriptionUrlByNetwork = (network) => {
         devnet: 'https://subscriptions-api.ixo-api.workers.dev',
     }[network];
 };
-export const getUserSubscription = async ({ bearerToken, network, subscriptionUrl: _subscriptionUrl, }) => {
+export const getUserSubscription = async ({ bearerToken, network, subscriptionUrl: _subscriptionUrl, authType, }) => {
     const subscriptionUrl = _subscriptionUrl ?? getSubscriptionUrlByNetwork(network);
     try {
         Logger.debug('Fetching user subscription from:', subscriptionUrl);
+        const headers = {
+            Authorization: `Bearer ${bearerToken}`,
+            'Content-Type': 'application/json',
+        };
+        if (authType === 'ucan') {
+            headers['X-Auth-Type'] = 'ucan';
+        }
         const response = await fetch(`${subscriptionUrl.endsWith('/') ? subscriptionUrl.slice(0, -1) : subscriptionUrl}/api/v1/subscriptions`, {
             method: 'GET',
-            headers: {
-                Authorization: `Bearer ${bearerToken}`,
-                'Content-Type': 'application/json',
-            },
+            headers,
         });
         if (!response.ok) {
-            console.error(`Failed to fetch user subscription: ${response.status} ${response.statusText}`);
+            Logger.error(`Failed to fetch user subscription: ${response.status} ${response.statusText}`);
             return null;
         }
         const data = await response.json();
@@ -37,7 +41,7 @@ export const getUserSubscription = async ({ bearerToken, network, subscriptionUr
         };
     }
     catch (error) {
-        console.error('Error fetching user subscription:', error);
+        Logger.error('Error fetching user subscription:', error);
         return null;
     }
 };

package/dist/utils/get-user-subscription.js.map

@@ -1 +1 @@
-{"version":3,"file":"get-user-subscription.js","sourceRoot":"","sources":["../../src/utils/get-user-subscription.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,aAAa,CAAC;AAErC,MAAM,CAAC,MAAM,2BAA2B,GAAG,CACzC,OAAyC,EACzC,EAAE;IACF,OAAO;QACL,OAAO,EAAE,uDAAuD;QAChE,OAAO,EAAE,uDAAuD;QAChE,MAAM,EAAE,+CAA+C;KACxD,CAAC,OAAO,CAAC,CAAC;AACb,CAAC,CAAC;AA4BF,MAAM,CAAC,MAAM,mBAAmB,GAAG,KAAK,EAAE,EACxC,WAAW,EACX,OAAO,EACP,eAAe,EAAE,gBAAgB,GACP,EAAiD,EAAE;IAC7E,MAAM,eAAe,GACnB,gBAAgB,IAAI,2BAA2B,CAAC,OAAO,CAAC,CAAC;IAC3D,IAAI,CAAC;QACH,MAAM,CAAC,KAAK,CAAC,kCAAkC,EAAE,eAAe,CAAC,CAAC;QAClE,MAAM,QAAQ,GAAG,MAAM,KAAK,CAC1B,GAAG,eAAe,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,eAAe,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,eAAe,uBAAuB,EACxG;YACE,MAAM,EAAE,KAAK;YACb,OAAO,EAAE;gBACP,aAAa,EAAE,UAAU,WAAW,EAAE;gBACtC,cAAc,EAAE,kBAAkB;aACnC;SACF,CACF,CAAC;QAEF,IAAI,CAAC,QAAQ,CAAC,EAAE,EAAE,CAAC;YACjB,OAAO,CAAC,KAAK,CACX,sCAAsC,QAAQ,CAAC,MAAM,IAAI,QAAQ,CAAC,UAAU,EAAE,CAC/E,CAAC;YACF,OAAO,IAAI,CAAC;QACd,CAAC;QAED,MAAM,IAAI,GAAG,MAAM,QAAQ,CAAC,IAAI,EAAE,CAAC;QACnC,IAAI,CAAC,IAAI,EAAE,CAAC;YACV,OAAO,IAAI,CAAC;QACd,CAAC;QACD,MAAM,YAAY,GAAG,IAAmC,CAAC;QACzD,OAAO;YACL,gBAAgB,EAAE,YAAY,CAAC,gBAAgB;YAC/C,WAAW,EAAE,YAAY,CAAC,WAAW;YACrC,eAAe,EAAE,YAAY,CAAC,eAAe;YAC7C,YAAY,EAAE,YAAY,CAAC,YAAY;YACvC,WAAW,EAAE,YAAY,CAAC,WAAW;YACrC,MAAM,EAAE,YAAY,CAAC,MAAM;YAC3B,YAAY,EAAE,YAAY,CAAC,YAAY;SACxC,CAAC;IACJ,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QACf,OAAO,CAAC,KAAK,CAAC,mCAAmC,EAAE,KAAK,CAAC,CAAC;QAC1D,OAAO,IAAI,CAAC;IACd,CAAC;AACH,CAAC,CAAC"}
+{"version":3,"file":"get-user-subscription.js","sourceRoot":"","sources":["../../src/utils/get-user-subscription.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,aAAa,CAAC;AAErC,MAAM,CAAC,MAAM,2BAA2B,GAAG,CACzC,OAAyC,EACzC,EAAE;IACF,OAAO;QACL,OAAO,EAAE,uDAAuD;QAChE,OAAO,EAAE,uDAAuD;QAChE,MAAM,EAAE,+CAA+C;KACxD,CAAC,OAAO,CAAC,CAAC;AACb,CAAC,CAAC;AA8BF,MAAM,CAAC,MAAM,mBAAmB,GAAG,KAAK,EAAE,EACxC,WAAW,EACX,OAAO,EACP,eAAe,EAAE,gBAAgB,EACjC,QAAQ,GACkB,EAAiD,EAAE;IAC7E,MAAM,eAAe,GACnB,gBAAgB,IAAI,2BAA2B,CAAC,OAAO,CAAC,CAAC;IAC3D,IAAI,CAAC;QACH,MAAM,CAAC,KAAK,CAAC,kCAAkC,EAAE,eAAe,CAAC,CAAC;QAClE,MAAM,OAAO,GAA2B;YACtC,aAAa,EAAE,UAAU,WAAW,EAAE;YACtC,cAAc,EAAE,kBAAkB;SACnC,CAAC;QACF,IAAI,QAAQ,KAAK,MAAM,EAAE,CAAC;YACxB,OAAO,CAAC,aAAa,CAAC,GAAG,MAAM,CAAC;QAClC,CAAC;QACD,MAAM,QAAQ,GAAG,MAAM,KAAK,CAC1B,GAAG,eAAe,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,eAAe,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,eAAe,uBAAuB,EACxG;YACE,MAAM,EAAE,KAAK;YACb,OAAO;SACR,CACF,CAAC;QAEF,IAAI,CAAC,QAAQ,CAAC,EAAE,EAAE,CAAC;YACjB,MAAM,CAAC,KAAK,CACV,sCAAsC,QAAQ,CAAC,MAAM,IAAI,QAAQ,CAAC,UAAU,EAAE,CAC/E,CAAC;YACF,OAAO,IAAI,CAAC;QACd,CAAC;QAED,MAAM,IAAI,GAAG,MAAM,QAAQ,CAAC,IAAI,EAAE,CAAC;QACnC,IAAI,CAAC,IAAI,EAAE,CAAC;YACV,OAAO,IAAI,CAAC;QACd,CAAC;QACD,MAAM,YAAY,GAAG,IAAmC,CAAC;QACzD,OAAO;YACL,gBAAgB,EAAE,YAAY,CAAC,gBAAgB;YAC/C,WAAW,EAAE,YAAY,CAAC,WAAW;YACrC,eAAe,EAAE,YAAY,CAAC,eAAe;YAC7C,YAAY,EAAE,YAAY,CAAC,YAAY;YACvC,WAAW,EAAE,YAAY,CAAC,WAAW;YACrC,MAAM,EAAE,YAAY,CAAC,MAAM;YAC3B,YAAY,EAAE,YAAY,CAAC,YAAY;SACxC,CAAC;IACJ,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QACf,MAAM,CAAC,KAAK,CAAC,mCAAmC,EAAE,KAAK,CAAC,CAAC;QACzD,OAAO,IAAI,CAAC;IACd,CAAC;AACH,CAAC,CAAC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ixo/common",
-  "version": "1.1.2",
+  "version": "1.1.4",
   "private": false,
   "publishConfig": {
     "access": "public"
@@ -24,32 +24,31 @@
     }
   },
   "devDependencies": {
-    "@langchain/langgraph-checkpoint-validation": "^1.0.0",
+    "@langchain/langgraph-checkpoint-validation": "^1.0.9",
     "@testcontainers/postgresql": "^10.16.0",
     "@types/better-sqlite3": "^7.6.13",
     "@types/node": "^22.7.3",
     "@types/store": "^2.0.5",
-    "better-sqlite3": "^12.4.6",
+    "better-sqlite3": "^12.9.0",
     "testcontainers": "^10.16.0",
     "typescript": "^5.3.3",
-    "@ixo/data-store": "^1.0.1",
     "@ixo/eslint-config": "2.0.0",
-    "@ixo/oracles-events": "^1.0.3",
-    "@ixo/typescript-config": "1.0.0",
-    "@ixo/vitest-config": "1.0.0"
+    "@ixo/oracles-events": "^1.0.4",
+    "@ixo/vitest-config": "1.0.0",
+    "@ixo/typescript-config": "1.0.0"
   },
   "dependencies": {
     "@cosmjs/proto-signing": "^0.33.0",
     "@cosmjs/stargate": "^0.33.0",
     "@ixo/impactxclient-sdk": "^2.3.1",
-    "@langchain/community": "^1.0.4",
-    "@langchain/core": "1.0.6",
-    "@langchain/langgraph": "1.0.2",
-    "@langchain/langgraph-checkpoint": "^1.0.0",
-    "@langchain/langgraph-checkpoint-sqlite": "^1.0.0",
-    "@langchain/openai": "^1.1.2",
-    "@langchain/textsplitters": "^1.0.0",
-    "@tavily/core": "0.0.2",
+    "@langchain/community": "^1.1.27",
+    "@langchain/core": "^1.1.42",
+    "@langchain/langgraph": "^1.2.9",
+    "@langchain/langgraph-checkpoint": "^1.0.1",
+    "@langchain/langgraph-checkpoint-sqlite": "^1.0.1",
+    "@langchain/openai": "^1.4.5",
+    "@langchain/textsplitters": "^1.0.1",
+    "@tavily/core": "0.7.2",
     "axios": "^1.7.9",
     "axios-retry": "^4.5.0",
     "class-transformer": "^0.5.1",
@@ -57,18 +56,18 @@
     "dotenv": "^16.4.5",
     "duck-duck-scrape": "^2.2.5",
     "html-to-text": "9.0.5",
-    "langchain": "1.0.6",
-    "langfuse": "^3.38.5",
-    "langsmith": "^0.1.61",
-    "mammoth": "1.8.0",
-    "openai": "^6.9.1",
-    "pdf-parse": "^1.1.1",
-    "playwright": "^1.51.0",
+    "langchain": "^1.3.5",
+    "langsmith": "^0.5.25",
+    "mammoth": "1.12.0",
+    "openai": "^6.34.0",
+    "pdf-parse": "2.4.5",
+    "playwright": "^1.59.1",
+    "node-emoji": "^2.2.0",
     "store": "^2.0.12",
-    "zod": "^4.1.12",
+    "zod": "^4.3.6",
     "@ixo/logger": "0.0.2",
-    "@ixo/oracles-chain-client": "1.2.0",
-    "@ixo/matrix": "1.2.2"
+    "@ixo/oracles-chain-client": "1.2.2",
+    "@ixo/matrix": "1.2.31"
   },
   "scripts": {
     "build": "tsc && tsc-alias",

package/src/ai/models/openai.ts

@@ -8,6 +8,37 @@ import {
 } from '@langchain/openai';
 import OpenAI, { type ClientOptions } from 'openai';
 
+export type LLMProvider = 'openrouter' | 'nebius';
+
+export function getLLMProvider(): LLMProvider {
+  const raw = (process.env.LLM_PROVIDER ?? 'openrouter').toLowerCase();
+  if (raw === 'nebius') return 'nebius';
+  return 'openrouter';
+}
+
+/** Provider-aware base URL and API key. */
+export function getProviderConfig() {
+  const provider = getLLMProvider();
+
+  if (provider === 'nebius') {
+    return {
+      provider,
+      baseURL: 'https://api.tokenfactory.nebius.com/v1/',
+      apiKey: process.env.NEBIUS_API_KEY ?? '',
+      headers: {} as Record<string, string>,
+    };
+  }
+
+  return {
+    provider,
+    baseURL: 'https://openrouter.ai/api/v1',
+    apiKey: process.env.OPEN_ROUTER_API_KEY ?? '',
+    headers: {
+      'HTTP-Referer': 'oracle-app.com',
+      'X-Title': process.env.ORACLE_NAME ?? 'Oracle App',
+    },
+  };
+}
 const getChatOpenAiModel = (params?: ChatOpenAIFields): ChatOpenAI =>
   new ChatOpenAI({
     temperature: 0.2,

package/src/ai/nodes/index.ts

@@ -1,3 +1,2 @@
 export * from './create-fake-node.js';
-export * from './find-docs/index.js';
 export * from './generic-chat/index.js';

package/src/ai/semantic-router-factory/create-semantic-router.test.ts

@@ -2,9 +2,6 @@ import { createSemanticRouter } from './create-semantic-router.js';
 
 const parse = vi.fn();
 const create = vi.fn();
-vi.mock('langfuse', () => ({
-  observeOpenAI: vi.fn((client: unknown) => client),
-}));
 vi.mock('openai', () => ({
   OpenAI: vi.fn().mockImplementation(() => {
     function fn(): unknown {

package/src/ai/semantic-router-factory/create-semantic-router.ts

@@ -1,6 +1,5 @@
 import { Logger } from '@ixo/logger';
 import { PromptTemplate } from '@langchain/core/prompts';
-import { type LangfuseConfig, observeOpenAI } from 'langfuse';
 import { OpenAI } from 'openai';
 import { zodResponseFormat } from 'openai/helpers/zod';
 import z from 'zod';
@@ -39,10 +38,7 @@ export const createSemanticRouter = <
     | 'gpt-4.1-nano'
     | 'gpt-4.1-mini' = 'gpt-4.1-mini',
   isComplex = false,
-): ((
-  state: EnsureKeys<Record<string, unknown>, K>,
-  traceConfig?: LangfuseConfig,
-) => Promise<keyof R>) => {
+): ((state: EnsureKeys<Record<string, unknown>, K>) => Promise<keyof R>) => {
   const keys = validateRoutes(routes, basedOn);
   const schema = z.object({
     nextRoute: z.enum(
@@ -52,7 +48,6 @@ export const createSemanticRouter = <
   });
   return async <T extends Record<string, unknown>>(
     state: EnsureKeys<T, K>,
-    traceConfig?: LangfuseConfig,
   ): Promise<keyof R> => {
     const selectedValues = {} as Record<string, string | object>;
     for (const key of basedOn) {
@@ -72,7 +67,7 @@ export const createSemanticRouter = <
     // find the route that matches the state
     const prompt = PromptTemplate.fromTemplate(semanticRouterPrompt);
 
-    const client = observeOpenAI(new OpenAI(), traceConfig);
+    const client = new OpenAI();
     const promptWithState = await prompt.format({
       routes: jsonToYaml(routes),
       state: jsonToYaml(selectedValues),

package/src/ai/tools/index.ts

@@ -1,7 +1,6 @@
 export * from './ask-ixo-guru/index.js';
 export * from './browser-tool-caller.js';
 export * from './parser-browser-tool.js';
-export * from './retriever-tool/index.js';
 export * from './scrape-web-page.js';
 export * from './web-search-tool.js';
 export * from './log-action-to-matrix.js';

package/src/ai/tools/parser-action-tool.ts

@@ -1,5 +1,6 @@
 import { type IRunnableConfigWithRequiredFields } from '@ixo/matrix';
 import { tool } from '@langchain/core/tools';
+import { randomUUID } from 'node:crypto';
 import { callAgAction } from './action-caller.js';
 import { logActionToMatrix } from './log-action-to-matrix.js';
 
@@ -16,19 +17,34 @@ export function parserActionTool(action: IParseAgActionParams) {
     async (input, runnableConfig) => {
       const { configurable } =
         runnableConfig as IRunnableConfigWithRequiredFields;
-      const { thread_id: sessionId, requestId, configs } = configurable;
+      // Prefer explicit `sessionId` — sub-agent wrappers set this to the real
+      // user WS session so routing works from nested contexts. Fall back to
+      // `thread_id` for direct invocations from the main agent (where
+      // thread_id IS the user's session).
+      const sessionIdField = (configurable as { sessionId?: unknown })
+        .sessionId;
+      const sessionId =
+        typeof sessionIdField === 'string' && sessionIdField.length > 0
+          ? sessionIdField
+          : configurable.thread_id;
+      const { requestId, configs } = configurable;
 
       if (!sessionId) {
         throw new Error('sessionId is required for AG-UI actions');
       }
 
+      // Unique toolCallId per invocation. Protects against:
+      //  - Multiple tool calls sharing one requestId (React key collisions)
+      //  - Any future code path that forgets to propagate requestId
+      const toolCallId = `ag_${requestId ?? 'noreq'}_${randomUUID().slice(0, 8)}`;
+
       // Call the action and WAIT for result from frontend
       const result = await callAgAction({
         sessionId,
-        toolCallId: `ag_${requestId}`,
+        toolCallId,
         toolName: name,
         args: input as Record<string, unknown>,
-        timeout: 5000, // 5 seconds
+        timeout: 15000, // 15 seconds
       });
 
       if (configs?.matrix.roomId) {

package/src/ai/utils/load-file.ts

@@ -107,6 +107,23 @@ export const loadFile = async (
   }
 };
 
+/**
+ * Loads a file from a buffer and returns processed content.
+ * Useful when you already have the file data (e.g., downloaded from Matrix).
+ */
+export const loadFileFromBuffer = async (
+  buffer: Buffer,
+  mimetype: string,
+  filename?: string,
+): Promise<Document[]> => {
+  const fileType = determineFileType(filename ?? '', mimetype);
+  if (!fileType) {
+    throw new Error(`Unsupported file type: ${mimetype}`);
+  }
+  const blob = new Blob([buffer], { type: mimetype });
+  return processFile(blob, fileType);
+};
+
 const processFile = async (
   blob: Blob,
   fileType: SupportedFileType,

package/src/ai/utils/transformGraphStateMessageToListMessageResponse.ts

@@ -5,6 +5,7 @@ import {
 } from '@langchain/core/messages';
 import { isUUID } from 'class-validator';
 import crypto from 'node:crypto';
+import { emojify } from 'node-emoji';
 
 interface ToolCall {
   name: string;
@@ -14,6 +15,15 @@ interface ToolCall {
   output?: string;
 }
 
+export interface AttachmentMeta {
+  filename: string;
+  mimetype: string;
+  size?: number;
+  mxcUri?: string;
+  eventId?: string;
+  category: string;
+}
+
 interface MessageDto {
   id: string;
   type: 'ai' | 'human';
@@ -22,6 +32,7 @@ interface MessageDto {
   reasoning?: string;
   isComplete?: boolean;
   isReasoning?: boolean;
+  attachment?: AttachmentMeta;
 }
 
 export interface ListOracleMessagesResponse {
@@ -36,6 +47,7 @@ export interface CleanAdditionalKwargs {
     type: string;
     text: string;
   }>;
+  attachment?: AttachmentMeta;
   [key: string]: unknown; // Allow additional properties for LangChain compatibility
 }
 
@@ -55,9 +67,13 @@ export function transformGraphStateMessageToListMessageResponse(
           message.additional_kwargs as CleanAdditionalKwargs;
         const reasoning = additionalKwargs?.reasoning;
 
+        // Extract attachment metadata for human messages
+        const attachment =
+          message.type === 'human' ? additionalKwargs?.attachment : undefined;
+
         acc.push({
           type: message.type === 'ai' ? 'ai' : 'human',
-          content: String(message.content),
+          content: emojify(String(message.content)),
           id: uuidFromString(message.id ?? String(message.content)),
           toolCalls: (message as AIMessage).tool_calls?.map((toolCall) => ({
             name: toolCall.name,
@@ -68,6 +84,7 @@ export function transformGraphStateMessageToListMessageResponse(
           reasoning,
           isComplete: true, // Messages from DB are always complete
           isReasoning: false, // since this is not a reasoning message and the request is done
+          ...(attachment && { attachment }),
         });
       }
       if (toolMsg) {

package/src/ai/utils/verify-matrix-openId-token.ts

@@ -16,7 +16,7 @@ export async function verifyMatrixOpenIdToken(
 
     if (response.ok) {
       const userInfo = (await response.json()) as { sub: string };
-      console.log('User info from server:', userInfo);
+      Logger.info('User info from server:', userInfo);
 
       return {
         isValid: true,
@@ -36,7 +36,7 @@ export async function verifyMatrixOpenIdToken(
     const errorMessage = error instanceof Error ? error.message : String(error);
     const errorStack = error instanceof Error ? error.stack : undefined;
 
-    console.error(
+    Logger.error(
       'Error verifying Matrix OpenID token:',
       errorMessage,
       errorStack,

package/src/services/env/env.service.ts

@@ -11,7 +11,7 @@ export class EnvService<T extends z.ZodType> {
   private constructor(schema: T, onError?: (error: z.ZodError) => void) {
     try {
       // Parse and validate environment variables
-      this.validatedEnv = schema.parse(process.env) as z.infer<T>;
+      this.validatedEnv = schema.parse(process.env) as unknown as z.infer<T>;
     } catch (error) {
       if (error instanceof z.ZodError) {
         if (onError) {