@sowonai/crewx-cli 0.4.0-dev.3 → 0.4.0-dev.30

package/dist/crewx.tool.js

@@ -41,9 +41,13 @@ var __importStar = (this && this.__importStar) || (function () {
 var __metadata = (this && this.__metadata) || function (k, v) {
     if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
 };
+var __param = (this && this.__param) || function (paramIndex, decorator) {
+    return function (target, key) { decorator(target, key, paramIndex); }
+};
 var CrewXTool_1;
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.CrewXTool = void 0;
+const crewx_sdk_1 = require("@sowonai/crewx-sdk");
 const common_1 = require("@nestjs/common");
 const nestjs_mcp_adapter_1 = require("@sowonai/nestjs-mcp-adapter");
 const zod_1 = require("zod");
@@ -53,7 +57,6 @@ const crypto = __importStar(require("crypto"));
 const ai_service_1 = require("./ai.service");
 const ai_provider_service_1 = require("./ai-provider.service");
 const project_service_1 = require("./project.service");
-const crewx_sdk_1 = require("@sowonai/crewx-sdk");
 const parallel_processing_service_1 = require("./services/parallel-processing.service");
 const task_management_service_1 = require("./services/task-management.service");
 const result_formatter_service_1 = require("./services/result-formatter.service");
@@ -62,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');
@@ -122,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) {
+    constructor(aiService, aiProviderService, projectService, parallelProcessingService, taskManagementService, resultFormatterService, templateService, documentLoaderService, toolCallService, agentLoaderService, remoteAgentService, providerBridgeService, layoutLoader, layoutRenderer) {
         this.aiService = aiService;
         this.aiProviderService = aiProviderService;
         this.projectService = projectService;
@@ -134,6 +138,9 @@ 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);
         this.timeoutConfig = (0, crewx_sdk_1.getTimeoutConfig)();
     }
@@ -141,6 +148,112 @@ let CrewXTool = CrewXTool_1 = class CrewXTool {
         this.toolCallService.setCrewXTool(this);
         this.logger.log('CrewXTool registered to ToolCallService');
     }
+    async processAgentSystemPrompt(agent, templateContext) {
+        const inlineLayout = agent.inline?.layout;
+        const baseSystemPrompt = agent.inline?.prompt ||
+            agent.inline?.system_prompt ||
+            agent.systemPrompt ||
+            agent.description ||
+            `You are an expert ${agent.id}.`;
+        const layoutSpec = inlineLayout ?? 'crewx/default';
+        if (layoutSpec) {
+            const layoutId = typeof layoutSpec === 'string' ? layoutSpec : layoutSpec.id;
+            const layoutProps = typeof layoutSpec === 'object' && layoutSpec !== null && 'props' in layoutSpec
+                ? layoutSpec.props
+                : undefined;
+            try {
+                console.log(`[DEBUG] Loading layout: ${layoutId} for agent ${agent.id}`);
+                const layout = this.layoutLoader.load(layoutId, layoutProps);
+                console.log(`[DEBUG] Loaded layout ID: ${layout.id}, template length: ${layout.template.length}`);
+                const providerRaw = agent.provider;
+                const providerList = Array.isArray(providerRaw)
+                    ? providerRaw
+                    : (typeof providerRaw === 'string' && providerRaw.length > 0)
+                        ? [providerRaw]
+                        : [];
+                const providerDisplay = providerList.length > 0
+                    ? providerList.join(', ')
+                    : (typeof providerRaw === 'string' ? providerRaw : '');
+                const inlineConfig = agent.inline
+                    ? { ...agent.inline, prompt: baseSystemPrompt }
+                    : { prompt: baseSystemPrompt };
+                const templateOptions = [];
+                const sessionInfo = {
+                    mode: templateContext.mode ?? 'query',
+                    platform: templateContext.platform ?? 'cli',
+                    options: templateOptions,
+                    env: templateContext.env ?? {},
+                    vars: templateContext.vars ?? {},
+                    tools: templateContext.tools ?? null,
+                };
+                const renderContext = {
+                    user_input: templateContext.user_input,
+                    agent: {
+                        id: agent.id,
+                        name: agent.name || agent.id,
+                        role: agent.role || '',
+                        team: agent.team || '',
+                        description: agent.description || '',
+                        workingDirectory: agent.workingDirectory,
+                        capabilities: agent.capabilities || [],
+                        specialties: agent.specialties || [],
+                        provider: providerDisplay,
+                        providerList,
+                        providerRaw,
+                        inline: inlineConfig,
+                        model: agent.inline?.model,
+                        options: agent.options ?? {},
+                        optionsArray: Array.isArray(agent.options) ? agent.options : undefined,
+                        optionsByMode: !Array.isArray(agent.options) && typeof agent.options === 'object'
+                            ? agent.options
+                            : undefined,
+                        remote: agent.remote ?? null,
+                        documents: agent.inline && 'documents' in agent.inline ? agent.inline.documents : undefined,
+                    },
+                    documents: {},
+                    vars: templateContext.vars || {},
+                    props: layoutProps ?? {},
+                    messages: templateContext.messages || [],
+                    platform: templateContext.platform ?? 'cli',
+                    tools: templateContext.tools,
+                    session: sessionInfo,
+                    env: templateContext.env ?? {},
+                    context: {
+                        mode: templateContext.mode ?? 'query',
+                        platform: templateContext.platform ?? 'cli',
+                        options: templateOptions,
+                        env: templateContext.env ?? {},
+                        vars: templateContext.vars ?? {},
+                        agent: templateContext.agent ?? null,
+                    },
+                };
+                renderContext.layout = {
+                    system_prompt: baseSystemPrompt,
+                    prompt: baseSystemPrompt,
+                };
+                const rendered = this.layoutRenderer.render(layout, renderContext);
+                this.logger.debug(`Layout rendered successfully for agent ${agent.id}`);
+                const { processDocumentTemplate } = await Promise.resolve().then(() => __importStar(require('./utils/template-processor')));
+                return await processDocumentTemplate(rendered, this.documentLoaderService, templateContext);
+            }
+            catch (error) {
+                const layoutIdForLog = typeof layoutSpec === 'string' ? layoutSpec : layoutSpec.id;
+                this.logger.warn(`Failed to process layout (${layoutIdForLog}) for agent ${agent.id}: ${(0, crewx_sdk_1.getErrorMessage)(error)}`);
+                if (inlineLayout) {
+                    this.logger.warn('Falling back to inline.system_prompt');
+                }
+                else {
+                    this.logger.warn('Falling back to default system prompt');
+                }
+            }
+        }
+        let systemPrompt = baseSystemPrompt;
+        if (systemPrompt) {
+            const { processDocumentTemplate } = await Promise.resolve().then(() => __importStar(require('./utils/template-processor')));
+            systemPrompt = await processDocumentTemplate(systemPrompt, this.documentLoaderService, templateContext);
+        }
+        return systemPrompt;
+    }
     async getTaskLogs(input) {
         this.logger.log('=== getTaskLogs called ===');
         this.logger.log(`Input taskId: ${input.taskId}`);
@@ -165,11 +278,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'}  
@@ -191,6 +322,10 @@ ${recommendations.map(r => `• ${r}`).join('\n')}`;
                     gemini: installation.gemini,
                     copilot: installation.copilot,
                 },
+                providerBridge: {
+                    status: bridgeStatus,
+                    providers: bridgeProviders,
+                },
                 recommendations,
             };
         }
@@ -215,7 +350,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: [],
+                },
             };
         }
     }
@@ -349,6 +488,7 @@ agents:
             }
             const agents = await this.agentLoaderService.getAllAgents();
             const agent = agents.find(a => a.id === agentId);
+            console.log(`[DEBUG queryAgent] Agent: ${agentId}, hasInline: ${!!agent?.inline}, layout: ${agent?.inline?.layout}, provider: ${agent?.provider}`);
             if (!agent) {
                 return {
                     content: [
@@ -416,63 +556,137 @@ ${errorMessage}`,
                 }
             }
             const workingDir = agent.workingDirectory || process.cwd();
