kiku-agent 1.3.1 → 1.3.3

package/server/agent/toolRouter.js

@@ -1,5 +1,5 @@
 import { toolsSchema } from './tools.js';
-import { resolveQueryEntities, detectPlatforms, detectPromotionIntent } from './catalogEntityResolver.js';
+import { resolveQueryEntities, detectPlatforms, detectPromotionIntent, classifyQueryDomain, isQueryInDomain, classifyQuerySpectrum } from './catalogEntityResolver.js';
 
 export const TOOL_CLUSTERS = Object.freeze({
   CATALOG: [
@@ -22,6 +22,13 @@ export const TOOL_CLUSTERS = Object.freeze({
     'stop_music',
     'pause_music',
     'resume_music',
+    'mute_music',
+    'unmute_music',
+    'set_volume',
+    'seek_music',
+    'set_repeat_mode',
+    'set_shuffle_mode',
+    'toggle_video_mode',
     'next_track',
     'prev_track',
     'add_to_queue',
@@ -51,6 +58,9 @@ export const TOOL_CLUSTERS = Object.freeze({
     'search_chinese_web',
     'search_bilibili',
     'search_web_images',
+    'get_user_location',
+    'search_location_map',
+    'get_weather',
   ],
   SYSTEM: [
     'get_system_stats',
@@ -63,6 +73,56 @@ export const TOOL_CLUSTERS = Object.freeze({
   ]
 });
 
+const TOOL_CLUSTER_MAP = new Map();
+for (const [cluster, tools] of Object.entries(TOOL_CLUSTERS)) {
+  for (const t of tools) {
+    TOOL_CLUSTER_MAP.set(t, cluster);
+  }
+}
+
+function getToolCluster(toolName) {
+  if (TOOL_CLUSTER_MAP.has(toolName)) return TOOL_CLUSTER_MAP.get(toolName);
+  if (toolName && toolName.startsWith('mcp_')) return 'SYSTEM';
+  return 'CATALOG';
+}
+
+export const DEFAULT_OPEN_DOMAIN_TOOLS = Object.freeze([
+  'get_user_location',
+  'search_location_map',
+  'get_weather',
+  'web_search',
+  'web_extract',
+  'fetch_webpage',
+  'search_encyclopedia',
+  'search_news',
+  'fetch_json',
+  'global_search',
+]);
+
+export const OPEN_DOMAIN_WEB_TOOLS = Object.freeze([
+  'web_search',
+  'web_extract',
+  'fetch_webpage',
+  'search_encyclopedia',
+  'search_news',
+  'fetch_json',
+  'fetch_api',
+  'fetch_rss',
+  'search_chinese_web',
+  'search_bilibili',
+  'search_youtube',
+  'search_web_images',
+  'search_music_platforms',
+  'get_youtube_transcript',
+]);
+
+const CATALOG_INTENT_TYPES = new Set([
+  'WORKS',
+  'PROFILE_AWARDS_BRANDS',
+  'TIMELINE_ERA',
+  'MEDIA',
+]);
+
 const DEFAULT_UNIVERSAL_TOOLS = Object.freeze([
   'global_search',
   'get_profile_and_fandom',
@@ -105,13 +165,13 @@ export function expandActiveToolsWithDependencies(selectedTools, allToolsSchema)
 const INTENT_PATTERNS = [
   {
     type: 'MEDIA',
-    regex: /(เพลง|ร้อง|ฟัง|เอ็มวี|\bmv\b|\bmusics?\b|\bsongs?\b|\bsingles?\b|\bsolos?\b|\balbums?\b|\bep\b|\bdiscography\b|\bdiscs?\b|\btracks?\b|\btunes?\b|\bmelod(?:y|ies)\b|\bplay\b|\bqueues?\b|\baudios?\b|\bsounds?\b|\blisten\b|\bstages?\b|\bdances?\b|\bdancing\b|\bconcerts?\b|\bost\b|\bbilibili\b|b站|\bqqmusic\b|\bspotify\b|(?<!เครื่อง)ดนตรี|อัลบั้ม|ซิงเกิล|โซโล่|歌曲|单曲|首发|舞台|演唱|คลิป|วิดีโอ|\bvideos?\b)/i,
+    regex: /(เพลง|ร้อง|ฟัง(?!ก์|กชัน)|เอ็มวี|\bmv\b|\bmusics?\b|\bsongs?\b|\bsingles?\b|\bsolos?\b|\balbums?\b|\bep\b|\bdiscography\b|\bdiscs?\b|\btracks?\b|\btunes?\b|\bmelod(?:y|ies)\b|\bplay\b|\bqueues?\b|\baudios?\b|\bsounds?\b|\blisten\b|\bstages?\b|\bdances?\b|\bdancing\b|\bconcerts?\b|\bost\b|\bbilibili\b|b站|\bqqmusic\b|\bspotify\b|(?<!เครื่อง)ดนตรี|อัลบั้ม|ซิงเกิล|โซโล่|歌曲|单曲|首发|舞台|演唱|คลิป|วิดีโอ|\bvideos?\b|หยุดเพลง|พักเพลง|เล่นต่อ|ข้ามเพลง|เพลงถัดไป|เพลงก่อนหน้า|(?<!เ)ปิดเพลง|ปรับเสียง|เพิ่มเสียง|ลดเสียง|(?<!เ)ปิดเสียง|เปิดเสียง|\bmute\b|\bunmute\b|\bvolume\b|\bpause\b|\bresume\b|\bnext\b|\bprev\b|\bseek\b|\bshuffle\b|\brepeat\b|\bloop\b|วนซ้ำ|สุ่มเพลง|กรอเพลง|วินาทีที่|นาทีที่|เปิด\s*mv|ดู\s*mv)/i,
     clusters: ['MEDIA'],
-    essentialTools: ['search_discography', 'get_music_videos', 'get_media_links', 'play_music', 'get_queue', 'search_youtube', 'get_current_track', 'get_music_status', 'search_bilibili', 'search_music_platforms', 'get_gallery_photos']
+    essentialTools: ['search_discography', 'get_music_videos', 'search_bilibili', 'search_music_platforms', 'search_youtube', 'get_media_links', 'play_music', 'get_current_track', 'get_music_status', 'get_queue', 'get_gallery_photos']
   },
   {
     type: 'WORKS',
-    regex: /(ละคร|ซีรีส์|หนัง|ภาพยนตร์|บทบาท|ตัวละคร|ตอน|ช่อง|ฉาย|\bdramas?\b|\bseries\b|\bmovies?\b|\bfilms?\b|\broles?\b|\bcharacters?\b|\bsynops(?:is|es)\b|\bactors?\b|\btv\b|\bworks?\b|\bbroadcast(?:s|ing)?\b|\bweibo\b|影视|剧|新剧|角色|饰演)/i,
+    regex: /(ละคร|ซีรีส์|หนัง|ภาพยนตร์|บทบาท|ตัวละคร|ตอน|ช่อง|ฉาย|\bdramas?\b|\bseries\b|\bmovies?\b|\bfilms?\b|\broles?\b|\bcharacters?\b|\bsynops(?:is|es)\b|\bactors?\b|\btv\b|\bworks?\b|\bbroadcast(?:s|ing)?\b|影视|剧|新剧|角色|饰演)/i,
     clusters: ['CATALOG'],
     essentialTools: ['search_works', 'get_work_detail', 'get_character_roles', 'global_search', 'get_career_timeline', 'get_gallery_photos']
   },
@@ -129,20 +189,59 @@ const INTENT_PATTERNS = [
   },
   {
     type: 'RESEARCH_VERIFY',
-    regex: /(ข่าว|ล่าสุด|จริงไหม|ข่าวลือ|สืบ|ตรวจสอบ|สัญญา|ศาล|\bstar48\b|\bsiba\b|\bnews\b|\bupdates?\b|\blatest\b|\brecent(?:ly)?\b|\brumors?\b|\bverify\b|\bclaims?\b|\bdisputes?\b|\blegal\b|\blawsuits?\b|\bcontracts?\b|\btruth\b|新闻|最新消息|动态|热搜|资讯|爆料|近况|百科|百度百科|维基|\bencyclopedia\b|\bbaike\b|\bwikipedia?\b)/i,
+    regex: /(ข่าว|ล่าสุด|ใหม่ล่าสุด|ตอนนี้|ช่วงนี้|ปัจจุบัน|ปีนี้|ตารางงาน|ความเคลื่อนไหว|จริงไหม|ข่าวลือ|สืบ|ตรวจสอบ|สัญญา|ศาล|\bstar48\b|\bsiba\b|\bnews\b|\bupdates?\b|\blatest\b|\brecent(?:ly)?\b|\brumors?\b|\bverify\b|\bclaims?\b|\bdisputes?\b|\blegal\b|\blawsuits?\b|\bcontracts?\b|\btruth\b|\bweibo\b|เว่ยป๋อ|微博|超话|\bxiaohongshu\b|เสี่ยวหงซู|小红书|\bdouyin\b|โต่วอิน|抖音|路透|开机|新剧|行程|\bcurrently\b|\bnowadays\b|\bthese days\b|新闻|最新消息|动态|热搜|资讯|爆料|近况|百科|百度百科|维基|\bencyclopedia\b|\bbaike\b|\bwikipedia?\b)/i,
     clusters: ['RESEARCH'],
-    essentialTools: ['verify_claim', 'web_search', 'web_extract', 'fetch_webpage', 'run_subagent', 'run_deep_research', 'global_search', 'search_news', 'search_encyclopedia', 'search_chinese_web', 'get_gallery_photos']
+    essentialTools: ['verify_claim', 'web_search', 'web_extract', 'fetch_webpage', 'run_subagent', 'run_deep_research', 'global_search', 'search_news', 'search_encyclopedia', 'search_chinese_web']
   },
   {
     type: 'SYSTEM_SKILL',
-    regex: /(\bskills?\b|\blearn(?:ing|ed)?\b|\bteach(?:ing|er)?\b|\btui\b|\bsystems?\b|\bstats\b|\bstatus\b|\bmemory\b|\bprefs?\b|\bfiles?\b|\bdirs?\b|\bdirector(?:y|ies)\b|สถิติ|จำนวน|ระบบ|สอน)/i,
+    regex: /(?:\bskills?\b|\bmanage_skill\b|\btui\b|\bsystems?\b|\bstats\b|\bstatus\b|\bmemory\b|\bprefs?\b|\bfiles?\b|\bdirs?\b|\bdirector(?:y|ies)\b|สถิติระบบ|สถานะระบบ|ระบบไฟล์|สอน\s*(?:kiku|บอต|ai|ระบบ|เธอ|คุณ|น้องจวี)|เรียนรู้ทักษะ|จัดการสกิล|\bteach\s*(?:kiku|the\s*bot|the\s*ai|the\s*system|you)\b|\blearn\s*(?:skill|preference|instruction)\b)/i,
     clusters: ['SYSTEM'],
     essentialTools: ['manage_skill', 'get_system_stats', 'read_local_file', 'list_directory']
+  },
+  {
+    type: 'LOCATION_WEATHER',
+    regex: /(สภาพอากาศ|พยากรณ์อากาศ|อากาศ|ฝนตก|อุณหภูมิ|กี่องศา|ร่ม|แดด|หนาว|ร้อน|พายุ|แถวนี้|ใกล้ฉัน|ที่นี่|พิกัด|ตำแหน่ง|\bweather\b|\btemperature\b|\bforecast\b|\brain\b|\bclimate\b|\bnearby\b|\baround here\b|\bhere\b|\blocation\b|\bcoords?\b|\bgeolocation\b)/i,
+    clusters: ['RESEARCH'],
+    essentialTools: ['get_weather', 'get_user_location', 'search_location_map', 'web_search', 'fetch_json', 'fetch_webpage']
+  },
+  {
+    type: 'MAP_NAVIGATION',
+    regex: /(แผนที่|ขอแผนที่|ปักหมุด|นำทาง|ทางไป|อยู่ตรงไหน|อยู่ที่ไหน|พิกัดของ|เปิดแมพ|แมพ|\bmap of\b|\bmap\b|\bosm\b|\bopenstreetmap\b|\bdirections?\b|\bnavigation\b|\bwhere is\b)/i,
+    clusters: ['RESEARCH'],
+    essentialTools: ['search_location_map', 'get_user_location', 'web_search']
   }
 ];
 
 const MAX_ROUTED_TOOLS = 15;
 
+export function calculateSearchEscalationScore(prompt = '') {
+  const text = String(prompt || '');
+  let score = 0;
+
+  // Factor 1: Recency and temporal live markers
+  if (/(?:ล่าสุด|ใหม่ล่าสุด|ตอนนี้|ช่วงนี้|ปัจจุบัน|ปีนี้|ปี\s*(?:202[4-9]|256[7-9])|\b202[4-9]\b|latest|newest|recent(?:ly)?|current(?:ly)?|today|nowadays|these days|最新|近期|现在|近况)/i.test(text)) {
+    score += 15;
+  }
+
+  // Factor 2: Social media, live events, ongoing production
+  if (/(?:\bweibo\b|เว่ยป๋อ|微博|超话|\bxiaohongshu\b|เสี่ยวหงซู|小红书|\bdouyin\b|โต่วอิน|抖音|路透|开机|新剧|行程|ตารางงาน|งานอีเวนต์|อีเวนต์|แฟนมีต|แฟนมีตติ้ง|คอนเสิร์ต|ไลฟ์สด|\blive\b|直播)/i.test(text)) {
+    score += 15;
+  }
+
+  // Factor 3: News, verification, rumors, controversies
+  if (/(?:ข่าว|ข่าวลือ|จริงไหม|สืบ|อัปเดต|ความเคลื่อนไหว|สัญญากับ|\bstar48\b|\bsiba\b|\bnews\b|\brumor(?:s)?\b|\bupdates?\b|\bdispute|\blawsuit|\bcontroversy|新闻|资讯|动态|热搜|爆料)/i.test(text)) {
+    score += 20;
+  }
+
+  // Factor 4: Inquiring about external presence / web / internet
+  if (/(?:ค้นหาเว็บ|ค้นหาในเน็ต|เสิร์ช|กูเกิล|baidu|ไป่ตู้|เน็ต|อินเทอร์เน็ต|\bweb\b|\bsearch\b|\bgoogle\b|\bbaidu\b|上网查|网上|搜索)/i.test(text)) {
+    score += 15;
+  }
+
+  return Math.min(score, 60);
+}
+
 export class DynamicToolRouter {
   constructor(allTools = toolsSchema) {
     this.allTools = Array.isArray(allTools) ? allTools : toolsSchema;
@@ -158,48 +257,56 @@ export class DynamicToolRouter {
     const text = String(prompt || '');
     const matched = [];
     const matchedTypes = new Set();
+    const resolution = resolveQueryEntities(text);
+    const intentScores = new Map();
 
+    const addScore = (type, score) => {
+      intentScores.set(type, (intentScores.get(type) || 0) + score);
+    };
 
     for (const pattern of INTENT_PATTERNS) {
       if (pattern.regex.test(text)) {
-        matched.push(pattern);
-        matchedTypes.add(pattern.type);
+        addScore(pattern.type, 3);
       }
     }
 
-  
-    const resolution = resolveQueryEntities(text);
-
-    if ((resolution.hasBrand || resolution.isPromotion) && !matchedTypes.has('PROFILE_AWARDS_BRANDS')) {
-      const brandPattern = INTENT_PATTERNS.find(p => p.type === 'PROFILE_AWARDS_BRANDS');
-      if (brandPattern) {
-        matched.push(brandPattern);
-        matchedTypes.add('PROFILE_AWARDS_BRANDS');
-      }
+    if (/(?:หยุดเพลง|พักเพลง|เล่นต่อ|ข้ามเพลง|เพลงถัดไป|เพลงก่อนหน้า|(?<!เ)ปิดเพลง|ปรับเสียง|เพิ่มเสียง|ลดเสียง|(?<!เ)ปิดเสียง|เปิดเสียง|\bmute\b|\bunmute\b|\bvolume\b|\bpause\b|\bresume\b|\bnext\b|\bprev\b|\bseek\b|\bshuffle\b|\brepeat\b|\bloop\b|วนซ้ำ|สุ่มเพลง|กรอเพลง|วินาทีที่|นาทีที่|เปิด\s*mv|ดู\s*mv|toggle_video)/i.test(text)) {
+      addScore('MEDIA', 5);
     }
+    if (resolution.hasSong) addScore('MEDIA', 4);
+    const mediaPlatforms = resolution.platforms.filter(p => ['bilibili', 'youtube', 'qqmusic', 'douyin'].includes(p));
+    if (mediaPlatforms.length > 0) addScore('MEDIA', 3);
 
-    if (resolution.hasWork && !matchedTypes.has('WORKS')) {
-      const workPattern = INTENT_PATTERNS.find(p => p.type === 'WORKS');
-      if (workPattern) {
-        matched.push(workPattern);
-        matchedTypes.add('WORKS');
-      }
-    }
+    if (resolution.hasWork) addScore('WORKS', 4);
+
+    if (resolution.hasBrand || resolution.isPromotion) addScore('PROFILE_AWARDS_BRANDS', 4);
+    if (resolution.hasAward || resolution.isAwardIntent) addScore('PROFILE_AWARDS_BRANDS', 5);
 
-    if (resolution.hasSong && !matchedTypes.has('MEDIA')) {
-      const mediaPattern = INTENT_PATTERNS.find(p => p.type === 'MEDIA');
-      if (mediaPattern) {
-        matched.push(mediaPattern);
-        matchedTypes.add('MEDIA');
+    const sortedIntents = [...intentScores.entries()]
+      .filter(([, score]) => score >= 3)
+      .sort((a, b) => b[1] - a[1]);
+
+    for (const [type, score] of sortedIntents) {
+      const p = INTENT_PATTERNS.find(item => item.type === type);
+      if (p) {
+        matched.push({ ...p, score });
+        matchedTypes.add(type);
       }
     }
 
-    if (resolution.platforms.length > 0 && !matchedTypes.has('MEDIA')) {
-      const mediaPattern = INTENT_PATTERNS.find(p => p.type === 'MEDIA');
-      if (mediaPattern) {
-        matched.push(mediaPattern);
-        matchedTypes.add('MEDIA');
-      }
+    const spectrum = classifyQuerySpectrum(text);
+    const hasCatalogSignal = resolution.matchedEntities.length > 0;
+    const offTopicEnforced = spectrum.verdict === 'OPEN_DOMAIN' && !hasCatalogSignal;
+    if (spectrum.verdict === 'OPEN_DOMAIN' || spectrum.bias < 0.4) {
+      matched.push({
+        type: 'OPEN_DOMAIN',
+        regex: /.*/,
+        clusters: ['RESEARCH'],
+        essentialTools: offTopicEnforced ? [...OPEN_DOMAIN_WEB_TOOLS] : ['web_search', 'web_extract', 'fetch_webpage', 'search_encyclopedia', 'search_news'],
+        score: offTopicEnforced ? 6 : Math.max(1, Math.round((1 - spectrum.bias) * 5)),
+        ...(offTopicEnforced ? { enforced: true } : {})
+      });
+      matchedTypes.add('OPEN_DOMAIN');
     }
 
     return matched;
@@ -245,8 +352,22 @@ export class DynamicToolRouter {
 
     const matchedIntents = this.detectIntents(prompt);
     const resolution = resolveQueryEntities(prompt);
+    const searchEscalationScore = calculateSearchEscalationScore(prompt);
+    const openIntent = matchedIntents.find(i => i.type === 'OPEN_DOMAIN');
+    const forceOpenDomain = Boolean(openIntent && openIntent.enforced)
+      && resolution.matchedEntities.length === 0;
+
+    if (searchEscalationScore >= 15) {
+      selectedNames.add('search_chinese_web');
+      selectedNames.add('search_news');
+      selectedNames.add('web_search');
+      selectedNames.add('web_extract');
+      highPriorityTools.add('search_chinese_web');
+      highPriorityTools.add('search_news');
+      highPriorityTools.add('web_search');
+    }
+
 
-   
     for (const entity of resolution.matchedEntities) {
       for (const toolName of (entity.recommendedTools || [])) {
         selectedNames.add(toolName);
@@ -254,35 +375,135 @@ export class DynamicToolRouter {
       }
     }
 
-  
+    for (const toolName of (resolution.recommendedTools || [])) {
+      selectedNames.add(toolName);
+      highPriorityTools.add(toolName);
+    }
+
     if (resolution.hasBrand || resolution.isPromotion) {
       selectedNames.add('get_brand_endorsements');
       highPriorityTools.add('get_brand_endorsements');
     }
 
+    if (resolution.hasAward || resolution.isAwardIntent) {
+      selectedNames.add('get_awards');
+      highPriorityTools.add('get_awards');
+    }
+
     if (resolution.platforms.includes('bilibili')) {
       selectedNames.add('search_bilibili');
-      selectedNames.add('get_media_links');
       highPriorityTools.add('search_bilibili');
+      if (!forceOpenDomain) {
+        selectedNames.add('get_media_links');
+        highPriorityTools.add('get_media_links');
+      }
     }
 
     if (resolution.platforms.includes('youtube')) {
       selectedNames.add('search_youtube');
-      selectedNames.add('get_media_links');
       highPriorityTools.add('search_youtube');
+      if (!forceOpenDomain) {
+        selectedNames.add('get_media_links');
+        highPriorityTools.add('get_media_links');
+      }
+    }
+
+    if (/(เปิดเพลง|เล่นเพลง|\bplay(?:_music)?\b)/i.test(prompt)) {
+      selectedNames.add('play_music');
+      highPriorityTools.add('play_music');
+    }
+    if (/(ปรับเสียง|เพิ่มเสียง|ลดเสียง|\bvolume\b)/i.test(prompt)) {
+      selectedNames.add('set_volume');
+      highPriorityTools.add('set_volume');
+    }
+    if (/(?:(?<!เ)ปิดเสียง|เปิดเสียง|\bmute\b|\bunmute\b)/i.test(prompt)) {
+      selectedNames.add('mute_music');
+      selectedNames.add('unmute_music');
+      highPriorityTools.add('mute_music');
+      highPriorityTools.add('unmute_music');
+    }
+    if (/(กรอเพลง|วินาทีที่|นาทีที่|\bseek\b)/i.test(prompt)) {
+      selectedNames.add('seek_music');
+      highPriorityTools.add('seek_music');
+    }
+    if (/(วนซ้ำ|\brepeat\b|\bloop\b)/i.test(prompt)) {
+      selectedNames.add('set_repeat_mode');
+      highPriorityTools.add('set_repeat_mode');
+    }
+    if (/(สุ่มเพลง|\bshuffle\b)/i.test(prompt)) {
+      selectedNames.add('set_shuffle_mode');
+      highPriorityTools.add('set_shuffle_mode');
+    }
+    if (/(เปิด\s*mv|ดู\s*mv|สลับ\s*mv|toggle_video)/i.test(prompt)) {
+      selectedNames.add('toggle_video_mode');
+      highPriorityTools.add('toggle_video_mode');
+    }
+    if (/(หยุดเพลง|พักเพลง|\bpause\b)/i.test(prompt)) {
+      selectedNames.add('pause_music');
+      highPriorityTools.add('pause_music');
+    }
+    if (/(เล่นต่อ|\bresume\b)/i.test(prompt)) {
+      selectedNames.add('resume_music');
+      highPriorityTools.add('resume_music');
+    }
+    if (/(ข้ามเพลง|เพลงถัดไป|\bnext\b)/i.test(prompt)) {
+      selectedNames.add('next_track');
+      highPriorityTools.add('next_track');
+    }
+    if (/(เพลงก่อนหน้า|\bprev\b)/i.test(prompt)) {
+      selectedNames.add('prev_track');
+      highPriorityTools.add('prev_track');
+    }
+    if (/(?:(?<!เ)ปิดเพลง|เลิกฟังเพลง|\bstop_music\b)/i.test(prompt)) {
+      selectedNames.add('stop_music');
+      highPriorityTools.add('stop_music');
+    }
+    if (/(สภาพอากาศ|พยากรณ์อากาศ|อากาศ|ฝนตก|อุณหภูมิ|กี่องศา|ร่ม|แดด|หนาว|ร้อน|พายุ|แถวนี้|ใกล้ฉัน|ที่นี่|พิกัด|ตำแหน่ง|\bweather\b|\btemperature\b|\bforecast\b|\brain\b|\bclimate\b|\bnearby\b|\baround here\b|\bhere\b|\blocation\b|\bcoords?\b|\bgeolocation\b)/i.test(prompt)) {
+      selectedNames.add('get_weather');
+      highPriorityTools.add('get_weather');
+      selectedNames.add('get_user_location');
+      highPriorityTools.add('get_user_location');
+      selectedNames.add('web_search');
+      highPriorityTools.add('web_search');
+    }
+    if (/(แผนที่|ขอแผนที่|ปักหมุด|นำทาง|ทางไป|อยู่ตรงไหน|อยู่ที่ไหน|พิกัดของ|เปิดแมพ|แมพ|\bmap of\b|\bmap\b|\bosm\b|\bopenstreetmap\b|\bdirections?\b|\bnavigation\b|\bwhere is\b)/i.test(prompt)) {
+      selectedNames.add('search_location_map');
+      highPriorityTools.add('search_location_map');
+      selectedNames.add('get_user_location');
     }
 
     if (matchedIntents.length === 0) {
-      for (const name of DEFAULT_UNIVERSAL_TOOLS) {
+      const isDomain = isQueryInDomain(prompt) || /^(?:สวัสดี|hello|hi|hey|หวัดดี|ดีครับ|ดีค่ะ)/i.test(prompt);
+      const fallbackTools = isDomain ? DEFAULT_UNIVERSAL_TOOLS : DEFAULT_OPEN_DOMAIN_TOOLS;
+      for (const name of fallbackTools) {
         selectedNames.add(name);
       }
     } else {
+      const isOpenDomain = matchedIntents.some(i => i.type === 'OPEN_DOMAIN');
       for (const intent of matchedIntents) {
+        if (forceOpenDomain && CATALOG_INTENT_TYPES.has(intent.type)) {
+          continue;
+        }
+        if (isOpenDomain && !resolution.hasWork && !resolution.hasBrand && (intent.type === 'WORKS' || intent.type === 'PROFILE_AWARDS_BRANDS')) {
+          continue;
+        }
         for (const toolName of intent.essentialTools) {
           selectedNames.add(toolName);
         }
       }
-      selectedNames.add('global_search');
+      if (isOpenDomain) {
+        highPriorityTools.add('web_search');
+        highPriorityTools.add('search_encyclopedia');
+      }
+      if (forceOpenDomain) {
+        for (const name of OPEN_DOMAIN_WEB_TOOLS) {
+          selectedNames.add(name);
+          highPriorityTools.add(name);
+        }
+      }
+      if (!forceOpenDomain) {
+        selectedNames.add('global_search');
+      }
       selectedNames.add('web_search');
       selectedNames.add('web_extract');
     }
@@ -313,13 +534,17 @@ export class DynamicToolRouter {
     }
 
     for (const intent of matchedIntents) {
+      if (forceOpenDomain && CATALOG_INTENT_TYPES.has(intent.type)) continue;
       for (const toolName of intent.essentialTools) {
         addToolByName(toolName);
       }
     }
 
     if (matchedIntents.length > 0) {
-      for (const name of ['global_search', 'web_search', 'web_extract']) {
+      const guaranteed = forceOpenDomain
+        ? ['web_search', 'web_extract', 'search_encyclopedia', 'search_news']
+        : ['global_search', 'web_search', 'web_extract'];
+      for (const name of guaranteed) {
         addToolByName(name);
       }
     }
@@ -352,7 +577,56 @@ export class DynamicToolRouter {
     }
 
     if (bundled.length > MAX_ROUTED_TOOLS && !options.showAll) {
-      return bundled.slice(0, MAX_ROUTED_TOOLS);
+      const priority = (toolName) => {
+        if (pinnedTools.some(t => t.function?.name === toolName)) return 100;
+        let score = 0;
+        if (highPriorityTools.has(toolName)) score += 20;
+        if (selectedNames.has(toolName)) score += 10;
+        if (searchEscalationScore > 0 && ['search_chinese_web', 'search_news', 'web_search'].includes(toolName)) {
+          score += Math.min(Math.round(searchEscalationScore * 0.4), 12);
+        }
+        for (let i = 0; i < matchedIntents.length; i++) {
+          const intent = matchedIntents[i];
+          const rank = intent.essentialTools ? intent.essentialTools.indexOf(toolName) : -1;
+          if (rank !== -1) {
+            score += Math.max(1, 15 - i * 3 - rank);
+          }
+        }
+        return score;
+      };
+
+      const ranked = [...bundled].sort((a, b) => {
+        const nameA = a.function?.name || a.name;
+        const nameB = b.function?.name || b.name;
+        return priority(nameB) - priority(nameA);
+      });
+
+      const kept = [];
+      const perCluster = new Map();
+      const overflow = [];
+
+      for (const tool of ranked) {
+        const name = tool.function?.name || tool.name;
+        if (pinnedTools.some(t => (t.function?.name || t.name) === name)) {
+          kept.push(tool);
+          continue;
+        }
+        const cluster = getToolCluster(name);
+        const count = perCluster.get(cluster) || 0;
+        if (count < 7) {
+          kept.push(tool);
+          perCluster.set(cluster, count + 1);
+          if (kept.length >= MAX_ROUTED_TOOLS) break;
+        } else {
+          overflow.push(tool);
+        }
+      }
+
+      while (kept.length < MAX_ROUTED_TOOLS && overflow.length > 0) {
+        kept.push(overflow.shift());
+      }
+
+      return kept;
     }
 
     return bundled;