Update app.js

app.js

@@ -19,6 +19,7 @@ const validateRequest = (req, res, next) => {
     next();
 };
 
+// --- HELPERS ---
 function extractWorkerPrompt(text) {
     const match = text.match(/WORKER_PROMPT:\s*(.*)/s);
     return match ? match[1].trim() : null;
@@ -31,18 +32,23 @@ function formatContext({ hierarchyContext, scriptContext, logContext }) {
     return out;
 }
 
-// Helper to check for Consultant requests
 function extractPMQuestion(text) {
-    const match = text.match(/\[ASK_PM:\s*(.*?)\]/s); // 's' flag for multiline questions
+    const match = text.match(/\[ASK_PM:\s*(.*?)\]/s); 
     return match ? match[1].trim() : null;
 }
 
+function extractImagePrompt(text) {
+    const match = text.match(/\[GENERATE_IMAGE:\s*(.*?)\]/s);
+    return match ? match[1].trim() : null;
+}
+
+// --- ENDPOINTS ---
+
 /**
  * 1. NEW PROJECT
  */
 app.post('/new/project', validateRequest, async (req, res) => {
     const { userId, projectId, description } = req.body;
-    console.log(`[${projectId}] Init: ${description}`);
 
     try {
         const pmHistory = [];
@@ -75,7 +81,9 @@ app.post('/new/project', validateRequest, async (req, res) => {
             failureCount: 0
         });
 
-        StateManager.queueCommand(projectId, workerResponse);
+        // Queue Initial Response
+        await processAndQueueResponse(projectId, workerResponse);
+
         res.json({ success: true, message: "Project Initialized", gddPreview: gddResponse.substring(0, 200) });
 
     } catch (err) {
@@ -85,7 +93,7 @@ app.post('/new/project', validateRequest, async (req, res) => {
 });
 
 /**
- * 2. FEEDBACK LOOP (Enhanced with Consultation Channel)
+ * 2. FEEDBACK LOOP
  */
 app.post('/project/feedback', async (req, res) => {
     const { projectId, prompt, hierarchyContext, scriptContext, logContext, taskComplete, images } = req.body;
@@ -122,13 +130,13 @@ app.post('/project/feedback', async (req, res) => {
             failureCount: 0
         });
 
-        StateManager.queueCommand(projectId, "CLEAR_CONSOLE"); 
-        StateManager.queueCommand(projectId, workerResponse);
+        StateManager.queueCommand(projectId, { type: "EXECUTE", payload: "warn('Starting Next Task')" }); // Reset console
+        await processAndQueueResponse(projectId, workerResponse);
 
         return res.json({ success: true, message: "Next Task Assigned" });
     }
 
-    // B. ERROR ESCALATION
+    // B. FAILURE DETECTION
     let isFailure = false;
     if (logContext?.logs) {
         const errs = ["Error", "Exception", "failed", "Stack Begin", "Infinite yield"];
@@ -138,7 +146,7 @@ app.post('/project/feedback', async (req, res) => {
         }
     }
 
-    // Escalation Threshold Check
+    // C. ESCALATION
     if (project.failureCount > 3) {
         console.log(`[${projectId}] 🚨 Escalating to PM...`);
         const pmPrompt = sysPrompts.pm_guidance_prompt.replace('{{LOGS}}', logContext?.logs);
@@ -154,8 +162,7 @@ app.post('/project/feedback', async (req, res) => {
             resetHistory.push({ role: 'model', parts: [{ text: workerResp }] });
 
             await StateManager.updateProject(projectId, { workerHistory: resetHistory, failureCount: 0 });
-            StateManager.queueCommand(projectId, "CLEAR_CONSOLE");
-            StateManager.queueCommand(projectId, workerResp);
+            await processAndQueueResponse(projectId, workerResp);
             return res.json({ success: true, message: "Worker Terminated." });
         } else {
             const injection = `[PM GUIDANCE]: ${pmVerdict} \n\nApply this fix now.`;
@@ -165,63 +172,50 @@ app.post('/project/feedback', async (req, res) => {
             project.workerHistory.push({ role: 'model', parts: [{ text: workerResp }] });
             
             await StateManager.updateProject(projectId, { workerHistory: project.workerHistory, failureCount: 1 });
-            await StateManager.queueCommand(projectId, workerResp);
+            await processAndQueueResponse(projectId, workerResp);
             return res.json({ success: true, message: "PM Guidance Applied." });
         }
     }
 
-    // C. STANDARD LOOP + CONSULTATION CHECK
+    // D. STANDARD WORKER FLOW
     try {
         const fullInput = `USER: ${prompt || "Automatic Feedback"}` + formatContext({ hierarchyContext, scriptContext, logContext });
         
-        // 1. Get Initial Worker Response
         let response = await AIEngine.callWorker(project.workerHistory, fullInput, images || []);
         
-        // 2. CHECK FOR CONSULTATION REQUEST [ASK_PM: ...]
+        // CHECK: PM CONSULTATION
         const pmQuestion = extractPMQuestion(response);
-
         if (pmQuestion) {
             console.log(`[${projectId}] 🙋 Worker asking PM: "${pmQuestion}"`);
-
-            // a. Ask PM
-            // We give the PM the worker's question AND a snippet of context so PM knows why
-            const pmConsultPrompt = `[WORKER CONSULTATION]: The Worker needs clarification:\n"${pmQuestion}"\n\nProvide a brief, technical answer to unblock them. Do not change the task scope unless necessary.`;
+            const pmConsultPrompt = `[WORKER CONSULTATION]: The Worker asks: "${pmQuestion}"\nProvide a technical answer.`;
             const pmAnswer = await AIEngine.callPM(project.pmHistory, pmConsultPrompt);
 
-            // Update PM history
             project.pmHistory.push({ role: 'user', parts: [{ text: pmConsultPrompt }] });
             project.pmHistory.push({ role: 'model', parts: [{ text: pmAnswer }] });
 
-            // b. Feed PM Answer back to Worker immediately
-            const injectionMsg = `[PM RESPONSE]: ${pmAnswer}\n\nProceed with this information.`;
+            const injectionMsg = `[PM RESPONSE]: ${pmAnswer}`;
             
-            // We push the "Question" state to history so the worker remembers it asked
+            // Push question-answer to history
             project.workerHistory.push({ role: 'user', parts: [{ text: fullInput }] });
-            project.workerHistory.push({ role: 'model', parts: [{ text: response }] }); // The response containing ASK_PM
+            project.workerHistory.push({ role: 'model', parts: [{ text: response }] });
             
-            // Now we call worker again with the answer
-            console.log(`[${projectId}] 🗣️ PM Answered. Resuming Worker...`);
+            // Resume Worker
             response = await AIEngine.callWorker(project.workerHistory, injectionMsg, []);
-            
-            // Push the answer transaction
             project.workerHistory.push({ role: 'user', parts: [{ text: injectionMsg }] });
             project.workerHistory.push({ role: 'model', parts: [{ text: response }] });
-
         } else {
-            // Standard flow if no question
             project.workerHistory.push({ role: 'user', parts: [{ text: fullInput }] });
             project.workerHistory.push({ role: 'model', parts: [{ text: response }] });
         }
 
-        // 3. Save & Queue Result
         await StateManager.updateProject(projectId, { 
             workerHistory: project.workerHistory,
-            pmHistory: project.pmHistory, // PM history might have updated if consulted
+            pmHistory: project.pmHistory, 
             failureCount: project.failureCount 
         });
         
-        // Queue whatever the FINAL response was (Code, Script read, etc.)
-        await StateManager.queueCommand(projectId, response);
+        // Process response for Code OR Images
+        await processAndQueueResponse(projectId, response);
         res.json({ success: true });
 
     } catch (err) {
@@ -231,14 +225,12 @@ app.post('/project/feedback', async (req, res) => {
 });
 
 /**
- * 3. HUMAN OVERRIDE
+ * HUMAN OVERRIDE
  */
 app.post('/human/override', validateRequest, async (req, res) => {
     const { projectId, instruction, pruneHistory } = req.body;
     const project = await StateManager.getProject(projectId);
     
-    if (!project) return res.status(404).json({ error: "Project not found" });
-
     const overrideMsg = `[SYSTEM OVERRIDE]: ${instruction}`;
     
     if (pruneHistory && project.workerHistory.length >= 2) {
@@ -251,30 +243,12 @@ app.post('/human/override', validateRequest, async (req, res) => {
     project.workerHistory.push({ role: 'model', parts: [{ text: response }] });
 
     await StateManager.updateProject(projectId, { workerHistory: project.workerHistory });
-    await StateManager.queueCommand(projectId, response);
-    res.json({ success: true, message: "Override Executed" });
+    await processAndQueueResponse(projectId, response);
+    res.json({ success: true });
 });
 
 /**
- * 4. WORKER KILL
- */
-app.post('/worker/kill', validateRequest, async (req, res) => {
-    const { projectId } = req.body;
-    const rebootPrompt = "[SYSTEM]: Worker process restarted. Attempt the task again from scratch.";
-    const response = await AIEngine.callWorker([{ role: 'user', parts: [{ text: rebootPrompt }] }], rebootPrompt, []);
-    
-    await StateManager.updateProject(projectId, {
-        workerHistory: [{ role: 'user', parts: [{ text: rebootPrompt }] }],
-        workerHistory: [{ role: 'model', parts: [{ text: response }] }],
-        failureCount: 0
-    });
-    
-    StateManager.queueCommand(projectId, response);
-    res.json({ success: true, message: "Worker Killed & Restarted" });
-});
-
-/**
- * 5. PING
+ * PING (Plugin Polling)
  */
 app.post('/project/ping', async (req, res) => {
     const { projectId } = req.body;
@@ -284,6 +258,7 @@ app.post('/project/ping', async (req, res) => {
         if (command.payload === "CLEAR_CONSOLE") {
              res.json({ action: "CLEAR_LOGS" });
         } else {
+            // Can be: EXECUTE, READ_SCRIPT, READ_HIERARCHY, CREATE_ASSET
             res.json({ 
                 action: command.type, 
                 target: command.payload, 
@@ -295,6 +270,32 @@ app.post('/project/ping', async (req, res) => {
     }
 });
 
+
+// --- CORE LOGIC: PROCESS RESPONSE & HANDLE IMAGES ---
+async function processAndQueueResponse(projectId, rawResponse) {
+    // 1. Check for Image Generation Tag
+    const imgPrompt = extractImagePrompt(rawResponse);
+    if (imgPrompt) {
+        console.log(`[${projectId}] 🎨 Generating Image for: ${imgPrompt}`);
+        const base64Image = await AIEngine.generateImage(imgPrompt);
+        
+        if (base64Image) {
+            // Queue the creation command for the plugin
+            await StateManager.queueCommand(projectId, {
+                type: "CREATE_ASSET", 
+                payload: base64Image // Plugin receives Base64
+            });
+            console.log(`[${projectId}] Image Asset Queued.`);
+        } else {
+            console.error(`[${projectId}] Image Generation Failed.`);
+        }
+    }
+
+    // 2. Queue standard commands (Code, Reads, etc.)
+    // We pass the RAW response to StateManager to parse code blocks
+    await StateManager.queueCommand(projectId, rawResponse);
+}
+
 app.listen(PORT, () => {
     console.log(`AI Backend Running on ${PORT}`);
 });