nothumanallowed 13.5.127 → 13.5.129

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "nothumanallowed",
-  "version": "13.5.127",
+  "version": "13.5.129",
   "description": "NotHumanAllowed — 38 AI agents, 80 tools, Studio (visual agentic workflows). Email, calendar, browser automation, screen capture, canvas, cron/heartbeat, Alexandria E2E messaging, GitHub, Notion, Slack, voice chat, free AI (Liara), 28 languages. Zero-dependency CLI.",
   "type": "module",
   "bin": {

package/src/commands/ui.mjs

@@ -2111,9 +2111,33 @@ export async function cmdUI(args) {
               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.`;
+            const followUp = `The user asked: "${body.message}"\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. If the user's request has multiple steps and the first step is done, execute the next step using a JSON tool block. Do NOT embed base64 data or image markdown — just natural text.`;
             try {
               fullResponse = await callLLM(config, enrichedSystemPrompt, followUp);
+
+              // Round 2: execute any tool calls emitted in the synthesis response
+              const { textParts: synthText2, actions: synthActions2 } = parseActions(fullResponse);
+              if (synthActions2.length > 0) {
+                const round2Results = [];
+                for (const { action: a2, params: p2 } of synthActions2) {
+                  try {
+                    const r2 = await executeTool(a2, p2, config);
+                    round2Results.push({ action: a2, result: typeof r2 === 'object' ? JSON.stringify(r2) : String(r2) });
+                  } catch (e2) {
+                    round2Results.push({ action: a2, result: `Error: ${e2.message}` });
+                  }
+                }
+                const round2Context = round2Results.map(t => `[${t.action} result]: ${t.result.slice(0, 2000)}`).join('\n\n');
+                try {
+                  const r2Summary = await callLLM(config, enrichedSystemPrompt, `The user asked: "${body.message}"\n\n${toolContext}\n\nRound 2 tool results:\n\n${round2Context}\n\nGive the user a final natural-language summary of everything. Do NOT output JSON blocks.`);
+                  fullResponse = synthText2.join('\n').replace(/```json[\s\S]*?```/g, '').trim() + (synthText2.join('').trim() ? '\n\n' : '') + r2Summary.trim();
+                } catch {
+                  fullResponse = synthText2.join('\n').replace(/```json[\s\S]*?```/g, '').trim() + '\n\n' + round2Results.map(t => `${t.action}: ${t.result}`).join('\n');
+                }
+              } else {
+                fullResponse = fullResponse.replace(/```json[\s\S]*?```/g, '').trim();
+              }
+
               // Prepend preserved markers so the UI can render canvas/screenshots
               if (preservedMarkers) fullResponse = preservedMarkers + fullResponse;
             } catch {
@@ -2615,17 +2639,50 @@ export async function cmdUI(args) {
               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.`;
+            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. If the user's request has multiple steps and the first step is done, execute the next step using a JSON tool block. Do NOT embed base64 data or 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 });
               });
               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();
+
+              // Round 2: execute any tool calls emitted in the synthesis response
+              const { textParts: synthText, actions: synthActions } = parseActions(finalResponse);
+              if (synthActions.length > 0) {
+                const round2Results = [];
+                for (const { action: a2, params: p2 } of synthActions) {
+                  sendSSE('tool', { action: a2, status: 'executing' });
+                  try {
+                    const r2 = await executeTool(a2, p2, config);
+                    const r2str = typeof r2 === 'object' ? JSON.stringify(r2) : String(r2);
+                    round2Results.push({ action: a2, result: r2str });
+                    sendSSE('tool', { action: a2, status: 'done', result: r2str.slice(0, 200) });
+                  } catch (e2) {
+                    round2Results.push({ action: a2, result: `Error: ${e2.message}` });
+                    sendSSE('tool', { action: a2, status: 'error', error: e2.message });
+                  }
+                }
+                const round2Context = round2Results.map(t => `[${t.action} result]: ${t.result.slice(0, 2000)}`).join('\n\n');
+                const round2Prompt = `${toolContext}\n\nRound 2 tool results:\n\n${round2Context}\n\nNow give the user a final natural-language summary of everything that was done. Do NOT output JSON blocks.`;
+                sendSSE('tool_synthesis', {});
+                try {
+                  finalResponse = synthText.join('\n').replace(/```json[\s\S]*?```/g, '').trim();
+                  const r2Summary = await callLLMStream(config, enrichedPrompt, `The user asked: "${msg}"\n\n${round2Prompt}`, (chunk) => {
+                    sendSSE('token', { content: chunk });
+                  });
+                  finalResponse = (finalResponse ? finalResponse + '\n\n' : '') + r2Summary.trim();
+                } catch {
+                  finalResponse = synthText.join('\n').replace(/```json[\s\S]*?```/g, '').trim() + '\n\n' + round2Results.map(t => `${t.action}: ${t.result}`).join('\n');
+                }
+              } else {
+                // No new tool calls — strip any leftover JSON blocks from display text
+                finalResponse = finalResponse.replace(/```json[\s\S]*?```/g, '').trim();
+              }
+
               // Prepend preserved markers for persistence
               if (preservedMarkers) finalResponse = preservedMarkers + finalResponse;
             } catch {

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 = '13.5.127';
+export const VERSION = '13.5.129';
 export const BASE_URL = 'https://nothumanallowed.com/cli';
 export const API_BASE = 'https://nothumanallowed.com/api/v1';
 

package/src/services/email-db.mjs

@@ -387,6 +387,18 @@ export function getSystemLabel(accountId, systemType) {
   return getDb().prepare('SELECT * FROM email_labels WHERE account_id = ? AND system_type = ?').get(accountId, systemType);
 }
 
+/** Idempotent — seeds any missing system labels for a single account. */
+export function ensureLabelsForAccount(accountId) {
+  const db = getDb();
+  const insert = db.prepare(`
+    INSERT OR IGNORE INTO email_labels (id, account_id, name, system_type, is_system, color, icon, sort_order, path)
+    VALUES (?, ?, ?, ?, 1, ?, ?, ?, ?)
+  `);
+  for (const lbl of SYSTEM_LABELS) {
+    insert.run(randomUUID(), accountId, lbl.name, lbl.system_type, lbl.color, lbl.icon, lbl.sort_order, lbl.system_type);
+  }
+}
+
 export function createLabel(accountId, name, color, parentId) {
   const db = getDb();
   const id = randomUUID();
@@ -503,8 +515,16 @@ export function listMessages(accountId, labelId, limit, offset, search) {
   const params = [accountId];
 
   if (labelId) {
-    where += ' AND EXISTS (SELECT 1 FROM email_message_labels j WHERE j.message_id = m.id AND j.label_id = ?)';
-    params.push(labelId);
+    // Also include messages saved with matching imap_folder_path in case label link was missing
+    const lbl = db.prepare('SELECT system_type FROM email_labels WHERE id = ?').get(labelId);
+    const folderFallback = lbl?.system_type ? lbl.system_type.charAt(0).toUpperCase() + lbl.system_type.slice(1) : null;
+    if (folderFallback) {
+      where += ' AND (EXISTS (SELECT 1 FROM email_message_labels j WHERE j.message_id = m.id AND j.label_id = ?) OR m.imap_folder_path = ?)';
+      params.push(labelId, folderFallback);
+    } else {
+      where += ' AND EXISTS (SELECT 1 FROM email_message_labels j WHERE j.message_id = m.id AND j.label_id = ?)';
+      params.push(labelId);
+    }
   }
   if (search) {
     where += ' AND (m.subject LIKE ? OR m.from_address LIKE ? OR m.from_name LIKE ? OR m.body_preview LIKE ?)';

package/src/services/email-smtp.mjs

@@ -9,7 +9,7 @@ import { createTransport } from 'nodemailer';
 import { randomUUID } from 'crypto';
 import {
   getAccountCredentials, insertMessage, addMessageToLabel, getSystemLabel,
-  insertAttachments, getDb,
+  ensureLabelsForAccount, insertAttachments, getDb,
 } from './email-db.mjs';
 import { createHash } from 'crypto';
 
@@ -97,6 +97,8 @@ export async function sendEmail(accountId, opts) {
   // ── Save to local DB as "sent" ────────────────────────────────────────
   const now = new Date().toISOString();
   const tid = threadId(opts.inReplyTo || msgId);
+  // Ensure system labels exist for this account (first send may precede first sync)
+  ensureLabelsForAccount(accountId);
   const sentLabel = getSystemLabel(accountId, 'sent');
 
   const dbId = insertMessage({

package/src/services/tool-executor.mjs

@@ -988,15 +988,19 @@ export async function executeTool(action, params, config) {
     case 'imap_send': {
       if (!params.accountId || !params.to || !params.subject) return 'accountId, to, subject required.';
       const { sendEmail: imapSendEmail } = await import('./email-smtp.mjs');
-      const result = await imapSendEmail(params.accountId, {
-        to: params.to,
-        cc: params.cc || null,
-        subject: params.subject,
-        bodyHtml: params.bodyHtml || params.body || '',
-        bodyText: params.bodyText || null,
-        inReplyTo: params.inReplyTo || null,
-      });
-      return `Email sent successfully. Message-ID: ${result.messageId}`;
+      try {
+        const result = await imapSendEmail(params.accountId, {
+          to: params.to,
+          cc: params.cc || null,
+          subject: params.subject,
+          bodyHtml: params.bodyHtml || params.body || '',
+          bodyText: params.bodyText || null,
+          inReplyTo: params.inReplyTo || null,
+        });
+        return `✅ Email sent and saved to Sent folder. Message-ID: ${result.messageId}`;
+      } catch (e) {
+        return `❌ SEND FAILED — the email was NOT delivered. Error: ${e.message}. Tell the user the send failed and show the exact error.`;
+      }
     }
 
     case 'imap_mark_read': {
@@ -1016,15 +1020,19 @@ export async function executeTool(action, params, config) {
       let refs = [];
       try { refs = JSON.parse(orig.references_list || '[]'); } catch {}
       if (orig.message_id) refs.push(orig.message_id);
-      const result = await imapSendReply(params.accountId, {
-        to: orig.from_address,
-        cc: params.cc || null,
-        subject: replySubject,
-        bodyHtml: params.bodyHtml,
-        inReplyTo: orig.message_id || null,
-        references: refs,
-      });
-      return `Reply sent to ${orig.from_address}. Message-ID: ${result.messageId}`;
+      try {
+        const result = await imapSendReply(params.accountId, {
+          to: orig.from_address,
+          cc: params.cc || null,
+          subject: replySubject,
+          bodyHtml: params.bodyHtml,
+          inReplyTo: orig.message_id || null,
+          references: refs,
+        });
+        return `✅ Reply sent to ${orig.from_address} and saved to Sent folder. Message-ID: ${result.messageId}`;
+      } catch (e) {
+        return `❌ SEND FAILED — reply was NOT delivered. Error: ${e.message}. Tell the user the send failed and show the exact error.`;
+      }
     }
 
     case 'imap_thread': {
@@ -1089,8 +1097,12 @@ export async function executeTool(action, params, config) {
       const applyVars = (str, vars) => Object.entries(vars).reduce((s, [k, v]) => s.split('[' + k + ']').join(v || ''), str);
       const subject = applyVars(tpl.subject, params.vars);
       const html = applyVars(tpl.html, params.vars);
-      const result = await imapSendTpl(params.accountId, { to: params.to, subject, bodyHtml: html });
-      return `Template email "${params.templateId}" sent to ${params.to}. Message-ID: ${result.messageId}`;
+      try {
+        const result = await imapSendTpl(params.accountId, { to: params.to, subject, bodyHtml: html });
+        return `✅ Template email "${params.templateId}" sent to ${params.to} and saved to Sent folder. Message-ID: ${result.messageId}`;
+      } catch (e) {
+        return `❌ SEND FAILED — email was NOT delivered. Error: ${e.message}. Tell the user the send failed and show the exact error.`;
+      }
     }
 
     case 'imap_bulk_send': {

package/src/services/web-ui.mjs

@@ -1639,7 +1639,11 @@ function emailSend() {
   }).then(function(r) {
     if (r.ok) {
       if (status) { status.textContent = 'Sent!'; status.style.color = 'var(--green)'; }
-      setTimeout(emailCloseCompose, 800);
+      setTimeout(function() {
+        emailCloseCompose();
+        // Reload current label to show the sent message if we are on Sent
+        emailLoadMessages();
+      }, 800);
     } else {
       if (status) { status.textContent = r.error || 'Error'; status.style.color = 'var(--red)'; }
     }