nothumanallowed 9.8.3 → 9.8.4

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "nothumanallowed",
-  "version": "9.8.3",
+  "version": "9.8.4",
   "description": "NotHumanAllowed — 38 AI agents, 53 tools. Email, calendar, browser automation, screen capture, canvas, cron/heartbeat, GitHub, Notion, Slack, voice chat, 28 languages. Zero-dependency CLI.",
   "type": "module",
   "bin": {

package/src/commands/ui.mjs

@@ -1095,14 +1095,35 @@ export async function cmdUI(args) {
               fullResponse = `![Screenshot](/api/screenshots/${fname})\n\n${fullResponse}`;
             }
           } else if (toolResults.length > 0) {
-            // Standard tool results flow
+            // Extract canvas/screenshot markers from tool results BEFORE second LLM call
+            // These markers must be preserved in the final response for the UI to render
+            let preservedMarkers = '';
             const toolContext = toolResults.map(t => {
-              let clean = t.result.replace(/\[Screenshot[^\]]*\]/g, '').replace(/!\[.*?\]\(data:image[^)]+\)/g, '').slice(0, 3000);
-              return `[${t.action} result]: ${clean.trim()}`;
+              let clean = t.result;
+              // Extract and preserve canvas markers
+              const canvasMatch = clean.match(/\[CANVAS_RENDER\][\s\S]*?\[\/CANVAS_RENDER\]/);
+              if (canvasMatch) {
+                preservedMarkers += canvasMatch[0] + '\n';
+                clean = clean.replace(/\[CANVAS_RENDER\][\s\S]*?\[\/CANVAS_RENDER\]/, '').trim();
+              }
+              if (clean.includes('[CANVAS_CLEAR]')) {
+                preservedMarkers += '[CANVAS_CLEAR]Canvas cleared.[/CANVAS_CLEAR]\n';
+                clean = clean.replace(/\[CANVAS_CLEAR\][\s\S]*?\[\/CANVAS_CLEAR\]/, '').trim();
+              }
+              // Extract screenshot file markers
+              const ssMatch = clean.match(/\[SCREENSHOT_FILE\].*?\[\/SCREENSHOT_FILE\]/);
+              if (ssMatch) {
+                preservedMarkers += ssMatch[0] + '\n';
+                clean = clean.replace(/\[SCREENSHOT_FILE\].*?\[\/SCREENSHOT_FILE\]/, '').trim();
+              }
+              clean = clean.replace(/\[Screenshot[^\]]*\]/g, '').replace(/!\[.*?\]\(data:image[^)]+\)/g, '').slice(0, 3000);
+              return `[${t.action} result]: ${clean.trim() || 'Done.'}`;
             }).join('\n\n');
             const followUp = `The user asked: "${body.message}"\n\nI executed these tools and got REAL results:\n\n${toolContext}\n\nNow respond conversationally based ONLY on the REAL data above. Do NOT output any JSON blocks, base64, or image markdown — just natural text.`;
             try {
               fullResponse = await callLLM(config, enrichedSystemPrompt, followUp);
+              // Prepend preserved markers so the UI can render canvas/screenshots
+              if (preservedMarkers) fullResponse = preservedMarkers + fullResponse;
             } catch {
               fullResponse = toolResults.map(t => `${t.action}: ${t.result}`).join('\n\n');
             }
