nothumanallowed 13.5.105 → 13.5.107

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "nothumanallowed",
-  "version": "13.5.105",
+  "version": "13.5.107",
   "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

@@ -3180,120 +3180,206 @@ ${rawText.slice(0, 18000)}`;
 
               // ── Extract parameters from task ──
               // Date: "16 maggio", "16/05", "16-05-2026", "sabato 16", etc.
-              const dateMatch = travelTask.match(/(\d{1,2})\s+(gennaio|febbraio|marzo|aprile|maggio|giugno|luglio|agosto|settembre|ottobre|novembre|dicembre)/i)
-                || travelTask.match(/(\d{1,2})[\/\-](\d{1,2})(?:[\/\-](\d{4}))?/)
-                || travelTask.match(/(monday|tuesday|wednesday|thursday|friday|saturday|sunday|luned|marted|mercoled|gioved|venerd|sabato|domenica)\s+\w+/i);
+              // ── PARAMETER EXTRACTION ──
               const monthNames = {gennaio:1,febbraio:2,marzo:3,aprile:4,maggio:5,giugno:6,luglio:7,agosto:8,settembre:9,ottobre:10,novembre:11,dicembre:12};
+              const dateMatch = travelTask.match(/(\d{1,2})\s+(gennaio|febbraio|marzo|aprile|maggio|giugno|luglio|agosto|settembre|ottobre|novembre|dicembre)/i)
+                || travelTask.match(/(\d{1,2})[\/\-](\d{1,2})(?:[\/\-](\d{4}))?/);
               let targetDate = null;
               let targetDateStr = null;
-              if (dateMatch && dateMatch[2] && isNaN(Number(dateMatch[2]))) {
-                const day = parseInt(dateMatch[1]);
-                const month = monthNames[(dateMatch[2] || '').toLowerCase()];
-                if (day && month) {
-                  const year = new Date().getFullYear();
-                  targetDate = new Date(year, month - 1, day);
-                  targetDateStr = String(day).padStart(2, '0') + '/' + String(month).padStart(2, '0') + '/' + year;
+              if (dateMatch) {
+                if (dateMatch[2] && isNaN(Number(dateMatch[2]))) {
+                  const day = parseInt(dateMatch[1]);
+                  const month = monthNames[(dateMatch[2] || '').toLowerCase()];
+                  if (day && month) {
+                    const year = new Date().getFullYear();
+                    targetDate = new Date(year, month - 1, day);
+                    targetDateStr = String(day).padStart(2, '0') + '/' + String(month).padStart(2, '0') + '/' + year;
+                  }
+                } else if (dateMatch[1] && dateMatch[2]) {
+                  const day = parseInt(dateMatch[1]);
+                  const month = parseInt(dateMatch[2]);
+                  const year = dateMatch[3] ? parseInt(dateMatch[3]) : new Date().getFullYear();
+                  if (day >= 1 && day <= 31 && month >= 1 && month <= 12) {
+                    targetDate = new Date(year, month - 1, day);
+                    targetDateStr = String(day).padStart(2, '0') + '/' + String(month).padStart(2, '0') + '/' + year;
+                  }
                 }
               }
 
-              // City/location: "a Bologna", "a Roma", "near Milan", "vicino a Firenze"
-              const cityMatch = travelTask.match(/\b(?:a|in|near|vicino\s+a|at)\s+([A-Z][a-zA-Z\s]{2,20}?)(?:\s*[,\.!?]|\s+(?:il|la|per|con|un|una|mi|mia|del|della)|$)/);
-              const city = cityMatch ? cityMatch[1].trim() : null;
+              // City extraction — multi-attempt, most specific first
+              let city = null;
+              const _stopRx = /\s+(il|la|lo|i|le|gli|per|con|un|una|del|della|dei|delle|e|o|\d).*$/i;
+              // P1: "vicino a/near/around <City>"
+              const _cp1 = travelTask.match(/\b(?:vicino\s+a|near|around)\s+([A-Z][a-zA-Z\u00C0-\u017E]{1,}(?:\s+[A-Z][a-zA-Z\u00C0-\u017E]+)?)/);
+              // P2: "a/in <Capitalized City>"
+              const _cp2 = travelTask.match(/\b(?:a|in)\s+([A-Z][a-zA-Z\u00C0-\u017E]{2,}(?:\s+[A-Z][a-zA-Z\u00C0-\u017E]+)?)/);
+              // P3: "a/in <lowercase city>" (case insensitive)
+              const _cp3 = travelTask.match(/\b(?:a|in|at|near)\s+([a-zA-Z\u00C0-\u017E]{3,}(?:\s+[a-zA-Z\u00C0-\u017E]+)?)/i);
+              // P4: standalone known Italian cities (capitalized, no preposition needed)
+              const _knownCities = 'Milano|Roma|Napoli|Torino|Firenze|Bologna|Venezia|Genova|Palermo|Bari|Catania|Verona|Padova|Trieste|Brescia|Bergamo|Modena|Parma|Reggio|Mantova|Ferrara|Vicenza|Treviso|Udine|Trento|Bolzano|Perugia|Ancona|Pescara|Foggia|Salerno|Taranto|Cagliari|Sassari|Siena|Pisa|Lucca|Arezzo|Rimini|Ravenna|Forl|Prato|Livorno|Messina';
+              const _cp4 = travelTask.match(new RegExp('\\b(' + _knownCities + ')\\b', 'i'));
+              const _cityRaw = (_cp1 && _cp1[1]) || (_cp2 && _cp2[1]) || (_cp3 && _cp3[1]) || (_cp4 && _cp4[1]) || null;
+              if (_cityRaw) {
+                city = _cityRaw.replace(_stopRx, '').trim();
+                if (city.length < 2) city = null;
+              }
 
-              // Cuisine/restaurant type
-              const cuisineMatch = travelTask.match(/\b(sushi|pizza|giapponese|japanese|italiano|italian|cinese|chinese|indiano|indian|steakhouse|bistrot|trattoria|osteria)\b/i);
-              const cuisine = cuisineMatch ? cuisineMatch[1].toLowerCase() : null;
+              // Cuisine type → OSM cuisine tag
+              const cuisineMap = {sushi:'sushi',pizza:'pizza',giapponese:'japanese',japanese:'japanese',italiano:'italian',italian:'italian',cinese:'chinese',chinese:'chinese',indiano:'indian',indian:'indian',steakhouse:'steak_house',trattoria:'italian',osteria:'italian'};
+              const cuisineMatch = travelTask.match(/\b(sushi|pizza|giapponese|japanese|italiano|italian|cinese|chinese|indiano|indian|steakhouse|trattoria|osteria)\b/i);
+              const cuisineRaw = cuisineMatch ? cuisineMatch[1].toLowerCase() : null;
+              const cuisineOSM = cuisineRaw ? (cuisineMap[cuisineRaw] || cuisineRaw) : null;
 
-              // Accommodation type
-              const hasAccommodation = /b&b|bed\s*&?\s*breakfast|hotel|albergo|agriturismo|locanda|ostello|hostel|airbnb/i.test(travelTask);
+              const hasAccommodation = /b&b|bed\s*(?:&|and)\s*breakfast|hotel|albergo|agriturismo|locanda|ostello|hostel|pernottament|soggiorno/i.test(travelTask);
               const hasRestaurant = /ristorante|restaurant|sushi|cena|dinner|pranzo|lunch|mangiare|eat/i.test(travelTask);
 
               const summaryParts = [];
-              if (city) summaryParts.push('location: ' + city);
+              if (city) summaryParts.push('city: ' + city);
               if (targetDateStr) summaryParts.push('date: ' + targetDateStr);
-              if (cuisine) summaryParts.push('cuisine: ' + cuisine);
+              if (cuisineRaw) summaryParts.push('cuisine: ' + cuisineRaw);
               if (hasAccommodation) summaryParts.push('accommodation: yes');
               if (hasRestaurant) summaryParts.push('restaurant: yes');
               sendToken('[Extracted — ' + (summaryParts.join(', ') || 'general search') + '] ');
 
-              // ── Build search URLs for portals ──
+              const UA = 'NHA-TravelAgent/1.0 (nothumanallowed.com)';
               const portalResults = [];
-              const cityQ = city ? encodeURIComponent(city) : '';
-              const cuisineQ = cuisine ? encodeURIComponent(cuisine) : '';
-              const dateQ = targetDateStr || '';
-
-              // TheFork: restaurant search
-              if (hasRestaurant) {
-                const theforkQuery = [cuisine, city].filter(Boolean).join(' ');
-                const theforkUrl = 'https://www.thefork.it/ristoranti/' + (city ? encodeURIComponent(city.toLowerCase()) : 'italia') + (cuisine ? '?q=' + cuisineQ : '');
-                sendToken('[Searching TheFork...] ');
+
+              // ── TIER 1: Nominatim geocoding → get lat/lon for city ──
+              let lat = null, lon = null;
+              if (city) {
+                sendToken('[Geocoding ' + city + '...] ');
                 try {
-                  if (!be.isBrowserRunning()) await be.browserOpen(theforkUrl, { waitForLoad: true });
-                  else await be.browserNavigate(theforkUrl, { waitForLoad: true });
-                  await new Promise(r => setTimeout(r, 2500));
-                  const theforkContent = await be.browserExtract({ selector: 'body', format: 'text' });
-                  if (theforkContent && !theforkContent.error && theforkContent.text && theforkContent.text.length > 200) {
-                    portalResults.push('## TheFork — ' + theforkUrl + '\n' + theforkContent.text.slice(0, 5000));
-                  } else {
-                    const fetchFork = await withTimeout(executeTool('fetch_url', { url: theforkUrl }, config), 20000);
-                    if (fetchFork && fetchFork.length > 200) portalResults.push('## TheFork — ' + theforkUrl + '\n' + fetchFork.slice(0, 5000));
+                  const geoUrl = 'https://nominatim.openstreetmap.org/search?' + new URLSearchParams({ q: city, format: 'json', limit: '1', addressdetails: '0' }).toString();
+                  const geoRes = await withTimeout(fetch(geoUrl, { headers: { 'User-Agent': UA, 'Accept': 'application/json' } }), 8000);
+                  if (geoRes.ok) {
+                    const geoData = await geoRes.json();
+                    if (geoData && geoData[0]) {
+                      lat = parseFloat(geoData[0].lat);
+                      lon = parseFloat(geoData[0].lon);
+                      sendToken('[Found: ' + lat.toFixed(4) + ', ' + lon.toFixed(4) + '] ');
+                    }
                   }
-                } catch (e) {
+                } catch {}
+              }
+
+              // ── TIER 1: Overpass API — real OSM data ──
+              if (lat !== null && lon !== null) {
+                const radius = 5000; // 5km radius
+                const formatPlace = (el) => {
+                  const t = el.tags || {};
+                  const parts = [];
+                  if (t.name) parts.push('**' + t.name + '**');
+                  if (t['addr:street']) parts.push(t['addr:street'] + (t['addr:housenumber'] ? ' ' + t['addr:housenumber'] : ''));
+                  if (t['addr:city']) parts.push(t['addr:city']);
+                  if (t.phone || t['contact:phone']) parts.push('Tel: ' + (t.phone || t['contact:phone']));
+                  if (t.website || t['contact:website']) parts.push('Web: ' + (t.website || t['contact:website']));
+                  if (t.opening_hours) parts.push('Orari: ' + t.opening_hours);
+                  if (t.email || t['contact:email']) parts.push('Email: ' + (t.email || t['contact:email']));
+                  if (t.cuisine) parts.push('Cucina: ' + t.cuisine);
+                  if (t.stars) parts.push('Stelle: ' + t.stars);
+                  const coordLat = el.lat || (el.center && el.center.lat);
+                  const coordLon = el.lon || (el.center && el.center.lon);
+                  if (coordLat && coordLon) parts.push('Maps: https://www.openstreetmap.org/?mlat=' + coordLat + '&mlon=' + coordLon + '&zoom=17');
+                  return parts.join(' | ');
+                };
+
+                // Restaurants query
+                if (hasRestaurant) {
+                  sendToken('[Overpass: searching restaurants' + (cuisineOSM ? ' (' + cuisineOSM + ')' : '') + '...] ');
                   try {
-                    const fetchFork = await withTimeout(executeTool('fetch_url', { url: theforkUrl }, config), 20000);
-                    if (fetchFork && fetchFork.length > 200) portalResults.push('## TheFork — ' + theforkUrl + '\n' + fetchFork.slice(0, 5000));
-                  } catch {}
+                    const cuisineFilter = cuisineOSM ? '["cuisine"="' + cuisineOSM + '"]' : '';
+                    const restQuery = '[out:json][timeout:20];(node["amenity"="restaurant"]' + cuisineFilter + '(around:' + radius + ',' + lat + ',' + lon + ');way["amenity"="restaurant"]' + cuisineFilter + '(around:' + radius + ',' + lat + ',' + lon + '););out center tags;';
+                    const restRes = await withTimeout(fetch('https://overpass.kumi.systems/api/interpreter', {
+                      method: 'POST',
+                      headers: { 'Content-Type': 'application/x-www-form-urlencoded', 'User-Agent': UA },
+                      body: 'data=' + encodeURIComponent(restQuery)
+                    }), 25000);
+                    if (restRes.ok) {
+                      const restData = await restRes.json();
+                      const elements = (restData.elements || []).filter(el => el.tags && el.tags.name);
+                      if (elements.length > 0) {
+                        const lines = ['## Ristoranti trovati via OpenStreetMap (' + elements.length + ' risultati, raggio ' + (radius/1000) + 'km da ' + city + ')'];
+                        elements.slice(0, 15).forEach((el, i) => { lines.push((i+1) + '. ' + formatPlace(el)); });
+                        portalResults.push(lines.join('\n'));
+                        sendToken('[Found ' + elements.length + ' restaurants] ');
+                      } else if (cuisineOSM) {
+                        // Retry without cuisine filter — broader search
+                        sendToken('[No ' + cuisineOSM + ' found, retrying broader...] ');
+                        const broadQuery = '[out:json][timeout:20];(node["amenity"="restaurant"](around:' + radius + ',' + lat + ',' + lon + ');way["amenity"="restaurant"](around:' + radius + ',' + lat + ',' + lon + '););out center tags;';
+                        const broadRes = await withTimeout(fetch('https://overpass.kumi.systems/api/interpreter', {
+                          method: 'POST',
+                          headers: { 'Content-Type': 'application/x-www-form-urlencoded', 'User-Agent': UA },
+                          body: 'data=' + encodeURIComponent(broadQuery)
+                        }), 25000);
+                        if (broadRes.ok) {
+                          const broadData = await broadRes.json();
+                          const broadEl = (broadData.elements || []).filter(el => el.tags && el.tags.name);
+                          if (broadEl.length > 0) {
+                            const lines = ['## Ristoranti a ' + city + ' (tutti i tipi, ' + broadEl.length + ' trovati — nessun ristorante ' + cuisineRaw + ' su OpenStreetMap in questa zona)'];
+                            broadEl.slice(0, 10).forEach((el, i) => { lines.push((i+1) + '. ' + formatPlace(el)); });
+                            portalResults.push(lines.join('\n'));
+                          }
+                        }
+                      }
+                    }
+                  } catch (e) { sendToken('[Overpass restaurants error: ' + e.message.slice(0,50) + '] '); }
                 }
-              }
 
-              // Booking.com: B&B / hotel search
-              if (hasAccommodation) {
-                const checkin = targetDate ? targetDate.toISOString().slice(0, 10) : '';
-                const checkout = targetDate ? new Date(targetDate.getTime() + 86400000).toISOString().slice(0, 10) : '';
-                const bookingUrl = 'https://www.booking.com/search.html?ss=' + (cityQ || 'Italy') + (checkin ? '&checkin=' + checkin + '&checkout=' + checkout : '') + '&group_adults=2&no_rooms=1&b_h4u_keep_filters=&from_sf=1';
-                sendToken('[Searching Booking.com...] ');
-                try {
-                  if (!be.isBrowserRunning()) await be.browserOpen(bookingUrl, { waitForLoad: true });
-                  else await be.browserNavigate(bookingUrl, { waitForLoad: true });
-                  await new Promise(r => setTimeout(r, 3000));
-                  const bookingContent = await be.browserExtract({ selector: 'body', format: 'text' });
-                  if (bookingContent && !bookingContent.error && bookingContent.text && bookingContent.text.length > 200) {
-                    portalResults.push('## Booking.com — ' + bookingUrl + '\n' + bookingContent.text.slice(0, 5000));
-                  } else {
-                    const fetchBook = await withTimeout(executeTool('fetch_url', { url: bookingUrl }, config), 20000);
-                    if (fetchBook && fetchBook.length > 200) portalResults.push('## Booking.com — ' + bookingUrl + '\n' + fetchBook.slice(0, 5000));
-                  }
-                } catch (e) {
+                // Accommodation query
+                if (hasAccommodation) {
+                  sendToken('[Overpass: searching accommodation...] ');
                   try {
-                    const fetchBook = await withTimeout(executeTool('fetch_url', { url: bookingUrl }, config), 20000);
-                    if (fetchBook && fetchBook.length > 200) portalResults.push('## Booking.com — ' + bookingUrl + '\n' + fetchBook.slice(0, 5000));
-                  } catch {}
+                    const accQuery = '[out:json][timeout:20];(node["tourism"~"hotel|guest_house|bed_and_breakfast|hostel|motel"](around:' + radius + ',' + lat + ',' + lon + ');way["tourism"~"hotel|guest_house|bed_and_breakfast|hostel|motel"](around:' + radius + ',' + lat + ',' + lon + ');node["amenity"="hotel"](around:' + radius + ',' + lat + ',' + lon + '););out center tags;';
+                    const accRes = await withTimeout(fetch('https://overpass.kumi.systems/api/interpreter', {
+                      method: 'POST',
+                      headers: { 'Content-Type': 'application/x-www-form-urlencoded', 'User-Agent': UA },
+                      body: 'data=' + encodeURIComponent(accQuery)
+                    }), 25000);
+                    if (accRes.ok) {
+                      const accData = await accRes.json();
+                      const elements = (accData.elements || []).filter(el => el.tags && el.tags.name);
+                      if (elements.length > 0) {
+                        const lines = ['## Alloggi trovati via OpenStreetMap (' + elements.length + ' risultati, raggio ' + (radius/1000) + 'km da ' + city + ')'];
+                        elements.slice(0, 15).forEach((el, i) => {
+                          const t = el.tags || {};
+                          const type = t.tourism === 'guest_house' ? 'B&B/Guest house' : t.tourism === 'hotel' ? 'Hotel' : t.tourism === 'bed_and_breakfast' ? 'B&B' : (t.tourism || 'Alloggio');
+                          lines.push((i+1) + '. [' + type + '] ' + formatPlace(el));
+                        });
+                        portalResults.push(lines.join('\n'));
+                        sendToken('[Found ' + elements.length + ' accommodations] ');
+                      }
+                    }
+                  } catch (e) { sendToken('[Overpass accommodation error: ' + e.message.slice(0,50) + '] '); }
                 }
+              } else if (city) {
+                sendToken('[Geocoding failed, skipping Overpass] ');
               }
 
-              // TripAdvisor: restaurants
-              if (hasRestaurant && city) {
-                const taUrl = 'https://www.tripadvisor.it/Search?q=' + [cuisineQ, cityQ].filter(Boolean).join('+') + '&searchSessionId=&sid=&blockRedirect=true';
-                sendToken('[Searching TripAdvisor...] ');
+              // ── TIER 2: Web search fallback — only if Overpass found nothing ──
+              const dataFound = portalResults.length > 0;
+              if (!dataFound) {
+                sendToken('[Web search fallback...] ');
                 try {
-                  const fetchTa = await withTimeout(executeTool('fetch_url', { url: taUrl }, config), 20000);
-                  if (fetchTa && fetchTa.length > 200) portalResults.push('## TripAdvisor — ' + taUrl + '\n' + fetchTa.slice(0, 5000));
+                  const cityStr = city || '';
+                  const queries = [];
+                  if (hasRestaurant && cityStr) queries.push((cuisineRaw ? cuisineRaw + ' ' : '') + 'ristorante ' + cityStr + ' prenotazione');
+                  else if (hasRestaurant) queries.push((cuisineRaw ? cuisineRaw + ' ' : '') + 'ristorante prenotazione online');
+                  if (hasAccommodation && cityStr) queries.push('b&b hotel ' + cityStr + (targetDateStr ? ' ' + targetDateStr.slice(0,5) : ''));
+                  if (queries.length === 0) queries.push(travelTask.slice(0, 80));
+                  for (const q of queries) {
+                    const sr = await withTimeout(executeTool('web_search', { query: q, deep: true }, config), 30000);
+                    if (sr && sr.length > 100) portalResults.push('## Web search: "' + q + '"\n' + (typeof sr === 'string' ? sr : JSON.stringify(sr)));
+                  }
                 } catch {}
               }
 
-              // Also do a DuckDuckGo search for the full task to capture any other results
-              sendToken('[Web search backup...] ');
-              try {
-                const generalQuery = [cuisine, 'ristorante', city, targetDateStr ? 'prenotazione' : '', hasAccommodation ? 'b&b romantico' : ''].filter(Boolean).join(' ');
-                const searchResult = await withTimeout(executeTool('web_search', { query: generalQuery, deep: true }, config), 30000);
-                if (searchResult && searchResult.length > 100) {
-                  portalResults.push('## Web search: "' + generalQuery + '"\n' + (typeof searchResult === 'string' ? searchResult : JSON.stringify(searchResult)));
-                }
-              } catch {}
-
-              toolData = portalResults.length > 0
-                ? portalResults.join('\n\n')
-                : 'No results found on travel portals. Try specifying city, date, and type of place.';
+              // ── Build final output ──
+              if (portalResults.length > 0) {
+                const header = '# TravelAgent — Risultati per: ' + (city || 'zona non specificata') + (targetDateStr ? ' | Data: ' + targetDateStr : '') + (cuisineRaw ? ' | Cucina: ' + cuisineRaw : '') + '\n\n';
+                toolData = header + portalResults.join('\n\n');
+              } else {
+                toolData = '# TravelAgent — Nessun risultato trovato\n\nNon sono stati trovati ristoranti o alloggi per i parametri specificati.\n\n**Parametri cercati:**\n- Città: ' + (city || 'non specificata') + '\n- Data: ' + (targetDateStr || 'non specificata') + '\n- Tipo cucina: ' + (cuisineRaw || 'qualsiasi') + '\n\n**Suggerimento:** Specifica la città esatta (es. "a Mantova") e il tipo di cucina per ottenere risultati migliori.';
+              }
             } catch (e) { toolData = toolData || 'TravelAgent failed: ' + e.message; }
 
           } else if (agent === 'BrowserAgent') {

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