@codebolt/agent 6.1.19 → 6.1.21

package/dist/unified/agent/tools.js

@@ -114,14 +114,54 @@ class Tool {
             }
         };
     }
-    // /**
-    //  * Converts a Zod schema to JSON Schema format for OpenAI functions
-    //  */
+    getZodDef(zodType) {
+        return (zodType._def || {});
+    }
+    getZodTypeName(zodType) {
+        const def = this.getZodDef(zodType);
+        return typeof def['typeName'] === 'string' ? def['typeName'] : undefined;
+    }
+    getZodDescription(zodType) {
+        const def = this.getZodDef(zodType);
+        return typeof def['description'] === 'string' ? def['description'] : undefined;
+    }
+    applyDescription(jsonSchema, zodType) {
+        const description = this.getZodDescription(zodType);
+        if (description) {
+            jsonSchema['description'] = description;
+        }
+    }
+    withDescriptionFrom(jsonSchema, zodType) {
+        if (jsonSchema && typeof jsonSchema === 'object' && !Array.isArray(jsonSchema)) {
+            this.applyDescription(jsonSchema, zodType);
+        }
+        return jsonSchema;
+    }
+    getObjectShape(zodType) {
+        const directShape = zodType.shape;
+        if (directShape && typeof directShape === 'object') {
+            return directShape;
+        }
+        const defShape = this.getZodDef(zodType)['shape'];
+        if (typeof defShape === 'function') {
+            return defShape();
+        }
+        if (defShape && typeof defShape === 'object') {
+            return defShape;
+        }
+        return {};
+    }
+    /**
+     * Converts a Zod schema to JSON Schema format for OpenAI functions.
+     *
+     * The converter intentionally checks Zod's schema metadata instead of
+     * relying only on instanceof. Local tools are often created in another
+     * workspace package with its own zod module instance, which makes
+     * instanceof checks fail even though the schema is valid.
+     */
     zodSchemaToJsonSchema(schema) {
-        // This is a simplified conversion - in a real implementation,
-        // you might want to use a library like zod-to-json-schema
-        if (schema instanceof zod_1.z.ZodObject) {
-            const shape = schema.shape;
+        if (schema instanceof zod_1.z.ZodObject || this.getZodTypeName(schema) === 'ZodObject') {
+            const shape = this.getObjectShape(schema);
             const properties = {};
             const required = [];
             for (const [key, value] of Object.entries(shape)) {
@@ -131,12 +171,14 @@ class Tool {
                     required.push(key);
                 }
             }
-            return {
+            const result = {
                 type: 'object',
                 properties,
                 required: required.length > 0 ? required : undefined,
                 additionalProperties: false
             };
+            this.applyDescription(result, schema);
+            return result;
         }
         return this.zodTypeToJsonSchema(schema);
     }
@@ -144,14 +186,12 @@ class Tool {
      * Converts individual Zod types to JSON Schema
      */
     zodTypeToJsonSchema(zodType) {
-        if (zodType instanceof zod_1.z.ZodString) {
+        const typeName = this.getZodTypeName(zodType);
+        if (zodType instanceof zod_1.z.ZodString || typeName === 'ZodString') {
             const result = { type: 'string' };
-            // Add description if available
-            if (zodType._def.description) {
-                result.description = zodType._def.description;
-            }
+            this.applyDescription(result, zodType);
             // Add constraints
-            const checks = zodType._def.checks || [];
+            const checks = this.getZodDef(zodType)['checks'] || [];
             for (const check of checks) {
                 switch (check.kind) {
                     case 'min':
@@ -173,12 +213,10 @@ class Tool {
             }
             return result;
         }
-        if (zodType instanceof zod_1.z.ZodNumber) {
+        if (zodType instanceof zod_1.z.ZodNumber || typeName === 'ZodNumber') {
             const result = { type: 'number' };
-            if (zodType._def.description) {
-                result.description = zodType._def.description;
-            }
-            const checks = zodType._def.checks || [];
+            this.applyDescription(result, zodType);
+            const checks = this.getZodDef(zodType)['checks'] || [];
             for (const check of checks) {
                 switch (check.kind) {
                     case 'min':
@@ -194,22 +232,18 @@ class Tool {
             }
             return result;
         }
-        if (zodType instanceof zod_1.z.ZodBoolean) {
+        if (zodType instanceof zod_1.z.ZodBoolean || typeName === 'ZodBoolean') {
             const result = { type: 'boolean' };
-            if (zodType._def.description) {
-                result.description = zodType._def.description;
-            }
+            this.applyDescription(result, zodType);
             return result;
         }
-        if (zodType instanceof zod_1.z.ZodArray) {
+        if (zodType instanceof zod_1.z.ZodArray || typeName === 'ZodArray') {
             const result = {
                 type: 'array',
-                items: this.zodTypeToJsonSchema(zodType._def.type)
+                items: this.zodTypeToJsonSchema(this.getZodDef(zodType)['type'])
             };
-            if (zodType._def.description) {
-                result.description = zodType._def.description;
-            }
-            const checks = zodType._def.checks || [];
+            this.applyDescription(result, zodType);
+            const checks = this.getZodDef(zodType)['checks'] || [];
             for (const check of checks) {
                 switch (check.kind) {
                     case 'min':
@@ -222,48 +256,45 @@ class Tool {
             }
             return result;
         }
-        if (zodType instanceof zod_1.z.ZodEnum) {
+        if (zodType instanceof zod_1.z.ZodEnum || typeName === 'ZodEnum') {
             const result = {
                 type: 'string',
-                enum: zodType._def.values
+                enum: this.getZodDef(zodType)['values']
             };
-            if (zodType._def.description) {
-                result.description = zodType._def.description;
-            }
+            this.applyDescription(result, zodType);
             return result;
         }
-        if (zodType instanceof zod_1.z.ZodLiteral) {
+        if (zodType instanceof zod_1.z.ZodLiteral || typeName === 'ZodLiteral') {
+            const value = this.getZodDef(zodType)['value'];
             const result = {
-                type: typeof zodType._def.value,
-                enum: [zodType._def.value]
+                type: typeof value,
+                enum: [value]
             };
-            if (zodType._def.description) {
-                result.description = zodType._def.description;
-            }
+            this.applyDescription(result, zodType);
             return result;
         }
-        if (zodType instanceof zod_1.z.ZodUnion) {
-            const options = zodType._def.options;
+        if (zodType instanceof zod_1.z.ZodUnion || typeName === 'ZodUnion') {
+            const options = this.getZodDef(zodType)['options'] || [];
             const anyOf = options.map((option) => this.zodTypeToJsonSchema(option));
             const result = { anyOf };
-            if (zodType._def.description) {
-                result.description = zodType._def.description;
-            }
+            this.applyDescription(result, zodType);
             return result;
         }
-        if (zodType instanceof zod_1.z.ZodOptional) {
-            return this.zodTypeToJsonSchema(zodType._def.innerType);
+        if (zodType instanceof zod_1.z.ZodOptional || typeName === 'ZodOptional') {
+            return this.withDescriptionFrom(this.zodTypeToJsonSchema(this.getZodDef(zodType)['innerType']), zodType);
         }
-        if (zodType instanceof zod_1.z.ZodNullable) {
-            const innerSchema = this.zodTypeToJsonSchema(zodType._def.innerType);
-            return {
+        if (zodType instanceof zod_1.z.ZodNullable || typeName === 'ZodNullable') {
+            const innerSchema = this.zodTypeToJsonSchema(this.getZodDef(zodType)['innerType']);
+            const result = {
                 anyOf: [
                     innerSchema,
                     { type: 'null' }
                 ]
             };
+            this.applyDescription(result, zodType);
+            return result;
         }
-        if (zodType instanceof zod_1.z.ZodObject) {
+        if (zodType instanceof zod_1.z.ZodObject || typeName === 'ZodObject') {
             return this.zodSchemaToJsonSchema(zodType);
         }
         // Fallback for unknown types

package/dist/unified/base/agentStep.d.ts

@@ -17,6 +17,7 @@ export declare class AgentStep implements AgentStepInterface {
      */
     executeStep(originalRequest: FlatUserMessage, createdMessage: ProcessedMessage): Promise<AgentStepOutput>;
     private generateResponse;
+    private extractCompletion;
     /**
      * Update LLM configuration
      */

package/dist/unified/base/agentStep.js

@@ -36,11 +36,11 @@ class AgentStep {
                 message: (0, promptContext_1.buildInferenceParams)(preparedMessage),
             };
             const rawLLMResponse = await this.generateResponse(actualMessageSentToLLM.message);
-            const assistantMessages = ((_a = rawLLMResponse.choices) !== null && _a !== void 0 ? _a : []).map((contentBlock) => ({
-                ...contentBlock.message,
-                role: contentBlock.message.role
-            }));
-            let modifiedMessage = (0, promptContext_1.appendTranscriptMessages)(preparedMessage, assistantMessages);
+            const assistantResponseItems = ((_a = rawLLMResponse.items) !== null && _a !== void 0 ? _a : [])
+                .filter((item) => (((item === null || item === void 0 ? void 0 : item.type) === 'message' && item.role === 'assistant') ||
+                (item === null || item === void 0 ? void 0 : item.type) === 'function_call' ||
+                (item === null || item === void 0 ? void 0 : item.type) === 'tool_search_call'));
+            let modifiedMessage = (0, promptContext_1.appendTranscriptMessages)(preparedMessage, assistantResponseItems);
             for (const postInferenceProcessor of this.postInferenceProcessors) {
                 try {
                     modifiedMessage = await postInferenceProcessor.modify(actualMessageSentToLLM, rawLLMResponse, modifiedMessage);
@@ -63,9 +63,14 @@ class AgentStep {
         }
     }
     async generateResponse(messageForLLM) {
-        var _a, _b, _c, _d;
+        var _a, _b, _c, _d, _e;
         const response = await codeboltjs_1.default.llm.inference(messageForLLM);
-        const completion = response.completion;
+        const completion = this.extractCompletion(response);
+        if (!completion) {
+            const responseType = (response === null || response === void 0 ? void 0 : response.type) || 'unknown';
+            const responseMessage = (response === null || response === void 0 ? void 0 : response.message) || ((_a = response === null || response === void 0 ? void 0 : response.error) === null || _a === void 0 ? void 0 : _a.message) || 'No completion returned from LLM service';
+            throw new Error(`LLM response did not include completion data (${responseType}): ${responseMessage}`);
+        }
         // Add tokenLimit and maxOutputTokens to completion object if available in response
         if (completion) {
             // Check if tokenLimit exists at response level or in completion
@@ -82,21 +87,44 @@ class AgentStep {
                 completion.compactionRequired = response.compactionRequired;
             }
             // Also check inside completion object itself (from LLM provider response)
-            if (((_a = completion.completion) === null || _a === void 0 ? void 0 : _a.tokenLimit) !== undefined) {
+            if (((_b = completion.completion) === null || _b === void 0 ? void 0 : _b.tokenLimit) !== undefined) {
                 completion.tokenLimit = completion.completion.tokenLimit;
             }
-            if (((_b = completion.completion) === null || _b === void 0 ? void 0 : _b.maxOutputTokens) !== undefined) {
+            if (((_c = completion.completion) === null || _c === void 0 ? void 0 : _c.maxOutputTokens) !== undefined) {
                 completion.maxOutputTokens = completion.completion.maxOutputTokens;
             }
-            if (((_c = completion.completion) === null || _c === void 0 ? void 0 : _c.contextCompaction) !== undefined) {
+            if (((_d = completion.completion) === null || _d === void 0 ? void 0 : _d.contextCompaction) !== undefined) {
                 completion.contextCompaction = completion.completion.contextCompaction;
             }
-            if (((_d = completion.completion) === null || _d === void 0 ? void 0 : _d.compactionRequired) !== undefined) {
+            if (((_e = completion.completion) === null || _e === void 0 ? void 0 : _e.compactionRequired) !== undefined) {
                 completion.compactionRequired = completion.completion.compactionRequired;
             }
         }
         return completion;
     }
+    extractCompletion(response) {
+        if (!response || typeof response !== 'object') {
+            return undefined;
+        }
+        if (response.completion && typeof response.completion === 'object') {
+            return response.completion;
+        }
+        if (Array.isArray(response.items) || typeof response.output_text === 'string') {
+            return {
+                ...response,
+                items: Array.isArray(response.items) ? response.items : [],
+                output_text: response.output_text || response.message || response.content || '',
+            };
+        }
+        if (typeof response.message === 'string' || typeof response.content === 'string') {
+            return {
+                ...response,
+                items: [],
+                output_text: response.message || response.content || '',
+            };
+        }
+        return undefined;
+    }
     /**
      * Update LLM configuration
      */

package/dist/unified/base/initialPromptGenerator.d.ts

@@ -8,9 +8,11 @@ export declare class InitialPromptGenerator implements InitialPromptGeneratorInt
     private metaData;
     private enableLogging;
     private baseSystemPrompt?;
+    private initialPrompt?;
     constructor(options?: {
         processors?: MessageModifier[];
         baseSystemPrompt?: string;
+        initialPrompt?: ProcessedMessage;
         metaData?: Record<string, unknown>;
         enableLogging?: boolean;
         templating?: boolean;

package/dist/unified/base/initialPromptGenerator.js

@@ -18,17 +18,80 @@ const mergeFlagLists = (existing, mentioned) => {
 };
 const formatFlagContext = (flags, mentionedFlags) => {
     const normalizedMentionedFlags = normalizeFlagList(mentionedFlags);
-    if (!flags && normalizedMentionedFlags.length === 0)
+    const userFlags = (flags === null || flags === void 0 ? void 0 : flags.user) || [];
+    const projectFlags = (flags === null || flags === void 0 ? void 0 : flags.project) || [];
+    const threadFlags = mergeFlagLists(flags === null || flags === void 0 ? void 0 : flags.thread, normalizedMentionedFlags);
+    const effectiveFlags = mergeFlagLists(flags === null || flags === void 0 ? void 0 : flags.effective, normalizedMentionedFlags);
+    if (userFlags.length === 0 &&
+        projectFlags.length === 0 &&
+        threadFlags.length === 0 &&
+        effectiveFlags.length === 0) {
         return null;
+    }
     return [
         '<flags>',
-        `user: ${formatFlagList(flags === null || flags === void 0 ? void 0 : flags.user)}`,
-        `project: ${formatFlagList(flags === null || flags === void 0 ? void 0 : flags.project)}`,
-        `thread: ${formatFlagList(mergeFlagLists(flags === null || flags === void 0 ? void 0 : flags.thread, normalizedMentionedFlags))}`,
-        `effective: ${formatFlagList(mergeFlagLists(flags === null || flags === void 0 ? void 0 : flags.effective, normalizedMentionedFlags))}`,
+        `user: ${formatFlagList(userFlags)}`,
+        `project: ${formatFlagList(projectFlags)}`,
+        `thread: ${formatFlagList(threadFlags)}`,
+        `effective: ${formatFlagList(effectiveFlags)}`,
         '</flags>',
     ].join('\n');
 };
+const createImageUrlBlock = (mediaType, base64Data) => ({
+    type: 'image_url',
+    image_url: {
+        url: `data:${mediaType};base64,${base64Data}`,
+    },
+});
+const normalizeImageAttachment = (image) => {
+    var _a, _b;
+    if (!image)
+        return null;
+    if (typeof image === 'string') {
+        const dataUrlMatch = image.match(/^data:([^;,]+);base64,(.+)$/);
+        if (!dataUrlMatch)
+            return null;
+        const mediaType = dataUrlMatch[1];
+        const base64Data = dataUrlMatch[2];
+        if (!mediaType || !base64Data)
+            return null;
+        return createImageUrlBlock(mediaType, base64Data);
+    }
+    if (typeof image === 'object') {
+        const imageBlock = image;
+        if (imageBlock.type === 'image_url' &&
+            typeof ((_a = imageBlock.image_url) === null || _a === void 0 ? void 0 : _a.url) === 'string') {
+            return {
+                type: 'image_url',
+                image_url: {
+                    url: imageBlock.image_url.url,
+                },
+            };
+        }
+        if (imageBlock.type === 'image' &&
+            ((_b = imageBlock.source) === null || _b === void 0 ? void 0 : _b.type) === 'base64' &&
+            typeof imageBlock.source.media_type === 'string' &&
+            typeof imageBlock.source.data === 'string') {
+            return createImageUrlBlock(imageBlock.source.media_type, imageBlock.source.data);
+        }
+    }
+    return null;
+};
+const buildUserMessageContent = (text, uploadedImages) => {
+    const imageBlocks = (uploadedImages || [])
+        .map(normalizeImageAttachment)
+        .filter((image) => image !== null);
+    if (imageBlocks.length === 0) {
+        return text.trim();
+    }
+    return [
+        {
+            type: 'text',
+            text: text.trim() || 'Please use the attached image.',
+        },
+        ...imageBlocks,
+    ];
+};
 /**
  * Initial prompt generator that combines message modifiers with unified processing
  */
@@ -42,6 +105,9 @@ class InitialPromptGenerator {
         if (options.baseSystemPrompt !== undefined) {
             this.baseSystemPrompt = options.baseSystemPrompt;
         }
+        if (options.initialPrompt !== undefined) {
+            this.initialPrompt = options.initialPrompt;
+        }
     }
     /**
      * Process and modify input messages using the message modifier pattern
@@ -51,24 +117,37 @@ class InitialPromptGenerator {
             if (this.enableLogging) {
                 // console.log('[InitialPromptGenerator] Processing message:', input);
             }
-            let createdMessage = {
-                message: {
-                    messages: [],
-                    tools: []
-                },
-                metadata: {
-                    timestamp: new Date().toISOString(),
-                    messageId: input.messageId,
-                    threadId: input.threadId
+            const isResumedPrompt = this.initialPrompt !== undefined;
+            let createdMessage = isResumedPrompt
+                ? {
+                    ...this.initialPrompt,
+                    metadata: {
+                        ...this.initialPrompt.metadata,
+                        timestamp: new Date().toISOString(),
+                        messageId: input.messageId,
+                        threadId: input.threadId,
+                        resumedPrompt: true,
+                    },
                 }
-            };
+                : {
+                    message: {
+                        formatVersion: 'codebolt.llm.v2',
+                        input: [],
+                        tools: []
+                    },
+                    metadata: {
+                        timestamp: new Date().toISOString(),
+                        messageId: input.messageId,
+                        threadId: input.threadId
+                    }
+                };
             createdMessage = (0, promptContext_1.syncProcessedMessageWithRuntimeContext)(createdMessage);
-            if (this.baseSystemPrompt !== undefined) {
+            if (!isResumedPrompt && this.baseSystemPrompt !== undefined) {
                 createdMessage = (0, promptContext_1.setSystemPrompt)(createdMessage, this.baseSystemPrompt);
             }
             createdMessage = (0, promptContext_1.appendTranscriptMessage)(createdMessage, {
                 role: 'user',
-                content: input.userMessage.trim(),
+                content: buildUserMessageContent(input.userMessage || '', input.uploadedImages),
             });
             const flagContext = formatFlagContext(input.flags, input.mentionedFlags);
             if (flagContext) {
@@ -86,7 +165,7 @@ class InitialPromptGenerator {
                     console.error(`[InitialPromptGenerator] Error in message modifier:`, error);
                 }
             }
-            let { todos } = await codeboltjs_1.default.todo.getAllIncompleteTodos();
+            const { todos } = await codeboltjs_1.default.todo.getAllIncompleteTodos();
             if (todos && todos.length == 0) {
                 createdMessage = (0, promptContext_1.appendUserContextMessage)(createdMessage, {
                     role: 'user',
@@ -95,7 +174,7 @@ class InitialPromptGenerator {
             }
             if (this.enableLogging) {
                 // console.log('[InitialPromptGenerator] Processing completed:', {
-                //     messageCount: createdMessage.message.messages.length,
+                //     messageCount: createdMessage.message.input.length,
                 //     metadata: createdMessage.metadata
                 // });
             }
@@ -130,7 +209,6 @@ class InitialPromptGenerator {
     updateProcessors(processors) {
         this.processors = processors;
     }
-    ;
     getProcessors() {
         return this.processors;
     }

package/dist/unified/base/promptContext.d.ts

@@ -1,5 +1,6 @@
 import type { ProcessedMessage } from '@codebolt/types/agent';
 import type { LLMInferenceParams, MessageObject } from '@codebolt/types/sdk';
+export declare function isGeneratedUserContextMessage(message: MessageObject): boolean;
 export declare function syncProcessedMessageWithRuntimeContext(prompt: ProcessedMessage): ProcessedMessage;
 export declare function reconcileRuntimePromptContext(prompt: ProcessedMessage): ProcessedMessage;
 export declare function setSystemPrompt(prompt: ProcessedMessage, systemPrompt: string): ProcessedMessage;
@@ -10,4 +11,6 @@ export declare function appendTranscriptMessages(prompt: ProcessedMessage, messa
 export declare function prependTranscriptMessages(prompt: ProcessedMessage, messages: MessageObject[]): ProcessedMessage;
 export declare function replaceTranscriptMessages(prompt: ProcessedMessage, messages: MessageObject[]): ProcessedMessage;
 export declare function getTranscriptMessages(prompt: ProcessedMessage): MessageObject[];
+export declare function getCurrentUserMessage(prompt: ProcessedMessage): MessageObject | undefined;
+export declare function updateCurrentUserMessage(prompt: ProcessedMessage, update: (message: MessageObject) => MessageObject): ProcessedMessage;
 export declare function buildInferenceParams(prompt: ProcessedMessage): LLMInferenceParams;