@oussema_mili/test-pkg-123 1.1.46 → 1.1.47

package/containerManager.js

@@ -173,27 +173,6 @@ class ContainerManager {
       const WS_PORT = options.wsPort || getCurrentWsPort();
       let APP_PORT = options.containerPort || getCurrentContainerPort();
 
-      // If containerPort is 0, find an available port
-      if (APP_PORT === 0) {
-        try {
-          APP_PORT = await findAvailableContainerPort(DEFAULT_CONTAINER_PORT, 100, [WS_PORT]);
-          console.log(chalk.blue(`📍 Auto-assigned container port: ${APP_PORT}`));
-        } catch (error) {
-          throw new Error(`Failed to find available container port: ${error.message}`);
-        }
-      }
-
-      // If the desired container port conflicts with the WebSocket port or is unavailable, pick another port
-      if (APP_PORT === WS_PORT || !(await isPortAvailable(APP_PORT))) {
-        try {
-          const newPort = await findAvailableContainerPort(DEFAULT_CONTAINER_PORT, 100, [WS_PORT]);
-          console.log(chalk.yellow(`⚠️  Port ${APP_PORT} is unavailable. Using ${newPort} instead.`));
-          APP_PORT = newPort;
-        } catch (err) {
-          throw new Error(`Failed to resolve container port conflict: ${err.message}`);
-        }
-      }
-
       // Check Docker availability
       const dockerAvailable = await this.checkDockerAvailable();
       if (!dockerAvailable) {
@@ -217,6 +196,28 @@ class ContainerManager {
         console.log(chalk.green('✅ Using cached local image'));
       }
 
+      // Now resolve container port (after image is ready)
+      // If containerPort is 0, find an available port
+      if (APP_PORT === 0) {
+        try {
+          APP_PORT = await findAvailableContainerPort(DEFAULT_CONTAINER_PORT, 100, [WS_PORT]);
+          console.log(chalk.blue(`📍 Auto-assigned DevApp port: ${APP_PORT}`));
+        } catch (error) {
+          throw new Error(`Failed to find available DevApp port: ${error.message}`);
+        }
+      }
+
+      // If the desired container port conflicts with the WebSocket port or is unavailable, pick another port
+      if (APP_PORT === WS_PORT || !(await isPortAvailable(APP_PORT))) {
+        try {
+          const newPort = await findAvailableContainerPort(DEFAULT_CONTAINER_PORT, 100, [WS_PORT]);
+          console.log(chalk.blue(`Port ${APP_PORT} is in use, using port ${newPort} for DevApp`));
+          APP_PORT = newPort;
+        } catch (err) {
+          throw new Error(`Failed to resolve DevApp port conflict: ${err.message}`);
+        }
+      }
+
       // Determine WebSocket URL based on platform
       let wsUrl = `ws://host.docker.internal:${WS_PORT}`;
       if (os.platform() === 'linux') {

package/daemon/agentRunner.js

@@ -301,9 +301,9 @@ export async function runAgent(options = {}) {
     const startPort = preferredPort === 0 ? DEFAULT_WS_PORT : preferredPort;
     actualPort = await findAvailablePort(startPort);
     if (actualPort !== preferredPort && preferredPort !== 0) {
-      log(`Port ${preferredPort} is in use, using port ${actualPort}`, 'warn');
+      log(`Port ${preferredPort} is in use, using port ${actualPort} for agent WebSocket`, 'warn');
     } else if (preferredPort === 0) {
-      log(`Auto-assigned WebSocket port: ${actualPort}`);
+      log(`Auto-assigned agent WebSocket port: ${actualPort}`);
     }
   } catch (error) {
     releaseLock();
@@ -428,12 +428,14 @@ export async function runAgent(options = {}) {
         };
 
         // Now that WebSocket is bound, start container (so it cannot take the WS port)
+        log('Starting container (after WebSocket bind)...');
         let actualContainerPort = preferredContainerPort;
         try {
           actualContainerPort = await containerManager.startContainer({
             wsPort: actualPort,
             containerPort: preferredContainerPort,
           });
+          log(`Container started successfully on port ${actualContainerPort}`);
         } catch (containerError) {
           log(`Failed to start container: ${containerError.message}`, 'warn');
           log('Continuing without container...');

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@oussema_mili/test-pkg-123",
-  "version": "1.1.46",
+  "version": "1.1.47",
   "description": "Fenwave Docker Agent and CLI",
   "keywords": [
     "fenwave",