Update app.js

app.js

@@ -158,7 +158,7 @@ async function runBackgroundInitialization(projectId, userId, description) {
         await StateManager.getProject(projectId);
 
         await StateManager.updateProject(projectId, { 
-            status: "WORKING", 
+            status: "working", 
             gdd: "",
             failureCount: 0 
         });
@@ -228,7 +228,7 @@ async function runBackgroundInitialization(projectId, userId, description) {
 
         await StateManager.updateProject(projectId, {
             gdd: gddText,
-            status: "IDLE" 
+            status: "idle" 
         });
 
         await processAndQueueResponse(projectId, workerTextAccumulated, userId); 
@@ -240,31 +240,42 @@ async function runBackgroundInitialization(projectId, userId, description) {
 
     } catch (err) {
         console.error(`[Background] Init Error for ${projectId}:`, err.message);
-        await StateManager.updateProject(projectId, { status: "ERROR" });
+        await StateManager.updateProject(projectId, { status: "error" });
     } finally {
         StateManager.unlock(projectId);
     }
 }
 
-// --- UPDATED: Accepts IMAGES and Handles Interaction Memory Correctly ---
+// --- CORE FIX: Robust Async Feedback with Immediate Persistence ---
 async function runAsyncFeedback(projectId, userId, fullInput, images = []) {
     let diamondUsage = 0;
     let basicUsage = 0;
 
     try {
-        // 1. Refresh Project State
+        console.log(`[${projectId}] Feedback received. Persisting state immediately.`);
+        
+        // 1. INSTANT PERSISTENCE: Save status and User Message BEFORE anything else.
+        // This ensures if the user reloads now, they see "Working" and their message.
+        await Promise.all([
+            StateManager.updateProject(projectId, { status: "working" }),
+            StateManager.addHistory(projectId, 'worker', 'user', fullInput)
+        ]);
+
+        // 2. Load latest state
         const project = await StateManager.getProject(projectId);
-        StateManager.clearSnapshot(projectId);
         
+        // Reset buffers for frontend streaming
+        StateManager.clearSnapshot(projectId);
         let stopStatus = startStatusLoop(projectId, 'worker');
         
-        // 2. Initial Worker Execution (The "Question" or "Attempt" phase)
         let firstTurnResponse = ""; 
         let thoughtText = "";
         
-        // Use a local history copy so we can append to it for the second turn without waiting for DB refetch
+        // Use local history clone so we can manipulate it for multi-turn without extra DB fetches
+        // Note: 'project.workerHistory' now already contains the user input we just saved in Step 1.
         const currentWorkerHistory = [...(project.workerHistory || [])];
 
+        // 3. First Turn (Worker Execution)
         await AIEngine.callWorkerStream(
             currentWorkerHistory, 
             fullInput, 
@@ -283,19 +294,17 @@ async function runAsyncFeedback(projectId, userId, fullInput, images = []) {
             images 
         );
 
-        // 3. Analyze for Delegation/Consultation
+        // 4. Analyze Output (Delegation Check)
         const routeTask = extractRouteToPM(firstTurnResponse);
         const pmQuestion = extractPMQuestion(firstTurnResponse);
 
         let finalResponseToSave = firstTurnResponse;
 
         if (routeTask || pmQuestion) {
-            // --- Save the Worker's first turn immediately ---
-            await StateManager.addHistory(projectId, 'worker', 'user', fullInput);
+            // Save the Worker's preliminary response to DB so it doesn't vanish
             await StateManager.addHistory(projectId, 'worker', 'model', firstTurnResponse);
             
-            // Push to our local history for the immediate next call
-            currentWorkerHistory.push({ role: 'user', parts: [{ text: fullInput }] });
+            // Add to local context
             currentWorkerHistory.push({ role: 'model', parts: [{ text: firstTurnResponse }] });
 
             let pmPrompt = "";
@@ -311,7 +320,7 @@ async function runAsyncFeedback(projectId, userId, fullInput, images = []) {
                 pmContextPrefix = "[PM ANSWER]:";
             }
 
-            // 4. Run Project Manager
+            // 5. Run PM
             StateManager.clearSnapshot(projectId); 
             stopStatus = startStatusLoop(projectId, 'pm');
             
@@ -333,20 +342,21 @@ async function runAsyncFeedback(projectId, userId, fullInput, images = []) {
                 }
             );
             
-            diamondUsage += 0; 
-            
             // Save PM History
             await StateManager.addHistory(projectId, 'pm', 'user', pmPrompt);
             await StateManager.addHistory(projectId, 'pm', 'model', pmResponseText);
 
-            // --- CRITICAL FIX: EXECUTE PM CODE ---
-            // If the PM wrote code (backend logic), execute it now.
+            // Execute PM Code (Server Logic)
             await processAndQueueResponse(projectId, pmResponseText, userId);
 
-            // 5. Run Worker Continuation (The "Answer" Phase)
+            // 6. Run Worker Continuation
             const nextInstruction = extractWorkerPrompt(pmResponseText) || pmResponseText;
             const workerContinuationPrompt = `${pmContextPrefix} ${nextInstruction}\n\nBased on this, continue the task and output the code.`;
 
+            // Save System Instruction
+            await StateManager.addHistory(projectId, 'worker', 'user', workerContinuationPrompt);
+            currentWorkerHistory.push({ role: 'user', parts: [{ text: workerContinuationPrompt }] });
+
             StateManager.clearSnapshot(projectId);
             stopStatus = startStatusLoop(projectId, 'worker');
             
@@ -368,25 +378,21 @@ async function runAsyncFeedback(projectId, userId, fullInput, images = []) {
                 }
             );
 
-            // Save the continuation
-            await StateManager.addHistory(projectId, 'worker', 'user', workerContinuationPrompt);
+            // Save Final Response
             await StateManager.addHistory(projectId, 'worker', 'model', secondTurnResponse);
             
-            // Update the variable for the FINAL execution (Worker's part)
             finalResponseToSave = secondTurnResponse;
         } else {
-            // Standard path (No PM needed), save history normally
-            await StateManager.addHistory(projectId, 'worker', 'user', fullInput);
+            // Normal path: We already saved 'user' in Step 1. Now save 'model'.
             await StateManager.addHistory(projectId, 'worker', 'model', firstTurnResponse);
         }
 
         StateManager.setStatus(projectId, "Idle");
         
-        // 6. Execute Logic (Worker's part)
-        // If PM ran before this, their code is already queued. Now we queue the Worker's code.
+        // 7. Final Execution & Cleanup
         await processAndQueueResponse(projectId, finalResponseToSave, userId);
-
-        // 7. Update Status & Timestamp
+        
+        // Ensure status goes back to idle AND timestamp is updated
         await StateManager.updateProject(projectId, { status: "idle" });
 
         if (diamondUsage > 0) await deductUserCredits(userId, diamondUsage, 'diamond');
@@ -395,6 +401,7 @@ async function runAsyncFeedback(projectId, userId, fullInput, images = []) {
     } catch (err) {
         console.error("Async Feedback Error:", err);
         StateManager.setStatus(projectId, "Error: " + err.message);
+        // Ensure we don't get stuck in 'working'
         await StateManager.updateProject(projectId, { status: "error" });
     }
 }
@@ -500,12 +507,14 @@ app.post('/project/feedback', async (req, res) => {
 
         await checkMinimumCredits(userId, 'basic');
         
+        // Response started -> Status is now WORKING (In Memory)
+        // Actual DB persistence happens inside runAsyncFeedback first thing
         await StateManager.updateProject(projectId, { status: "working" });
           
         const context = formatContext({ hierarchyContext, scriptContext, logContext });
         const fullInput = `USER: ${prompt || "Automatic Feedback"}${context}`;
         
-        // Pass images array to async runner
+        // Trigger Async
         runAsyncFeedback(projectId, userId, fullInput, images || []);
 
         res.json({ success: true, message: "Processing started" });
@@ -527,6 +536,7 @@ app.post('/project/ping', async (req, res) => {
     const currentStatus = StateManager.getStatus(projectId);
 
     if (isFrontend) {
+        // Return Snapshot for streaming
         const snapshot = StateManager.getSnapshot(projectId);
         return res.json({ status: currentStatus, snapshot });
     }