@multiplayer-app/ai-agent-node 0.1.0-beta.5 → 0.1.0-beta.51

package/README.md

@@ -419,7 +419,7 @@ const stream = await chatProcessor.createMessageStream({
   messageId: 'message-id',
   approvalId: 'approval-id',
   approved: true,
-  reason: 'User approved'
+  userResponse: 'User approved'
 });
 
 // Or use streamMessage directly if you already have the chat object
@@ -429,7 +429,7 @@ await chatProcessor.streamMessage(chat, {
   messageId: 'message-id',
   approvalId: 'approval-id',
   approved: true,
-  reason: 'User approved'
+  userResponse: 'User approved'
 });
 ```
 

package/dist/cjs/config.cjs

@@ -1,47 +1,98 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.config = void 0;
-exports.getRedisUrl = getRedisUrl;
+exports.ConfigProvider = void 0;
 require("dotenv/config");
+function createDefaultConfig() {
+    return {
+        debug: false,
+        redis: {
+            host: 'localhost',
+            port: 6379,
+        },
+        ai: {
+            maxContextMessages: 10,
+        },
+        s3: {
+            bucket: 'ai-agent-attachments',
+            presignedUrlExpires: 120,
+            region: process.env.AWS_REGION || 'us-east-1',
+        },
+        fileProcessing: {
+            maxExtractedTextSize: 51200,
+            enableTextExtraction: true,
+        },
+        logger: {
+            nodeEnv: 'development',
+            appName: 'ai-agent-node',
+            logLevel: 'debug',
+        },
+        socket: {
+            path: undefined
+        },
+    };
+}
 /**
- * Centralized configuration for the AI Agent Service
- * All environment variables are accessed through this file
+ * Deep merge utility function
+ * Merges source into target, with source values taking precedence
  */
-exports.config = {
-    // Redis configuration
-    redis: {
-        url: process.env.REDIS_URL,
-        host: process.env.REDIS_HOST ?? 'localhost',
-        port: Number(process.env.REDIS_PORT ?? 6379),
-        password: process.env.REDIS_PASSWORD,
-        database: process.env.REDIS_DATABASE ? Number(process.env.REDIS_DATABASE) : undefined,
-    },
-    // AI Provider API Keys
-    ai: {
-        openaiApiKey: process.env.OPENAI_API_KEY,
-        anthropicApiKey: process.env.ANTHROPIC_API_KEY,
-        googleApiKey: process.env.GOOGLE_GENERATIVE_AI_API_KEY,
-        openrouterApiKey: process.env.OPENROUTER_API_KEY,
-        maxContextMessages: Number(process.env.MAX_CONTEXT_MESSAGES) || 10,
-        defaultModel: process.env.DEFAULT_MODEL,
-    },
-    s3: {
-        bucket: process.env.S3_ATTACHMENTS_BUCKET || 'ai-agent-attachments',
-    },
-    // Kafka configuration
-    kafka: {
-        groupId: process.env.KAFKA_GROUP_ID ?? 'ai-agent-node',
-        chatTitleGenerationTopic: process.env.KAFKA_CHAT_TITLE_GENERATION_TOPIC ?? 'chat-title-generation',
-        backgroundChatProcessingTopic: process.env.KAFKA_BACKGROUND_CHAT_PROCESSING_TOPIC ?? 'background-chat-processing',
-    },
-};
+function deepMerge(target, source) {
+    const result = { ...target };
+    for (const key in source) {
+        if (source[key] !== undefined) {
+            if (typeof source[key] === 'object' &&
+                source[key] !== null &&
+                !Array.isArray(source[key]) &&
+                typeof target[key] === 'object' &&
+                target[key] !== null &&
+                !Array.isArray(target[key])) {
+                // Recursively merge nested objects
+                result[key] = deepMerge(target[key], source[key]);
+            }
+            else {
+                // Override with source value
+                result[key] = source[key];
+            }
+        }
+    }
+    return result;
+}
 /**
- * Get Redis connection URL
+ * ConfigProvider manages runtime configuration
+ * Allows setting config overrides through AIAgentService
  */
-function getRedisUrl() {
-    if (exports.config.redis.url) {
-        return exports.config.redis.url;
+class ConfigProvider {
+    constructor() {
+        this.runtimeConfig = createDefaultConfig();
+    }
+    /**
+     * Get the singleton instance of ConfigProvider
+     */
+    static getInstance() {
+        if (!ConfigProvider.instance) {
+            ConfigProvider.instance = new ConfigProvider();
+        }
+        return ConfigProvider.instance;
+    }
+    /**
+     * Get the current runtime configuration
+     */
+    getConfig() {
+        return this.runtimeConfig;
+    }
+    /**
+     * Set configuration overrides
+     * Merges the provided overrides with existing config (deep merge)
+     * @param overrides - Partial config to override existing values
+     */
+    setConfig(overrides) {
+        this.runtimeConfig = deepMerge(this.runtimeConfig, overrides);
+    }
+    /**
+     * Reset configuration to defaults (from environment variables)
+     */
+    reset() {
+        this.runtimeConfig = createDefaultConfig();
     }
-    return `redis://${exports.config.redis.host}:${exports.config.redis.port}`;
 }
