@solidstarters/solid-core 1.2.173 → 1.2.175

package/dist/jobs/database/trigger-mcp-client-subscriber-database.service.js.map

@@ -1 +1 @@
-{"version":3,"file":"trigger-mcp-client-subscriber-database.service.js","sourceRoot":"","sources":["../../../src/jobs/database/trigger-mcp-client-subscriber-database.service.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA,2CAAoD;AAGpD,0EAAqE;AACrE,sFAAgF;AAEhF,mGAAqF;AACrF,0GAA8E;AAC9E,kFAA2E;AAC3E,kEAA4D;AAGrD,IAAM,kCAAkC,0CAAxC,MAAM,kCAAmC,SAAQ,gDAA2C;IAG/F,YACa,gBAAkC,EAClC,qBAA4C,EAC5C,MAAqB,EACrB,oBAA0C;QAEnD,KAAK,CAAC,gBAAgB,EAAE,qBAAqB,EAAE,MAAM,CAAC,CAAC;QAL9C,qBAAgB,GAAhB,gBAAgB,CAAkB;QAClC,0BAAqB,GAArB,qBAAqB,CAAuB;QAC5C,WAAM,GAAN,MAAM,CAAe;QACrB,yBAAoB,GAApB,oBAAoB,CAAsB;QANtC,qCAAgC,GAAG,IAAI,eAAM,CAAC,oCAAkC,CAAC,IAAI,CAAC,CAAC;IASxG,CAAC;IAED,OAAO;QACH,OAAO;YACH,GAAG,0CAA4B;SAClC,CAAA;IACL,CAAC;IAED,KAAK,CAAC,SAAS,CAAC,OAA8C;QAC1D,IAAI,CAAC,gCAAgC,CAAC,KAAK,CAAC,qBAAqB,IAAI,CAAC,SAAS,CAAC,OAAO,CAAC,EAAE,CAAC,CAAC;QAE5F,MAAM,oBAAoB,GAAG,OAAO,CAAC,OAAO,CAAC;QAE7C,MAAM,aAAa,GAAG,MAAM,IAAI,CAAC,oBAAoB,CAAC,OAAO,CAAC,oBAAoB,CAAC,eAAe,EAAE;YAChG,QAAQ,EAAE,CAAC,MAAM,CAAC;SACrB,CAAC,CAAC;QACH,IAAI,CAAC,aAAa,EAAE,CAAC;YACjB,MAAM,CAAC,GAAG,qFAAqF,oBAAoB,CAAC,eAAe,EAAE,CAAA;YACrI,IAAI,CAAC,gCAAgC,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC;YAC7C,MAAM,IAAI,KAAK,CAAC,CAAC,CAAC,CAAC;QACvB,CAAC;QAGD,MAAM,MAAM,GAAG,aAAa,CAAC,OAAO,CAAC;QAKrC,MAAM,UAAU,GAAG,MAAM,IAAI,CAAC,oBAAoB,CAAC,YAAY,CAAC,MAAM,CAAC,CAAC;QACxE,IAAI,CAAC,gCAAgC,CAAC,GAAG,CAAC,cAAc,CAAC,CAAC;QAC1D,IAAI,CAAC,gCAAgC,CAAC,GAAG,CAAC,IAAI,CAAC,SAAS,CAAC,UAAU,CAAC,CAAC,CAAC;QAEtE,IAAI,CAAC,UAAU,CAAC,OAAO,EAAE,CAAC;YACtB,IAAI,CAAC,gCAAgC,CAAC,GAAG,CAAC,8CAA8C,CAAC,CAAC;YAE1F,MAAM,SAAS,GAAG,UAAU,CAAC,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;YAE/C,MAAM,IAAI,CAAC,oBAAoB,CAAC,MAAM,CAAC;gBACnC,MAAM,EAAE,aAAa,CAAC,IAAI,CAAC,EAAE;gBAC7B,QAAQ,EAAE,aAAa,CAAC,QAAQ;gBAChC,mBAAmB,EAAE,aAAa,CAAC,EAAE;gBACrC,IAAI,EAAE,QAAQ;gBACd,OAAO,EAAE,GAAG;gBACZ,WAAW,EAAE,UAAU,CAAC,YAAY;gBACpC,YAAY,EAAE,SAAS;gBACvB,SAAS,EAAE,UAAU,CAAC,KAAK;gBAC3B,cAAc,EAAE,UAAU,CAAC,WAAW;gBACtC,QAAQ,EAAE,IAAI,CAAC,SAAS,CAAC,UAAU,EAAE,IAAI,EAAE,CAAC,CAAC;gBAC7C,SAAS,EAAE,aAAa,CAAC,SAAS;gBAClC,MAAM,EAAE,UAAU,CAAC,OAAO,CAAC,CAAC,CAAC,WAAW,CAAC,CAAC,CAAC,QAAQ;aACtD,CAAC,CAAC;YAGH,MAAM,IAAI,KAAK,CAAC,SAAS,CAAC,CAAC;QAC/B,CAAC;aACI,CAAC;YACF,IAAI,cAAc,GAAG,UAAU,CAAC,QAAQ,CAAC,IAAI,EAAE,CAAC;YAEhD,MAAM,gBAAgB,GAAG,MAAM,IAAI,CAAC,oBAAoB,CAAC,MAAM,CAAC;gBAC5D,MAAM,EAAE,aAAa,CAAC,IAAI,CAAC,EAAE;gBAC7B,QAAQ,EAAE,aAAa,CAAC,QAAQ;gBAChC,mBAAmB,EAAE,aAAa,CAAC,EAAE;gBACrC,IAAI,EAAE,QAAQ;gBACd,OAAO,EAAE,cAAc;gBACvB,WAAW,EAAE,UAAU,CAAC,YAAY;gBACpC,YAAY,EAAE,EAAE;gBAChB,SAAS,EAAE,UAAU,CAAC,KAAK;gBAC3B,cAAc,EAAE,UAAU,CAAC,WAAW;gBACtC,QAAQ,EAAE,IAAI,CAAC,SAAS,CAAC,UAAU,EAAE,IAAI,EAAE,CAAC,CAAC;gBAC7C,SAAS,EAAE,aAAa,CAAC,SAAS;gBAClC,MAAM,EAAE,UAAU,CAAC,OAAO,CAAC,CAAC,CAAC,WAAW,CAAC,CAAC,CAAC,QAAQ;aACtD,CAAC,CAAC;YAGH,IAAI,aAAa,CAAC,WAAW,EAAE,CAAC;gBAC5B,IAAI,CAAC,oBAAoB,CAAC,uBAAuB,CAAC,gBAAgB,CAAC,EAAE,CAAC,CAAC;YAC3E,CAAC;QACL,CAAC;QAED,OAAO,UAAU,CAAC;IACtB,CAAC;CACJ,CAAA;AA3FY,gFAAkC;6CAAlC,kCAAkC;IAD9C,IAAA,mBAAU,GAAE;qCAKsB,qCAAgB;QACX,gDAAqB;QACpC,8BAAa;QACC,6CAAoB;GAP9C,kCAAkC,CA2F9C","sourcesContent":["import { Injectable, Logger } from '@nestjs/common';\n\nimport { QueueMessage } from 'src/interfaces/mq';\nimport { MqMessageService } from '../../services/mq-message.service';\nimport { MqMessageQueueService } from '../../services/mq-message-queue.service';\nimport { QueuesModuleOptions, TriggerMcpClientOptions } from \"../../interfaces\";\nimport { DatabaseSubscriber } from 'src/services/queues/database-subscriber.service';\nimport triggerMcpClientQueueOptions from \"./trigger-mcp-client-queue-options\";\nimport { AiInteractionService } from 'src/services/ai-interaction.service';\nimport { PollerService } from 'src/services/poller.service';\n\n@Injectable()\nexport class TriggerMcpClientSubscriberDatabase extends DatabaseSubscriber<TriggerMcpClientOptions> {\n    private readonly triggerMcpClientSubscriberLogger = new Logger(TriggerMcpClientSubscriberDatabase.name);\n\n    constructor(\n        readonly mqMessageService: MqMessageService,\n        readonly mqMessageQueueService: MqMessageQueueService,\n        readonly poller: PollerService,\n        readonly aiInteractionService: AiInteractionService,\n    ) {\n        super(mqMessageService, mqMessageQueueService, poller);\n    }\n\n    options(): QueuesModuleOptions {\n        return {\n            ...triggerMcpClientQueueOptions\n        }\n    }\n\n    async subscribe(message: QueueMessage<TriggerMcpClientOptions>) {\n        this.triggerMcpClientSubscriberLogger.debug(`Received message: ${JSON.stringify(message)}`);\n\n        const codeGnerationOptions = message.payload;\n\n        const aiInteraction = await this.aiInteractionService.findOne(codeGnerationOptions.aiInteractionId, {\n            populate: ['user']\n        });\n        if (!aiInteraction) {\n            const m = `Unable to identified the aiInteraction entry that triggered this job... using id: ${codeGnerationOptions.aiInteractionId}`\n            this.triggerMcpClientSubscriberLogger.log(m);\n            throw new Error(m);\n        }\n\n        // The message contains the users prompt.\n        const prompt = aiInteraction.message;\n\n        // Use this to invoke our mcp client\n        // TODO: try / catch ... \n        // Handle the rejection gracefully...\n        const aiResponse = await this.aiInteractionService.runMcpPrompt(prompt);\n        this.triggerMcpClientSubscriberLogger.log(`aiResponse: `);\n        this.triggerMcpClientSubscriberLogger.log(JSON.stringify(aiResponse));\n\n        if (!aiResponse.success) {\n            this.triggerMcpClientSubscriberLogger.log(`Gen ai has returned with a false status code`);\n\n            const errorsStr = aiResponse.errors.join('; ');\n\n            await this.aiInteractionService.create({\n                userId: aiInteraction.user.id,\n                threadId: aiInteraction.threadId,\n                parentInteractionId: aiInteraction.id,\n                role: 'gen-ai',\n                message: '-',\n                contentType: aiResponse.content_type,\n                errorMessage: errorsStr,\n                modelUsed: aiResponse.model,\n                responseTimeMs: aiResponse.duration_ms,\n                metadata: JSON.stringify(aiResponse, null, 2),\n                isApplied: aiInteraction.isApplied,\n                status: aiResponse.success ? 'succeeded' : 'failed'\n            });\n\n            // update the job entry with failure... raising an error will lead the job to be marked as failed...\n            throw new Error(errorsStr);\n        }\n        else {\n            let nestedResponse = aiResponse.response.trim();\n\n            const genAiInteraction = await this.aiInteractionService.create({\n                userId: aiInteraction.user.id,\n                threadId: aiInteraction.threadId,\n                parentInteractionId: aiInteraction.id,\n                role: 'gen-ai',\n                message: nestedResponse,\n                contentType: aiResponse.content_type,\n                errorMessage: '',\n                modelUsed: aiResponse.model,\n                responseTimeMs: aiResponse.duration_ms,\n                metadata: JSON.stringify(aiResponse, null, 2),\n                isApplied: aiInteraction.isApplied,\n                status: aiResponse.success ? 'succeeded' : 'failed'\n            });\n\n            // If the human interaction was with isAutoApply=true, then we can go ahead and autoApply.\n            if (aiInteraction.isAutoApply) {\n                this.aiInteractionService.applySolidAiInteraction(genAiInteraction.id);\n            }\n        }\n\n        return aiResponse;\n    }\n}\n"]}
+{"version":3,"file":"trigger-mcp-client-subscriber-database.service.js","sourceRoot":"","sources":["../../../src/jobs/database/trigger-mcp-client-subscriber-database.service.ts"],"names":[],"mappings":"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","sourcesContent":["import { Injectable, Logger } from '@nestjs/common';\n\nimport { QueueMessage } from 'src/interfaces/mq';\nimport { MqMessageService } from '../../services/mq-message.service';\nimport { MqMessageQueueService } from '../../services/mq-message-queue.service';\nimport { McpResponse, QueuesModuleOptions, TriggerMcpClientOptions } from \"../../interfaces\";\nimport { DatabaseSubscriber } from 'src/services/queues/database-subscriber.service';\nimport triggerMcpClientQueueOptions from \"./trigger-mcp-client-queue-options\";\nimport { AiInteractionService } from 'src/services/ai-interaction.service';\nimport { PollerService } from 'src/services/poller.service';\n\n@Injectable()\nexport class TriggerMcpClientSubscriberDatabase extends DatabaseSubscriber<TriggerMcpClientOptions> {\n    private readonly triggerMcpClientSubscriberLogger = new Logger(TriggerMcpClientSubscriberDatabase.name);\n\n    constructor(\n        readonly mqMessageService: MqMessageService,\n        readonly mqMessageQueueService: MqMessageQueueService,\n        readonly poller: PollerService,\n        readonly aiInteractionService: AiInteractionService,\n    ) {\n        super(mqMessageService, mqMessageQueueService, poller);\n    }\n\n    options(): QueuesModuleOptions {\n        return {\n            ...triggerMcpClientQueueOptions\n        }\n    }\n\n    cleanNestedResponse(aiResponse: McpResponse) {\n        let nestedResponse: any;\n\n        try {\n            let raw = aiResponse.response;\n\n            if (typeof raw === \"string\") {\n                raw = raw.trim();\n                try {\n                    // Try to parse as JSON\n                    nestedResponse = JSON.parse(raw);\n                } catch {\n                    // Not JSON, just keep as string\n                    nestedResponse = raw;\n                }\n            } else if (typeof raw === \"object\" && raw !== null) {\n                // Already JSON\n                nestedResponse = raw;\n            } else {\n                // Fallback\n                nestedResponse = String(raw);\n            }\n        } catch (err) {\n            this.triggerMcpClientSubscriberLogger.error(\"Error processing AI response:\", err);\n            nestedResponse = `Error handling response: ${err?.message || String(err)}`;\n        }\n\n        return nestedResponse;\n    }\n\n    async subscribe(message: QueueMessage<TriggerMcpClientOptions>) {\n        this.triggerMcpClientSubscriberLogger.debug(`Received message: ${JSON.stringify(message)}`);\n\n        const codeGnerationOptions = message.payload;\n\n        const aiInteraction = await this.aiInteractionService.findOne(codeGnerationOptions.aiInteractionId, {\n            populate: ['user']\n        });\n        if (!aiInteraction) {\n            const m = `Unable to identified the aiInteraction entry that triggered this job... using id: ${codeGnerationOptions.aiInteractionId}`\n            this.triggerMcpClientSubscriberLogger.log(m);\n            throw new Error(m);\n        }\n\n        // The message contains the users prompt.\n        const prompt = aiInteraction.message;\n\n        // Use this to invoke our mcp client\n        // TODO: try / catch ... \n        // Handle the rejection gracefully...\n\n        // We create the aiInteraction entry first \n        const genAiInteraction = await this.aiInteractionService.create({\n            userId: aiInteraction.user.id,\n            threadId: aiInteraction.threadId,\n            parentInteractionId: aiInteraction.id,\n            role: 'gen-ai',\n            message: '...', // Updated in the tool\n            contentType: '', // Updated in the tool\n            errorMessage: '', // Updated after we receive the response\n            modelUsed: '', // Updated after we receive the response\n            responseTimeMs: 0, // Updated after we receive the response\n            metadata: '', // Updated in the tool\n            isApplied: false, // Updated after we receive the response\n            status: '' // Updated after we receive the response\n        });\n\n        const finalPrompt = `\n        # User Prompt: \n        ${prompt}\n        \n        # System Instructions:\n        - aiInteractionId: ${genAiInteraction.id}\n        - moduleName:${message.payload.moduleName}\n        - You will be invoking tools if needed.\n        - If a tool is invoked, you must return **exactly** the raw output from the tool, without any additional formatting, commentary, or text.\n        - Do not wrap the result in quotes, JSON, or markdown fences.\n        - Do not explain what the result means.\n        - Your final response must be identical to the tool output.\n        `\n\n        const aiResponse = await this.aiInteractionService.runMcpPrompt(finalPrompt);\n        this.triggerMcpClientSubscriberLogger.log(`aiResponse: `);\n        this.triggerMcpClientSubscriberLogger.log(JSON.stringify(aiResponse));\n\n        if (!aiResponse.success) {\n            this.triggerMcpClientSubscriberLogger.log(`Gen ai has returned with a false status code`);\n\n            const errorsStr = aiResponse.errors.join('\\n ');\n            const errorTrace = aiResponse.error_trace.join('\\n');\n\n            // await this.aiInteractionService.create({\n            //     userId: aiInteraction.user.id,\n            //     threadId: aiInteraction.threadId,\n            //     parentInteractionId: aiInteraction.id,\n            //     role: 'gen-ai',\n            //     message: '-',\n            //     contentType: aiResponse.content_type,\n            //     errorMessage: errorsStr,\n            //     modelUsed: aiResponse.model,\n            //     responseTimeMs: aiResponse.duration_ms,\n            //     metadata: JSON.stringify(aiResponse, null, 2),\n            //     isApplied: aiInteraction.isApplied,\n            //     status: aiResponse.success ? 'succeeded' : 'failed'\n            // });\n\n            // TODO: Update the previously created genAiInteraction record with the respective error fields and save to DB\n            await this.aiInteractionService.update(genAiInteraction.id, {\n                // contentType: aiResponse.content_type,\n                errorMessage: `${errorsStr}\\n\\n${errorTrace}`,\n                modelUsed: aiResponse.model,\n                responseTimeMs: aiResponse.duration_ms,\n                isApplied: aiInteraction.isApplied,\n                status: aiResponse.success ? 'succeeded' : 'failed'\n            }, [], true);\n\n            // update the job entry with failure... raising an error will lead the job to be marked as failed...\n            throw new Error(errorsStr);\n        }\n        else {\n            // let nestedResponse = this.cleanNestedResponse(aiResponse);\n\n            // const genAiInteraction = await this.aiInteractionService.create({\n            //     userId: aiInteraction.user.id,\n            //     threadId: aiInteraction.threadId,\n            //     parentInteractionId: aiInteraction.id,\n            //     role: 'gen-ai',\n            //     message: nestedResponse,\n            //     contentType: aiResponse.content_type,\n            //     errorMessage: '',\n            //     modelUsed: aiResponse.model,\n            //     responseTimeMs: aiResponse.duration_ms,\n            //     metadata: JSON.stringify(aiResponse, null, 2),\n            //     isApplied: aiInteraction.isApplied,\n            //     status: aiResponse.success ? 'succeeded' : 'failed'\n            // });\n\n            // TODO: Update the previously created genAiInteraction record with the respective success fields and save to DB\n            await this.aiInteractionService.update(genAiInteraction.id, {\n                // contentType: aiResponse.content_type,\n                errorMessage: '',\n                // message: nestedResponse,\n                modelUsed: aiResponse.model,\n                responseTimeMs: aiResponse.duration_ms,\n                isApplied: aiInteraction.isApplied,\n                status: aiResponse.success ? 'succeeded' : 'failed'\n            }, [], true);\n\n            // If the human interaction was with isAutoApply=true, then we can go ahead and autoApply.\n            if (aiInteraction.isAutoApply) {\n                this.aiInteractionService.applySolidAiInteraction(genAiInteraction.id);\n            }\n        }\n\n        return aiResponse;\n    }\n}\n"]}

package/dist/repository/chatter-message-details.repository.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"chatter-message-details.repository.d.ts","sourceRoot":"","sources":["../../src/repository/chatter-message-details.repository.ts"],"names":[],"mappings":"AACA,OAAO,EACL,UAAU,EACV,WAAW,EACX,kBAAkB,EACnB,MAAM,SAAS,CAAC;AAGjB,OAAO,EAAE,qBAAqB,EAAE,MAAM,6CAA6C,CAAC;AAEpF,OAAO,EAAE,qBAAqB,EAAE,MAAM,sCAAsC,CAAC;AAC7E,OAAO,EAAE,sBAAsB,EAAE,MAAM,4BAA4B,CAAC;AACpE,OAAO,EAAE,mBAAmB,EAAE,MAAM,yBAAyB,CAAC;AAI9D,qBACa,+BAAgC,SAAQ,mBAAmB,CAAC,qBAAqB,CAAC;IAE3F,QAAQ,CAAC,UAAU,EAAE,UAAU;IAC/B,QAAQ,CAAC,qBAAqB,EAAE,qBAAqB;IACrD,QAAQ,CAAC,sBAAsB,EAAE,sBAAsB;gBAF9C,UAAU,EAAE,UAAU,EACtB,qBAAqB,EAAE,qBAAqB,EAC5C,sBAAsB,EAAE,sBAAsB;IAIvD,OAAO,CAAC,QAAQ,CAAC,kBAAkB,CAA4C;IAQxE,kBAAkB,CACzB,KAAK,SAAW,EAChB,WAAW,CAAC,EAAE,WAAW,GACxB,kBAAkB,CAAC,qBAAqB,CAAC;IAsC5C,eAAe,CAAC,CAAC,EACf,EAAE,EAAE,kBAAkB,CAAC,CAAC,CAAC,EACzB,WAAW,EAAE,MAAM,EACnB,YAAY,GAAE,MAAkB,GAC/B,kBAAkB,CAAC,CAAC,CAAC;IAqBxB,OAAO,CAAC,sBAAsB;CAS/B"}
+{"version":3,"file":"chatter-message-details.repository.d.ts","sourceRoot":"","sources":["../../src/repository/chatter-message-details.repository.ts"],"names":[],"mappings":"AACA,OAAO,EACL,UAAU,EACV,WAAW,EACX,kBAAkB,EACnB,MAAM,SAAS,CAAC;AAGjB,OAAO,EAAE,qBAAqB,EAAE,MAAM,6CAA6C,CAAC;AAEpF,OAAO,EAAE,qBAAqB,EAAE,MAAM,sCAAsC,CAAC;AAC7E,OAAO,EAAE,sBAAsB,EAAE,MAAM,4BAA4B,CAAC;AACpE,OAAO,EAAE,mBAAmB,EAAE,MAAM,yBAAyB,CAAC;AAI9D,qBACa,+BAAgC,SAAQ,mBAAmB,CAAC,qBAAqB,CAAC;IAE3F,QAAQ,CAAC,UAAU,EAAE,UAAU;IAC/B,QAAQ,CAAC,qBAAqB,EAAE,qBAAqB;IACrD,QAAQ,CAAC,sBAAsB,EAAE,sBAAsB;gBAF9C,UAAU,EAAE,UAAU,EACtB,qBAAqB,EAAE,qBAAqB,EAC5C,sBAAsB,EAAE,sBAAsB;IAIvD,OAAO,CAAC,QAAQ,CAAC,kBAAkB,CAA4C;IAQxE,kBAAkB,CACzB,KAAK,SAAW,EAChB,WAAW,CAAC,EAAE,WAAW,GACxB,kBAAkB,CAAC,qBAAqB,CAAC;IAqC5C,eAAe,CAAC,CAAC,EACf,EAAE,EAAE,kBAAkB,CAAC,CAAC,CAAC,EACzB,WAAW,EAAE,MAAM,EACnB,YAAY,GAAE,MAAkB,GAC/B,kBAAkB,CAAC,CAAC,CAAC;IAqBxB,OAAO,CAAC,sBAAsB;CAW/B"}

