@codebolt/agent 6.1.20 → 6.1.21

package/dist/unified/base/responseExecutor.js

@@ -7,6 +7,55 @@ exports.ResponseExecutor = void 0;
 const codeboltjs_1 = __importDefault(require("@codebolt/codeboltjs"));
 const promptContext_1 = require("./promptContext");
 const agentToolLoader_1 = require("../utils/agentToolLoader");
+function normalizeDiscoveredToolSchema(schema) {
+    const schemaFunction = schema['function'];
+    if (typeof (schemaFunction === null || schemaFunction === void 0 ? void 0 : schemaFunction.name) === 'string' && schemaFunction.name.length > 0) {
+        return schema;
+    }
+    if (schema['type'] !== 'function' || typeof schema['name'] !== 'string' || schema['name'].length === 0) {
+        return null;
+    }
+    return {
+        ...schema,
+        function: {
+            name: schema['name'],
+            description: schema['description'],
+            parameters: schema['parameters'] || { type: 'object', properties: {} },
+        },
+    };
+}
+function extractDiscoveredToolSchemas(content) {
+    let parsedContent = content;
+    if (typeof content === 'string') {
+        try {
+            parsedContent = JSON.parse(content);
+        }
+        catch {
+            const jsonMatch = content.match(/\[[\s\S]*\]/);
+            if (!jsonMatch)
+                return [];
+            try {
+                parsedContent = JSON.parse(jsonMatch[0]);
+            }
+            catch {
+                return [];
+            }
+        }
+    }
+    const rawSchemas = Array.isArray(parsedContent)
+        ? parsedContent
+        : (parsedContent &&
+            typeof parsedContent === 'object' &&
+            !Array.isArray(parsedContent) &&
+            parsedContent.type === 'tool_search_output' &&
+            Array.isArray(parsedContent.tools))
+            ? parsedContent.tools
+            : [];
+    return rawSchemas
+        .filter((schema) => !!schema && typeof schema === 'object' && !Array.isArray(schema))
+        .map(normalizeDiscoveredToolSchema)
+        .filter((schema) => !!schema);
+}
 class ResponseExecutor {
     constructor(options) {
         this.preToolCallProcessors = [];
@@ -42,24 +91,22 @@ class ResponseExecutor {
         }
         const compactionMessagePromise = this.runRequiredCompaction(input.rawLLMOutput);
         const toolExecution = await this.executeTools(input);
-        const compactionCompleted = await compactionMessagePromise;
-        if (compactionCompleted) {
+        const compactionOutcome = await compactionMessagePromise;
+        if (compactionOutcome.completed) {
             await Promise.resolve(codeboltjs_1.default.chat.sendMessage('Conversation Compacted'));
         }
         this.completed = this.completed || toolExecution.completed;
         this.finalMessage = (_a = toolExecution.finalMessage) !== null && _a !== void 0 ? _a : this.finalMessage;
         await this.injectDiscoveredTools(input.rawLLMOutput, toolExecution.toolResults, nextMessage);
-        if (toolExecution.toolResults.length > 0 || toolExecution.followUpMessages.length > 0) {
-            nextMessage = (0, promptContext_1.appendTranscriptMessages)(nextMessage, [
-                ...toolExecution.toolResults.map((toolResult) => ({
-                    role: toolResult.role,
-                    content: typeof toolResult.content === 'string'
-                        ? toolResult.content
-                        : JSON.stringify(toolResult.content),
-                    tool_call_id: toolResult.tool_call_id,
-                })),
-                ...toolExecution.followUpMessages,
-            ]);
+        const toolResultMessages = this.buildToolResultMessages(toolExecution);
+        if (compactionOutcome.completed) {
+            const refreshedMessage = await this.refreshNextMessageFromCompactedContext(nextMessage, input.actualMessageSentToLLM, compactionOutcome, toolResultMessages);
+            nextMessage = refreshedMessage || (toolResultMessages.length > 0
+                ? (0, promptContext_1.appendTranscriptMessages)(nextMessage, toolResultMessages)
+                : nextMessage);
+        }
+        else if (toolResultMessages.length > 0) {
+            nextMessage = (0, promptContext_1.appendTranscriptMessages)(nextMessage, toolResultMessages);
         }
         const transcriptLengthBeforePostToolProcessors = (0, promptContext_1.getTranscriptMessages)(nextMessage).length;
         for (const postToolCallProcessor of this.postToolCallProcessors) {
@@ -88,6 +135,24 @@ class ResponseExecutor {
             this.completed = false;
             this.finalMessage = undefined;
         }
+        if (this.completed) {
+            const pendingAsyncTasks = await this.getPendingAsyncTasks();
+            if (pendingAsyncTasks.length > 0) {
+                nextMessage = (0, promptContext_1.appendTranscriptMessages)(nextMessage, [{
+                        role: 'user',
+                        content: [
+                            '<async_tasks_require_decision>',
+                            'You attempted to complete while scoped async tasks owned by this run are still unresolved.',
+                            'Before completing, use async_task_control on each task with action "wait", "stop", or "detach".',
+                            'If a wait times out and the task is intentionally long-running, either stop it or detach it explicitly. background_detached tasks do not block completion and survive user force-stop.',
+                            JSON.stringify(pendingAsyncTasks, null, 2),
+                            '</async_tasks_require_decision>',
+                        ].join('\n'),
+                    }]);
+                this.completed = false;
+                this.finalMessage = undefined;
+            }
+        }
         const output = {
             completed: this.completed,
             nextMessage,
@@ -99,10 +164,12 @@ class ResponseExecutor {
         return output;
     }
     parseToolCall(tool) {
+        var _a, _b, _c;
         let toolInput = {};
-        if (tool.function.arguments) {
+        const rawArguments = (_a = tool.arguments) !== null && _a !== void 0 ? _a : (_b = tool.function) === null || _b === void 0 ? void 0 : _b.arguments;
+        if (rawArguments) {
             try {
-                const parsedArguments = JSON.parse(tool.function.arguments);
+                const parsedArguments = typeof rawArguments === 'string' ? JSON.parse(rawArguments) : rawArguments;
                 if (parsedArguments && typeof parsedArguments === 'object' && !Array.isArray(parsedArguments)) {
                     toolInput = parsedArguments;
                 }
@@ -114,37 +181,32 @@ class ResponseExecutor {
         return {
             tool,
             toolInput,
-            toolName: tool.function.name,
-            toolUseId: tool.id,
+            toolName: tool.name || ((_c = tool.function) === null || _c === void 0 ? void 0 : _c.name) || '',
+            toolUseId: tool.call_id || tool.id || '',
             waitForPrevious: toolInput['waitForPreviousTools'] === true,
         };
     }
     extractLastMessageContent(llmResponse) {
-        var _a, _b, _c;
-        for (const choice of (_a = llmResponse.choices) !== null && _a !== void 0 ? _a : []) {
-            if ((_b = choice.message) === null || _b === void 0 ? void 0 : _b.content) {
-                return choice.message.content;
-            }
-            const reasoningContent = (_c = choice.message) === null || _c === void 0 ? void 0 : _c.reasoning_content;
-            if (reasoningContent) {
-                return reasoningContent;
-            }
+        if (llmResponse.output_text) {
+            return llmResponse.output_text;
+        }
+        if (llmResponse.content) {
+            return llmResponse.content;
         }
         return undefined;
     }
     getToolCalls(llmResponse) {
-        var _a, _b, _c, _d;
+        var _a, _b;
         const toolCallsById = new Map();
-        for (const toolCall of (_a = llmResponse.tool_calls) !== null && _a !== void 0 ? _a : []) {
-            if (toolCall === null || toolCall === void 0 ? void 0 : toolCall.id) {
-                toolCallsById.set(toolCall.id, toolCall);
+        for (const item of (_a = llmResponse.items) !== null && _a !== void 0 ? _a : []) {
+            if ((item === null || item === void 0 ? void 0 : item.type) === 'function_call' && item.call_id) {
+                toolCallsById.set(item.call_id, item);
             }
         }
-        for (const choice of (_b = llmResponse.choices) !== null && _b !== void 0 ? _b : []) {
-            for (const toolCall of (_d = (_c = choice.message) === null || _c === void 0 ? void 0 : _c.tool_calls) !== null && _d !== void 0 ? _d : []) {
-                if ((toolCall === null || toolCall === void 0 ? void 0 : toolCall.id) && !toolCallsById.has(toolCall.id)) {
-                    toolCallsById.set(toolCall.id, toolCall);
-                }
+        for (const toolCall of (_b = llmResponse.tool_calls) !== null && _b !== void 0 ? _b : []) {
+            const id = (toolCall === null || toolCall === void 0 ? void 0 : toolCall.call_id) || (toolCall === null || toolCall === void 0 ? void 0 : toolCall.id);
+            if (id) {
+                toolCallsById.set(id, toolCall);
             }
         }
         return Array.from(toolCallsById.values());
@@ -152,29 +214,120 @@ class ResponseExecutor {
     hasExecutableToolCalls(llmResponse) {
         return this.getToolCalls(llmResponse).some((toolCall) => {
             var _a;
-            const toolName = ((_a = toolCall.function) === null || _a === void 0 ? void 0 : _a.name) || '';
+            const toolName = toolCall.name || ((_a = toolCall.function) === null || _a === void 0 ? void 0 : _a.name) || '';
             return !toolName.includes('attempt_completion') &&
                 !toolName.includes('context_compaction') &&
                 !toolName.includes('contextCompaction');
         });
     }
     async runRequiredCompaction(llmResponse) {
-        var _a;
+        var _a, _b;
         const decision = llmResponse.contextCompaction;
         if (!(decision === null || decision === void 0 ? void 0 : decision.required) || decision.hasToolCalls === false || !this.hasExecutableToolCalls(llmResponse)) {
-            return false;
+            return { completed: false };
         }
         try {
-            await codeboltjs_1.default.contextCompaction.run({
-                ...(decision.runRequest || {}),
-                reason: String(((_a = decision.runRequest) === null || _a === void 0 ? void 0 : _a['reason']) || decision.reason || 'llm_response_tool_calls'),
+            const runRequest = decision.runRequest || {};
+            const response = await codeboltjs_1.default.contextCompaction.run({
+                ...runRequest,
+                reason: String(runRequest['reason'] || decision.reason || 'llm_response_tool_calls'),
             });
-            return true;
+            const responseThreadId = (_b = (_a = response === null || response === void 0 ? void 0 : response.data) === null || _a === void 0 ? void 0 : _a.result) === null || _b === void 0 ? void 0 : _b.threadId;
+            const requestThreadId = runRequest['threadId'];
+            const threadId = typeof responseThreadId === 'string'
+                ? responseThreadId
+                : typeof requestThreadId === 'string'
+                    ? requestThreadId
+                    : undefined;
+            return {
+                completed: (response === null || response === void 0 ? void 0 : response.success) !== false,
+                ...(threadId ? { threadId } : {}),
+            };
         }
         catch (error) {
             console.error('[ResponseExecutor] Context compaction failed:', error);
+            return { completed: false };
+        }
+    }
+    buildToolResultMessages(toolExecution) {
+        return [
+            ...toolExecution.toolResults.map((toolResult) => {
+                const content = toolResult.content;
+                if (content &&
+                    typeof content === 'object' &&
+                    !Array.isArray(content) &&
+                    content.type === 'tool_search_output') {
+                    return {
+                        ...content,
+                        type: 'tool_search_output',
+                        call_id: content.call_id || toolResult.tool_call_id,
+                        status: content.status || 'completed',
+                    };
+                }
+                return {
+                    type: 'function_call_output',
+                    call_id: toolResult.tool_call_id,
+                    output: typeof content === 'string'
+                        ? content
+                        : JSON.stringify(content),
+                    status: 'completed',
+                };
+            }),
+            ...toolExecution.followUpMessages,
+        ];
+    }
+    async refreshNextMessageFromCompactedContext(nextMessage, actualMessageSentToLLM, compactionOutcome, toolResultMessages) {
+        if (!compactionOutcome.threadId) {
+            return null;
+        }
+        try {
+            const response = await codeboltjs_1.default.thread.getThreadContextCompacted({
+                threadId: compactionOutcome.threadId,
+            });
+            const compactedMessages = this.extractCompactedContextMessages(response === null || response === void 0 ? void 0 : response.compactedContext);
+            if (compactedMessages.length === 0) {
+                return null;
+            }
+            const currentTurnMessages = this.getMessagesAddedAfterInference(actualMessageSentToLLM, nextMessage);
+            return (0, promptContext_1.replaceTranscriptMessages)(nextMessage, [
+                ...compactedMessages,
+                ...currentTurnMessages,
+                ...toolResultMessages,
+            ]);
+        }
+        catch (error) {
+            console.error('[ResponseExecutor] Failed to refresh compacted context:', error);
+            return null;
+        }
+    }
+    extractCompactedContextMessages(compactedContext) {
+        const data = typeof compactedContext === 'object' && compactedContext !== null
+            ? compactedContext.data
+            : undefined;
+        const messages = typeof data === 'object' && data !== null
+            ? data.input
+            : undefined;
+        if (!Array.isArray(messages)) {
+            return [];
+        }
+        return messages
+            .filter((message) => this.isMessageObject(message))
+            .map((message) => ({ ...message }));
+    }
+    isMessageObject(value) {
+        if (!value || typeof value !== 'object') {
+            return false;
+        }
+        const message = value;
+        if (typeof message.role !== 'string') {
             return false;
         }
+        return message.content !== undefined;
+    }
+    getMessagesAddedAfterInference(actualMessageSentToLLM, nextMessage) {
+        const sentMessages = (0, promptContext_1.getTranscriptMessages)(actualMessageSentToLLM);
+        const nextMessages = (0, promptContext_1.getTranscriptMessages)(nextMessage);
+        return nextMessages.slice(sentMessages.length);
     }
     async executeTools(input) {
         var _a;
@@ -257,6 +410,21 @@ class ResponseExecutor {
             console.error('[ResponseExecutor] Failed to send final chat message:', error);
         }
     }
+    async getPendingAsyncTasks() {
+        try {
+            const response = await Promise.resolve(codeboltjs_1.default.asyncTask.listTasks({
+                scope: 'current_run',
+            }));
+            const tasks = Array.isArray(response === null || response === void 0 ? void 0 : response.tasks) ? response.tasks : [];
+            return tasks.filter((task) => task &&
+                task.executionMode !== 'background_detached' &&
+                !['completed', 'failed', 'stopped'].includes(task.status));
+        }
+        catch (error) {
+            console.error('[ResponseExecutor] Failed to check async tasks before completion:', error);
+            return [];
+        }
+    }
     extractCompletionMessage(toolInput) {
         if ('result' in toolInput) {
             return this.formatCompletionValue(toolInput['result']);
@@ -364,6 +532,7 @@ class ResponseExecutor {
         return [false, data];
     }
     parseToolResult(tool_call_id, content) {
+        let parsedStructuredContent = content;
         let serializedContent = typeof content === 'string'
             ? content
             : JSON.stringify(content);
@@ -372,6 +541,7 @@ class ResponseExecutor {
             const parsedContent = typeof serializedContent === 'string'
                 ? JSON.parse(serializedContent)
                 : serializedContent;
+            parsedStructuredContent = parsedContent;
             if (parsedContent &&
                 typeof parsedContent === 'object' &&
                 'payload' in parsedContent &&
@@ -386,10 +556,16 @@ class ResponseExecutor {
         catch {
             // Preserve the raw tool result when it is not JSON.
         }
+        const contentForModel = (parsedStructuredContent &&
+            typeof parsedStructuredContent === 'object' &&
+            !Array.isArray(parsedStructuredContent) &&
+            parsedStructuredContent.type === 'tool_search_output')
+            ? parsedStructuredContent
+            : serializedContent;
         return {
             role: 'tool',
             tool_call_id,
-            content: serializedContent,
+            content: contentForModel,
             userMessage,
         };
     }
@@ -414,7 +590,7 @@ class ResponseExecutor {
             for (const toolCall of toolCalls) {
                 if (!toolCall)
                     continue;
-                const toolName = ((_b = toolCall.function) === null || _b === void 0 ? void 0 : _b.name) || '';
+                const toolName = toolCall.name || ((_b = toolCall.function) === null || _b === void 0 ? void 0 : _b.name) || '';
                 const isToolSearch = toolName === 'tool_search' ||
                     toolName === 'codebolt--tool_search' ||
                     toolName.endsWith('--tool_search') ||
@@ -431,20 +607,8 @@ class ResponseExecutor {
                 const toolResult = toolResults.find(r => r.tool_call_id === toolCallId);
                 if (!(toolResult === null || toolResult === void 0 ? void 0 : toolResult.content))
                     continue;
-                const content = typeof toolResult.content === 'string'
-                    ? toolResult.content
-                    : JSON.stringify(toolResult.content);
-                const jsonMatch = content.match(/\[[\s\S]*\]/);
-                if (!jsonMatch)
-                    continue;
-                let discoveredSchemas;
-                try {
-                    discoveredSchemas = JSON.parse(jsonMatch[0]);
-                }
-                catch {
-                    continue;
-                }
-                if (!Array.isArray(discoveredSchemas))
+                const discoveredSchemas = extractDiscoveredToolSchemas(toolResult.content);
+                if (!discoveredSchemas.length)
                     continue;
                 const existingToolNames = new Set(nextMessage.message.tools.map((tool) => { var _a; return (_a = tool.function) === null || _a === void 0 ? void 0 : _a.name; }));
                 for (const schema of discoveredSchemas) {

package/dist/unified/services/CompressionCoordinator.js

@@ -37,7 +37,7 @@ class CompressionCoordinator {
         this.conversationCompactor = new processor_pieces_1.ConversationCompactorModifier(conversationCompactorOptions);
     }
     shouldCompressBeforeInference(message) {
-        const estimatedTokens = this.countMessageTokens(message.message.messages);
+        const estimatedTokens = this.countMessageTokens(message.message.input);
         const threshold = this.options.proactiveThreshold * this.options.modelTokenLimit;
         if (!this.options.enabled) {
             return {
@@ -92,8 +92,8 @@ class CompressionCoordinator {
                 recoveredMessage: this.withCompressionMetadata(message, {
                     status: 'FAILED_REACTIVE_RETRY_LIMIT',
                     stage: 'reactive_force_compact',
-                    originalTokenCount: this.countMessageTokens(message.message.messages),
-                    newTokenCount: this.countMessageTokens(message.message.messages),
+                    originalTokenCount: this.countMessageTokens(message.message.input),
+                    newTokenCount: this.countMessageTokens(message.message.input),
                     timestamp: new Date().toISOString(),
                     strategy: this.options.compactStrategy,
                     reactiveRetryCount: this.reactiveRetryCount,
@@ -104,7 +104,7 @@ class CompressionCoordinator {
             };
         }
         this.reactiveRetryCount++;
-        const proactiveCompression = await this.chatCompression.tryCompressChat(message.message.messages, true);
+        const proactiveCompression = await this.chatCompression.tryCompressChat(message.message.input, true);
         if (proactiveCompression.compressedMessages &&
             proactiveCompression.compressionStatus === 1) {
             return {
@@ -112,7 +112,7 @@ class CompressionCoordinator {
                     ...message,
                     message: {
                         ...message.message,
-                        messages: proactiveCompression.compressedMessages,
+                        input: proactiveCompression.compressedMessages,
                     },
                 }, {
                     status: 'COMPRESSED',
@@ -128,19 +128,19 @@ class CompressionCoordinator {
                 reason: 'Reactive pre-inference compression applied',
             };
         }
-        const forceCompressed = await this.conversationCompactor.forceCompress(message.message.messages);
+        const forceCompressed = await this.conversationCompactor.forceCompress(message.message.input);
         return {
             recoveredMessage: this.withCompressionMetadata({
                 ...message,
                 message: {
                     ...message.message,
-                    messages: forceCompressed.messages,
+                    input: forceCompressed.input,
                 },
             }, {
                 status: 'COMPRESSED',
                 stage: 'reactive_force_compact',
-                originalTokenCount: this.countMessageTokens(message.message.messages),
-                newTokenCount: this.countMessageTokens(forceCompressed.messages),
+                originalTokenCount: this.countMessageTokens(message.message.input),
+                newTokenCount: this.countMessageTokens(forceCompressed.input),
                 timestamp: new Date().toISOString(),
                 strategy: this.options.compactStrategy,
                 ...(forceCompressed.metadata.messagesCompressed !==

package/dist/unified/services/compaction/autoCompact.js

@@ -196,7 +196,7 @@ class AutoCompact {
         return splitIndex;
     }
     async generateSummary(messages) {
-        var _a, _b, _c, _d, _e;
+        var _a, _b;
         try {
             // eslint-disable-next-line @typescript-eslint/no-require-imports
             const codebolt = require('@codebolt/codeboltjs');
@@ -266,11 +266,11 @@ CRITICAL RULES:
             });
             // Extract summary from response
             let summary;
-            if (typeof ((_a = response === null || response === void 0 ? void 0 : response.completion) === null || _a === void 0 ? void 0 : _a.content) === 'string') {
-                summary = response.completion.content;
+            if (typeof ((_a = response === null || response === void 0 ? void 0 : response.completion) === null || _a === void 0 ? void 0 : _a.output_text) === 'string') {
+                summary = response.completion.output_text;
             }
-            else if ((_e = (_d = (_c = (_b = response === null || response === void 0 ? void 0 : response.completion) === null || _b === void 0 ? void 0 : _b.choices) === null || _c === void 0 ? void 0 : _c[0]) === null || _d === void 0 ? void 0 : _d.message) === null || _e === void 0 ? void 0 : _e.content) {
-                summary = response.completion.choices[0].message.content;
+            else if (typeof ((_b = response === null || response === void 0 ? void 0 : response.completion) === null || _b === void 0 ? void 0 : _b.content) === 'string') {
+                summary = response.completion.content;
             }
             if (summary && summary.trim().length > 0) {
                 return summary.trim();

package/dist/unified/services/compaction/contextCollapse.js

@@ -213,7 +213,7 @@ class ContextCollapse {
         ];
     }
     async generateGranularSummary(messages) {
-        var _a, _b, _c, _d, _e;
+        var _a, _b;
         const estimator = new types_1.TokenEstimator();
         // For small ranges, create a structural summary without LLM
         const tokenCount = estimator.estimateForMessages(messages);
@@ -244,7 +244,7 @@ ${historyText}`;
                     { role: 'user', content: prompt },
                 ],
             });
-            const summary = ((_a = response === null || response === void 0 ? void 0 : response.completion) === null || _a === void 0 ? void 0 : _a.content) || ((_e = (_d = (_c = (_b = response === null || response === void 0 ? void 0 : response.completion) === null || _b === void 0 ? void 0 : _b.choices) === null || _c === void 0 ? void 0 : _c[0]) === null || _d === void 0 ? void 0 : _d.message) === null || _e === void 0 ? void 0 : _e.content);
+            const summary = ((_a = response === null || response === void 0 ? void 0 : response.completion) === null || _a === void 0 ? void 0 : _a.output_text) || ((_b = response === null || response === void 0 ? void 0 : response.completion) === null || _b === void 0 ? void 0 : _b.content);
             if (summary && typeof summary === 'string' && summary.trim().length > 0) {
                 return summary.trim();
             }

package/dist/unified/services/compaction/reactiveCompact.js

@@ -235,7 +235,7 @@ class ReactiveCompact {
         ];
     }
     async forceCompact(messages) {
-        var _a, _b, _c, _d, _e;
+        var _a, _b;
         try {
             // eslint-disable-next-line @typescript-eslint/no-require-imports
             const codebolt = require('@codebolt/codeboltjs');
@@ -276,11 +276,11 @@ ${historyText}`;
                 ],
             });
             let summary;
-            if (typeof ((_a = response === null || response === void 0 ? void 0 : response.completion) === null || _a === void 0 ? void 0 : _a.content) === 'string') {
-                summary = response.completion.content;
+            if (typeof ((_a = response === null || response === void 0 ? void 0 : response.completion) === null || _a === void 0 ? void 0 : _a.output_text) === 'string') {
+                summary = response.completion.output_text;
             }
-            else if ((_e = (_d = (_c = (_b = response === null || response === void 0 ? void 0 : response.completion) === null || _b === void 0 ? void 0 : _b.choices) === null || _c === void 0 ? void 0 : _c[0]) === null || _d === void 0 ? void 0 : _d.message) === null || _e === void 0 ? void 0 : _e.content) {
-                summary = response.completion.choices[0].message.content;
+            else if (typeof ((_b = response === null || response === void 0 ? void 0 : response.completion) === null || _b === void 0 ? void 0 : _b.content) === 'string') {
+                summary = response.completion.content;
             }
             if (!summary || summary.trim().length === 0) {
                 return null;

package/dist/unified/types/libTypes.d.ts

@@ -181,6 +181,12 @@ export interface CodeboltAPI {
         executeTool(toolName: string, params: unknown): Promise<{
             data: unknown;
         }>;
+        /** List registered project-local and plugin MCP tools */
+        getRegisteredTools(): Promise<{
+            data?: {
+                tools: OpenAITool[];
+            };
+        }>;
         /** List available MCP tools */
         listTools(): Promise<string[]>;
         /** Get tool schema */

package/dist/unified/utils/agentToolLoader.js

@@ -30,7 +30,16 @@ function isTool(value) {
         return false;
     }
     const candidate = value;
-    return candidate.type === 'function' && typeof ((_a = candidate.function) === null || _a === void 0 ? void 0 : _a.name) === 'string';
+    return candidate.type === 'function' &&
+        typeof ((_a = candidate.function) === null || _a === void 0 ? void 0 : _a.name) === 'string' &&
+        candidate.function.name.trim().length > 0;
+}
+function getToolName(tool) {
+    var _a, _b;
+    return ((_b = (_a = tool.function) === null || _a === void 0 ? void 0 : _a.name) === null || _b === void 0 ? void 0 : _b.trim()) || '';
+}
+function compareToolsByName(leftTool, rightTool) {
+    return getToolName(leftTool).localeCompare(getToolName(rightTool));
 }
 function hashString(value) {
     let hash = 0;
@@ -86,17 +95,16 @@ function normalizeToolResponse(response) {
     return tools.filter(isTool).map(normalizeToolForModel);
 }
 function mergeTools(...toolGroups) {
-    var _a;
     const mergedTools = new Map();
     for (const tools of toolGroups) {
         for (const tool of tools) {
-            const toolName = (_a = tool.function) === null || _a === void 0 ? void 0 : _a.name;
+            const toolName = getToolName(tool);
             if (toolName && !mergedTools.has(toolName)) {
                 mergedTools.set(toolName, tool);
             }
         }
     }
-    return Array.from(mergedTools.values());
+    return Array.from(mergedTools.values()).sort(compareToolsByName);
 }
 function isAgentLocalTool(value) {
     if (!value || typeof value !== 'object') {
@@ -151,16 +159,23 @@ function assertNoLocalToolSchemaCollisions(localSchemas, externalSchemas) {
 }
 async function listProjectLocalTools() {
     const mcp = codeboltjs_1.default.mcp;
-    if (typeof mcp.getLocalMCPServers !== 'function') {
-        return [];
-    }
-    try {
-        return normalizeToolResponse(await mcp.getLocalMCPServers());
+    if (typeof mcp.getRegisteredTools === 'function') {
+        try {
+            return normalizeToolResponse(await mcp.getRegisteredTools());
+        }
+        catch (error) {
+            console.error('[AgentToolLoader] Failed to load registered MCP tools:', error);
+        }
     }
-    catch (error) {
-        console.error('[AgentToolLoader] Failed to load project-local tools:', error);
-        return [];
+    if (typeof mcp.getLocalMCPServers === 'function') {
+        try {
+            return normalizeToolResponse(await mcp.getLocalMCPServers());
+        }
+        catch (error) {
+            console.error('[AgentToolLoader] Failed to load project-local tools:', error);
+        }
     }
+    return [];
 }
 async function listAgentAvailableTools(mentionedMCPs = []) {
     let codeboltTools = [];
@@ -184,16 +199,6 @@ async function listAgentAvailableTools(mentionedMCPs = []) {
     return mergeTools(codeboltTools, localTools, mentionedTools);
 }
 function appendUniqueTools(targetTools, toolsToAppend) {
-    var _a;
-    const existingToolNames = new Set(targetTools
-        .map((tool) => { var _a; return (_a = tool.function) === null || _a === void 0 ? void 0 : _a.name; })
-        .filter((toolName) => typeof toolName === 'string' && toolName.length > 0));
-    for (const tool of toolsToAppend) {
-        const toolName = (_a = tool.function) === null || _a === void 0 ? void 0 : _a.name;
-        if (!toolName || existingToolNames.has(toolName)) {
-            continue;
-        }
-        targetTools.push(tool);
-        existingToolNames.add(toolName);
-    }
+    const mergedTools = mergeTools(targetTools, toolsToAppend);
+    targetTools.splice(0, targetTools.length, ...mergedTools);
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@codebolt/agent",
-  "version": "6.1.20",
+  "version": "6.1.21",
   "description": "CodeBolt Agent utilities for building and managing AI agents",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
@@ -72,6 +72,10 @@
     "./unified": {
       "types": "./dist/unified/index.d.ts",
       "default": "./dist/unified/index.js"
+    },
+    "./unified/tools": {
+      "types": "./dist/unified/agent/tools.d.ts",
+      "default": "./dist/unified/agent/tools.js"
     }
   }
 }