@codebolt/codeboltjs 5.0.1 → 5.0.2

package/dist/core/Codebolt.d.ts

@@ -13,6 +13,7 @@ declare class Codebolt {
     private readyHandlers;
     private messageQueue;
     private messageResolvers;
+    private lastUserMessage;
     /**
      * @constructor
      * @description Initializes the websocket connection.
@@ -380,10 +381,16 @@ declare class Codebolt {
      */
     onReady(handler: () => void | Promise<void>): void;
     /**
-     * Waits for and returns the next incoming message.
-     * If a message is already in the queue, returns it immediately.
-     * Otherwise, waits for the next message to arrive.
-     * @returns {Promise<FlatUserMessage>} A promise that resolves with the next message
+     * Gets the current or next incoming message.
+     * Priority order:
+     * 1. Returns the current message being processed (if called during message handling)
+     * 2. Returns a queued message (if any are waiting)
+     * 3. Waits for the next message to arrive
+     *
+     * This allows getMessage() to work both during active message processing
+     * and when waiting for new messages in a loop.
+     *
+     * @returns {Promise<FlatUserMessage>} A promise that resolves with the message
      */
     getMessage(): Promise<FlatUserMessage>;
     /**

package/dist/core/Codebolt.js

@@ -80,6 +80,7 @@ class Codebolt {
         console.log("Codebolt Agent initialized");
         this.readyPromise = this.initializeConnection();
         this.setupMessageListener();
+        this.lastUserMessage = undefined;
     }
     /**
      * @method initializeConnection
@@ -150,22 +151,36 @@ class Codebolt {
         }
     }
     /**
-     * Waits for and returns the next incoming message.
-     * If a message is already in the queue, returns it immediately.
-     * Otherwise, waits for the next message to arrive.
-     * @returns {Promise<FlatUserMessage>} A promise that resolves with the next message
+     * Gets the current or next incoming message.
+     * Priority order:
+     * 1. Returns the current message being processed (if called during message handling)
+     * 2. Returns a queued message (if any are waiting)
+     * 3. Waits for the next message to arrive
+     *
+     * This allows getMessage() to work both during active message processing
+     * and when waiting for new messages in a loop.
+     *
+     * @returns {Promise<FlatUserMessage>} A promise that resolves with the message
      */
     async getMessage() {
         // Wait for WebSocket to be ready first
-        console.log('[Codebolt] getMessage ');
-        await this.waitForReady();
-        console.log('[Codebolt] getMessage ');
+        console.log('[Codebolt] getMessage called');
+        // await this.waitForReady();
+        // First, check if there's a current message being processed
+        const currentMessage = user_message_manager_1.userMessageManager.getMessage();
+        if (currentMessage) {
+            console.log('[Codebolt] Returning current message');
+            return Promise.resolve(currentMessage);
+        }
         // If there are queued messages, return the first one
-        if (this.messageQueue.length > 0) {
-            const message = this.messageQueue.shift();
-            return Promise.resolve(message);
+        if (this.messageQueue.length > 0 || this.lastUserMessage) {
+            console.log('[Codebolt] Returning queued message');
+            const message = this.messageQueue.shift() || this.lastUserMessage;
+            if (message)
+                return Promise.resolve(message);
         }
         // Otherwise, create a new promise that will be resolved when a message arrives
+        console.log('[Codebolt] Waiting for next message');
         return new Promise((resolve) => {
             this.messageResolvers.push(resolve);
         });
@@ -192,9 +207,11 @@ class Codebolt {
      * @private
      */
     setupMessageListener() {
+        console.log("listener setup");
         this.waitForReady().then(() => {
             const handleSocketMessage = async (response) => {
                 var _a, _b;
+                console.log(response);
                 if (response.type === "messageResponse") {
                     // Extract user-facing message from internal socket message
                     const userMessage = {
@@ -219,6 +236,7 @@ class Codebolt {
                     };
                     // Automatically save the user message globally
                     user_message_manager_1.userMessageManager.saveMessage(userMessage);
+                    this.lastUserMessage = userMessage;
                     // Handle the message in the queue system for getMessage() resolvers
                     this.handleIncomingMessage(userMessage);
                 }

package/dist/core/websocket.js

@@ -65,21 +65,21 @@ class cbws {
         const socketPort = process.env.SOCKET_PORT || '12345';
         const serverUrl = process.env.CODEBOLT_SERVER_URL || 'localhost';
         const threadToken = process.env.threadToken || null;
-        console.log('[WebSocket] Logging all relevant variables:');
-        console.log('uniqueConnectionId:', uniqueConnectionId);
+        // console.log('[WebSocket] Logging all relevant variables:');
+        // console.log('uniqueConnectionId:', uniqueConnectionId);
         // console.log('initialMessage:', initialMessage);
-        console.log('agentIdParam:', agentIdParam);
-        console.log('parentIdParam:', parentIdParam);
-        console.log('parentAgentInstanceIdParam:', parentAgentInstanceIdParam);
-        console.log('agentTask:', agentTask);
-        console.log('socketPort:', socketPort);
-        console.log('serverUrl:', serverUrl);
-        console.log('threadToken:', threadToken);
-        console.log('[WebSocket] Environment variables check:');
-        console.log('process.env.agentId:', process.env.agentId);
-        console.log('process.env.threadToken:', process.env.threadToken);
-        console.log('process.env.parentId:', process.env.parentId);
-        console.log('process.env.agentTask:', process.env.agentTask);
+        // console.log('agentIdParam:', agentIdParam);
+        // console.log('parentIdParam:', parentIdParam);
+        // console.log('parentAgentInstanceIdParam:', parentAgentInstanceIdParam);
+        // console.log('agentTask:', agentTask);
+        // console.log('socketPort:', socketPort);
+        // console.log('serverUrl:', serverUrl);
+        // console.log('threadToken:', threadToken);
+        // console.log('[WebSocket] Environment variables check:');
+        // console.log('process.env.agentId:', process.env.agentId);
+        // console.log('process.env.threadToken:', process.env.threadToken);
+        // console.log('process.env.parentId:', process.env.parentId);
+        // console.log('process.env.agentTask:', process.env.agentTask);
         const threadTokenParam = threadToken ? `&threadToken=${encodeURIComponent(threadToken)}` : '';
         // Add all custom environment variables as URL parameters
         const knownEnvVars = ['SOCKET_PORT', 'CODEBOLT_SERVER_URL', 'agentId', 'parentId', 'parentAgentInstanceId', 'agentTask', 'threadToken', 'Is_Dev', 'PATH', 'NODE_ENV', 'HOME', 'USER', 'SHELL'];
@@ -90,7 +90,7 @@ class cbws {
             }
         }
         const wsUrl = `ws://${serverUrl}:${socketPort}/codebolt?id=${uniqueConnectionId}${agentIdParam}${parentIdParam}${parentAgentInstanceIdParam}${agentTask}${threadTokenParam}${customParams}${process.env.Is_Dev ? '&dev=true' : ''}`;
-        console.log('[WebSocket] Connecting to:', wsUrl);
+        console.log('[WebSocket] Connecting to:', serverUrl);
         this.websocket = new ws_1.default(wsUrl);
         return new Promise((resolve, reject) => {
             // Set a timeout for the connection

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@codebolt/codeboltjs",
-  "version": "5.0.1",
+  "version": "5.0.2",
   "description": "",
   "keywords": [],
   "author": "",