package/dist/repository/chatter-message-details.repository.js

@@ -29,11 +29,13 @@ let ChatterMessageDetailsRepository = class ChatterMessageDetailsRepository exte
     createQueryBuilder(alias = 'detail', queryRunner) {
         const activeUser = this.requestContextService.getActiveUser();
         let qb = super.createQueryBuilder(alias, queryRunner);
-        qb = qb.leftJoin(`${alias}.chatterMessage`, 'chatterMessage');
-        const [coModelName, coModelAlias] = this.getCoModelNameAndAlias();
-        qb = this.leftJoinCoModel(qb, coModelName, 'chatterMessage');
         if (!activeUser)
             return qb;
+        const [coModelName, coModelAlias] = this.getCoModelNameAndAlias();
+        if (!coModelName)
+            return qb;
+        qb = qb.leftJoin(`${alias}.chatterMessage`, 'chatterMessage');
+        qb = this.leftJoinCoModel(qb, coModelName, 'chatterMessage');
         return this.securityRuleRepository.applySecurityRules(qb, coModelName, activeUser, coModelAlias);
     }
     leftJoinCoModel(qb, coModelName, messageAlias = 'message') {
@@ -48,6 +50,8 @@ let ChatterMessageDetailsRepository = class ChatterMessageDetailsRepository exte
         if (!requestFilter)
             return [undefined, undefined];
         const coModelName = (0, lodash_1.get)(requestFilter, this.CO_MODEL_NAME_PATH);
+        if (!coModelName)
+            return [undefined, undefined];
         const alias = (0, strings_1.camelize)(coModelName);
         return [coModelName, alias];
     }