+exports.ConfigProvider = ConfigProvider;
 //# sourceMappingURL=config.js.map

package/dist/cjs/config.cjs.map

@@ -1 +1 @@
-{"version":3,"file":"config.js","sourceRoot":"","sources":["../../src/config.ts"],"names":[],"mappings":";;;AAwCA,kCAKC;AA7CD,yBAAuB;AAEvB;;;GAGG;AAEU,QAAA,MAAM,GAAG;IACpB,sBAAsB;IACtB,KAAK,EAAE;QACL,GAAG,EAAE,OAAO,CAAC,GAAG,CAAC,SAAS;QAC1B,IAAI,EAAE,OAAO,CAAC,GAAG,CAAC,UAAU,IAAI,WAAW;QAC3C,IAAI,EAAE,MAAM,CAAC,OAAO,CAAC,GAAG,CAAC,UAAU,IAAI,IAAI,CAAC;QAC5C,QAAQ,EAAE,OAAO,CAAC,GAAG,CAAC,cAAc;QACpC,QAAQ,EAAE,OAAO,CAAC,GAAG,CAAC,cAAc,CAAC,CAAC,CAAC,MAAM,CAAC,OAAO,CAAC,GAAG,CAAC,cAAc,CAAC,CAAC,CAAC,CAAC,SAAS;KACtF;IAED,uBAAuB;IACvB,EAAE,EAAE;QACF,YAAY,EAAE,OAAO,CAAC,GAAG,CAAC,cAAc;QACxC,eAAe,EAAE,OAAO,CAAC,GAAG,CAAC,iBAAiB;QAC9C,YAAY,EAAE,OAAO,CAAC,GAAG,CAAC,4BAA4B;QACtD,gBAAgB,EAAE,OAAO,CAAC,GAAG,CAAC,kBAAkB;QAChD,kBAAkB,EAAE,MAAM,CAAC,OAAO,CAAC,GAAG,CAAC,oBAAoB,CAAC,IAAI,EAAE;QAClE,YAAY,EAAE,OAAO,CAAC,GAAG,CAAC,aAAa;KACxC;IACD,EAAE,EAAE;QACF,MAAM,EAAE,OAAO,CAAC,GAAG,CAAC,qBAAqB,IAAI,sBAAsB;KACpE;IACD,sBAAsB;IACtB,KAAK,EAAE;QACL,OAAO,EAAE,OAAO,CAAC,GAAG,CAAC,cAAc,IAAI,eAAe;QACtD,wBAAwB,EAAE,OAAO,CAAC,GAAG,CAAC,iCAAiC,IAAI,uBAAuB;QAClG,6BAA6B,EAAE,OAAO,CAAC,GAAG,CAAC,sCAAsC,IAAI,4BAA4B;KAClH;CACO,CAAC;AAEX;;GAEG;AACH,SAAgB,WAAW;IACzB,IAAI,cAAM,CAAC,KAAK,CAAC,GAAG,EAAE,CAAC;QACrB,OAAO,cAAM,CAAC,KAAK,CAAC,GAAG,CAAC;IAC1B,CAAC;IACD,OAAO,WAAW,cAAM,CAAC,KAAK,CAAC,IAAI,IAAI,cAAM,CAAC,KAAK,CAAC,IAAI,EAAE,CAAC;AAC7D,CAAC"}
+{"version":3,"file":"config.js","sourceRoot":"","sources":["../../src/config.ts"],"names":[],"mappings":";;;AAAA,yBAAuB;AA2CvB,SAAS,mBAAmB;IAC1B,OAAO;QACL,KAAK,EAAE,KAAK;QACZ,KAAK,EAAE;YACL,IAAI,EAAE,WAAW;YACjB,IAAI,EAAG,IAAI;SACZ;QACD,EAAE,EAAE;YACF,kBAAkB,EAAE,EAAE;SACvB;QACD,EAAE,EAAE;YACF,MAAM,EAAE,sBAAsB;YAC9B,mBAAmB,EAAE,GAAG;YACxB,MAAM,EAAE,OAAO,CAAC,GAAG,CAAC,UAAU,IAAI,WAAW;SAC9C;QACD,cAAc,EAAE;YACd,oBAAoB,EAAE,KAAK;YAC3B,oBAAoB,EAAE,IAAI;SAC3B;QACD,MAAM,EAAE;YACN,OAAO,EAAE,aAAa;YACtB,OAAO,EAAE,eAAe;YACxB,QAAQ,EAAE,OAAO;SAClB;QACD,MAAM,EAAE;YACN,IAAI,EAAE,SAAS;SAChB;KACF,CAAC;AACJ,CAAC;AAGD;;;GAGG;AACH,SAAS,SAAS,CAAgC,MAAS,EAAE,MAAkB;IAC7E,MAAM,MAAM,GAAG,EAAE,GAAG,MAAM,EAAE,CAAC;IAE7B,KAAK,MAAM,GAAG,IAAI,MAAM,EAAE,CAAC;QACzB,IAAI,MAAM,CAAC,GAAG,CAAC,KAAK,SAAS,EAAE,CAAC;YAC9B,IACI,OAAO,MAAM,CAAC,GAAG,CAAC,KAAK,QAAQ;gBAC/B,MAAM,CAAC,GAAG,CAAC,KAAK,IAAI;gBACpB,CAAC,KAAK,CAAC,OAAO,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC;gBAC3B,OAAO,MAAM,CAAC,GAAG,CAAC,KAAK,QAAQ;gBAC/B,MAAM,CAAC,GAAG,CAAC,KAAK,IAAI;gBACpB,CAAC,KAAK,CAAC,OAAO,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,EAC7B,CAAC;gBACD,mCAAmC;gBACnC,MAAM,CAAC,GAAG,CAAC,GAAG,SAAS,CAAC,MAAM,CAAC,GAAG,CAAC,EAAE,MAAM,CAAC,GAAG,CAAQ,CAAC,CAAC;YAC3D,CAAC;iBAAM,CAAC;gBACN,6BAA6B;gBAC7B,MAAM,CAAC,GAAG,CAAC,GAAG,MAAM,CAAC,GAAG,CAAQ,CAAC;YACnC,CAAC;QACH,CAAC;IACH,CAAC;IAED,OAAO,MAAM,CAAC;AAChB,CAAC;AAED;;;GAGG;AACH,MAAa,cAAc;IAIzB;QACE,IAAI,CAAC,aAAa,GAAG,mBAAmB,EAAE,CAAC;IAC7C,CAAC;IAED;;OAEG;IACH,MAAM,CAAC,WAAW;QAChB,IAAI,CAAC,cAAc,CAAC,QAAQ,EAAE,CAAC;YAC7B,cAAc,CAAC,QAAQ,GAAG,IAAI,cAAc,EAAE,CAAC;QACjD,CAAC;QACD,OAAO,cAAc,CAAC,QAAQ,CAAC;IACjC,CAAC;IAED;;OAEG;IACH,SAAS;QACP,OAAO,IAAI,CAAC,aAAa,CAAC;IAC5B,CAAC;IAED;;;;OAIG;IACH,SAAS,CAAC,SAA0B;QAClC,IAAI,CAAC,aAAa,GAAG,SAAS,CAAC,IAAI,CAAC,aAAa,EAAE,SAAS,CAAC,CAAC;IAChE,CAAC;IAED;;OAEG;IACH,KAAK;QACH,IAAI,CAAC,aAAa,GAAG,mBAAmB,EAAE,CAAC;IAC7C,CAAC;CACF;AAxCD,wCAwCC"}