-            let systemPrompt = agent.systemPrompt || agent.description || `You are an expert ${agentId}.`;
             const securityKey = this.generateSecurityKey();
-            if (systemPrompt) {
-                const { processDocumentTemplate } = await Promise.resolve().then(() => __importStar(require('./utils/template-processor')));
-                const contextMessages = messages && messages.length > 0 ? messages.slice(0, -1) : [];
-                const templateContext = {
-                    env: process.env,
-                    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,
-                    },
-                    mode: 'query',
-                    messages: contextMessages,
-                    platform: platform,
-                    tools: this.buildToolsContext(),
-                    vars: {
-                        security_key: securityKey,
+            const contextMessages = messages && messages.length > 0 ? messages.slice(0, -1) : [];
+            const templateContext = {
+                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,
+                    inline: {
+                        prompt: agent.inline?.prompt || agent.inline?.system_prompt || agent.systemPrompt || '',
                     },
-                };
-                systemPrompt = await processDocumentTemplate(systemPrompt, this.documentLoaderService, templateContext);
-            }
-            systemPrompt += `
+                    specialties: agent.specialties,
+                    capabilities: agent.capabilities,
+                    description: agent.description,
+                },
+                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') {
+                this.logger.debug('[WBS-14] Legacy append mode enabled (query)', {
+                    agentId: agent.id,
+                    layoutId: typeof agent.inline?.layout === 'string'
+                        ? agent.inline?.layout
+                        : agent.inline?.layout?.id ?? 'crewx/default',
+                });
+                systemPrompt += `
 
 Specialties: ${agent.specialties?.join(', ') || 'General'}
 Capabilities: ${agent.capabilities?.join(', ') || 'Analysis'}
 Working Directory: ${workingDir}`;
-            const wrappedQuery = `
-<user_query key="${securityKey}">
-${query}
-</user_query>`;
+            }
+            else if (process.env.CREWX_WBS14_TELEMETRY === 'true') {
+                this.logger.debug('[WBS-14] Metadata delegated to layout (query mode)', {
+                    agentId: agent.id,
+                    hasLayout: Boolean(agent.inline?.layout),
+                    layoutId: typeof agent.inline?.layout === 'string'
+                        ? agent.inline?.layout
+                        : agent.inline?.layout?.id ?? 'crewx/default',
+                    specialtiesCount: agent.specialties?.length ?? 0,
+                    capabilitiesCount: agent.capabilities?.length ?? 0,
+                    workingDirectory: workingDir,
+                });
+            }
             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,
@@ -480,17 +694,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
@@ -624,34 +876,59 @@ Please check the agent ID and try again.`
                 }
             }
             const workingDir = projectPath || agent.workingDirectory || './';