package/dist/repository/chatter-message-details.repository.js.map

@@ -1 +1 @@
-{"version":3,"file":"chatter-message-details.repository.js","sourceRoot":"","sources":["../../src/repository/chatter-message-details.repository.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,2CAA4C;AAC5C,qCAIiB;AACjB,oEAA4E;AAE5E,+FAAoF;AAEpF,iFAA6E;AAC7E,yEAAoE;AACpE,mEAA8D;AAC9D,mCAA0B;AAInB,IAAM,+BAA+B,GAArC,MAAM,+BAAgC,SAAQ,2CAA0C;IAC7F,YACW,UAAsB,EACtB,qBAA4C,EAC5C,sBAA8C;QAEvD,KAAK,CAAC,sDAAqB,EAAE,UAAU,EAAE,qBAAqB,EAAE,sBAAsB,CAAC,CAAC;QAJ/E,eAAU,GAAV,UAAU,CAAY;QACtB,0BAAqB,GAArB,qBAAqB,CAAuB;QAC5C,2BAAsB,GAAtB,sBAAsB,CAAwB;QAItC,uBAAkB,GAAG,wCAAwC,CAAC;IADjF,CAAC;IASQ,kBAAkB,CACzB,KAAK,GAAG,QAAQ,EAChB,WAAyB;QAEzB,MAAM,UAAU,GAAG,IAAI,CAAC,qBAAqB,CAAC,aAAa,EAAE,CAAC;QAC9D,IAAI,EAAE,GAAG,KAAK,CAAC,kBAAkB,CAAC,KAAK,EAAE,WAAW,CAAC,CAAC;QAGtD,EAAE,GAAG,EAAE,CAAC,QAAQ,CAAC,GAAG,KAAK,iBAAiB,EAAE,gBAAgB,CAAC,CAAC;QAG9D,MAAM,CAAC,WAAW,EAAE,YAAY,CAAC,GAAG,IAAI,CAAC,sBAAsB,EAAE,CAAC;QAElE,EAAE,GAAG,IAAI,CAAC,eAAe,CAAC,EAAE,EAAE,WAAW,EAAE,gBAAgB,CAAC,CAAC;QAE7D,IAAI,CAAC,UAAU;YAAE,OAAO,EAAE,CAAC;QAI3B,OAAO,IAAI,CAAC,sBAAsB,CAAC,kBAAkB,CACnD,EAAE,EACF,WAAW,EACX,UAA4B,EAC5B,YAAY,CACb,CAAC;IACJ,CAAC;IAgBD,eAAe,CACb,EAAyB,EACzB,WAAmB,EACnB,eAAuB,SAAS;QAGhC,MAAM,UAAU,GAAG,IAAA,kBAAQ,EAAC,WAAW,CAAC,CAAC;QACzC,MAAM,IAAI,GAAG,IAAI,CAAC,UAAU,CAAC,WAAW,CAAC,UAAU,CAAC,CAAC;QAErD,MAAM,OAAO,GAAG,IAAA,kBAAQ,EAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QAKpC,EAAE,CAAC,QAAQ,CACT,UAAU,EACV,OAAO,EACP,IAAI,OAAO,aAAa,YAAY,+BAA+B,YAAY,4BAA4B,EAC3G,EAAE,KAAK,EAAE,WAAW,EAAE,CACvB,CAAC;QAEF,OAAO,EAAE,CAAC;IACZ,CAAC;IAGO,sBAAsB;QAC5B,MAAM,aAAa,GAAG,IAAI,CAAC,qBAAqB,CAAC,gBAAgB,EAAE,CAAC;QACpE,IAAI,CAAC,aAAa;YAAE,OAAO,CAAC,SAAS,EAAE,SAAS,CAAC,CAAC;QAElD,MAAM,WAAW,GAAG,IAAA,YAAG,EAAC,aAAa,EAAE,IAAI,CAAC,kBAAkB,CAAC,CAAC;QAChE,MAAM,KAAK,GAAG,IAAA,kBAAQ,EAAC,WAAW,CAAC,CAAC;QACpC,OAAO,CAAC,WAAW,EAAE,KAAK,CAAC,CAAC;IAC9B,CAAC;CAEF,CAAA;AA3FY,0EAA+B;0CAA/B,+BAA+B;IAD3C,IAAA,mBAAU,GAAE;qCAGY,oBAAU;QACC,+CAAqB;QACpB,iDAAsB;GAJ9C,+BAA+B,CA2F3C","sourcesContent":["import { Injectable } from '@nestjs/common';\nimport {\n  DataSource,\n  QueryRunner,\n  SelectQueryBuilder,\n} from 'typeorm';\nimport { camelize, classify } from '@angular-devkit/core/src/utils/strings';\n\nimport { ChatterMessageDetails } from 'src/entities/chatter-message-details.entity';\nimport { ActiveUserData } from 'src/interfaces/active-user-data.interface';\nimport { RequestContextService } from 'src/services/request-context.service';\nimport { SecurityRuleRepository } from './security-rule.repository';\nimport { SolidBaseRepository } from './solid-base.repository';\nimport {get} from \"lodash\"\n\n\n@Injectable()\nexport class ChatterMessageDetailsRepository extends SolidBaseRepository<ChatterMessageDetails> {\n  constructor(\n    readonly dataSource: DataSource,\n    readonly requestContextService: RequestContextService,\n    readonly securityRuleRepository: SecurityRuleRepository,\n  ) {\n    super(ChatterMessageDetails, dataSource, requestContextService, securityRuleRepository);\n  }\n    private readonly CO_MODEL_NAME_PATH = 'filters.chatterMessage.coModelName.$eq';\n\n  /**\n   * Build a security-aware QB:\n   *  - join the real relation to ChatterMessage (alias: \"message\")\n   *  - left join the polymorphic co-model table using message.co_model_* fields\n   *  - (optionally) apply security rules on the co-model alias\n   */\n  override createQueryBuilder(\n    alias = 'detail',\n    queryRunner?: QueryRunner,\n  ): SelectQueryBuilder<ChatterMessageDetails> {\n    const activeUser = this.requestContextService.getActiveUser();\n    let qb = super.createQueryBuilder(alias, queryRunner);\n\n    // Join the real relation so we can access co_model_* fields\n    qb = qb.leftJoin(`${alias}.chatterMessage`, 'chatterMessage');\n\n    // Example: join the \"client\" co-model (pass whatever co-model name you need)\n    const [coModelName, coModelAlias] = this.getCoModelNameAndAlias();\n\n    qb = this.leftJoinCoModel(qb, coModelName, 'chatterMessage');\n\n    if (!activeUser) return qb;\n\n    // If your security rules should apply to the co-model rows, pass the co-model alias.\n    // Here we use the co-model name \"client\" both as model key and alias base for consistency.\n    return this.securityRuleRepository.applySecurityRules(\n      qb,\n      coModelName,                           // modelSingularName (or whatever your rules expect)\n      activeUser as ActiveUserData,\n      coModelAlias,      // the alias we used inside leftJoinCoModel\n    );\n  }\n\n  /**\n   * Left-join the polymorphic co-model table, matching:\n   *   <coModelAlias>.id = <messageAlias>.co_model_entity_id\n   *   AND <messageAlias>.co_model_name = :model\n   *\n   * @param qb            QB built on ChatterMessageDetails\n   * @param coModelName   e.g. \"client\" | \"invoice\" | ...\n   * @param messageAlias  alias used for joined ChatterMessage (default: \"message\")\n   *\n   * Notes:\n   * - We resolve the entity metadata from the classified name (e.g., \"Client\"),\n   *   then use metadata.tablePath to get schema-qualified table.\n   * - We build a stable alias from metadata.name (camelized).\n   */\n  leftJoinCoModel<T>(\n    qb: SelectQueryBuilder<T>,\n    coModelName: string,\n    messageAlias: string = 'message',\n  ): SelectQueryBuilder<T> {\n    // Resolve entity metadata from your naming convention\n    const entityName = classify(coModelName);                 // \"client\" -> \"Client\"\n    const meta = this.dataSource.getMetadata(entityName);     // throws if not registered\n    // const table = meta.tablePath;                             // schema-qualified\n    const coAlias = camelize(meta.name);                      // stable alias, e.g., \"client\"\n\n    // LEFT JOIN \"<schema>\".\"<table>\" \"<coAlias>\"\n    //   ON \"<coAlias>\".\"id\" = \"message\".\"co_model_entity_id\"\n    //  AND \"message\".\"co_model_name\" = :model\n    qb.leftJoin(\n      entityName,\n      coAlias,\n      `\"${coAlias}\".\"id\" = \"${messageAlias}\".\"co_model_entity_id\" AND \"${messageAlias}\".\"co_model_name\" = :model`,\n      { model: coModelName },\n    );\n\n    return qb;\n  }\n\n  // This uses the requestContextService.getRequestFilter method and extracts the coModelName and creates the alias and returns the name and alias tuple\n  private getCoModelNameAndAlias() {\n    const requestFilter = this.requestContextService.getRequestFilter();\n    if (!requestFilter) return [undefined, undefined];\n\n    const coModelName = get(requestFilter, this.CO_MODEL_NAME_PATH);\n    const alias = camelize(coModelName);\n    return [coModelName, alias];\n  }\n\n}"]}
+{"version":3,"file":"chatter-message-details.repository.js","sourceRoot":"","sources":["../../src/repository/chatter-message-details.repository.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,2CAA4C;AAC5C,qCAIiB;AACjB,oEAA4E;AAE5E,+FAAoF;AAEpF,iFAA6E;AAC7E,yEAAoE;AACpE,mEAA8D;AAC9D,mCAA0B;AAInB,IAAM,+BAA+B,GAArC,MAAM,+BAAgC,SAAQ,2CAA0C;IAC7F,YACW,UAAsB,EACtB,qBAA4C,EAC5C,sBAA8C;QAEvD,KAAK,CAAC,sDAAqB,EAAE,UAAU,EAAE,qBAAqB,EAAE,sBAAsB,CAAC,CAAC;QAJ/E,eAAU,GAAV,UAAU,CAAY;QACtB,0BAAqB,GAArB,qBAAqB,CAAuB;QAC5C,2BAAsB,GAAtB,sBAAsB,CAAwB;QAItC,uBAAkB,GAAG,wCAAwC,CAAC;IADjF,CAAC;IASQ,kBAAkB,CACzB,KAAK,GAAG,QAAQ,EAChB,WAAyB;QAEzB,MAAM,UAAU,GAAG,IAAI,CAAC,qBAAqB,CAAC,aAAa,EAAE,CAAC;QAC9D,IAAI,EAAE,GAAG,KAAK,CAAC,kBAAkB,CAAC,KAAK,EAAE,WAAW,CAAC,CAAC;QACtD,IAAI,CAAC,UAAU;YAAE,OAAO,EAAE,CAAC;QAG3B,MAAM,CAAC,WAAW,EAAE,YAAY,CAAC,GAAG,IAAI,CAAC,sBAAsB,EAAE,CAAC;QAClE,IAAI,CAAC,WAAW;YAAE,OAAO,EAAE,CAAC;QAG5B,EAAE,GAAG,EAAE,CAAC,QAAQ,CAAC,GAAG,KAAK,iBAAiB,EAAE,gBAAgB,CAAC,CAAC;QAC9D,EAAE,GAAG,IAAI,CAAC,eAAe,CAAC,EAAE,EAAE,WAAW,EAAE,gBAAgB,CAAC,CAAC;QAI7D,OAAO,IAAI,CAAC,sBAAsB,CAAC,kBAAkB,CACnD,EAAE,EACF,WAAW,EACX,UAA4B,EAC5B,YAAY,CACb,CAAC;IACJ,CAAC;IAgBD,eAAe,CACb,EAAyB,EACzB,WAAmB,EACnB,eAAuB,SAAS;QAGhC,MAAM,UAAU,GAAG,IAAA,kBAAQ,EAAC,WAAW,CAAC,CAAC;QACzC,MAAM,IAAI,GAAG,IAAI,CAAC,UAAU,CAAC,WAAW,CAAC,UAAU,CAAC,CAAC;QAErD,MAAM,OAAO,GAAG,IAAA,kBAAQ,EAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QAKpC,EAAE,CAAC,QAAQ,CACT,UAAU,EACV,OAAO,EACP,IAAI,OAAO,aAAa,YAAY,+BAA+B,YAAY,4BAA4B,EAC3G,EAAE,KAAK,EAAE,WAAW,EAAE,CACvB,CAAC;QAEF,OAAO,EAAE,CAAC;IACZ,CAAC;IAGO,sBAAsB;QAC5B,MAAM,aAAa,GAAG,IAAI,CAAC,qBAAqB,CAAC,gBAAgB,EAAE,CAAC;QACpE,IAAI,CAAC,aAAa;YAAE,OAAO,CAAC,SAAS,EAAE,SAAS,CAAC,CAAC;QAElD,MAAM,WAAW,GAAG,IAAA,YAAG,EAAC,aAAa,EAAE,IAAI,CAAC,kBAAkB,CAAC,CAAC;QAChE,IAAI,CAAC,WAAW;YAAE,OAAO,CAAC,SAAS,EAAE,SAAS,CAAC,CAAC;QAEhD,MAAM,KAAK,GAAG,IAAA,kBAAQ,EAAC,WAAW,CAAC,CAAC;QACpC,OAAO,CAAC,WAAW,EAAE,KAAK,CAAC,CAAC;IAC9B,CAAC;CAEF,CAAA;AA5FY,0EAA+B;0CAA/B,+BAA+B;IAD3C,IAAA,mBAAU,GAAE;qCAGY,oBAAU;QACC,+CAAqB;QACpB,iDAAsB;GAJ9C,+BAA+B,CA4F3C","sourcesContent":["import { Injectable } from '@nestjs/common';\nimport {\n  DataSource,\n  QueryRunner,\n  SelectQueryBuilder,\n} from 'typeorm';\nimport { camelize, classify } from '@angular-devkit/core/src/utils/strings';\n\nimport { ChatterMessageDetails } from 'src/entities/chatter-message-details.entity';\nimport { ActiveUserData } from 'src/interfaces/active-user-data.interface';\nimport { RequestContextService } from 'src/services/request-context.service';\nimport { SecurityRuleRepository } from './security-rule.repository';\nimport { SolidBaseRepository } from './solid-base.repository';\nimport {get} from \"lodash\"\n\n\n@Injectable()\nexport class ChatterMessageDetailsRepository extends SolidBaseRepository<ChatterMessageDetails> {\n  constructor(\n    readonly dataSource: DataSource,\n    readonly requestContextService: RequestContextService,\n    readonly securityRuleRepository: SecurityRuleRepository,\n  ) {\n    super(ChatterMessageDetails, dataSource, requestContextService, securityRuleRepository);\n  }\n    private readonly CO_MODEL_NAME_PATH = 'filters.chatterMessage.coModelName.$eq';\n\n  /**\n   * Build a security-aware QB:\n   *  - join the real relation to ChatterMessage (alias: \"message\")\n   *  - left join the polymorphic co-model table using message.co_model_* fields\n   *  - (optionally) apply security rules on the co-model alias\n   */\n  override createQueryBuilder(\n    alias = 'detail',\n    queryRunner?: QueryRunner,\n  ): SelectQueryBuilder<ChatterMessageDetails> {\n    const activeUser = this.requestContextService.getActiveUser();\n    let qb = super.createQueryBuilder(alias, queryRunner);\n    if (!activeUser) return qb;\n\n    // Example: join the \"client\" co-model (pass whatever co-model name you need)\n    const [coModelName, coModelAlias] = this.getCoModelNameAndAlias();\n    if (!coModelName) return qb;\n\n    // Join the real relation so we can access co_model_* fields\n    qb = qb.leftJoin(`${alias}.chatterMessage`, 'chatterMessage');\n    qb = this.leftJoinCoModel(qb, coModelName, 'chatterMessage');\n\n    // If your security rules should apply to the co-model rows, pass the co-model alias.\n    // Here we use the co-model name \"client\" both as model key and alias base for consistency.\n    return this.securityRuleRepository.applySecurityRules(\n      qb,\n      coModelName,                           // modelSingularName (or whatever your rules expect)\n      activeUser as ActiveUserData,\n      coModelAlias,      // the alias we used inside leftJoinCoModel\n    );\n  }\n\n  /**\n   * Left-join the polymorphic co-model table, matching:\n   *   <coModelAlias>.id = <messageAlias>.co_model_entity_id\n   *   AND <messageAlias>.co_model_name = :model\n   *\n   * @param qb            QB built on ChatterMessageDetails\n   * @param coModelName   e.g. \"client\" | \"invoice\" | ...\n   * @param messageAlias  alias used for joined ChatterMessage (default: \"message\")\n   *\n   * Notes:\n   * - We resolve the entity metadata from the classified name (e.g., \"Client\"),\n   *   then use metadata.tablePath to get schema-qualified table.\n   * - We build a stable alias from metadata.name (camelized).\n   */\n  leftJoinCoModel<T>(\n    qb: SelectQueryBuilder<T>,\n    coModelName: string,\n    messageAlias: string = 'message',\n  ): SelectQueryBuilder<T> {\n    // Resolve entity metadata from your naming convention\n    const entityName = classify(coModelName);                 // \"client\" -> \"Client\"\n    const meta = this.dataSource.getMetadata(entityName);     // throws if not registered\n    // const table = meta.tablePath;                             // schema-qualified\n    const coAlias = camelize(meta.name);                      // stable alias, e.g., \"client\"\n\n    // LEFT JOIN \"<schema>\".\"<table>\" \"<coAlias>\"\n    //   ON \"<coAlias>\".\"id\" = \"message\".\"co_model_entity_id\"\n    //  AND \"message\".\"co_model_name\" = :model\n    qb.leftJoin(\n      entityName,\n      coAlias,\n      `\"${coAlias}\".\"id\" = \"${messageAlias}\".\"co_model_entity_id\" AND \"${messageAlias}\".\"co_model_name\" = :model`,\n      { model: coModelName },\n    );\n\n    return qb;\n  }\n\n  // This uses the requestContextService.getRequestFilter method and extracts the coModelName and creates the alias and returns the name and alias tuple\n  private getCoModelNameAndAlias() {\n    const requestFilter = this.requestContextService.getRequestFilter();\n    if (!requestFilter) return [undefined, undefined];\n\n    const coModelName = get(requestFilter, this.CO_MODEL_NAME_PATH);\n    if (!coModelName) return [undefined, undefined];\n\n    const alias = camelize(coModelName);\n    return [coModelName, alias];\n  }\n\n}"]}

package/dist/repository/chatter-message.repository.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"chatter-message.repository.d.ts","sourceRoot":"","sources":["../../src/repository/chatter-message.repository.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,cAAc,EAAE,MAAM,qCAAqC,CAAC;AAErE,OAAO,EAAE,qBAAqB,EAAE,MAAM,sCAAsC,CAAC;AAC7E,OAAO,EAAE,UAAU,EAAE,WAAW,EAAE,kBAAkB,EAAE,MAAM,SAAS,CAAC;AACtE,OAAO,EAAE,sBAAsB,EAAE,MAAM,4BAA4B,CAAC;AACpE,OAAO,EAAE,mBAAmB,EAAE,MAAM,yBAAyB,CAAC;AAG9D,qBACa,wBAAyB,SAAQ,mBAAmB,CAAC,cAAc,CAAC;IAEzE,QAAQ,CAAC,UAAU,EAAE,UAAU;IAC/B,QAAQ,CAAC,qBAAqB,EAAE,qBAAqB;IACrD,QAAQ,CAAC,sBAAsB,EAAE,sBAAsB;gBAF9C,UAAU,EAAE,UAAU,EACtB,qBAAqB,EAAE,qBAAqB,EAC5C,sBAAsB,EAAE,sBAAsB;IAK3D,OAAO,CAAC,QAAQ,CAAC,kBAAkB,CAA6B;IACvD,kBAAkB,CAAC,KAAK,CAAC,EAAE,MAAM,EAAE,WAAW,CAAC,EAAE,WAAW,GAAG,kBAAkB,CAAC,cAAc,CAAC;IAiB1G,OAAO,CAAC,eAAe;IAoBvB,OAAO,CAAC,sBAAsB;CASjC"}
+{"version":3,"file":"chatter-message.repository.d.ts","sourceRoot":"","sources":["../../src/repository/chatter-message.repository.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,cAAc,EAAE,MAAM,qCAAqC,CAAC;AAErE,OAAO,EAAE,qBAAqB,EAAE,MAAM,sCAAsC,CAAC;AAC7E,OAAO,EAAE,UAAU,EAAE,WAAW,EAAE,kBAAkB,EAAE,MAAM,SAAS,CAAC;AACtE,OAAO,EAAE,sBAAsB,EAAE,MAAM,4BAA4B,CAAC;AACpE,OAAO,EAAE,mBAAmB,EAAE,MAAM,yBAAyB,CAAC;AAG9D,qBACa,wBAAyB,SAAQ,mBAAmB,CAAC,cAAc,CAAC;IAEzE,QAAQ,CAAC,UAAU,EAAE,UAAU;IAC/B,QAAQ,CAAC,qBAAqB,EAAE,qBAAqB;IACrD,QAAQ,CAAC,sBAAsB,EAAE,sBAAsB;gBAF9C,UAAU,EAAE,UAAU,EACtB,qBAAqB,EAAE,qBAAqB,EAC5C,sBAAsB,EAAE,sBAAsB;IAK3D,OAAO,CAAC,QAAQ,CAAC,kBAAkB,CAA6B;IACvD,kBAAkB,CAAC,KAAK,CAAC,EAAE,MAAM,EAAE,WAAW,CAAC,EAAE,WAAW,GAAG,kBAAkB,CAAC,cAAc,CAAC;IAkB1G,OAAO,CAAC,eAAe;IAoBvB,OAAO,CAAC,sBAAsB;CAUjC"}

package/dist/repository/chatter-message.repository.js

@@ -32,6 +32,8 @@ let ChatterMessageRepository = class ChatterMessageRepository extends solid_base
         if (!activeUserOrUndefined)
             return qb;
         const [coModelName, coModelAlias] = this.getCoModelNameAndAlias();
+        if (!coModelName)
+            return qb;
         qb = this.leftJoinCoModel(qb, coModelName);
         return this.securityRuleRepository.applySecurityRules(qb, coModelName, activeUserOrUndefined, coModelAlias);
     }
@@ -47,6 +49,8 @@ let ChatterMessageRepository = class ChatterMessageRepository extends solid_base
         if (!requestFilter)
             return [undefined, undefined];
         const coModelName = (0, lodash_1.get)(requestFilter, this.CO_MODEL_NAME_PATH);
+        if (!coModelName)
+            return [undefined, undefined];
         const alias = (0, strings_1.camelize)(coModelName);
         return [coModelName, alias];
     }

package/dist/repository/chatter-message.repository.js.map

@@ -1 +1 @@
-{"version":3,"file":"chatter-message.repository.js","sourceRoot":"","sources":["../../src/repository/chatter-message.repository.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,oEAA4E;AAC5E,2CAA4C;AAC5C,+EAAqE;AAErE,iFAA6E;AAC7E,qCAAsE;AACtE,yEAAoE;AACpE,mEAA8D;AAC9D,mCAA0B;AAGnB,IAAM,wBAAwB,GAA9B,MAAM,wBAAyB,SAAQ,2CAAmC;IAC7E,YACa,UAAsB,EACtB,qBAA4C,EAC5C,sBAA8C;QAEvD,KAAK,CAAC,uCAAc,EAAE,UAAU,EAAE,qBAAqB,EAAE,sBAAsB,CAAC,CAAC;QAJxE,eAAU,GAAV,UAAU,CAAY;QACtB,0BAAqB,GAArB,qBAAqB,CAAuB;QAC5C,2BAAsB,GAAtB,sBAAsB,CAAwB;QAK1C,uBAAkB,GAAG,yBAAyB,CAAC;IAFhE,CAAC;IAGQ,kBAAkB,CAAC,KAAc,EAAE,WAAyB;QACjE,MAAM,qBAAqB,GAAG,IAAI,CAAC,qBAAqB,CAAC,aAAa,EAAE,CAAC;QACzE,IAAI,EAAE,GAAG,KAAK,CAAC,kBAAkB,CAAC,KAAK,EAAE,WAAW,CAAC,CAAC;QACtD,IAAI,CAAC,qBAAqB;YAAE,OAAO,EAAE,CAAC;QAGtC,MAAM,CAAC,WAAW,EAAE,YAAY,CAAC,GAAG,IAAI,CAAC,sBAAsB,EAAE,CAAC;QAClE,EAAE,GAAG,IAAI,CAAC,eAAe,CAAC,EAAE,EAAE,WAAW,CAAC,CAAC;QAE3C,OAAO,IAAI,CAAC,sBAAsB,CAAC,kBAAkB,CACjD,EAAE,EACF,WAAW,EACX,qBAAuC,EACvC,YAAY,CACf,CAAC;IACN,CAAC;IAEO,eAAe,CACnB,EAAsC,EACtC,WAAmB;QAGnB,MAAM,UAAU,GAAG,IAAA,kBAAQ,EAAC,WAAW,CAAC,CAAA;QACxC,MAAM,IAAI,GAAG,IAAI,CAAC,UAAU,CAAC,WAAW,CAAC,UAAU,CAAC,CAAC;QACrD,MAAM,KAAK,GAAG,IAAA,kBAAQ,EAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QAClC,EAAE,CAAC,QAAQ,CACP,UAAU,EACV,KAAK,EAEL,GAAG,KAAK,mEAAmE,EAC3E,EAAE,KAAK,EAAE,WAAW,EAAE,CACzB,CAAC;QACF,OAAO,EAAE,CAAC;IAEd,CAAC;IAGO,sBAAsB;QAC1B,MAAM,aAAa,GAAG,IAAI,CAAC,qBAAqB,CAAC,gBAAgB,EAAE,CAAC;QACpE,IAAI,CAAC,aAAa;YAAE,OAAO,CAAC,SAAS,EAAE,SAAS,CAAC,CAAC;QAElD,MAAM,WAAW,GAAG,IAAA,YAAG,EAAC,aAAa,EAAE,IAAI,CAAC,kBAAkB,CAAC,CAAC;QAChE,MAAM,KAAK,GAAG,IAAA,kBAAQ,EAAC,WAAW,CAAC,CAAC;QACpC,OAAO,CAAC,WAAW,EAAE,KAAK,CAAC,CAAC;IAChC,CAAC;CAEJ,CAAA;AAxDY,4DAAwB;mCAAxB,wBAAwB;IADpC,IAAA,mBAAU,GAAE;qCAGgB,oBAAU;QACC,+CAAqB;QACpB,iDAAsB;GAJlD,wBAAwB,CAwDpC","sourcesContent":["import { camelize, classify } from \"@angular-devkit/core/src/utils/strings\";\nimport { Injectable } from \"@nestjs/common\";\nimport { ChatterMessage } from \"src/entities/chatter-message.entity\";\nimport { ActiveUserData } from \"src/interfaces/active-user-data.interface\";\nimport { RequestContextService } from \"src/services/request-context.service\";\nimport { DataSource, QueryRunner, SelectQueryBuilder } from \"typeorm\";\nimport { SecurityRuleRepository } from \"./security-rule.repository\";\nimport { SolidBaseRepository } from \"./solid-base.repository\";\nimport {get} from \"lodash\"\n\n@Injectable()\nexport class ChatterMessageRepository extends SolidBaseRepository<ChatterMessage> {\n    constructor(\n        readonly dataSource: DataSource,\n        readonly requestContextService: RequestContextService,\n        readonly securityRuleRepository: SecurityRuleRepository,\n    ) {\n        super(ChatterMessage, dataSource, requestContextService, securityRuleRepository);\n    }\n\n    private readonly CO_MODEL_NAME_PATH = 'filters.coModelName.$eq';\n    override createQueryBuilder(alias?: string, queryRunner?: QueryRunner): SelectQueryBuilder<ChatterMessage> {\n        const activeUserOrUndefined = this.requestContextService.getActiveUser();\n        let qb = super.createQueryBuilder(alias, queryRunner);\n        if (!activeUserOrUndefined) return qb;\n        \n        //Left join on the associated chatter model entity\n        const [coModelName, coModelAlias] = this.getCoModelNameAndAlias();\n        qb = this.leftJoinCoModel(qb, coModelName);\n        \n        return this.securityRuleRepository.applySecurityRules(\n            qb,\n            coModelName,\n            activeUserOrUndefined as ActiveUserData,\n            coModelAlias\n        );\n    }\n\n    private leftJoinCoModel<ChatterMessage>(\n        qb: SelectQueryBuilder<ChatterMessage>,\n        coModelName: string\n    ) {\n        // const Target = resolveEntityFromCoModelName(coModelName); // your mapping\n        const entityName = classify(coModelName)\n        const meta = this.dataSource.getMetadata(entityName);\n        const alias = camelize(meta.name);\n        qb.leftJoin(\n            entityName,\n            alias,\n            // `${alias}.id = entity.co_model_entity_id`,\n            `${alias}.id = entity.co_model_entity_id AND entity.co_model_name = :model`,\n            { model: coModelName }\n        );\n        return qb;\n        // return qb.leftJoin(Target, alias, `${alias}.id = entity.co_model_entity_id`);\n    }\n\n    // This uses the requestContextService.getRequestFilter method and extracts the coModelName and creates the alias and returns the name and alias tuple\n    private getCoModelNameAndAlias() {\n        const requestFilter = this.requestContextService.getRequestFilter();\n        if (!requestFilter) return [undefined, undefined];\n\n        const coModelName = get(requestFilter, this.CO_MODEL_NAME_PATH);\n        const alias = camelize(coModelName);\n        return [coModelName, alias];\n    }\n\n}"]}
+{"version":3,"file":"chatter-message.repository.js","sourceRoot":"","sources":["../../src/repository/chatter-message.repository.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,oEAA4E;AAC5E,2CAA4C;AAC5C,+EAAqE;AAErE,iFAA6E;AAC7E,qCAAsE;AACtE,yEAAoE;AACpE,mEAA8D;AAC9D,mCAA0B;AAGnB,IAAM,wBAAwB,GAA9B,MAAM,wBAAyB,SAAQ,2CAAmC;IAC7E,YACa,UAAsB,EACtB,qBAA4C,EAC5C,sBAA8C;QAEvD,KAAK,CAAC,uCAAc,EAAE,UAAU,EAAE,qBAAqB,EAAE,sBAAsB,CAAC,CAAC;QAJxE,eAAU,GAAV,UAAU,CAAY;QACtB,0BAAqB,GAArB,qBAAqB,CAAuB;QAC5C,2BAAsB,GAAtB,sBAAsB,CAAwB;QAK1C,uBAAkB,GAAG,yBAAyB,CAAC;IAFhE,CAAC;IAGQ,kBAAkB,CAAC,KAAc,EAAE,WAAyB;QACjE,MAAM,qBAAqB,GAAG,IAAI,CAAC,qBAAqB,CAAC,aAAa,EAAE,CAAC;QACzE,IAAI,EAAE,GAAG,KAAK,CAAC,kBAAkB,CAAC,KAAK,EAAE,WAAW,CAAC,CAAC;QACtD,IAAI,CAAC,qBAAqB;YAAE,OAAO,EAAE,CAAC;QAGtC,MAAM,CAAC,WAAW,EAAE,YAAY,CAAC,GAAG,IAAI,CAAC,sBAAsB,EAAE,CAAC;QAClE,IAAI,CAAC,WAAW;YAAE,OAAO,EAAE,CAAC;QAC5B,EAAE,GAAG,IAAI,CAAC,eAAe,CAAC,EAAE,EAAE,WAAW,CAAC,CAAC;QAE3C,OAAO,IAAI,CAAC,sBAAsB,CAAC,kBAAkB,CACjD,EAAE,EACF,WAAW,EACX,qBAAuC,EACvC,YAAY,CACf,CAAC;IACN,CAAC;IAEO,eAAe,CACnB,EAAsC,EACtC,WAAmB;QAGnB,MAAM,UAAU,GAAG,IAAA,kBAAQ,EAAC,WAAW,CAAC,CAAA;QACxC,MAAM,IAAI,GAAG,IAAI,CAAC,UAAU,CAAC,WAAW,CAAC,UAAU,CAAC,CAAC;QACrD,MAAM,KAAK,GAAG,IAAA,kBAAQ,EAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QAClC,EAAE,CAAC,QAAQ,CACP,UAAU,EACV,KAAK,EAEL,GAAG,KAAK,mEAAmE,EAC3E,EAAE,KAAK,EAAE,WAAW,EAAE,CACzB,CAAC;QACF,OAAO,EAAE,CAAC;IAEd,CAAC;IAGO,sBAAsB;QAC1B,MAAM,aAAa,GAAG,IAAI,CAAC,qBAAqB,CAAC,gBAAgB,EAAE,CAAC;QACpE,IAAI,CAAC,aAAa;YAAE,OAAO,CAAC,SAAS,EAAE,SAAS,CAAC,CAAC;QAElD,MAAM,WAAW,GAAG,IAAA,YAAG,EAAC,aAAa,EAAE,IAAI,CAAC,kBAAkB,CAAC,CAAC;QAChE,IAAI,CAAC,WAAW;YAAE,OAAO,CAAC,SAAS,EAAE,SAAS,CAAC,CAAC;QAChD,MAAM,KAAK,GAAG,IAAA,kBAAQ,EAAC,WAAW,CAAC,CAAC;QACpC,OAAO,CAAC,WAAW,EAAE,KAAK,CAAC,CAAC;IAChC,CAAC;CAEJ,CAAA;AA1DY,4DAAwB;mCAAxB,wBAAwB;IADpC,IAAA,mBAAU,GAAE;qCAGgB,oBAAU;QACC,+CAAqB;QACpB,iDAAsB;GAJlD,wBAAwB,CA0DpC","sourcesContent":["import { camelize, classify } from \"@angular-devkit/core/src/utils/strings\";\nimport { Injectable } from \"@nestjs/common\";\nimport { ChatterMessage } from \"src/entities/chatter-message.entity\";\nimport { ActiveUserData } from \"src/interfaces/active-user-data.interface\";\nimport { RequestContextService } from \"src/services/request-context.service\";\nimport { DataSource, QueryRunner, SelectQueryBuilder } from \"typeorm\";\nimport { SecurityRuleRepository } from \"./security-rule.repository\";\nimport { SolidBaseRepository } from \"./solid-base.repository\";\nimport {get} from \"lodash\"\n\n@Injectable()\nexport class ChatterMessageRepository extends SolidBaseRepository<ChatterMessage> {\n    constructor(\n        readonly dataSource: DataSource,\n        readonly requestContextService: RequestContextService,\n        readonly securityRuleRepository: SecurityRuleRepository,\n    ) {\n        super(ChatterMessage, dataSource, requestContextService, securityRuleRepository);\n    }\n\n    private readonly CO_MODEL_NAME_PATH = 'filters.coModelName.$eq';\n    override createQueryBuilder(alias?: string, queryRunner?: QueryRunner): SelectQueryBuilder<ChatterMessage> {\n        const activeUserOrUndefined = this.requestContextService.getActiveUser();\n        let qb = super.createQueryBuilder(alias, queryRunner);\n        if (!activeUserOrUndefined) return qb;\n        \n        //Left join on the associated chatter model entity\n        const [coModelName, coModelAlias] = this.getCoModelNameAndAlias();\n        if (!coModelName) return qb;\n        qb = this.leftJoinCoModel(qb, coModelName);\n        \n        return this.securityRuleRepository.applySecurityRules(\n            qb,\n            coModelName,\n            activeUserOrUndefined as ActiveUserData,\n            coModelAlias\n        );\n    }\n\n    private leftJoinCoModel<ChatterMessage>(\n        qb: SelectQueryBuilder<ChatterMessage>,\n        coModelName: string\n    ) {\n        // const Target = resolveEntityFromCoModelName(coModelName); // your mapping\n        const entityName = classify(coModelName)\n        const meta = this.dataSource.getMetadata(entityName);\n        const alias = camelize(meta.name);\n        qb.leftJoin(\n            entityName,\n            alias,\n            // `${alias}.id = entity.co_model_entity_id`,\n            `${alias}.id = entity.co_model_entity_id AND entity.co_model_name = :model`,\n            { model: coModelName }\n        );\n        return qb;\n        // return qb.leftJoin(Target, alias, `${alias}.id = entity.co_model_entity_id`);\n    }\n\n    // This uses the requestContextService.getRequestFilter method and extracts the coModelName and creates the alias and returns the name and alias tuple\n    private getCoModelNameAndAlias() {\n        const requestFilter = this.requestContextService.getRequestFilter();\n        if (!requestFilter) return [undefined, undefined];\n\n        const coModelName = get(requestFilter, this.CO_MODEL_NAME_PATH);\n        if (!coModelName) return [undefined, undefined];\n        const alias = camelize(coModelName);\n        return [coModelName, alias];\n    }\n\n}"]}

package/dist/seeders/seed-data/solid-core-metadata.json

@@ -3748,7 +3748,8 @@
                         "selectionStaticValues": [
                             "audit_insert:audit_insert",
                             "audit_update:audit_update",
-                            "audit_delete:audit_delete"
+                            "audit_delete:audit_delete",
+                            "custom:custom"
                         ]
                     },
                     {
@@ -3835,6 +3836,30 @@
                         "columnName": null,
                         "relationJoinTableName": "",
                         "isRelationManyToManyOwner": null
+                    },
+                    {
+                        "name": "modelDisplayName",
+                        "displayName": "Model Display Name",
+                        "type": "shortText",
+                        "ormType": "text",
+                        "required": false,
+                        "unique": false,
+                        "index": false,
+                        "private": false,
+                        "encrypt": false,
+                        "isSystem": false
+                    },
+                    {
+                        "name": "modelUserKey",
+                        "displayName": "Model User Key",
+                        "type": "shortText",
+                        "ormType": "text",
+                        "required": false,
+                        "unique": false,
+                        "index": false,
+                        "private": false,
+                        "encrypt": false,
+                        "isSystem": false
                     }
                 ]
             },
