nothumanallowed 14.1.67 → 14.1.69

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "nothumanallowed",
-  "version": "14.1.67",
+  "version": "14.1.69",
   "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/constants.mjs

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

package/src/server/routes/calendar.mjs

@@ -4,13 +4,74 @@
 
 import { sendJSON, sendError, parseBody } from '../index.mjs';
 import { loadConfig } from '../../config.mjs';
-import { getTodayEvents, getUpcomingEvents, createEvent, updateEvent, deleteEvent, getEventsForDate } from '../../services/mail-router.mjs';
+import { getTodayEvents, getUpcomingEvents, createEvent, updateEvent, deleteEvent, getEventsForDate, listEvents, detectMailProvider } from '../../services/mail-router.mjs';
 import { getTasks, addTask, completeTask, getDayStats } from '../../services/task-store.mjs';
 import { runPlanningPipeline } from '../../services/ops-pipeline.mjs';
 import { NHA_DIR } from '../../constants.mjs';
 import fs from 'fs';
 import path from 'path';
 
+/**
+ * Load all events for a given month from all calendars.
+ * Returns { byDate: { "2026-05-01": [...], "2026-05-02": [...] } }
+ */
+async function getMonthEvents(config, monthStr) {
+  // monthStr = "2026-05"
+  const [y, m] = monthStr.split('-').map(Number);
+  const startOfMonth = new Date(y, m - 1, 1);
+  const endOfMonth = new Date(y, m, 1); // first day of next month
+
+  const provider = detectMailProvider(config);
+  if (!provider) throw new Error('No mail provider authenticated.');
+
+  // Load calendars list
+  let listCalendars;
+  if (provider === 'microsoft') {
+    const ms = await import('../../services/microsoft-calendar.mjs');
+    listCalendars = ms.listCalendars || (() => [{ id: 'primary', accessRole: 'owner' }]);
+  } else {
+    const gc = await import('../../services/google-calendar.mjs');
+    listCalendars = gc.listCalendars;
+  }
+
+  const calendars = await listCalendars(config);
+  const byDate = {};
+
+  for (const cal of calendars) {
+    if (cal.accessRole === 'freeBusyReader') continue;
+    const isHolidayFeed = (cal.id || '').includes('#holiday@group');
+    try {
+      const events = await listEvents(config, cal.id, startOfMonth, endOfMonth);
+      for (const e of events) {
+        e.calendarName = cal.summary;
+        e.calendarId = cal.id;
+        e.readOnly = cal.accessRole === 'reader' || cal.accessRole === 'freeBusyReader';
+        e._isHoliday = isHolidayFeed;
+
+        // Determine which date this event belongs to
+        const dateKey = (e.start || '').slice(0, 10);
+        if (!dateKey) continue;
+        if (!byDate[dateKey]) byDate[dateKey] = [];
+        byDate[dateKey].push(e);
+      }
+    } catch { /* skip failed calendars */ }
+  }
+
+  // Sort events within each day and deduplicate holidays
+  for (const dateKey of Object.keys(byDate)) {
+    byDate[dateKey].sort((a, b) => new Date(a.start).getTime() - new Date(b.start).getTime());
+    const holidaySeen = new Set();
+    byDate[dateKey] = byDate[dateKey].filter(e => {
+      if (!e._isHoliday) return true;
+      if (holidaySeen.has(dateKey)) return false;
+      holidaySeen.add(dateKey);
+      return true;
+    });
+  }
+
+  return { byDate };
+}
+
 export function register(router) {
   // ── Calendar ──────────────────────────────────────────────────────────
 
@@ -18,10 +79,10 @@ export function register(router) {
     try {
       const config = loadConfig();
 
-      // ENTERPRISE OAUTH CHECK: Validate Google configuration upfront
       if (!config.google?.clientId && !config.google?.tokens?.access_token) {
         return sendJSON(res, 200, {
           events: [],
+          byDate: {},
           authRequired: true,
           message: 'Google Calendar requires authentication. Setup OAuth to view events.',
           setupUrl: 'https://console.cloud.google.com/apis/credentials'
@@ -29,16 +90,28 @@ export function register(router) {
       }
 
       const url = new URL(req.url, 'http://localhost');
+      const month = url.searchParams.get('month');
       const date = url.searchParams.get('date');
-      const events = date ? await getEventsForDate(config, date) : await getTodayEvents(config);
+
+      if (month) {
+        // Month view: return all events grouped by date
+        const result = await getMonthEvents(config, month);
+        return sendJSON(res, 200, result);
+      }
+
+      if (date) {
+        const events = await getEventsForDate(config, date);
+        return sendJSON(res, 200, { events });
+      }
+
+      // Default: today's events
+      const events = await getTodayEvents(config);
       sendJSON(res, 200, { events });
     } catch (e) {
       const msg = e.message || '';
-
-      // ENHANCED ERROR DETECTION
       if (msg.includes('invalid_grant') || msg.includes('unauthorized') || msg.includes('token')) {
         return sendJSON(res, 200, {
-          events: [],
+          events: [], byDate: {},
           authRequired: true,
           message: 'Google OAuth expired. Please re-authenticate.',
           error: 'Authentication required'
@@ -51,7 +124,7 @@ export function register(router) {
         });
       }
       if (msg.includes('No mail provider') || msg.includes('not authenticated') || msg.includes('No Google')) {
-        return sendJSON(res, 200, { events: [], authRequired: true, error: msg });
+        return sendJSON(res, 200, { events: [], byDate: {}, authRequired: true, error: msg });
       }
       sendError(res, 500, msg);
     }
@@ -73,23 +146,46 @@ export function register(router) {
     }
   });
 
+  // Create a new event
   router.post('/api/calendar', async (req, res) => {
     try {
       const body = await parseBody(req);
       const config = loadConfig();
-      if (body.action === 'update' && body.id) {
-        const updated = await updateEvent(config, body.id, body);
-        return sendJSON(res, 200, { event: updated });
-      }
-      if (body.action === 'delete' && body.id) {
-        await deleteEvent(config, body.id);
-        return sendJSON(res, 200, { ok: true });
-      }
       const event = await createEvent(config, body);
       sendJSON(res, 201, { event });
     } catch (e) { sendError(res, 500, e.message); }
   });
 
+  // Update an existing event (PATCH)
+  router.patch('/api/calendar/:calId/:eventId', async (req, res) => {
+    try {
+      const body = await parseBody(req);
+      const config = loadConfig();
+      const { calId, eventId } = req.params;
+
+      const tz = Intl.DateTimeFormat().resolvedOptions().timeZone;
+      const patch = {};
+      if (body.summary) patch.summary = body.summary;
+      if (body.description !== undefined) patch.description = body.description;
+      if (body.location !== undefined) patch.location = body.location;
+      if (body.start) patch.start = { dateTime: body.start, timeZone: tz };
+      if (body.end) patch.end = { dateTime: body.end, timeZone: tz };
+
+      const updated = await updateEvent(config, calId, eventId, patch);
+      sendJSON(res, 200, { event: updated });
+    } catch (e) { sendError(res, 500, e.message); }
+  });
+
+  // Delete an event
+  router.delete('/api/calendar/:calId/:eventId', async (req, res) => {
+    try {
+      const config = loadConfig();
+      const { calId, eventId } = req.params;
+      await deleteEvent(config, calId, eventId);
+      sendJSON(res, 200, { ok: true });
+    } catch (e) { sendError(res, 500, e.message); }
+  });
+
   // ── Tasks ─────────────────────────────────────────────────────────────
 
   router.get('/api/tasks', async (req, res) => {

package/src/server/routes/studio.mjs

@@ -215,12 +215,24 @@ export function register(router) {
       const contextBlock = context ? `\n\n## CONTEXT FROM PREVIOUS STEPS:\n${context.slice(0, 8000)}` : '';
       const proposalContextBlock = body.proposalContext ? `\n\n## OTHER AGENTS' PROPOSALS (CROSS-READING):\n${body.proposalContext.slice(0, 6000)}` : '';
 
+      const formatInstructions = `\n\nFORMATTING RULES (CRITICAL — your output will be rendered as HTML):
+- Use MARKDOWN TABLES with | pipes | for ALL tabular data. Example:
+  | Header 1 | Header 2 | Header 3 |
+  |----------|----------|----------|
+  | data     | data     | data     |
+- NEVER use ASCII art boxes (┌─┐│└─┘╔═╗║╚═╝). They render as ugly <pre> blocks.
+- NEVER use ASCII art charts/graphs (├─●──┤). Describe data in tables instead.
+- Use **bold**, *italic*, headers (## ##), bullet points, numbered lists, blockquotes (>).
+- For emphasis boxes, use blockquotes: > **Key insight:** text here
+- Write COMPLETE content under every heading — never leave a section empty.`;
+
       const sysParts = [
         agentSysDef || `You are ${agent}, a specialist AI agent in NHA Studio. Respond entirely in ${language}. Today is ${today}.`,
         `\n\n## WORKFLOW GOAL: ${task}`,
         contextBlock,
         proposalContextBlock,
         stepDef?.prompt ? `\n\n## YOUR SPECIFIC TASK:\n${stepDef.prompt}` : '',
+        formatInstructions,
       ];
       const systemPrompt = sysParts.join('');
       const userMessage = stepDef?.prompt || task;