package/dist/cjs/config.d.ts

@@ -3,33 +3,67 @@ import 'dotenv/config';
  * Centralized configuration for the AI Agent Service
  * All environment variables are accessed through this file
  */
-export declare const config: {
-    readonly redis: {
-        readonly url: string | undefined;
-        readonly host: string;
-        readonly port: number;
-        readonly password: string | undefined;
-        readonly database: number | undefined;
+export interface Config {
+    debug: boolean;
+    redis: {
+        url?: string;
+        host?: string;
+        port?: number;
+        password?: string;
+        database?: number;
     };
-    readonly ai: {
-        readonly openaiApiKey: string | undefined;
-        readonly anthropicApiKey: string | undefined;
-        readonly googleApiKey: string | undefined;
-        readonly openrouterApiKey: string | undefined;
-        readonly maxContextMessages: number;
-        readonly defaultModel: string | undefined;
+    ai: {
+        openaiApiKey?: string;
+        anthropicApiKey?: string;
+        googleApiKey?: string;
+        openrouterApiKey?: string;
+        maxContextMessages?: number;
+        defaultModel?: string;
     };
-    readonly s3: {
-        readonly bucket: string;
+    s3: {
+        bucket?: string;
+        host?: string;
+        presignedUrlExpires?: number;
+        region?: string;
     };
-    readonly kafka: {
-        readonly groupId: string;
-        readonly chatTitleGenerationTopic: string;
-        readonly backgroundChatProcessingTopic: string;
+    fileProcessing: {
+        maxExtractedTextSize?: number;
+        enableTextExtraction?: boolean;
     };
-};
+    logger: {
+        nodeEnv?: string;
+        appName?: string;
+        logLevel?: string;
+    };
+    socket: {
+        path?: string;
+    };
+}
 /**
- * Get Redis connection URL
+ * ConfigProvider manages runtime configuration
+ * Allows setting config overrides through AIAgentService
  */
-export declare function getRedisUrl(): string;
+export declare class ConfigProvider {
+    private static instance;
+    private runtimeConfig;
+    private constructor();
+    /**
+     * Get the singleton instance of ConfigProvider
+     */
+    static getInstance(): ConfigProvider;
+    /**
+     * Get the current runtime configuration
+     */
+    getConfig(): Config;
+    /**
+     * Set configuration overrides
+     * Merges the provided overrides with existing config (deep merge)
+     * @param overrides - Partial config to override existing values
+     */
+    setConfig(overrides: Partial<Config>): void;
+    /**
+     * Reset configuration to defaults (from environment variables)
+     */
+    reset(): void;
+}
 //# sourceMappingURL=config.d.ts.map

package/dist/cjs/config.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"config.d.ts","sourceRoot":"","sources":["../../src/config.ts"],"names":[],"mappings":"AAAA,OAAO,eAAe,CAAC;AAEvB;;;GAGG;AAEH,eAAO,MAAM,MAAM;;;;;;;;;;;;;;;;;;;;;;;;CA4BT,CAAC;AAEX;;GAEG;AACH,wBAAgB,WAAW,IAAI,MAAM,CAKpC"}
+{"version":3,"file":"config.d.ts","sourceRoot":"","sources":["../../src/config.ts"],"names":[],"mappings":"AAAA,OAAO,eAAe,CAAC;AAEvB;;;GAGG;AACH,MAAM,WAAW,MAAM;IACrB,KAAK,EAAE,OAAO,CAAC;IACf,KAAK,EAAE;QACL,GAAG,CAAC,EAAE,MAAM,CAAC;QACb,IAAI,CAAC,EAAE,MAAM,CAAC;QACd,IAAI,CAAC,EAAE,MAAM,CAAC;QACd,QAAQ,CAAC,EAAE,MAAM,CAAC;QAClB,QAAQ,CAAC,EAAE,MAAM,CAAC;KACnB,CAAC;IACF,EAAE,EAAE;QACF,YAAY,CAAC,EAAE,MAAM,CAAC;QACtB,eAAe,CAAC,EAAE,MAAM,CAAC;QACzB,YAAY,CAAC,EAAE,MAAM,CAAC;QACtB,gBAAgB,CAAC,EAAE,MAAM,CAAC;QAC1B,kBAAkB,CAAC,EAAE,MAAM,CAAC;QAC5B,YAAY,CAAC,EAAE,MAAM,CAAC;KACvB,CAAC;IACF,EAAE,EAAE;QACF,MAAM,CAAC,EAAE,MAAM,CAAC;QAChB,IAAI,CAAC,EAAE,MAAM,CAAC;QACd,mBAAmB,CAAC,EAAE,MAAM,CAAC;QAC7B,MAAM,CAAC,EAAE,MAAM,CAAC;KACjB,CAAC;IACF,cAAc,EAAE;QACd,oBAAoB,CAAC,EAAE,MAAM,CAAC;QAC9B,oBAAoB,CAAC,EAAE,OAAO,CAAC;KAChC,CAAC;IACF,MAAM,EAAE;QACN,OAAO,CAAC,EAAE,MAAM,CAAC;QACjB,OAAO,CAAC,EAAE,MAAM,CAAC;QACjB,QAAQ,CAAC,EAAE,MAAM,CAAC;KACnB,CAAC;IACF,MAAM,EAAE;QACN,IAAI,CAAC,EAAE,MAAM,CAAC;KACf,CAAC;CACH;AA8DD;;;GAGG;AACH,qBAAa,cAAc;IACzB,OAAO,CAAC,MAAM,CAAC,QAAQ,CAAiB;IACxC,OAAO,CAAC,aAAa,CAAS;IAE9B,OAAO;IAIP;;OAEG;IACH,MAAM,CAAC,WAAW,IAAI,cAAc;IAOpC;;OAEG;IACH,SAAS,IAAI,MAAM;IAInB;;;;OAIG;IACH,SAAS,CAAC,SAAS,EAAE,OAAO,CAAC,MAAM,CAAC,GAAG,IAAI;IAI3C;;OAEG;IACH,KAAK,IAAI,IAAI;CAGd"}

package/dist/cjs/helpers/AIHelper.cjs

@@ -6,13 +6,42 @@ const services_1 = require("../services/index.cjs");
 const store_1 = require("../store/index.cjs");
 const logger_1 = require("../libs/logger/index.cjs");
 const store_2 = require("../store/index.cjs");
-const FileHelper_1 = require("./FileHelper.cjs");
 class AIHelper {
-    static async convertUserMessage(msg, ignoreFileAttachments) {
-        const userContent = [{
-                type: "text",
+    constructor(fileHelper, config) {
+        this.fileHelper = fileHelper;
+        this.aiService = new services_1.AIService(store_1.ModelStore.getInstance(), config.ai);
+    }
+    getLanguageModelId(modelId) {
+        const model = this.aiService.getLanguageModelId(modelId);
+        return model.id;
+    }
+    clip(value, max) {
+        if (value.length <= max)
+            return value;
+        return `${value.slice(0, max)}…`;
+    }
+    renderContextValue(value, limits) {
+        if (value === null || value === undefined)
+            return '';
+        if (typeof value === 'string')
+            return this.clip(value, limits.maxString);
+        if (typeof value === 'number' || typeof value === 'boolean')
+            return String(value);
+        try {
+            const json = JSON.stringify(value);
+            return this.clip(json, limits.maxJson);
+        }
+        catch {
+            return '';
+        }
+    }
+    async convertUserMessage(msg, ignoreFileAttachments) {
+        const userContent = [
+            {
+                type: 'text',
                 text: msg.content
-            }];
+            }
+        ];
         const atts = msg.attachments ?? [];
         if (!atts.length) {
             return userContent;
@@ -23,21 +52,21 @@ class AIHelper {
                 if (ignoreFileAttachments) {
                     continue;
                 }
-                if ((0, FileHelper_1.isImage)(att)) {
-                    const image = await (0, FileHelper_1.prepareImageForVisionAPI)(att);
+                if (this.fileHelper.isImage(att)) {
+                    const image = await this.fileHelper.prepareImageForVisionAPI(att);
                     if (image) {
                         userContent.push({
-                            type: "image",
+                            type: 'image',
                             image: image.image_url.url,
-                            mediaType: att.mimeType,
+                            mediaType: att.mimeType
                         });
                     }
                 }
                 else {
-                    const fileText = await (0, FileHelper_1.extractTextFromDocument)(att);
+                    const fileText = await this.fileHelper.extractTextFromDocument(att);
                     if (fileText) {
                         userContent.push({
-                            type: "text",
+                            type: 'text',
                             text: `${att.type}: ${att.name}(${att.mimeType})\n ${fileText}`
                         });
                     }
@@ -56,9 +85,8 @@ class AIHelper {
                 if (title)
                     lines.push(`  title: ${title}`);
                 if (selectedText) {
-                    const clipped = selectedText.length > 4000 ? `${selectedText.slice(0, 4000)}…` : selectedText;
                     lines.push('  BEGIN_UNTRUSTED_WEB_SNIPPET');
-                    lines.push(clipped);
+                    lines.push(this.clip(selectedText, 4000));
                     lines.push('  END_UNTRUSTED_WEB_SNIPPET');
                 }
                 continue;
@@ -67,7 +95,7 @@ class AIHelper {
                 const formId = typeof md?.formId === 'string' ? md.formId : undefined;
                 const fieldName = typeof md?.fieldName === 'string' ? md.fieldName : undefined;
                 const fieldLabel = typeof md?.fieldLabel === 'string' ? md.fieldLabel : undefined;
-                const value = typeof md?.value === 'string' ? md.value : '';
+                const value = md?.value;
                 const inputType = typeof md?.inputType === 'string' ? md.inputType : undefined;
                 const options = Array.isArray(md?.options) ? md.options : [];
                 if (formId)
@@ -84,15 +112,18 @@ class AIHelper {
                         const l = typeof o?.label === 'string' ? o.label : '';
                         if (!v && !l)
                             return '';
-                        return l && v ? `${l} (${v})` : (l || v);
+                        return l && v ? `${l} (${v})` : l || v;
                     })
                         .filter(Boolean)
                         .join(', ');
                     if (rendered)
                         lines.push(`  options: ${rendered}${options.length > 30 ? '…' : ''}`);
                 }
-                if (value)
-                    lines.push(`  value: ${value.length > 1000 ? `${value.slice(0, 1000)}…` : value}`);
+                if (value !== undefined) {
+                    const rendered = this.renderContextValue(value, { maxString: 1000, maxJson: 2500 });
+                    if (rendered)
+                        lines.push(`  value: ${rendered}`);
+                }
                 continue;
             }
             if (kind === 'formSnapshot') {
@@ -107,17 +138,17 @@ class AIHelper {
                 for (const f of fields.slice(0, 50)) {
                     const name = typeof f?.name === 'string' ? f.name : 'unknown';
                     const label = typeof f?.label === 'string' ? f.label : undefined;
-                    const value = typeof f?.value === 'string' ? f.value : '';
+                    const value = f?.value;
                     const inputType = typeof f?.inputType === 'string' ? f.inputType : undefined;
                     const options = Array.isArray(f?.options) ? f.options : [];
-                    const clipped = value.length > 1000 ? `${value.slice(0, 1000)}…` : value;
+                    const clipped = this.renderContextValue(value, { maxString: 1000, maxJson: 2500 });
                     const meta = [];
                     if (inputType)
                         meta.push(`type=${inputType}`);
                     if ((inputType === 'select' || inputType === 'radio') && options.length) {
                         const opts = options
                             .slice(0, 20)
-                            .map((o) => typeof o?.value === 'string' ? o.value : '')
+                            .map((o) => (typeof o?.value === 'string' ? o.value : ''))
                             .filter(Boolean)
                             .join('|');
                         if (opts)
@@ -127,84 +158,118 @@ class AIHelper {
                 }
                 continue;
             }
+            if (kind === 'pageContext') {
+                const url = typeof md?.source?.url === 'string' ? md.source.url : att.url;
+                const title = typeof md?.title === 'string' ? md.title : undefined;
+                const route = typeof md?.source?.route === 'string' ? md.source.route : undefined;
+                const data = md?.data;
+                if (url)
+                    lines.push(`  url: ${url}`);
+                if (title)
+                    lines.push(`  title: ${title}`);
+                if (route)
+                    lines.push(`  route: ${route}`);
+                if (data && typeof data === 'object') {
+                    const entries = Object.entries(data)
+                        .filter(([k]) => typeof k === 'string' && k.length > 0)
+                        .sort(([a], [b]) => a.localeCompare(b));
+                    if (entries.length) {
+                        lines.push('  data:');
+                        const limits = { maxString: 1000, maxJson: 1500 };
+                        for (const [k, v] of entries.slice(0, 40)) {
+                            const rendered = this.renderContextValue(v, limits);
+                            if (!rendered)
+                                continue;
+                            lines.push(`    - ${k}: ${rendered}`);
+                        }
+                        if (entries.length > 40) {
+                            lines.push(`    - … (${entries.length - 40} more keys)`);
+                        }
+                    }
+                }
+                else if (data !== undefined) {
+                    const rendered = this.renderContextValue(data, { maxString: 1000, maxJson: 2000 });
+                    if (rendered)
+                        lines.push(`  data: ${rendered}`);
+                }
+                continue;
+            }
             // Custom kind: prefer summary, fall back to minimal JSON.
             const title = typeof md?.title === 'string' ? md.title : undefined;
             const summary = typeof md?.summary === 'string' ? md.summary : undefined;
             if (title)
                 lines.push(`  title: ${title}`);
             if (summary) {
-                lines.push(`  summary: ${summary.length > 4000 ? `${summary.slice(0, 4000)}…` : summary}`);
+                lines.push(`  summary: ${this.clip(summary, 4000)}`);
                 continue;
             }
             if (md?.data !== undefined) {
-                const json = JSON.stringify(md.data);
-                lines.push(`  data: ${json.length > 2000 ? `${json.slice(0, 2000)}…` : json}`);
+                const rendered = this.renderContextValue(md.data, { maxString: 2000, maxJson: 5000 });
+                if (rendered)
+                    lines.push(`  data: ${rendered}`);
             }
         }
         if (lines.length) {
             userContent.push({
-                type: "text",
+                type: 'text',
                 text: `Context attachments (non-authoritative; user message is primary):\n ${lines.join('\n')}`
             });
         }
         return userContent;
     }
-    static getAgentConfigs(contextKey) {
+    getAgentConfigs(contextKey) {
         const agents = store_2.ConfigStore.getInstance().getAgentsForContext(contextKey);
         if (!agents.length) {
             throw new Error(`Agent configs not found for context key: ${contextKey}`);
         }
         return agents;
     }
-    static async getAgentOptions(params, options = {}) {
+    async getAgentOptions(params, options = {}) {
         const { contextKey, messages, modelId, context, agentName } = params;
         let agentConfig = store_2.ConfigStore.getInstance().getAgentConfigByName(agentName);
         if (contextKey && messages) {
-            agentConfig = await AIHelper.selectAgentConfig(contextKey, messages);
+            agentConfig = await this.selectAgentConfig(contextKey, messages, options.onStepFinish);
         }
-        const aiService = new services_1.AIService(store_1.ModelStore.getInstance());
-        const agentOptions = aiService.getAgentOptions(agentConfig, modelId, context);
+        const agentOptions = this.aiService.getAgentOptions(agentConfig, modelId, context);
         return {
             ...agentOptions,
-            ...options,
+            ...options
         };
     }
-    static async selectAgentConfig(contextKey, messages) {
-        const configs = AIHelper.getAgentConfigs(contextKey);
+    async selectAgentConfig(contextKey, messages, onStepFinish) {
+        const configs = this.getAgentConfigs(contextKey);
         if (configs.length === 1) {
             return configs[0];
         }
-        const aiService = new services_1.AIService(store_1.ModelStore.getInstance());
-        const systemPrompt = `Select the most appropriate agent for the given user prompt.
-Return only the agent name, no quotes or extra text.
-Available agents: ${JSON.stringify(configs.map(config => ({
+        const lastUsedAgent = messages.find((message) => message.agentName);
+        const systemPrompt = `Select the most appropriate agent for the given user message.
+Return only the agent name, no quotes or extra text. ${lastUsedAgent ? `Latest Used agent: ${lastUsedAgent}` : ''}
+Available agents: ${JSON.stringify(configs.map((config) => ({
             name: config.name,
             description: config.description,
-            tools: config.tools.map(({ data }) => data.title)
+            tools: config.tools?.map(({ data }) => data.title)
         })))}`;
-        const agentName = await aiService.generateText({
-            messages,
+        const promptMessages = messages.length > 2 ? messages.slice(messages.length - 2) : messages;
+        const agentName = await this.aiService.generateText({
+            messages: await this.convertMessages(promptMessages, true),
             system: systemPrompt,
-            temperature: 0.7,
-            maxOutputTokens: 2000
+            temperature: 0.1,
+            maxOutputTokens: 2000,
+            onStepFinish
         });
-        const agent = configs.find(config => config.name === agentName);
+        const agent = configs.find((config) => config.name === agentName);
         if (!agent) {
             // fallback, agent not found, grabbing first from the list
             return configs[0];
         }
         return agent;
     }
-    static async getAssistantResponse(messages, signal, options = {}) {
+    async getAssistantResponse(messages, options = {}) {
         try {
-            const aiService = new services_1.AIService(store_1.ModelStore.getInstance());
             const processedOptions = this.processToolChoice(options, messages);
-            return aiService.generateText({
-                temperature: 0.7,
-                maxOutputTokens: 2000,
+            return this.aiService.generateText({
                 ...processedOptions,
-                messages: await AIHelper.convertMessages(messages),
-                signal,
+                messages: await this.convertMessages(messages),
             });
         }
         catch (error) {
@@ -212,14 +277,12 @@ Available agents: ${JSON.stringify(configs.map(config => ({
             throw error;
         }
     }
-    static processToolChoice(options, agentMessages) {
+    processToolChoice(options, agentMessages) {
         if (!options?.toolChoice) {
             return options || {};
         }
         // Find the latest assistant message
-        const latestAssistantMessage = [...agentMessages]
-            .reverse()
-            .find(msg => msg.role === ai_agent_types_1.MessageRole.Assistant);
+        const latestAssistantMessage = [...agentMessages].reverse().find((msg) => msg.role === ai_agent_types_1.MessageRole.Assistant);
         // Handle 'required' toolChoice: if any tool was called, set to 'auto'
         if (options.toolChoice === 'required') {
             const anyToolWasCalled = (latestAssistantMessage?.toolCalls?.length ?? 0) > 0;
@@ -234,7 +297,7 @@ Available agents: ${JSON.stringify(configs.map(config => ({
         // Handle specific tool toolChoice: if that specific tool was called, set to 'auto'
         if (typeof options.toolChoice === 'object' && options.toolChoice.type === 'tool') {
             const toolName = options.toolChoice.toolName;
-            const toolWasCalled = latestAssistantMessage?.toolCalls?.some(toolCall => toolCall.name === toolName) ?? false;
+            const toolWasCalled = latestAssistantMessage?.toolCalls?.some((toolCall) => toolCall.name === toolName) ?? false;
             if (toolWasCalled) {
                 return {
                     ...options,
@@ -244,11 +307,10 @@ Available agents: ${JSON.stringify(configs.map(config => ({
         }
         return options;
     }
-    static async streamAssistantResponse(agentMessages, signal, options) {
-        const aiService = new services_1.AIService(store_1.ModelStore.getInstance());
+    async streamAssistantResponse(agentMessages, signal, options) {
         const messages = await this.convertMessages(agentMessages);
         const processedOptions = this.processToolChoice(options, agentMessages);
-        return aiService.streamText({
+        return this.aiService.streamText({
             messages,
             temperature: 0.7,
             maxOutputTokens: 2000,
@@ -256,7 +318,7 @@ Available agents: ${JSON.stringify(configs.map(config => ({
             ...processedOptions
         });
     }
-    static async convertMessages(agentMessages, ignoreToolsAndAttachments = false) {
+    async convertMessages(agentMessages, ignoreToolsAndAttachments = false) {
         const result = [];
         for (const msg of agentMessages) {
             if (msg.role === ai_agent_types_1.MessageRole.User) {
@@ -279,12 +341,12 @@ Available agents: ${JSON.stringify(configs.map(config => ({
                 };
                 if (!ignoreToolsAndAttachments) {
                     msg.toolCalls?.forEach((toolCall) => {
-                        if (toolCall.output) {
+                        if (toolCall.output || toolCall.error) {
                             assistantMessage.content.push({
                                 type: 'tool-call',
                                 toolCallId: toolCall.id,
                                 toolName: toolCall.name,
-                                input: toolCall.input
+                                input: Object.keys(toolCall.input).length ? toolCall.input : { stub: 'stub' }, // todo: remove this workaround when openrouter will have new stable version(last tested: 2.2.3 has reasoning issues)
                             });
                             toolMessage.content.push({
                                 type: 'tool-result',
@@ -292,7 +354,7 @@ Available agents: ${JSON.stringify(configs.map(config => ({
                                 toolName: toolCall.name,
                                 output: {
                                     type: 'text',
-                                    value: JSON.stringify(toolCall.output)
+                                    value: JSON.stringify(toolCall.output || { error: toolCall.error })
                                 }
                             });
                         }
@@ -308,13 +370,13 @@ Available agents: ${JSON.stringify(configs.map(config => ({
         }
         return result;
     }
-    static async generateTitleForMessage(contextKey, messages) {
+    async generateTitleForMessage(contextKey, messages, onStepFinish) {
         try {
-            const aiService = new services_1.AIService(store_1.ModelStore.getInstance());
             const systemPrompt = `Generate descriptive title 5 words maximum for a chat conversation. Return only the title, no quotes or extra text. If user question is opaque, assume it is related to ${contextKey} topic.`;
-            return aiService.generateText({
-                messages: await AIHelper.convertMessages(messages, true),
+            return this.aiService.generateText({
+                messages: await this.convertMessages(messages, true),
                 system: systemPrompt,
+                onStepFinish
             });
         }
         catch (error) {