@@ -3910,6 +3935,19 @@
                         "encrypt": false,
                         "isSystem": false
                     },
+                    {
+                        "name": "fieldDisplayName",
+                        "displayName": "Field Display Name",
+                        "type": "shortText",
+                        "ormType": "varchar",
+                        "length": 512,
+                        "required": false,
+                        "unique": false,
+                        "index": false,
+                        "private": false,
+                        "encrypt": false,
+                        "isSystem": false
+                    },
                     {
                         "name": "chatterMessage",
                         "displayName": "Chatter Message",
@@ -12059,7 +12097,7 @@
                     {
                         "type": "field",
                         "attrs": {
-                            "name": "modelUsed"
+                            "name": "contentType"
                         }
                     },
                     {
@@ -12067,6 +12105,24 @@
                         "attrs": {
                             "name": "responseTimeMs"
                         }
+                    },
+                    {
+                        "type": "field",
+                        "attrs": {
+                            "name": "inputTokens"
+                        }
+                    },
+                    {
+                        "type": "field",
+                        "attrs": {
+                            "name": "outputTokens"
+                        }
+                    },
+                    {
+                        "type": "field",
+                        "attrs": {
+                            "name": "totalTokens"
+                        }
                     }
                 ]
             }
@@ -12184,6 +12240,24 @@
                                                                 "attrs": {
                                                                     "name": "parentInteraction"
                                                                 }