@@ -1437,23 +1458,35 @@ export async function cmdUI(args) {
           // If tools were executed, make a second LLM call with results
           let finalResponse = fullResponse;
           if (toolResults.length > 0) {
+            // Extract canvas/screenshot markers BEFORE sending to LLM
+            let preservedMarkers = '';
             const toolContext = toolResults.map(t => {
-              // Strip screenshot file references and base64 from tool results — the screenshot was already sent to the UI
-              let clean = t.result.replace(/\[Screenshot[^\]]*\]/g, '').replace(/!\[.*?\]\(data:image[^)]+\)/g, '').slice(0, 3000);
-              return `[${t.action} result]: ${clean.trim()}`;
+              let clean = t.result;
+              const canvasMatch = clean.match(/\[CANVAS_RENDER\][\s\S]*?\[\/CANVAS_RENDER\]/);
+              if (canvasMatch) { preservedMarkers += canvasMatch[0] + '\n'; clean = clean.replace(/\[CANVAS_RENDER\][\s\S]*?\[\/CANVAS_RENDER\]/, '').trim(); }
+              if (clean.includes('[CANVAS_CLEAR]')) { preservedMarkers += '[CANVAS_CLEAR]Canvas cleared.[/CANVAS_CLEAR]\n'; clean = clean.replace(/\[CANVAS_CLEAR\][\s\S]*?\[\/CANVAS_CLEAR\]/, '').trim(); }
+              clean = clean.replace(/\[Screenshot[^\]]*\]/g, '').replace(/!\[.*?\]\(data:image[^)]+\)/g, '').slice(0, 3000);
+              return `[${t.action} result]: ${clean.trim() || 'Done.'}`;
             }).join('\n\n');
+
+            // If we have canvas content, send it to client immediately via SSE
+            if (preservedMarkers.includes('[CANVAS_RENDER]')) {
+              sendSSE('canvas', { markers: preservedMarkers });
+            }
+
             const followUp = `The user asked: "${msg}"\n\nI executed these tools and got REAL results:\n\n${toolContext}\n\nNow respond to the user conversationally based ONLY on the REAL data above. Present the results clearly. Do NOT output any JSON blocks, any base64 data, or any image markdown — just natural text. If a screenshot was taken, just mention "Screenshot captured" without embedding it.`;
             sendSSE('tool_synthesis', {});
             try {
               finalResponse = await callLLMStream(config, enrichedPrompt, followUp, (chunk) => {
                 sendSSE('token', { content: chunk });
               });
-              // Strip any JSON blocks and base64 the LLM might have emitted
               finalResponse = finalResponse
                 .replace(/```json[\s\S]*?```/g, '')
                 .replace(/!\[.*?\]\(data:image\/[^)]+\)/g, '')
                 .replace(/data:image\/[a-z]+;base64,[A-Za-z0-9+/=]{100,}/g, '[image]')
                 .trim();
+              // Prepend preserved markers for persistence
+              if (preservedMarkers) finalResponse = preservedMarkers + finalResponse;
             } catch {
               finalResponse = toolResults.map(t => `${t.action}: ${t.result}`).join('\n\n');
             }

package/src/constants.mjs

@@ -5,7 +5,7 @@ import { fileURLToPath } from 'url';
 const __filename = fileURLToPath(import.meta.url);
 const __dirname = path.dirname(__filename);
 
-export const VERSION = '9.8.3';
+export const VERSION = '9.8.4';
 export const BASE_URL = 'https://nothumanallowed.com/cli';
 export const API_BASE = 'https://nothumanallowed.com/api/v1';
 

package/src/services/web-ui.mjs

@@ -652,6 +652,12 @@ function sendChat(){
                 updateBrowserFrame(data.base64,data.format||'jpeg');
                 if(data.url)updateBrowserStatus(data.url);
               }
+              if(currentEvent==='canvas'&&data.markers){
+                // Canvas content arrived — render it immediately
+                var cm=data.markers.match(/\\[CANVAS_RENDER\\]([\\s\\S]*?)\\[\\/CANVAS_RENDER\\]/);
+                if(cm){try{var cd=JSON.parse(cm[1]);showCanvas(cd.html,cd.title);}catch(e){}}
+                if(data.markers.indexOf('[CANVAS_CLEAR]')!==-1)closeCanvas();
+              }
               if(currentEvent==='tool_synthesis'){chatHistory[streamIdx].content='';renderMessages();}
               if(currentEvent==='done'){endStreaming();if(data.content)chatHistory[streamIdx].content=data.content;var ssf=data.screenshotFiles||[];for(var fi=0;fi<ssf.length;fi++){chatHistory[streamIdx].content+='\\n![Screenshot](/api/screenshots/'+ssf[fi]+')\\n';}renderMessages();loadConvList();if(ssf.length>0)setTimeout(closeBrowserViewer,5000);}
               if(currentEvent==='error'){endStreaming();chatHistory[streamIdx].content='Error: '+(data.message||'Unknown');renderMessages();}