nothumanallowed 3.2.0 → 3.4.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "nothumanallowed",
-  "version": "3.2.0",
+  "version": "3.4.0",
   "description": "NotHumanAllowed — 38 AI agents for security, code, DevOps, data & daily ops. Ask agents directly, plan your day with 5 specialist agents, manage tasks, connect Gmail + Calendar.",
   "type": "module",
   "bin": {

package/src/commands/ui.mjs

@@ -14,8 +14,8 @@ import fs from 'fs';
 import path from 'path';
 import { loadConfig } from '../config.mjs';
 import { callLLM, callAgent, parseAgentFile } from '../services/llm.mjs';
-import { getUnreadImportant } from '../services/google-gmail.mjs';
-import { getTodayEvents } from '../services/google-calendar.mjs';
+import { getUnreadImportant, getMessage, listMessages, sendEmail, createDraft } from '../services/google-gmail.mjs';
+import { getTodayEvents, getUpcomingEvents, createEvent, updateEvent, getEventsForDate } from '../services/google-calendar.mjs';
 import {
   getTasks,
   addTask,
@@ -87,19 +87,7 @@ RULES:
 - Dates: today is {{TODAY}}. The user's timezone is {{TIMEZONE}}.
 `.trim();
 
-// ── Reuse the executeTool and parseActions logic from chat.mjs ──────────
-
-import {
-  listMessages,
-  getMessage,
-  sendEmail,
-  createDraft,
-} from '../services/google-gmail.mjs';
-
-import {
-  getUpcomingEvents,
-  createEvent,
-} from '../services/google-calendar.mjs';
+// ── Tool execution (all imports are at top of file) ──────────
 
 function parseActions(text) {
   const actions = [];
@@ -189,6 +177,40 @@ async function executeTool(action, params, config) {
       });
       return `Event "${params.summary}" created for ${fmtTime(params.start)} - ${fmtTime(params.end)}.`;
     }
+    case 'calendar_move': {
+      await updateEvent(config, 'primary', params.eventId, {
+        start: { dateTime: new Date(params.newStart).toISOString() },
+        end: { dateTime: new Date(params.newEnd).toISOString() },
+      });
+      return `Event ${params.eventId} moved to ${fmtTime(params.newStart)} - ${fmtTime(params.newEnd)}.`;
+    }
+    case 'calendar_tomorrow': {
+      const tomorrow = new Date();
+      tomorrow.setDate(tomorrow.getDate() + 1);
+      const events = await getEventsForDate(config, tomorrow);
+      if (events.length === 0) return 'No events scheduled for tomorrow.';
+      return events.map((e, i) => {
+        const time = e.isAllDay ? 'All day' : `${fmtTime(e.start)} - ${fmtTime(e.end)}`;
+        return `${i + 1}. ${time} — ${e.summary}${e.location ? ' @ ' + e.location : ''}`;
+      }).join('\n');
+    }
+    case 'task_move': {
+      const { moveTask } = await import('../services/task-store.mjs');
+      const today = new Date().toISOString().split('T')[0];
+      const toDate = params.toDate === 'tomorrow'
+        ? new Date(new Date().setDate(new Date().getDate() + 1)).toISOString().split('T')[0]
+        : params.toDate;
+      const moved = moveTask(params.id, today, toDate);
+      return moved ? `Task #${params.id} moved to ${toDate}.` : `Task #${params.id} not found.`;
+    }
+    case 'notify_remind': {
+      const delay = params.atTime ? Math.max(0, new Date(params.atTime).getTime() - Date.now()) : 60000;
+      setTimeout(async () => {
+        const { notify } = await import('../services/notification.mjs');
+        notify('Reminder', params.message, config);
+      }, delay);
+      return `Reminder set: "${params.message}" at ${params.atTime || 'in 1 minute'}.`;
+    }
     case 'task_list': {
       const tasks = getTasks();
       if (tasks.length === 0) return 'No tasks for today.';
@@ -428,11 +450,17 @@ export async function cmdUI(args) {
         return;
       }
 
-      // GET /api/calendar
+      // GET /api/calendar?date=YYYY-MM-DD
       if (method === 'GET' && pathname === '/api/calendar') {
         try {
-          const events = await getTodayEvents(config);
-          sendJSON(res, 200, { events });
+          const dateParam = url.searchParams.get('date');
+          let events;
+          if (dateParam && dateParam !== new Date().toISOString().split('T')[0]) {
+            events = await getEventsForDate(config, new Date(dateParam));
+          } else {
+            events = await getTodayEvents(config);
+          }
+          sendJSON(res, 200, { events, date: dateParam || new Date().toISOString().split('T')[0] });
         } catch (e) {
           sendJSON(res, 200, { events: [], error: e.message });
         }
@@ -528,28 +556,33 @@ export async function cmdUI(args) {
           const { textParts, actions } = parseActions(response);
           const textResponse = textParts.join('\n\n');
 
-          // Execute non-destructive tool actions automatically
-          let toolResult = null;
-          if (actions.length > 0) {
-            const { action, params } = actions[0];
-            // Skip destructive actions in web UI for safety (gmail_send, gmail_reply, calendar_create)
-            const safeActions = new Set([
-              'gmail_list', 'gmail_read', 'gmail_draft',
-              'calendar_today', 'calendar_upcoming',
-              'task_list', 'task_add', 'task_done',
-            ]);
-            if (safeActions.has(action)) {
-              try {
-                toolResult = await executeTool(action, params, config);
-              } catch (e) {
-                toolResult = `Error: ${e.message}`;
-              }
-            } else {
-              toolResult = `[Action "${action}" requires confirmation. Use nha chat in terminal for write operations.]`;
+          // Execute ALL tool actions and collect results
+          const toolResults = [];
+          for (const { action, params } of actions) {
+            try {
+              const result = await executeTool(action, params, config);
+              toolResults.push({ action, result: typeof result === 'object' ? JSON.stringify(result) : String(result) });
+            } catch (e) {
+              toolResults.push({ action, result: `Error: ${e.message}` });
+            }
+          }
+
+          let fullResponse;
+          if (toolResults.length > 0) {
+            // Second LLM call with real tool results — forces the LLM to use actual data
+            const toolContext = toolResults.map(t => `[${t.action} result]: ${t.result}`).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 to the user based ONLY on the REAL data above. Do NOT invent or fabricate any information. Present the actual results clearly.`;
+            try {
+              fullResponse = await callLLM(config, chatSystemPrompt, followUp);
+            } catch {
+              // Fallback: show raw results
+              fullResponse = toolResults.map(t => `${t.action}: ${t.result}`).join('\n\n');
             }
+          } else {
+            fullResponse = textResponse;
           }
 
-          sendJSON(res, 200, { response: textResponse, toolResult, actions });
+          sendJSON(res, 200, { response: fullResponse, toolResults, actions });
         } catch (e) {
           sendJSON(res, 200, { response: null, error: e.message });
         }

package/src/services/web-ui.mjs

@@ -279,8 +279,11 @@ function sendChat(){
   apiPost('/api/chat',{message:msg,history:chatHistory.slice(0,-1)}).then(function(r){
     chatHistory.pop();
     if(r&&r.response){chatHistory.push({role:'assistant',content:r.response})}
-    else{chatHistory.push({role:'assistant',content:'Error: no response'})}
+    else if(r&&r.error){chatHistory.push({role:'assistant',content:'Error: '+r.error})}
+    else{chatHistory.push({role:'assistant',content:'Error: no response from server'})}
     renderMessages();
+    // Refresh data if an action was executed
+    if(r&&r.actions&&r.actions.length>0){loadDash().catch(function(){})}
   });
 }
 
@@ -340,13 +343,29 @@ function renderEmails(el){
 }
 
 // ---- CALENDAR ----
+var calDate = new Date().toISOString().split('T')[0];
 function renderCalendar(el){
-  var ev=dash.events;
-  if(ev.length===0){el.innerHTML='<div class="card" style="text-align:center;color:var(--dim);padding:30px">No events today</div>';return}
-  var h='';ev.forEach(function(x){
-    h+='<div class="card event"><span class="event__time">'+(x.isAllDay?'All day':fmtTime(x.start)+' - '+fmtTime(x.end))+'</span><span class="event__title">'+esc(x.summary)+'</span>'+(x.location?'<span class="event__location">'+esc(x.location)+'</span>':'')+'</div>';
-  });
+  var h='<div style="display:flex;gap:8px;align-items:center;margin-bottom:12px">'+
+    '<button class="btn btn--secondary" onclick="calNav(-1)">&lt;</button>'+
+    '<span style="flex:1;text-align:center;font-weight:700;color:var(--bright)">'+calDate+(calDate===new Date().toISOString().split('T')[0]?' (today)':'')+'</span>'+
+    '<button class="btn btn--secondary" onclick="calNav(1)">&gt;</button>'+
+    '<button class="btn btn--secondary" onclick="calDate=new Date().toISOString().split(\\x27T\\x27)[0];renderCalendar(document.getElementById(\\x27content\\x27))">Today</button>'+
+  '</div><div id="calEvents"><div style="text-align:center;padding:20px"><div class="spinner"></div></div></div>';
   el.innerHTML=h;
+  apiGet('/api/calendar?date='+calDate).then(function(r){
+    var ev=(r&&r.events)||[];
+    var ce=document.getElementById('calEvents');if(!ce)return;
+    if(ev.length===0){ce.innerHTML='<div class="card" style="text-align:center;color:var(--dim);padding:20px">No events on '+calDate+'</div>';return}
+    var out='';ev.forEach(function(x){
+      out+='<div class="card event"><span class="event__time">'+(x.isAllDay?'All day':fmtTime(x.start)+' - '+fmtTime(x.end))+'</span><span class="event__title">'+esc(x.summary)+'</span>'+(x.location?'<span class="event__location">'+esc(x.location)+'</span>':'')+'</div>';
+    });
+    ce.innerHTML=out;
+  });
+}
+function calNav(dir){
+  var d=new Date(calDate);d.setDate(d.getDate()+dir);
+  calDate=d.toISOString().split('T')[0];
+  renderCalendar(document.getElementById('content'));
 }
 
 // ---- AGENTS ----