+                                                            },
+                                                            {
+                                                                "type": "field",
+                                                                "attrs": {
+                                                                    "name": "inputTokens"
+                                                                }
+                                                            },
+                                                            {
+                                                                "type": "field",
+                                                                "attrs": {
+                                                                    "name": "outputTokens"
+                                                                }
+                                                            },
+                                                            {
+                                                                "type": "field",
+                                                                "attrs": {
+                                                                    "name": "totalTokens"
+                                                                }
                                                             }
                                                         ]
                                                     }
@@ -12249,7 +12323,7 @@
                                                         "type": "column",
                                                         "attrs": {
                                                             "name": "col-meta",
-                                                            "label": "Metadata",
+                                                            "label": "",
                                                             "className": "col-12"
                                                         },
                                                         "children": [
@@ -12257,8 +12331,7 @@
                                                                 "type": "field",
                                                                 "attrs": {
                                                                     "name": "metadata",
-                                                                    "editWidget": "codeEditor",
-                                                                    "editorLanguage": "json"
+                                                                    "height": "80vh"
                                                                 }
                                                             }
                                                         ]

package/dist/services/ai-interaction.service.d.ts

@@ -10,6 +10,7 @@ import { AiInteraction } from '../entities/ai-interaction.entity';
 import { McpResponse, TriggerMcpClientOptions } from 'src/interfaces';
 import { PublisherFactory } from './queues/publisher-factory.service';
 import { McpToolResponseHandlerFactory } from './mcp-tool-response-handlers/mcp-tool-response-handler-factory.service';