-            let systemPrompt = agent.systemPrompt || agent.description || `You are an expert ${agentId}.`;
             const securityKey = this.generateSecurityKey();
-            if (systemPrompt) {
-                const { processDocumentTemplate } = await Promise.resolve().then(() => __importStar(require('./utils/template-processor')));
-                const contextMessages = messages && messages.length > 0 ? messages.slice(0, -1) : [];
-                const templateContext = {
-                    env: process.env,
-                    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,
-                    },
-                    mode: 'execute',
-                    messages: contextMessages,
-                    platform: platform,
-                    tools: this.buildToolsContext(),
-                    vars: {
-                        security_key: securityKey,
+            const contextMessages = messages && messages.length > 0 ? messages.slice(0, -1) : [];
+            const templateContext = {
+                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,
+                    inline: {
+                        prompt: agent.inline?.prompt || agent.inline?.system_prompt || agent.systemPrompt || '',
                     },
-                };
-                systemPrompt = await processDocumentTemplate(systemPrompt, this.documentLoaderService, templateContext);
-            }
-            systemPrompt += `
+                    specialties: agent.specialties,
+                    capabilities: agent.capabilities,
+                    description: agent.description,
+                },
+                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') {
+                this.logger.debug('[WBS-14] Legacy append mode enabled (execute)', {
+                    agentId: agent.id,
+                    layoutId: typeof agent.inline?.layout === 'string'
+                        ? agent.inline?.layout
+                        : agent.inline?.layout?.id ?? 'crewx/default',
+                });
+                systemPrompt += `
 Specialties: ${agent.specialties?.join(', ') || 'General'}
 Capabilities: ${agent.capabilities?.join(', ') || 'Implementation'}
 Working Directory: ${workingDir}`;
+            }
+            else if (process.env.CREWX_WBS14_TELEMETRY === 'true') {
+                this.logger.debug('[WBS-14] Metadata delegated to layout (execute mode)', {
+                    agentId: agent.id,
+                    hasLayout: Boolean(agent.inline?.layout),
+                    layoutId: typeof agent.inline?.layout === 'string'
+                        ? agent.inline?.layout
+                        : agent.inline?.layout?.id ?? 'crewx/default',
+                    specialtiesCount: agent.specialties?.length ?? 0,
+                    capabilitiesCount: agent.capabilities?.length ?? 0,
+                    workingDirectory: workingDir,
+                });
+            }
             const fullPrompt = context
                 ? `${systemPrompt}
 ${context}
@@ -662,26 +939,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,
@@ -689,16 +1014,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}`;
@@ -770,6 +1134,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)) {
@@ -1446,6 +1845,8 @@ __decorate([
 ], CrewXTool.prototype, "clearAllLogs", null);
 exports.CrewXTool = CrewXTool = CrewXTool_1 = __decorate([
     (0, common_1.Injectable)(),
+    __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,
@@ -1456,6 +1857,9 @@ exports.CrewXTool = CrewXTool = CrewXTool_1 = __decorate([
         document_loader_service_1.DocumentLoaderService,
         tool_call_service_1.ToolCallService,
         agent_loader_service_1.AgentLoaderService,
-        remote_agent_service_1.RemoteAgentService])
+        remote_agent_service_1.RemoteAgentService,
+        provider_bridge_service_1.ProviderBridgeService,
+        crewx_sdk_1.LayoutLoader,
+        crewx_sdk_1.LayoutRenderer])
 ], CrewXTool);
 //# sourceMappingURL=crewx.tool.js.map