fleetbo-cockpit-cli 1.0.215 → 1.0.217

package/cli.js

@@ -390,7 +390,6 @@ if (command === 'alex') {
                 }
                 
                 if (actualMetalCode) {
-                    //const sourceText = fs.existsSync(localKtPath) ? "LOCAL" : "CACHE";
                     process.stdout.write(` \x1b[32mFOUND METAL\x1b[0m\n`);
                     
                     // Extraction des schémas mémoires (uniquement dispo dans le cache cloud)
@@ -436,32 +435,24 @@ if (command === 'alex') {
             
             const promptWithTime = prompt + `\n\n[SYSTEM INFO: The exact current timestamp is ${exactTime}. Use it STRICTLY for your signature '// ⚡ Forged by Alex on...' at the bottom of your files.]`;
 
-            const result = await axios.post(ALEX_ENGINE_URL, { prompt: promptWithTime, projectType: 'android', jsFramework: JS_FRAMEWORK }, {
-                headers: { 'x-project-id': projectId }
-            });
-
-            let aiData = result.data;
-
-            // 🛡️ ROBUST PARSER: Unwrap all nesting levels until we find a valid aiData object
+            // =================================================================
+            // 🚀 THE AUTOMATED 3-STEP WORKFLOW (Cross-Platform)
+            // =================================================================
+            
             const deepUnwrap = (raw, depth = 0) => {
-                if (depth > 5) return raw; // Safety: max 5 nesting levels
+                if (depth > 5) return raw;
                 if (typeof raw === 'string') {
-                    // Try to extract a JSON object even if there's trailing garbage (truncation)
                     const jsonMatch = raw.match(/\{[\s\S]*\}/);
                     if (jsonMatch) {
-                        try {
-                            return deepUnwrap(JSON.parse(jsonMatch[0]), depth + 1);
-                        } catch (_) {}
+                        try { return deepUnwrap(JSON.parse(jsonMatch[0]), depth + 1); } catch (_) {}
                     }
                     return raw;
                 }
                 if (typeof raw === 'object' && raw !== null) {
-                    // If the message field itself is a JSON string, unwrap it and merge moduleData
                     if (typeof raw.message === 'string' && raw.message.trimStart().startsWith('{')) {
                         try {
                             const nested = JSON.parse(raw.message);
                             if (nested && typeof nested === 'object' && nested.status) {
-                                // Merge: keep top-level moduleData if present, else take nested one
                                 if (!raw.moduleData && nested.moduleData) raw.moduleData = nested.moduleData;
                                 raw.message = nested.message || raw.message;
                                 if (!raw.status && nested.status) raw.status = nested.status;
@@ -473,90 +464,98 @@ if (command === 'alex') {
                 return raw;
             };
 
-            aiData = deepUnwrap(aiData);
+            const fetchStep = async (stepName, memory = {}) => {
+                const res = await axios.post(ALEX_ENGINE_URL, { 
+                    prompt: promptWithTime, 
+                    projectType: 'android', 
+                    jsFramework: JS_FRAMEWORK,
+                    step: stepName, 
+                    memory: memory 
+                }, { headers: { 'x-project-id': projectId } });
 
-            // DISPLAY REASONING IN TERMINAL
-            if (aiData.thinking_process) {
-                // Show start of reasoning in gray for info
-                console.log(`   \x1b[90m🧠 Alex Analysis: ${aiData.thinking_process.substring(0, 150)}...\x1b[0m`);
-            }
+                return deepUnwrap(res.data);
+            };
+
+            // Fonction pour animer les étapes silencieusement
+            const logStep = (icon, text) => {
+                // \x1b[2K efface la ligne courante, \r ramène au début
+                process.stdout.write(`\x1b[2K\r   ${icon} ${text}`);
+            };
 
             process.stdout.write('\x1b[A\r' + ' '.repeat(50) + '\r');
             
+            // --- ÉTAPE 1 : NATIF ---
+            logStep('🧠', '\x1b[33m1/3 - Alex forge les fondations natives...\x1b[0m');
+            let aiData = await fetchStep('native_only');
+            
             if (aiData.status === 'quota_exceeded') {
                 console.log(`\n\x1b[31m⛔ ARCHITECT QUOTA REACHED:\x1b[0m ${aiData.message}`);
                 return;
             }
-            
-            if (aiData.status === 'success' || aiData.status === 'message' || aiData.status === 'complex_refusal') {
-                console.log(''); 
-                let rawMsg = aiData.message || "I'm ready.";
 
-                if (typeof rawMsg === 'object') {
-                    rawMsg = rawMsg.message || rawMsg.text || "Module generated.";
-                }
+            let mergedModuleData = aiData.moduleData || {};
+            let aiDataMessage = aiData.message;
+
+            // 🛡️ RÉCTROCOMPATIBILITÉ BACKEND : 
+            // Si le cloud renvoie déjà le Mock, c'est que ton index.js n'est pas encore mis à jour.
+            // On bypass la suite pour ne pas générer de doublons et consommer du token pour rien.
+            const isCloudUpdated = !mergedModuleData.mockCode;
+
+            if (isCloudUpdated && mergedModuleData.code) {
+                logStep('✅', '\x1b[32m1/3 - Code Natif généré.\x1b[0m\n');
                 
-                // 🟢 LE SYSTÈME DE WRAP ANTI-COUPURE (Ultra Robuste)
-                // 1. On récupère la vraie largeur, ou 80 par défaut (standard des terminaux)
-                const termWidth = process.stdout.columns || 80; 
-                // 2. On prend 85% de l'espace pour un confort de lecture optimal
-                const maxWidth = Math.max(40, Math.floor(termWidth * 0.85)); 
+                // --- ÉTAPE 2 : MOCK ---
+                logStep('🎨', '\x1b[33m2/3 - Analyse du Natif et génération de l\'Interface (Mock)...\x1b[0m');
+                const aiData2 = await fetchStep('mock_only', { nativeCode: mergedModuleData.code });
                 
-                const wrapDynamic = (text, max) => {
-                    return text.split('\n').map(line => {
-                        // On ignore les lignes de code, les listes, ou les lignes déjà courtes
-                        if (/^[\s]*[-*•\d]/.test(line) || line.startsWith("    ") || line.length <= max) {
-                            return line;
-                        }
-                        
-                        const words = line.split(' ');
-                        let wrapped = [];
-                        let currentLine = '';
-
-                        for (let i = 0; i < words.length; i++) {
-                            const word = words[i];
-                            
-                            // Sécurité : Si un mot est IMMENSE (ex: un long lien HTTP), on le force sur sa propre ligne
-                            if (word.length > max) {
-                                if (currentLine) wrapped.push(currentLine);
-                                wrapped.push(word);
-                                currentLine = '';
-                                continue;
-                            }
-
-                            const spaceNeeded = currentLine.length > 0 ? 1 : 0;
-                            
-                            // Est-ce que le mot rentre sur la ligne courante ?
-                            if (currentLine.length + word.length + spaceNeeded > max) {
-                                wrapped.push(currentLine); // Non -> on sauvegarde la ligne
-                                currentLine = word;        // On commence une nouvelle ligne avec ce mot
-                            } else {
-                                currentLine += (spaceNeeded ? ' ' : '') + word; // Oui -> on l'ajoute
-                            }
-                        }
-                        
-                        if (currentLine) wrapped.push(currentLine);
-                        return wrapped.join('\n');
-                    }).join('\n');
-                };
+                if (aiData2.moduleData) {
+                    mergedModuleData.mockCode = aiData2.moduleData.mockCode;
+                    mergedModuleData.mockFileName = aiData2.moduleData.mockFileName;
+                }
+                logStep('✅', '\x1b[32m2/3 - Interface Mock générée.\x1b[0m\n');
 
-                const formattedMsg = wrapDynamic(rawMsg, maxWidth);
+                // --- ÉTAPE 3 : JSON CONFIG ---
+                logStep('⚙️', '\x1b[33m3/3 - Finalisation de la plomberie JSON...\x1b[0m');
+                const aiData3 = await fetchStep('json_only', { 
+                    nativeCode: mergedModuleData.code,
+                    mockCode: mergedModuleData.mockCode
+                });
                 
-                console.log('\x1b[32mAlex ❯\x1b[0m ' + formattedMsg);
+                if (aiData3.moduleData) {
+                    mergedModuleData.config_offload = aiData3.moduleData.config_offload;
+                    mergedModuleData.dataSchema = aiData3.moduleData.dataSchema;
+                    mergedModuleData.uiSchema = aiData3.moduleData.uiSchema;
+                }
+                logStep('✅', '\x1b[32m3/3 - Configuration terminée.\x1b[0m\n');
+            } else {
+                // Le cloud n'est pas à jour, on efface le loader de l'étape 1 en silence
+                process.stdout.write(`\x1b[2K\r`);
+            }
+
+            // DISPLAY REASONING IN TERMINAL
+            if (aiData.thinking_process) {
+                console.log(`   \x1b[90m🧠 Alex Analysis: ${aiData.thinking_process.substring(0, 150)}...\x1b[0m`);
+            }
+
+            // --- OUTPUT VERS XTERM ---
+            if (aiData.status === 'success' || aiData.status === 'message' || aiData.status === 'complex_refusal') {
+                let rawMsg = aiDataMessage || "I'm ready.";
+                if (typeof rawMsg === 'object') {
+                    rawMsg = rawMsg.message || rawMsg.text || "Module generated.";
+                }
+                console.log(`[ALEX_START]${rawMsg}[ALEX_END]`);
             }
             
             // --- FILE CREATION LOGIC ---
-            if (aiData.status === 'success' && aiData.moduleData) {
-                let { fileName, code, mockFileName, mockCode, moduleName, instructions, config_offload, dataSchema, uiSchema } = aiData.moduleData;
+            if (aiData.status === 'success' && mergedModuleData && Object.keys(mergedModuleData).length > 0) {
+                let { fileName, code, mockFileName, mockCode, moduleName, config_offload, dataSchema, uiSchema } = mergedModuleData;
 
-                // 🛡️ ANTI-DUMP SHIELD (Prevents terminal flooding)
                 if (moduleName) {
-                    // Cleanup module name
                     moduleName = moduleName.split('\n')[0].replace(/["'{}]/g, '').trim();
                     if (moduleName.length > 40) moduleName = moduleName.substring(0, 40) + "...";
                 }
 
-                console.log(`\n   \x1b[90mArchitecting: ${moduleName}\x1b[0m`);
+                console.log(`\n   \x1b[90mArchitecting: ${moduleName || 'Unknown Module'}\x1b[0m`);
 
                 const writeFile = (dir, name, content) => {
                     const fullPath = path.join(process.cwd(), dir);
@@ -565,19 +564,6 @@ if (command === 'alex') {
                     fs.writeFileSync(filePath, content);
                 };
                 
-                // --- SUPPRIME CE BLOC ENTIER ---
-                /*
-                if (instructions && Array.isArray(instructions) && instructions.length > 0) {
-                    console.log('\n\x1b[33m--- GUIDE (MCI) ---\x1b[0m');
-                    instructions.forEach(line => {
-                        if (typeof line === 'string') {
-                            const formattedLine = line.replace(/ACTION|CAPTURE|PERSPECTIVE/g, '\x1b[1m$&\x1b[0m');
-                            console.log(`   ${formattedLine}`);
-                        }
-                    });
-                }
-                */
-                
                 if (code && fileName) {
                     const folder = fileName.endsWith('.kt') ? 'public/native/android/' : 'src/app/';
                     writeFile(folder, fileName, code);
@@ -615,21 +601,14 @@ if (command === 'alex') {
                     console.error(`  ⚠️ OS sync failed: ${err.message}`);
                 }
 
-                // 💡 LES ASTUCES CONTEXTUELLES DYNAMIQUES
                 console.log('');
-                
-                // Astuce 1 : Le Patch manuel
                 console.log(`\x1b[90m If you manually edit the native code, sync it to the Cloud OS:\x1b[0m`);
                 console.log(`\x1b[33m patch module\x1b[0m \x1b[36m${moduleName}\x1b[0m \x1b[33mandroid\x1b[0m \x1b[90m(or ios)\x1b[0m`);
-                
-                // Astuce 2 : L'éradication
                 console.log(`\x1b[90m To eradicate this module later, open a new terminal and type:\x1b[0m`);
                 console.log(`\x1b[31m npm run fleetbo rm\x1b[0m \x1b[36m${moduleName}\x1b[0m`);
 
-
-            } else if (aiData.status === 'success' && !aiData.moduleData) {
-                // SAFETY: If formatting is broken
-                console.log(`\n\x1b[31m⚠️  Error: Alex replied, but source code could not be extracted. Try the command again.\x1b[0m\n`);
+            } else if (aiData.status === 'success' && (!mergedModuleData || Object.keys(mergedModuleData).length === 0)) {
+                console.log(`\n\x1b[31m⚠️  Error: Alex replied, but source code could not be extracted.\x1b[0m\n`);
             }
         } catch (error) { 
             process.stdout.write('\r' + ' '.repeat(50) + '\r');
@@ -638,12 +617,7 @@ if (command === 'alex') {
     };
     
     // ============================================================
-    // CLI PATCH — startAlexSession (cli.js)
-    // 
-    // Remplace le bloc ENTIER de startAlexSession, depuis :
-    //   const startAlexSession = async () => {
-    // Jusqu'à (NON INCLUS) :
-    //   const rl = readline.createInterface({
+    // DÉMARRAGE DE LA SESSION INTERACTIVE ALEX
     // ============================================================
 
     const startAlexSession = async () => {
@@ -664,8 +638,6 @@ if (command === 'alex') {
 
                 if (validation.data?.isRunning) { 
                     isReady = true; 
-                    // ASTUCE : On confirme que le moteur est allumé
-                    // process.stdout.write('[ALEX_ONLINE]\n');
                     dynamicUsername = validation.data.username || 'Pilot';
                     hasAiKey = validation.data.hasAiKey || false;
                     aiProvider = validation.data.aiProvider || null;
@@ -688,9 +660,6 @@ if (command === 'alex') {
         
         process.stdout.write(' '.repeat(60) + '\r');
 
-        // ═══════════════════════════════════════════════
-        // AI KEY CHECK — Block if no key configured
-        // ═══════════════════════════════════════════════
         if (!hasAiKey) {
             console.log('');
             console.log('\x1b[1m\x1b[33m AI Configuration Required\x1b[0m');
@@ -710,9 +679,6 @@ if (command === 'alex') {
             process.exit(0);
         }
 
-        // ═══════════════════════════════════════════════
-        // ALEX WELCOME — Key is configured, show capabilities
-        // ═══════════════════════════════════════════════
         const providerLabel = aiProvider === 'anthropic' ? 'Anthropic' : 'Google AI';
         const modelLabel = aiModel && aiModel !== 'auto' ? aiModel : 'auto';
 
@@ -726,12 +692,10 @@ if (command === 'alex') {
         console.log('\x1b[90m│                                                         │\x1b[0m');
         console.log('\x1b[90m└─────────────────────────────────────────────────────────┘\x1b[0m');
 
-        // AI ENGINE STATUS
         console.log('');
         console.log(`\x1b[32m✓\x1b[0m  ${providerLabel} \x1b[90m· ${modelLabel}\x1b[0m`);
         console.log(`\x1b[32m✓\x1b[0m  ${JS_FRAMEWORK === 'vue' ? '\x1b[32mVue.js\x1b[0m' : '\x1b[36mReact\x1b[0m'} \x1b[90m· JavaScript Framework\x1b[0m`);
 
-        // FORGE CAPABILITIES
         console.log('');
         console.log('\x1b[36mCAPABILITIES\x1b[0m');
         console.log('\x1b[90m─────────────────────────────────────────────────────\x1b[0m');
@@ -741,7 +705,6 @@ if (command === 'alex') {
         console.log('\x1b[1mFleetbo View\x1b[0m\x1b[90m    Full native tab (120 FPS)\x1b[0m');
         console.log('\x1b[90m─────────────────────────────────────────────────────\x1b[0m');
 
-       // TRIGGER SYNTAX
         console.log('');
         console.log('\x1b[36mCODE GENERATION SYNTAX\x1b[0m \x1b[90m(strict format required)\x1b[0m');
         console.log('');
@@ -749,31 +712,17 @@ if (command === 'alex') {
         console.log('\x1b[90mVerbs:   \x1b[33mforge\x1b[0m \x1b[90m·\x1b[0m \x1b[33mcreate\x1b[0m \x1b[90m·\x1b[0m \x1b[33mupdate\x1b[0m \x1b[90m·\x1b[0m \x1b[33mmodify\x1b[0m \x1b[90m·\x1b[0m \x1b[33mfix\x1b[0m \x1b[90m·\x1b[0m \x1b[33medit\x1b[0m');
         console.log('\x1b[90mExample: \x1b[0m\x1b[33mupdate\x1b[0m module \x1b[36mProfileManager\x1b[0m \x1b[90mwith a red button\x1b[0m');
         console.log('');
-        console.log('\x1b[90mWithout this exact structure, Alex answers but does not generate code.\x1b[0m');
-
-        // EXAMPLES
-        console.log('');
-        console.log('\x1b[36mEXAMPLES\x1b[0m');
-        console.log('');
-        console.log('\x1b[33m›\x1b[0m \x1b[90m"\x1b[33mforge\x1b[90m a camera module to scan receipts for my expense tracker"\x1b[0m');
-        console.log('\x1b[33m›\x1b[0m \x1b[90m"\x1b[33mcreate\x1b[90m a form module to add products with photos to my catalog"\x1b[0m');
-        console.log('\x1b[33m›\x1b[0m \x1b[90m"\x1b[33mupdate\x1b[90m the CloudCamera module to save in the collection orders"\x1b[0m');
 
-
-        // READY
-        console.log('');
         console.log('\x1b[32mAlex ❯\x1b[0m Describe your feature using the Compose panel...');
         
-        // 1. ON SUPPRIME LE PROMPT VISUEL (Plus de "Pilot ❯")
         const rl = readline.createInterface({ 
             input: process.stdin, 
             output: process.stdout
         });
 
-        // LE BOUCLIER ANTI CTRL+C (SIGINT)
         rl.on('SIGINT', () => {
             console.log('\n\x1b[90m Alex session aborted (Ctrl+C).\x1b[0m');
-            process.stdout.write('[ALEX_OFFLINE]\n'); // Prévient React !
+            process.stdout.write('[ALEX_OFFLINE]\n'); 
             rl.close();
             process.exit(0); 
         });
@@ -790,22 +739,15 @@ if (command === 'alex') {
             }
             
             if (text !== "") {
-                if (text.length > 4000) {
-                    console.log(`\n\x1b[31m⛔ [Alex Safety] Mission rejected: Excessive size (${text.length}/4000 characters).\x1b[0m`);
-                    return;
-                }
-                
                 isProcessing = true;
                 
-                // 2. On exécute la requête sans faire de "rl.setPrompt()"
                 await processAlexRequest(text);
                 
                 isProcessing = false;
-                console.log(''); // Petit saut de ligne esthétique quand Alex a fini
+                console.log(''); 
             }
         };
 
-        //  3. RÉCEPTEUR SILENCIEUX (Plus de "rl.prompt()" qui pollue l'écran)
         let pasteTimer = null;
 
         rl.on('line', async (line) => {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "fleetbo-cockpit-cli",
-  "version": "1.0.215",
+  "version": "1.0.217",
   "description": "Fleetbo CLI - Build native mobile apps with React",
   "author": "Fleetbo",
   "license": "MIT",