+import { InvokeAiPromptDto } from 'src/dtos/invoke-ai-prompt.dto';
 export declare class AiInteractionService extends CRUDService<AiInteraction> {
     readonly modelMetadataService: ModelMetadataService;
     readonly moduleMetadataService: ModuleMetadataService;
@@ -24,7 +25,7 @@ export declare class AiInteractionService extends CRUDService<AiInteraction> {
     readonly mcpToolResponseHandlerFactory: McpToolResponseHandlerFactory;
     private readonly logger;
     constructor(modelMetadataService: ModelMetadataService, moduleMetadataService: ModuleMetadataService, configService: ConfigService, fileService: FileService, discoveryService: DiscoveryService, crudHelperService: CrudHelperService, entityManager: EntityManager, repo: Repository<AiInteraction>, moduleRef: ModuleRef, publisherFactory: PublisherFactory<TriggerMcpClientOptions>, mcpToolResponseHandlerFactory: McpToolResponseHandlerFactory);
-    triggerMcpClientJob(prompt: string, userId: number, isAutoApply?: boolean, threadId?: string): Promise<any>;
+    triggerMcpClientJob(dto: InvokeAiPromptDto, userId: number, isAutoApply?: boolean, threadId?: string): Promise<any>;
     runMcpPrompt(prompt: string): Promise<McpResponse>;
     cleanResponse(response: string): string;
     applySolidAiInteraction(id: number): Promise<any>;

package/dist/services/ai-interaction.service.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"ai-interaction.service.d.ts","sourceRoot":"","sources":["../../src/services/ai-interaction.service.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,gBAAgB,EAAE,SAAS,EAAE,MAAM,cAAc,CAAC;AAC3D,OAAO,EAAE,aAAa,EAAE,UAAU,EAAE,MAAM,SAAS,CAAC;AAEpD,OAAO,EAAE,WAAW,EAAE,MAAM,2BAA2B,CAAC;AACxD,OAAO,EAAE,oBAAoB,EAAE,MAAM,qCAAqC,CAAC;AAC3E,OAAO,EAAE,qBAAqB,EAAE,MAAM,sCAAsC,CAAC;AAC7E,OAAO,EAAE,aAAa,EAAE,MAAM,gBAAgB,CAAC;AAC/C,OAAO,EAAE,WAAW,EAAE,MAAM,2BAA2B,CAAC;AACxD,OAAO,EAAE,iBAAiB,EAAE,MAAM,kCAAkC,CAAC;AAErE,OAAO,EAAE,aAAa,EAAE,MAAM,mCAAmC,CAAC;AAElE,OAAO,EAAE,WAAW,EAAE,uBAAuB,EAAE,MAAM,gBAAgB,CAAC;AACtE,OAAO,EAAE,gBAAgB,EAAE,MAAM,oCAAoC,CAAC;AAGtE,OAAO,EAAE,6BAA6B,EAAE,MAAM,wEAAwE,CAAC;AAGvH,qBACa,oBAAqB,SAAQ,WAAW,CAAC,aAAa,CAAC;IAIhE,QAAQ,CAAC,oBAAoB,EAAE,oBAAoB;IACnD,QAAQ,CAAC,qBAAqB,EAAE,qBAAqB;IACrD,QAAQ,CAAC,aAAa,EAAE,aAAa;IACrC,QAAQ,CAAC,WAAW,EAAE,WAAW;IACjC,QAAQ,CAAC,gBAAgB,EAAE,gBAAgB;IAC3C,QAAQ,CAAC,iBAAiB,EAAE,iBAAiB;IAE7C,QAAQ,CAAC,aAAa,EAAE,aAAa;IAErC,QAAQ,CAAC,IAAI,EAAE,UAAU,CAAC,aAAa,CAAC;IACxC,QAAQ,CAAC,SAAS,EAAE,SAAS;IAC7B,QAAQ,CAAC,gBAAgB,EAAE,gBAAgB,CAAC,uBAAuB,CAAC;IAEpE,QAAQ,CAAC,6BAA6B,EAAE,6BAA6B;IAhBvE,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAyC;gBAGrD,oBAAoB,EAAE,oBAAoB,EAC1C,qBAAqB,EAAE,qBAAqB,EAC5C,aAAa,EAAE,aAAa,EAC5B,WAAW,EAAE,WAAW,EACxB,gBAAgB,EAAE,gBAAgB,EAClC,iBAAiB,EAAE,iBAAiB,EAEpC,aAAa,EAAE,aAAa,EAE5B,IAAI,EAAE,UAAU,CAAC,aAAa,CAAC,EAC/B,SAAS,EAAE,SAAS,EACpB,gBAAgB,EAAE,gBAAgB,CAAC,uBAAuB,CAAC,EAE3D,6BAA6B,EAAE,6BAA6B;IAMjE,mBAAmB,CAAC,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,WAAW,GAAE,OAAe,EAAE,QAAQ,GAAE,MAAa,GAAG,OAAO,CAAC,GAAG,CAAC;IAoCxH,YAAY,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,WAAW,CAAC;IA2ExD,aAAa,CAAC,QAAQ,EAAE,MAAM;IAexB,uBAAuB,CAAC,EAAE,EAAE,MAAM;CAiDzC"}
+{"version":3,"file":"ai-interaction.service.d.ts","sourceRoot":"","sources":["../../src/services/ai-interaction.service.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,gBAAgB,EAAE,SAAS,EAAE,MAAM,cAAc,CAAC;AAC3D,OAAO,EAAE,aAAa,EAAE,UAAU,EAAE,MAAM,SAAS,CAAC;AAEpD,OAAO,EAAE,WAAW,EAAE,MAAM,2BAA2B,CAAC;AACxD,OAAO,EAAE,oBAAoB,EAAE,MAAM,qCAAqC,CAAC;AAC3E,OAAO,EAAE,qBAAqB,EAAE,MAAM,sCAAsC,CAAC;AAC7E,OAAO,EAAE,aAAa,EAAE,MAAM,gBAAgB,CAAC;AAC/C,OAAO,EAAE,WAAW,EAAE,MAAM,2BAA2B,CAAC;AACxD,OAAO,EAAE,iBAAiB,EAAE,MAAM,kCAAkC,CAAC;AAErE,OAAO,EAAE,aAAa,EAAE,MAAM,mCAAmC,CAAC;AAElE,OAAO,EAAE,WAAW,EAAE,uBAAuB,EAAE,MAAM,gBAAgB,CAAC;AACtE,OAAO,EAAE,gBAAgB,EAAE,MAAM,oCAAoC,CAAC;AAGtE,OAAO,EAAE,6BAA6B,EAAE,MAAM,wEAAwE,CAAC;AAEvH,OAAO,EAAE,iBAAiB,EAAE,MAAM,+BAA+B,CAAC;AAElE,qBACa,oBAAqB,SAAQ,WAAW,CAAC,aAAa,CAAC;IAIhE,QAAQ,CAAC,oBAAoB,EAAE,oBAAoB;IACnD,QAAQ,CAAC,qBAAqB,EAAE,qBAAqB;IACrD,QAAQ,CAAC,aAAa,EAAE,aAAa;IACrC,QAAQ,CAAC,WAAW,EAAE,WAAW;IACjC,QAAQ,CAAC,gBAAgB,EAAE,gBAAgB;IAC3C,QAAQ,CAAC,iBAAiB,EAAE,iBAAiB;IAE7C,QAAQ,CAAC,aAAa,EAAE,aAAa;IAErC,QAAQ,CAAC,IAAI,EAAE,UAAU,CAAC,aAAa,CAAC;IACxC,QAAQ,CAAC,SAAS,EAAE,SAAS;IAC7B,QAAQ,CAAC,gBAAgB,EAAE,gBAAgB,CAAC,uBAAuB,CAAC;IAEpE,QAAQ,CAAC,6BAA6B,EAAE,6BAA6B;IAhBvE,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAyC;gBAGrD,oBAAoB,EAAE,oBAAoB,EAC1C,qBAAqB,EAAE,qBAAqB,EAC5C,aAAa,EAAE,aAAa,EAC5B,WAAW,EAAE,WAAW,EACxB,gBAAgB,EAAE,gBAAgB,EAClC,iBAAiB,EAAE,iBAAiB,EAEpC,aAAa,EAAE,aAAa,EAE5B,IAAI,EAAE,UAAU,CAAC,aAAa,CAAC,EAC/B,SAAS,EAAE,SAAS,EACpB,gBAAgB,EAAE,gBAAgB,CAAC,uBAAuB,CAAC,EAE3D,6BAA6B,EAAE,6BAA6B;IAMjE,mBAAmB,CAAC,GAAG,EAAE,iBAAiB,EAAE,MAAM,EAAE,MAAM,EAAE,WAAW,GAAE,OAAe,EAAE,QAAQ,GAAE,MAAa,GAAG,OAAO,CAAC,GAAG,CAAC;IAqChI,YAAY,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,WAAW,CAAC;IA8FxD,aAAa,CAAC,QAAQ,EAAE,MAAM;IAexB,uBAAuB,CAAC,EAAE,EAAE,MAAM;CAiDzC"}

package/dist/services/ai-interaction.service.js

@@ -79,12 +79,12 @@ let AiInteractionService = AiInteractionService_1 = class AiInteractionService e
         this.mcpToolResponseHandlerFactory = mcpToolResponseHandlerFactory;
         this.logger = new common_1.Logger(AiInteractionService_1.name);
     }
-    async triggerMcpClientJob(prompt, userId, isAutoApply = false, threadId = null) {
+    async triggerMcpClientJob(dto, userId, isAutoApply = false, threadId = null) {
         const aiInteraction = await this.create({
             userId: userId,
             threadId: threadId ? threadId : `thread-${userId}`,
             role: 'human',
-            message: prompt,
+            message: dto.prompt,
             contentType: '',
             errorMessage: '',
             modelUsed: '',
@@ -95,6 +95,7 @@ let AiInteractionService = AiInteractionService_1 = class AiInteractionService e
         const m = {
             payload: {
                 aiInteractionId: aiInteraction.id,
+                moduleName: dto.moduleName
             },
             parentEntity: 'aiInteraction',
             parentEntityId: aiInteraction.id,
@@ -147,7 +148,18 @@ let AiInteractionService = AiInteractionService_1 = class AiInteractionService e
                 try {
                     this.logger.log(`Python script exited with zero exit code: ${stdout}`);
                     const raw = JSON.parse(stdout);
-                    resolve(raw);
+                    let parsedResponse = raw.response;
+                    try {
+                        parsedResponse = JSON.parse(raw.response);
+                    }
+                    catch (ex) {
+                        this.logger.warn(`Attempting to parse mcp client response assuming it is JSON, however it is not: ${parsedResponse}`);
+                    }
+                    const enrichedRaw = {
+                        ...raw,
+                        response: parsedResponse,
+                    };
+                    resolve(enrichedRaw);
                 }
                 catch (err) {
                     reject(new Error(`Mcp Invocation Failed: ${err.message}`));

package/dist/services/ai-interaction.service.js.map

@@ -1 +1 @@
-{"version":3,"file":"ai-interaction.service.js","sourceRoot":"","sources":["../../src/services/ai-interaction.service.ts"],"names":[],"mappings":"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","sourcesContent":["import { BadRequestException, Logger, Injectable } from '@nestjs/common';\nimport { InjectEntityManager, InjectRepository } from '@nestjs/typeorm';\nimport { DiscoveryService, ModuleRef } from \"@nestjs/core\";\nimport { EntityManager, Repository } from 'typeorm';\n\nimport { CRUDService } from 'src/services/crud.service';\nimport { ModelMetadataService } from 'src/services/model-metadata.service';\nimport { ModuleMetadataService } from 'src/services/module-metadata.service';\nimport { ConfigService } from '@nestjs/config';\nimport { FileService } from 'src/services/file.service';\nimport { CrudHelperService } from 'src/services/crud-helper.service';\nimport { spawn } from 'child_process';\nimport { AiInteraction } from '../entities/ai-interaction.entity';\nimport * as fs from 'fs/promises';\nimport { McpResponse, TriggerMcpClientOptions } from 'src/interfaces';\nimport { PublisherFactory } from './queues/publisher-factory.service';\nimport { RequestContextService } from './request-context.service';\nimport { ActiveUserData } from 'src/interfaces/active-user-data.interface';\nimport { McpToolResponseHandlerFactory } from './mcp-tool-response-handlers/mcp-tool-response-handler-factory.service';\nimport { ERROR_MESSAGES } from 'src/constants/error-messages';\n\n@Injectable()\nexport class AiInteractionService extends CRUDService<AiInteraction> {\n  private readonly logger = new Logger(AiInteractionService.name);\n\n  constructor(\n    readonly modelMetadataService: ModelMetadataService,\n    readonly moduleMetadataService: ModuleMetadataService,\n    readonly configService: ConfigService,\n    readonly fileService: FileService,\n    readonly discoveryService: DiscoveryService,\n    readonly crudHelperService: CrudHelperService,\n    @InjectEntityManager()\n    readonly entityManager: EntityManager,\n    @InjectRepository(AiInteraction, 'default')\n    readonly repo: Repository<AiInteraction>,\n    readonly moduleRef: ModuleRef,\n    readonly publisherFactory: PublisherFactory<TriggerMcpClientOptions>,\n    // readonly requestContextService: RequestContextService,\n    readonly mcpToolResponseHandlerFactory: McpToolResponseHandlerFactory,\n\n  ) {\n    super(modelMetadataService, moduleMetadataService, configService, fileService, discoveryService, crudHelperService, entityManager, repo, 'aiInteraction', 'solid-core', moduleRef);\n  }\n\n  async triggerMcpClientJob(prompt: string, userId: number, isAutoApply: boolean = false, threadId: string = null): Promise<any> {\n    // const activeUser: ActiveUserData = this.requestContextService.getActiveUser();\n\n    const aiInteraction = await this.create({\n      userId: userId,\n      threadId: threadId ? threadId : `thread-${userId}`,\n      role: 'human',\n      message: prompt,\n      contentType: '',\n      errorMessage: '',\n      modelUsed: '',\n      responseTimeMs: 0,\n      metadata: '',\n      isAutoApply: isAutoApply\n    });\n    const m = {\n      payload: {\n        aiInteractionId: aiInteraction.id,\n      },\n      parentEntity: 'aiInteraction',\n      parentEntityId: aiInteraction.id,\n    };\n\n    const queueMessageId = await this.publisherFactory.publish(m, 'TriggerMcpClientPublisher');\n\n    return {\n      queueMessageId: queueMessageId,\n      aiInteractionId: aiInteraction.id\n    }\n  }\n\n  /**\n   * Runs the Python MCP client with a prompt and returns the parsed JSON embedded in the 'response'.\n   * @param prompt - The question or instruction to send to the MCP client.\n   * @returns The parsed object inside the 'response' field of the JSON output.\n   */\n  async runMcpPrompt(prompt: string): Promise<McpResponse> {\n    const pythonExecutable = process.env.MCP_PYTHON_EXECUTABLE;\n    const mcpClient = process.env.MCP_CLIENT;\n\n    // TODO: We can return an error if the above env variables are not properly setup...\n    if (!pythonExecutable || !mcpClient) {\n      throw new BadRequestException(ERROR_MESSAGES.PYTHON_EXECUTABLE_NOT_CONFIGURED);\n    }\n\n    // Check if both paths are valid and accessible\n    try {\n      const [pyStat, clientStat] = await Promise.all([\n        fs.stat(pythonExecutable),\n        fs.stat(mcpClient),\n      ]);\n\n      if (!pyStat.isFile()) {\n        throw new BadRequestException(`MCP_PYTHON_EXECUTABLE path is not a file: ${pythonExecutable}`);\n      }\n\n      if (!clientStat.isFile()) {\n        throw new BadRequestException(`MCP_CLIENT path is not a file: ${mcpClient}`);\n      }\n\n    } catch (err: any) {\n      throw new BadRequestException(`Invalid MCP executable or client path: ${err.message}`);\n    }\n\n    // TODO: Refactor to use the command.service.ts instead...\n    return new Promise((resolve, reject) => {\n      this.logger.log(`Attempting to run command:`)\n      this.logger.log(`${pythonExecutable} ${mcpClient} \"${prompt}\"`);\n\n      const python = spawn(pythonExecutable, [mcpClient, `\"${prompt}\"`]);\n\n      let stdout = '';\n      let stderr = '';\n\n      python.stdout.on('data', (data) => {\n        stdout += data.toString();\n      });\n\n      python.stderr.on('data', (data) => {\n        stderr += data.toString();\n      });\n\n      python.on('close', (code) => {\n        this.logger.log(`Python script exited with code ${code}`);\n\n        if (code !== 0) {\n          this.logger.error(`Python script exited with a non-zero exit code: ${stderr}`);\n          return reject(new Error(`Python script exited with a non-zero exit code: ${stderr}`));\n        }\n\n        try {\n          this.logger.log(`Python script exited with zero exit code: ${stdout}`);\n          const raw: McpResponse = JSON.parse(stdout);\n\n          // if (!raw.success) {\n          //   return reject(new Error(`MCP error: ${raw.errors?.join(', ')}`));\n          // }\n          // let cleaned = raw.response.trim();\n\n          // Don't need to re-parse this...\n          // const parsed = JSON.parse(cleaned);\n          // resolve(cleaned);\n\n          resolve(raw);\n        } catch (err: any) {\n          reject(new Error(`Mcp Invocation Failed: ${err.message}`));\n        }\n      });\n    });\n  }\n\n  cleanResponse(response: string) {\n    this.logger.log(`mcp server response is: ${response}`);\n\n    // Remove markdown-style code block wrapper\n    if (response.startsWith('```json')) {\n      response = response.replace(/^```json/, '').trim();\n    }\n    if (response.endsWith('```')) {\n      response = response.replace(/```$/, '').trim();\n    }\n    this.logger.log(`mcp server response after removing doc tags is: ${response}`);\n\n    return response;\n  }\n\n  async applySolidAiInteraction(id: number) {\n    // Fetch the aiInteraction\n    const aiInteraction = await this.findOne(id, {\n      populate: ['user']\n    });\n    if (!aiInteraction) {\n      const m = `Unable to identified the aiInteraction entry that triggered this job... using id: ${id}`\n\n      // TODO: RESPONSE SHAPE ALERT Check if we want to control the shape of the response....\n      throw new Error(m);\n    }\n\n    // TODO: Validation: Check if JSON.parse(metadata).tools_invoked starts with solid_\n    let metadata = {};\n    try {\n      metadata = JSON.parse(aiInteraction.metadata);\n    }\n    catch (e) {\n      // TODO: RESPONSE SHAPE ALERT Check if we want to control the shape of the response....\n      throw new Error(e);\n    }\n\n    const toolsInvoked = metadata['tools_invoked'];\n    if (!toolsInvoked) {\n      // TODO: RESPONSE SHAPE ALERT Check if we want to control the shape of the response....\n      throw new Error(ERROR_MESSAGES.UNABLE_TO_RESOLVE_SOLID_COMMAND);\n    }\n\n    // TODO: OPTIMISATION for chained tool invocation, for now we are assuming only 1 tool was used.\n    const toolInvoked = toolsInvoked[0];\n\n    // TODO: use the toolInvoked to identify a service using some convention.\n    // TODO: Eg. if toolInvoked is solid_create_module <> SolidCreateModuleMcpToolHandler ... create a factory class to do this mapping and identify the relevant provider. \n    const mcpToolHandler = this.mcpToolResponseHandlerFactory.getInstance(toolInvoked);\n    if (!mcpToolHandler) {\n      // TODO: RESPONSE SHAPE ALERT Check if we want to control the shape of the response....\n      throw new Error(ERROR_MESSAGES.UNABLE_TO_RESOLVE_MCP_HANDLER);\n    }\n\n    const handlerApplicationResponse = await mcpToolHandler.apply(aiInteraction);\n\n    // TODO: This provider to implement an interface - IMcpToolResponseHandler ... apply(aiInteraction: AiInteraction)\n    // throw new Error('Method not implemented.');\n\n    // Mark the interaction as applied\n    await this.update(aiInteraction.id, { isApplied: true }, [], true);\n\n    return handlerApplicationResponse;\n  }\n}\n"]}
+{"version":3,"file":"ai-interaction.service.js","sourceRoot":"","sources":["../../src/services/ai-interaction.service.ts"],"names":[],"mappings":"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","sourcesContent":["import { BadRequestException, Logger, Injectable } from '@nestjs/common';\nimport { InjectEntityManager, InjectRepository } from '@nestjs/typeorm';\nimport { DiscoveryService, ModuleRef } from \"@nestjs/core\";\nimport { EntityManager, Repository } from 'typeorm';\n\nimport { CRUDService } from 'src/services/crud.service';\nimport { ModelMetadataService } from 'src/services/model-metadata.service';\nimport { ModuleMetadataService } from 'src/services/module-metadata.service';\nimport { ConfigService } from '@nestjs/config';\nimport { FileService } from 'src/services/file.service';\nimport { CrudHelperService } from 'src/services/crud-helper.service';\nimport { spawn } from 'child_process';\nimport { AiInteraction } from '../entities/ai-interaction.entity';\nimport * as fs from 'fs/promises';\nimport { McpResponse, TriggerMcpClientOptions } from 'src/interfaces';\nimport { PublisherFactory } from './queues/publisher-factory.service';\nimport { RequestContextService } from './request-context.service';\nimport { ActiveUserData } from 'src/interfaces/active-user-data.interface';\nimport { McpToolResponseHandlerFactory } from './mcp-tool-response-handlers/mcp-tool-response-handler-factory.service';\nimport { ERROR_MESSAGES } from 'src/constants/error-messages';\nimport { InvokeAiPromptDto } from 'src/dtos/invoke-ai-prompt.dto';\n\n@Injectable()\nexport class AiInteractionService extends CRUDService<AiInteraction> {\n  private readonly logger = new Logger(AiInteractionService.name);\n\n  constructor(\n    readonly modelMetadataService: ModelMetadataService,\n    readonly moduleMetadataService: ModuleMetadataService,\n    readonly configService: ConfigService,\n    readonly fileService: FileService,\n    readonly discoveryService: DiscoveryService,\n    readonly crudHelperService: CrudHelperService,\n    @InjectEntityManager()\n    readonly entityManager: EntityManager,\n    @InjectRepository(AiInteraction, 'default')\n    readonly repo: Repository<AiInteraction>,\n    readonly moduleRef: ModuleRef,\n    readonly publisherFactory: PublisherFactory<TriggerMcpClientOptions>,\n    // readonly requestContextService: RequestContextService,\n    readonly mcpToolResponseHandlerFactory: McpToolResponseHandlerFactory,\n\n  ) {\n    super(modelMetadataService, moduleMetadataService, configService, fileService, discoveryService, crudHelperService, entityManager, repo, 'aiInteraction', 'solid-core', moduleRef);\n  }\n\n  async triggerMcpClientJob(dto: InvokeAiPromptDto, userId: number, isAutoApply: boolean = false, threadId: string = null): Promise<any> {\n    // const activeUser: ActiveUserData = this.requestContextService.getActiveUser();\n\n    const aiInteraction = await this.create({\n      userId: userId,\n      threadId: threadId ? threadId : `thread-${userId}`,\n      role: 'human',\n      message: dto.prompt,\n      contentType: '',\n      errorMessage: '',\n      modelUsed: '',\n      responseTimeMs: 0,\n      metadata: '',\n      isAutoApply: isAutoApply\n    });\n    const m = {\n      payload: {\n        aiInteractionId: aiInteraction.id,\n        moduleName:dto.moduleName\n      },\n      parentEntity: 'aiInteraction',\n      parentEntityId: aiInteraction.id,\n    };\n\n    const queueMessageId = await this.publisherFactory.publish(m, 'TriggerMcpClientPublisher');\n\n    return {\n      queueMessageId: queueMessageId,\n      aiInteractionId: aiInteraction.id\n    }\n  }\n\n  /**\n   * Runs the Python MCP client with a prompt and returns the parsed JSON embedded in the 'response'.\n   * @param prompt - The question or instruction to send to the MCP client.\n   * @returns The parsed object inside the 'response' field of the JSON output.\n   */\n  async runMcpPrompt(prompt: string): Promise<McpResponse> {\n    const pythonExecutable = process.env.MCP_PYTHON_EXECUTABLE;\n    const mcpClient = process.env.MCP_CLIENT;\n\n    // TODO: We can return an error if the above env variables are not properly setup...\n    if (!pythonExecutable || !mcpClient) {\n      throw new BadRequestException(ERROR_MESSAGES.PYTHON_EXECUTABLE_NOT_CONFIGURED);\n    }\n\n    // Check if both paths are valid and accessible\n    try {\n      const [pyStat, clientStat] = await Promise.all([\n        fs.stat(pythonExecutable),\n        fs.stat(mcpClient),\n      ]);\n\n      if (!pyStat.isFile()) {\n        throw new BadRequestException(`MCP_PYTHON_EXECUTABLE path is not a file: ${pythonExecutable}`);\n      }\n\n      if (!clientStat.isFile()) {\n        throw new BadRequestException(`MCP_CLIENT path is not a file: ${mcpClient}`);\n      }\n\n    } catch (err: any) {\n      throw new BadRequestException(`Invalid MCP executable or client path: ${err.message}`);\n    }\n\n    // TODO: Refactor to use the command.service.ts instead...\n    return new Promise((resolve, reject) => {\n      this.logger.log(`Attempting to run command:`)\n      this.logger.log(`${pythonExecutable} ${mcpClient} \"${prompt}\"`);\n\n      const python = spawn(pythonExecutable, [mcpClient, `\"${prompt}\"`]);\n\n      let stdout = '';\n      let stderr = '';\n\n      python.stdout.on('data', (data) => {\n        stdout += data.toString();\n      });\n\n      python.stderr.on('data', (data) => {\n        stderr += data.toString();\n      });\n\n      python.on('close', (code) => {\n        this.logger.log(`Python script exited with code ${code}`);\n\n        if (code !== 0) {\n          this.logger.error(`Python script exited with a non-zero exit code: ${stderr}`);\n          return reject(new Error(`Python script exited with a non-zero exit code: ${stderr}`));\n        }\n\n        try {\n          this.logger.log(`Python script exited with zero exit code: ${stdout}`);\n          const raw: McpResponse = JSON.parse(stdout);\n\n          // Sometimes the raw.response might not be a valid json\n          // TODO: examine the content type of the raw response..\n          // if (raw.content_type==='json') {\n          // }\n          let parsedResponse = raw.response;\n          try {\n            parsedResponse = JSON.parse(raw.response);\n          }\n          catch (ex) {\n            this.logger.warn(`Attempting to parse mcp client response assuming it is JSON, however it is not: ${parsedResponse}`);\n          }\n          // Parse the response string into an object\n          // const parsedResponse = JSON.parse(raw.response);\n\n          // Replace the string with the parsed object\n          const enrichedRaw = {\n            ...raw,\n            response: parsedResponse,\n          };\n          // if (!raw.success) {\n          //   return reject(new Error(`MCP error: ${raw.errors?.join(', ')}`));\n          // }\n          // let cleaned = raw.response.trim();\n\n          // Don't need to re-parse this...\n          // const parsed = JSON.parse(cleaned);\n          // resolve(cleaned);\n\n          resolve(enrichedRaw);\n        } catch (err: any) {\n          reject(new Error(`Mcp Invocation Failed: ${err.message}`));\n        }\n      });\n    });\n  }\n\n  cleanResponse(response: string) {\n    this.logger.log(`mcp server response is: ${response}`);\n\n    // Remove markdown-style code block wrapper\n    if (response.startsWith('```json')) {\n      response = response.replace(/^```json/, '').trim();\n    }\n    if (response.endsWith('```')) {\n      response = response.replace(/```$/, '').trim();\n    }\n    this.logger.log(`mcp server response after removing doc tags is: ${response}`);\n\n    return response;\n  }\n\n  async applySolidAiInteraction(id: number) {\n    // Fetch the aiInteraction\n    const aiInteraction = await this.findOne(id, {\n      populate: ['user']\n    });\n    if (!aiInteraction) {\n      const m = `Unable to identified the aiInteraction entry that triggered this job... using id: ${id}`\n\n      // TODO: RESPONSE SHAPE ALERT Check if we want to control the shape of the response....\n      throw new Error(m);\n    }\n\n    // TODO: Validation: Check if JSON.parse(metadata).tools_invoked starts with solid_\n    let metadata = {};\n    try {\n      metadata = JSON.parse(aiInteraction.metadata);\n    }\n    catch (e) {\n      // TODO: RESPONSE SHAPE ALERT Check if we want to control the shape of the response....\n      throw new Error(e);\n    }\n\n    const toolsInvoked = metadata['tools_invoked'];\n    if (!toolsInvoked) {\n      // TODO: RESPONSE SHAPE ALERT Check if we want to control the shape of the response....\n      throw new Error(ERROR_MESSAGES.UNABLE_TO_RESOLVE_SOLID_COMMAND);\n    }\n\n    // TODO: OPTIMISATION for chained tool invocation, for now we are assuming only 1 tool was used.\n    const toolInvoked = toolsInvoked[0];\n\n    // TODO: use the toolInvoked to identify a service using some convention.\n    // TODO: Eg. if toolInvoked is solid_create_module <> SolidCreateModuleMcpToolHandler ... create a factory class to do this mapping and identify the relevant provider. \n    const mcpToolHandler = this.mcpToolResponseHandlerFactory.getInstance(toolInvoked);\n    if (!mcpToolHandler) {\n      // TODO: RESPONSE SHAPE ALERT Check if we want to control the shape of the response....\n      throw new Error(ERROR_MESSAGES.UNABLE_TO_RESOLVE_MCP_HANDLER);\n    }\n\n    const handlerApplicationResponse = await mcpToolHandler.apply(aiInteraction);\n\n    // TODO: This provider to implement an interface - IMcpToolResponseHandler ... apply(aiInteraction: AiInteraction)\n    // throw new Error('Method not implemented.');\n\n    // Mark the interaction as applied\n    await this.update(aiInteraction.id, { isApplied: true }, [], true);\n\n    return handlerApplicationResponse;\n  }\n}\n"]}

package/dist/services/authentication.service.d.ts

@@ -127,7 +127,7 @@ export declare class AuthenticationService {
         refreshToken: string;
     }>;
     generateAccessToken(user: User): Promise<string>;
-    generateRefreshToken(user: User): Promise<string>;
+    generateRefreshToken(user: User, previousRefreshToken?: string): Promise<string>;
     refreshTokens(refreshTokenDto: RefreshTokenDto): Promise<{
         accessToken: string;
         refreshToken: string;
@@ -151,8 +151,6 @@ export declare class AuthenticationService {
     }>;
     activateUser(userId: number): Promise<void>;
     me(activeUser: ActiveUserData): Promise<{
-        accessToken: string;
-        refreshToken: string;
         user: {
             email: string;
             mobile: string;
@@ -160,6 +158,7 @@ export declare class AuthenticationService {
             id: number;
             roles: string[];
         };
+        refreshToken: any;
     }>;
 }
 //# sourceMappingURL=authentication.service.d.ts.map

package/dist/services/authentication.service.d.ts.map

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

package/dist/services/authentication.service.js

@@ -747,12 +747,12 @@ let AuthenticationService = AuthenticationService_1 = class AuthenticationServic
         const accessToken = await this.signToken(user.id, this.jwtConfiguration.accessTokenTtl, { username: user.username, email: user.email, roles: userRoleNames });
         return accessToken;
     }
-    async generateRefreshToken(user) {
+    async generateRefreshToken(user, previousRefreshToken) {
         const refreshTokenId = (0, crypto_1.randomUUID)();
         const refreshToken = await this.signToken(user.id, this.jwtConfiguration.refreshTokenTtl, {
             refreshTokenId,
         });
-        await this.refreshTokenIdsStorage.insert(user.id, refreshToken);
+        await this.refreshTokenIdsStorage.insert(user.id, refreshToken, previousRefreshToken);
         return refreshToken;
     }
     async refreshTokens(refreshTokenDto) {
@@ -874,7 +874,7 @@ let AuthenticationService = AuthenticationService_1 = class AuthenticationServic
                 roles: true
             }
         });
-        const tokens = await this.generateTokens(user);
+        const refreshTokenState = await this.refreshTokenIdsStorage.getCurrentRefreshTokenState(user.id);
         const response = {
             user: {
                 email: user.email,
@@ -883,7 +883,7 @@ let AuthenticationService = AuthenticationService_1 = class AuthenticationServic
                 id: user.id,
                 roles: user.roles.map((role) => role.name)
             },
-            ...tokens
+            refreshToken: refreshTokenState.currentRefreshToken,
         };
         return response;
     }