@sowonai/crewx-cli 0.4.0-dev.28 → 0.4.0-dev.29

package/dist/crewx.tool.d.ts

@@ -11,6 +11,7 @@ import { DocumentLoaderService } from './services/document-loader.service';
 import { ToolCallService } from './services/tool-call.service';
 import { AgentLoaderService } from './services/agent-loader.service';
 import { RemoteAgentService } from './services/remote-agent.service';
+import { ProviderBridgeService } from './services/provider-bridge.service';
 export declare class CrewXTool implements OnModuleInit {
     private readonly aiService;
     private readonly aiProviderService;
@@ -23,6 +24,7 @@ export declare class CrewXTool implements OnModuleInit {
     private readonly toolCallService;
     private readonly agentLoaderService;
     private readonly remoteAgentService;
+    private readonly providerBridgeService;
     private readonly layoutLoader;
     private readonly layoutRenderer;
     private readonly logger;
@@ -30,7 +32,7 @@ export declare class CrewXTool implements OnModuleInit {
     private generateSecurityKey;
     private buildToolsContext;
     private buildStructuredPayload;
-    constructor(aiService: AIService, aiProviderService: AIProviderService, projectService: ProjectService, parallelProcessingService: ParallelProcessingService, taskManagementService: TaskManagementService, resultFormatterService: ResultFormatterService, templateService: TemplateService, documentLoaderService: DocumentLoaderService, toolCallService: ToolCallService, agentLoaderService: AgentLoaderService, remoteAgentService: RemoteAgentService, layoutLoader: LayoutLoader, layoutRenderer: LayoutRenderer);
+    constructor(aiService: AIService, aiProviderService: AIProviderService, projectService: ProjectService, parallelProcessingService: ParallelProcessingService, taskManagementService: TaskManagementService, resultFormatterService: ResultFormatterService, templateService: TemplateService, documentLoaderService: DocumentLoaderService, toolCallService: ToolCallService, agentLoaderService: AgentLoaderService, remoteAgentService: RemoteAgentService, providerBridgeService: ProviderBridgeService, layoutLoader: LayoutLoader, layoutRenderer: LayoutRenderer);
     onModuleInit(): void;
     private processAgentSystemPrompt;
     getTaskLogs(input: {
@@ -54,6 +56,10 @@ export declare class CrewXTool implements OnModuleInit {
             gemini: boolean;
             copilot: boolean;
         };
+        providerBridge: {
+            status: string;
+            providers: string[];
+        };
         recommendations: string[];
         error?: undefined;
     } | {
@@ -75,6 +81,10 @@ export declare class CrewXTool implements OnModuleInit {
                 installed: boolean;
             };
         };
+        providerBridge: {
+            status: string;
+            providers: string[];
+        };
         recommendations?: undefined;
     }>;
     private getInstallationRecommendations;
@@ -110,6 +120,7 @@ export declare class CrewXTool implements OnModuleInit {
             metadata?: Record<string, any>;
         }>;
         platform?: 'slack' | 'cli';
+        provider?: string;
     }): Promise<any>;
     executeAgent(args: {
         agentId: string;
@@ -123,8 +134,10 @@ export declare class CrewXTool implements OnModuleInit {
             metadata?: Record<string, any>;
         }>;
         platform?: 'slack' | 'cli';
+        provider?: string;
     }): Promise<any>;
     private normalizeRemoteResult;
+    private toConversationMessages;
     private getOptionsForAgent;
     queryAgentParallel(args: {
         queries: Array<{

package/dist/crewx.tool.js

@@ -65,6 +65,7 @@ const document_loader_service_1 = require("./services/document-loader.service");
 const tool_call_service_1 = require("./services/tool-call.service");
 const agent_loader_service_1 = require("./services/agent-loader.service");
 const remote_agent_service_1 = require("./services/remote-agent.service");
+const provider_bridge_service_1 = require("./services/provider-bridge.service");
 let CrewXTool = CrewXTool_1 = class CrewXTool {
     generateSecurityKey() {
         return crypto.randomBytes(8).toString('hex');
@@ -125,7 +126,7 @@ let CrewXTool = CrewXTool_1 = class CrewXTool {
         };
         return JSON.stringify(payload);
     }
-    constructor(aiService, aiProviderService, projectService, parallelProcessingService, taskManagementService, resultFormatterService, templateService, documentLoaderService, toolCallService, agentLoaderService, remoteAgentService, layoutLoader, layoutRenderer) {
+    constructor(aiService, aiProviderService, projectService, parallelProcessingService, taskManagementService, resultFormatterService, templateService, documentLoaderService, toolCallService, agentLoaderService, remoteAgentService, providerBridgeService, layoutLoader, layoutRenderer) {
         this.aiService = aiService;
         this.aiProviderService = aiProviderService;
         this.projectService = projectService;
@@ -137,6 +138,7 @@ let CrewXTool = CrewXTool_1 = class CrewXTool {
         this.toolCallService = toolCallService;
         this.agentLoaderService = agentLoaderService;
         this.remoteAgentService = remoteAgentService;
+        this.providerBridgeService = providerBridgeService;
         this.layoutLoader = layoutLoader;
         this.layoutRenderer = layoutRenderer;
         this.logger = new common_1.Logger(CrewXTool_1.name);
@@ -184,6 +186,7 @@ let CrewXTool = CrewXTool_1 = class CrewXTool {
                     tools: templateContext.tools ?? null,
                 };
                 const renderContext = {
+                    user_input: templateContext.user_input,
                     agent: {
                         id: agent.id,
                         name: agent.name || agent.id,
@@ -274,11 +277,29 @@ let CrewXTool = CrewXTool_1 = class CrewXTool {
             const availableProviders = await this.aiService.checkAvailableProviders();
             const installation = await this.aiService.validateCLIInstallation();
             const recommendations = this.getInstallationRecommendations(installation);
+            const bridgeProviders = this.providerBridgeService.listAvailableProviders();
+            let bridgeStatus = '⚠️ ProviderBridge: no providers registered.';
+            if (bridgeProviders.length > 0) {
+                try {
+                    const { resolution } = await this.providerBridgeService.createAgentRuntime({
+                        provider: bridgeProviders[0],
+                        defaultAgentId: 'provider-bridge-check',
+                    });
+                    bridgeStatus = `✅ ProviderBridge ready (${resolution.provider.name})`;
+                }
+                catch (error) {
+                    const message = error instanceof Error ? error.message : String(error);
+                    bridgeStatus = `❌ ProviderBridge error: ${message}`;
+                }
+            }
             const responseText = `🤖 **AI Providers Status**
 
 **Available Providers:**
 ${availableProviders.length > 0 ? availableProviders.map(p => `✅ ${p}`).join('\n') : '❌ No providers available'}
 
+**Provider Bridge:**
+${bridgeStatus}${bridgeProviders.length > 0 ? `\nRegistered: ${bridgeProviders.join(', ')}` : ''}
+
 **Installation Status:**
 • Claude CLI: ${installation.claude ? '✅ Installed' : '❌ Not Installed'}
 • Gemini CLI: ${installation.gemini ? '✅ Installed' : '❌ Not Installed'}  
@@ -300,6 +321,10 @@ ${recommendations.map(r => `• ${r}`).join('\n')}`;
                     gemini: installation.gemini,
                     copilot: installation.copilot,
                 },
+                providerBridge: {
+                    status: bridgeStatus,
+                    providers: bridgeProviders,
+                },
                 recommendations,
             };
         }
@@ -324,7 +349,11 @@ No AI providers could be verified.`
                     claude: { installed: false },
                     gemini: { installed: false },
                     copilot: { installed: false }
-                }
+                },
+                providerBridge: {
+                    status: '❌ ProviderBridge inspection skipped due to error',
+                    providers: [],
+                },
             };
         }
     }
@@ -528,26 +557,30 @@ ${errorMessage}`,
             const securityKey = this.generateSecurityKey();
             const contextMessages = messages && messages.length > 0 ? messages.slice(0, -1) : [];
             const templateContext = {
-                env: process.env,
+                user_input: query,
+                messages: contextMessages,
                 agent: {
                     id: agent.id,
                     name: agent.name || agent.id,
                     provider: (Array.isArray(agent.provider) ? agent.provider[0] : agent.provider) || 'claude',
                     model: model || agent.inline?.model,
                     workingDirectory: workingDir,
-                },
-                agentMetadata: {
+                    inline: {
+                        prompt: agent.inline?.prompt || agent.inline?.system_prompt || agent.systemPrompt || '',
+                    },
                     specialties: agent.specialties,
                     capabilities: agent.capabilities,
                     description: agent.description,
                 },
-                mode: 'query',
-                messages: contextMessages,
-                platform: platform,
-                tools: this.buildToolsContext(),
+                documents: {},
                 vars: {
                     security_key: securityKey,
                 },
+                props: {},
+                mode: 'query',
+                platform: platform,
+                env: process.env,
+                tools: this.buildToolsContext(),
             };
             let systemPrompt = await this.processAgentSystemPrompt(agent, templateContext);
             if (process.env.CREWX_APPEND_LEGACY === 'true') {
@@ -575,34 +608,83 @@ Working Directory: ${workingDir}`;
                     workingDirectory: workingDir,
                 });
             }
-            const wrappedQuery = `
-<user_query key="${securityKey}">
-${query}
-</user_query>`;
             let fullPrompt = systemPrompt;
             if (context) {
                 fullPrompt += `\n\n${context}`;
             }
-            fullPrompt += `\n\n${wrappedQuery}`;
-            let response;
-            let provider;
-            if (Array.isArray(agent.provider)) {
-                if (agent.inline?.model || model) {
-                    provider = agent.provider[0] || 'claude';
-                }
-                else {
-                    provider = await this.getAvailableProvider(agent.provider);
-                    this.taskManagementService.addTaskLog(taskId, { level: 'info', message: `Using fallback provider: ${provider}` });
-                }
+            if (!systemPrompt.includes('<user_query')) {
+                this.logger.debug('[Legacy] Adding <user_query> wrapper manually (layout not used)');
+                fullPrompt += `\n\n<user_query key="${securityKey}">
+${query}
+</user_query>`;
+            }
+            let runtimeResult;
+            let providerResolution;
+            let providerInput;
+            if (args.provider) {
+                providerInput = args.provider;
+            }
+            else if (Array.isArray(agent.provider)) {
+                providerInput = await this.getAvailableProvider(agent.provider);
+            }
+            else if (typeof agent.provider === 'string' && agent.provider.trim().length > 0) {
+                providerInput = agent.provider;
+            }
+            try {
+                runtimeResult = await this.providerBridgeService.createAgentRuntime({
+                    provider: providerInput,
+                    defaultAgentId: agentId,
+                    validAgents: agents.map(a => a.id),
+                });
+                providerResolution = runtimeResult.resolution;
+            }
+            catch (error) {
+                const errorMsg = error instanceof Error ? error.message : 'Unknown provider error';
+                this.taskManagementService.addTaskLog(taskId, {
+                    level: 'error',
+                    message: `Provider resolution failed: ${errorMsg}`,
+                });
+                this.taskManagementService.completeTask(taskId, { success: false, error: errorMsg }, false);
+                return {
+                    content: [
+                        {
+                            type: 'text',
+                            text: `❌ **Provider Error**\n\n${errorMsg}\n\nAvailable providers: ${this.providerBridgeService.listAvailableProviders().join(', ')}`,
+                        },
+                    ],
+                    success: false,
+                    agent: agentId,
+                    provider: 'none',
+                    error: errorMsg,
+                    taskId,
+                    readOnlyMode: true,
+                    readOnly: true,
+                };
+            }
+            const resolvedProviderName = providerResolution.provider.name;
+            if (args.provider) {
+                this.taskManagementService.addTaskLog(taskId, {
+                    level: 'info',
+                    message: `Using CLI-specified provider: ${args.provider} (resolved to ${resolvedProviderName})`
+                });
+            }
+            else if (providerInput) {
+                this.taskManagementService.addTaskLog(taskId, {
+                    level: 'info',
+                    message: `Agent provider resolved to ${resolvedProviderName} (input: ${providerInput})`
+                });
             }
             else {
-                provider = agent.provider || 'claude';
+                this.taskManagementService.addTaskLog(taskId, {
+                    level: 'info',
+                    message: `Using ProviderBridge fallback provider: ${resolvedProviderName}`,
+                });
             }
-            const agentOptions = this.getOptionsForAgent(agent, 'query', provider);
-            const modelToUse = model || agent.inline?.model;
+            const agentOptions = this.getOptionsForAgent(agent, 'query', resolvedProviderName);
+            const modelToUse = model || agent.inline?.model || providerResolution.defaultModel;
             const structuredPayload = await this.buildStructuredPayload({
                 agentId,
-                provider,
+                provider: resolvedProviderName,
                 mode: 'query',
                 prompt: fullPrompt,
                 context,
@@ -610,17 +692,55 @@ ${query}
                 platform: platform || 'cli',
                 model: modelToUse,
             });
-            response = await this.aiService.queryAI(fullPrompt, provider, {
-                workingDirectory: workingDir,
-                timeout: this.timeoutConfig.parallel,
-                additionalArgs: agentOptions,
-                taskId,
-                model: modelToUse,
-                agentId,
-                securityKey,
-                messages,
-                pipedContext: structuredPayload,
-            });
+            const runtimeMessages = this.toConversationMessages(messages);
+            let agentResult;
+            try {
+                agentResult = await runtimeResult.runtime.agent.query({
+                    agentId,
+                    prompt: fullPrompt,
+                    context,
+                    messages: runtimeMessages,
+                    model: modelToUse,
+                    options: {
+                        workingDirectory: workingDir,
+                        timeout: this.timeoutConfig.parallel,
+                        additionalArgs: agentOptions,
+                        taskId,
+                        securityKey,
+                        pipedContext: structuredPayload,
+                    },
+                });
+            }
+            catch (error) {
+                const errorMsg = error instanceof Error ? error.message : 'Agent runtime query failed';
+                this.taskManagementService.addTaskLog(taskId, {
+                    level: 'error',
+                    message: `Agent runtime query failed: ${errorMsg}`,
+                });
+                this.taskManagementService.completeTask(taskId, { success: false, error: errorMsg }, false);
+                return {
+                    content: [
+                        {
+                            type: 'text',
+                            text: `❌ **Provider Error**\n\n${errorMsg}\n\nAvailable providers: ${this.providerBridgeService.listAvailableProviders().join(', ')}`,
+                        },
+                    ],
+                    success: false,
+                    agent: agentId,
+                    provider: resolvedProviderName,
+                    error: errorMsg,
+                    taskId,
+                    readOnlyMode: true,
+                    readOnly: true,
+                };
+            }
+            const response = {
+                success: agentResult.success,
+                content: agentResult.content,
+                provider: agentResult.metadata?.provider ?? resolvedProviderName,
+                taskId: agentResult.metadata?.taskId ?? taskId,
+                error: agentResult.metadata?.error,
+            };
             this.taskManagementService.addTaskLog(taskId, { level: 'info', message: `Query completed. Success: ${response.success}` });
             this.taskManagementService.completeTask(taskId, response, response.success);
             const responseText = response.success
@@ -757,26 +877,30 @@ Please check the agent ID and try again.`
             const securityKey = this.generateSecurityKey();
             const contextMessages = messages && messages.length > 0 ? messages.slice(0, -1) : [];
             const templateContext = {
-                env: process.env,
+                user_input: task,
+                messages: contextMessages,
                 agent: {
                     id: agent.id,
                     name: agent.name || agent.id,
                     provider: (Array.isArray(agent.provider) ? agent.provider[0] : agent.provider) || 'claude',
                     model: model || agent.inline?.model,
                     workingDirectory: workingDir,
-                },
-                agentMetadata: {
+                    inline: {
+                        prompt: agent.inline?.prompt || agent.inline?.system_prompt || agent.systemPrompt || '',
+                    },
                     specialties: agent.specialties,
                     capabilities: agent.capabilities,
                     description: agent.description,
                 },
-                mode: 'execute',
-                messages: contextMessages,
-                platform: platform,
-                tools: this.buildToolsContext(),
+                documents: {},
                 vars: {
                     security_key: securityKey,
                 },
+                props: {},
+                mode: 'execute',
+                platform: platform,
+                env: process.env,
+                tools: this.buildToolsContext(),
             };
             let systemPrompt = await this.processAgentSystemPrompt(agent, templateContext);
             if (process.env.CREWX_APPEND_LEGACY === 'true') {
@@ -813,26 +937,74 @@ Task: ${task}
 
 Task: ${task}
 `;
-            let response;
-            let provider;
-            if (Array.isArray(agent.provider)) {
-                if (agent.inline?.model || model) {
-                    provider = agent.provider[0] || 'claude';
-                }
-                else {
-                    provider = await this.getAvailableProvider(agent.provider);
-                    this.taskManagementService.addTaskLog(taskId, { level: 'info', message: `Using fallback provider: ${provider}` });
-                }
+            let runtimeResult;
+            let providerResolution;
+            let providerInput;
+            if (args.provider) {
+                providerInput = args.provider;
+            }
+            else if (Array.isArray(agent.provider)) {
+                providerInput = await this.getAvailableProvider(agent.provider);
+            }
+            else if (typeof agent.provider === 'string' && agent.provider.trim().length > 0) {
+                providerInput = agent.provider;
+            }
+            try {
+                runtimeResult = await this.providerBridgeService.createAgentRuntime({
+                    provider: providerInput,
+                    defaultAgentId: agentId,
+                    validAgents: agents.map(a => a.id),
+                    enableCallStack: true,
+                });
+                providerResolution = runtimeResult.resolution;
+            }
+            catch (error) {
+                const errorMsg = error instanceof Error ? error.message : 'Unknown provider error';
+                this.taskManagementService.addTaskLog(taskId, {
+                    level: 'error',
+                    message: `Provider resolution failed: ${errorMsg}`,
+                });
+                this.taskManagementService.completeTask(taskId, { success: false, error: errorMsg }, false);
+                return {
+                    content: [
+                        {
+                            type: 'text',
+                            text: `❌ **Provider Error**\n\n${errorMsg}\n\nAvailable providers: ${this.providerBridgeService.listAvailableProviders().join(', ')}`,
+                        },
+                    ],
+                    success: false,
+                    agent: agentId,
+                    provider: 'none',
+                    error: errorMsg,
+                    taskId,
+                    readOnlyMode: false,
+                    readOnly: false,
+                };
+            }
+            const resolvedProviderName = providerResolution.provider.name;
+            if (args.provider) {
+                this.taskManagementService.addTaskLog(taskId, {
+                    level: 'info',
+                    message: `Using CLI-specified provider: ${args.provider} (resolved to ${resolvedProviderName})`
+                });
+            }
+            else if (providerInput) {
+                this.taskManagementService.addTaskLog(taskId, {
+                    level: 'info',
+                    message: `Agent provider resolved to ${resolvedProviderName} (input: ${providerInput})`
+                });
             }
             else {
-                provider = agent.provider || 'claude';
+                this.taskManagementService.addTaskLog(taskId, {
+                    level: 'info',
+                    message: `Using ProviderBridge fallback provider: ${resolvedProviderName}`,
+                });
             }
-            this.taskManagementService.addTaskLog(taskId, { level: 'info', message: `Using provider: ${provider}` });
-            const agentOptions = this.getOptionsForAgent(agent, 'execute', provider);
-            const modelToUse = model || agent.inline?.model;
+            const agentOptions = this.getOptionsForAgent(agent, 'execute', resolvedProviderName);
+            const modelToUse = model || agent.inline?.model || providerResolution.defaultModel;
             const structuredPayload = await this.buildStructuredPayload({
                 agentId,
-                provider,
+                provider: resolvedProviderName,
                 mode: 'execute',
                 prompt: fullPrompt,
                 context,
@@ -840,16 +1012,55 @@ Task: ${task}
                 platform: platform || 'cli',
                 model: modelToUse,
             });
-            response = await this.aiService.executeAI(fullPrompt, provider, {
-                workingDirectory: workingDir,
-                timeout: 1200000,
-                taskId: taskId,
-                additionalArgs: agentOptions,
-                model: modelToUse,
-                agentId,
-                messages,
-                pipedContext: structuredPayload,
-            });
+            const runtimeMessages = this.toConversationMessages(messages);
+            let agentResult;
+            try {
+                agentResult = await runtimeResult.runtime.agent.execute({
+                    agentId,
+                    prompt: fullPrompt,
+                    context,
+                    messages: runtimeMessages,
+                    model: modelToUse,
+                    options: {
+                        workingDirectory: workingDir,
+                        timeout: 1200000,
+                        additionalArgs: agentOptions,
+                        taskId,
+                        pipedContext: structuredPayload,
+                        securityKey,
+                    },
+                });
+            }
+            catch (error) {
+                const errorMsg = error instanceof Error ? error.message : 'Agent runtime execution failed';
+                this.taskManagementService.addTaskLog(taskId, {
+                    level: 'error',
+                    message: `Agent runtime execution failed: ${errorMsg}`,
+                });
+                this.taskManagementService.completeTask(taskId, { success: false, error: errorMsg }, false);
+                return {
+                    content: [
+                        {
+                            type: 'text',
+                            text: `❌ **Provider Error**\n\n${errorMsg}\n\nAvailable providers: ${this.providerBridgeService.listAvailableProviders().join(', ')}`,
+                        },
+                    ],
+                    success: false,
+                    agent: agentId,
+                    provider: resolvedProviderName,
+                    error: errorMsg,
+                    taskId,
+                    readOnlyMode: false,
+                    readOnly: false,
+                };
+            }
+            const response = {
+                success: agentResult.success,
+                content: agentResult.content,
+                provider: agentResult.metadata?.provider ?? resolvedProviderName,
+                taskId: agentResult.metadata?.taskId ?? taskId,
+                error: agentResult.metadata?.error,
+            };
             this.taskManagementService.addTaskLog(taskId, { level: 'info', message: `Execution completed. Success: ${response.success}` });
             this.taskManagementService.completeTask(taskId, response, response.success);
             const responseText = response.success ? response.content : `❌ Execution Failed: ${response.error}`;
@@ -921,6 +1132,41 @@ Task: ${task}
             readOnly,
         };
     }
+    toConversationMessages(messages) {
+        if (!messages || messages.length === 0) {
+            return [];
+        }
+        return messages.map((message, index) => {
+            const metadata = message.metadata ?? {};
+            const rawTimestamp = metadata.timestamp;
+            let timestamp;
+            if (rawTimestamp instanceof Date) {
+                timestamp = rawTimestamp;
+            }
+            else if (typeof rawTimestamp === 'number') {
+                timestamp = new Date(rawTimestamp);
+            }
+            else if (typeof rawTimestamp === 'string') {
+                const parsed = new Date(rawTimestamp);
+                timestamp = Number.isNaN(parsed.getTime()) ? new Date() : parsed;
+            }
+            else {
+                timestamp = new Date();
+            }
+            return {
+                id: typeof metadata.id === 'string' ? metadata.id : `cli-msg-${index}`,
+                userId: typeof metadata.userId === 'string'
+                    ? metadata.userId
+                    : message.isAssistant
+                        ? 'assistant'
+                        : 'user',
+                text: message.text,
+                timestamp,
+                isAssistant: message.isAssistant,
+                metadata: metadata,
+            };
+        });
+    }
     getOptionsForAgent(agent, mode, provider) {
         try {
             if (agent.options && typeof agent.options === 'object' && !Array.isArray(agent.options)) {
@@ -1597,8 +1843,8 @@ __decorate([
 ], CrewXTool.prototype, "clearAllLogs", null);
 exports.CrewXTool = CrewXTool = CrewXTool_1 = __decorate([
     (0, common_1.Injectable)(),
-    __param(11, (0, common_1.Inject)('LAYOUT_LOADER')),
-    __param(12, (0, common_1.Inject)('LAYOUT_RENDERER')),
+    __param(12, (0, common_1.Inject)('LAYOUT_LOADER')),
+    __param(13, (0, common_1.Inject)('LAYOUT_RENDERER')),
     __metadata("design:paramtypes", [ai_service_1.AIService,
         ai_provider_service_1.AIProviderService,
         project_service_1.ProjectService,
@@ -1610,6 +1856,7 @@ exports.CrewXTool = CrewXTool = CrewXTool_1 = __decorate([
         tool_call_service_1.ToolCallService,
         agent_loader_service_1.AgentLoaderService,
         remote_agent_service_1.RemoteAgentService,
+        provider_bridge_service_1.ProviderBridgeService,
         crewx_sdk_1.LayoutLoader,
         crewx_sdk_1.LayoutRenderer])
 ], CrewXTool);