kiku-agent 1.2.0 → 1.3.1

package/server/agent/toolRouter.js

@@ -1,216 +1,362 @@
-import { toolsSchema } from './tools.js';
-
-export const TOOL_CLUSTERS = Object.freeze({
-  CATALOG: [
-    'global_search',
-    'search_works',
-    'get_work_detail',
-    'get_character_roles',
-    'search_discography',
-    'get_profile_and_fandom',
-    'get_awards',
-    'get_brand_endorsements',
-    'get_career_timeline',
-    'get_social_feed',
-    'get_gallery_photos',
-    'get_quotes',
-  ],
-  MEDIA: [
-    'play_music',
-    'stop_music',
-    'pause_music',
-    'resume_music',
-    'next_track',
-    'prev_track',
-    'add_to_queue',
-    'remove_from_queue',
-    'clear_queue',
-    'get_queue',
-    'search_youtube',
-    'get_current_track',
-    'get_music_status',
-    'get_music_videos',
-    'get_media_links',
-  ],
-  RESEARCH: [
-    'web_search',
-    'web_extract',
-    'fetch_webpage',
-    'fetch_api',
-    'fetch_json',
-    'screenshot_webpage',
-    'verify_claim',
-    'run_subagent',
-    'run_deep_research',
-  ],
-  SYSTEM: [
-    'get_system_stats',
-    'manage_skill',
-    'read_local_file',
-    'list_directory',
-  ]
-});
-
-const DEFAULT_UNIVERSAL_TOOLS = Object.freeze([
-  'global_search',
-  'search_works',
-  'search_discography',
-  'get_profile_and_fandom',
-  'get_media_links',
-  'web_search',
-  'web_extract',
-  'run_subagent',
-]);
-
-const INTENT_PATTERNS = [
-  {
-    type: 'MEDIA',
-    regex: /(เพลง|ร้อง|ฟัง|เอ็มวี|mv|music|song|play|queue|track|audio|sound|listen|stage|dance|concert|ost|bilibili|qqmusic|歌曲|单曲|首发|舞台|演唱)/i,
-    clusters: ['MEDIA'],
-    essentialTools: ['search_discography', 'get_music_videos', 'get_media_links', 'play_music', 'get_queue', 'search_youtube', 'get_current_track', 'get_music_status']
-  },
-  {
-    type: 'WORKS',
-    regex: /(ละคร|ซีรีส์|หนัง|ภาพยนตร์|บทบาท|ตัวละคร|ตอน|ช่อง|ฉาย|drama|series|movie|film|role|character|synopsis|actor|tv|works|broadcast|weibo|影视|剧|新剧|角色|饰演)/i,
-    clusters: ['CATALOG'],
-    essentialTools: ['search_works', 'get_work_detail', 'get_character_roles', 'global_search', 'get_career_timeline']
-  },
-  {
-    type: 'PROFILE_AWARDS_BRANDS',
-    regex: /(ประวัติ|วันเกิด|อายุ|บ้านเกิด|แฟนคลับ|สโลแกน|แบรนด์|พรีเซนเตอร์|โฆษณา|ทูต|รางวัล|เกียรติยศ|นิตยสาร|แฟชั่น|ปก|โซเชียล|ไอจี|profile|bio|birthday|fandom|miju|蜜橘|brand|ambassador|award|honor|endorsement|quote|fashion|magazine|cover|snh48|election|hall of fame|senbatsu|win|social|instagram|weibo|douyin|wechat|account|คำพูด|代言|彩妆|品牌|荣誉|奖项|微博之夜)/i,
-    clusters: ['CATALOG'],
-    essentialTools: ['get_profile_and_fandom', 'get_brand_endorsements', 'get_awards', 'get_quotes', 'get_career_timeline', 'get_gallery_photos', 'get_social_feed']
-  },
-  {
-    type: 'RESEARCH_VERIFY',
-    regex: /(ข่าว|ล่าสุด|จริงไหม|ข่าวลือ|สืบ|ตรวจสอบ|สัญญา|ศาล|star48|siba|news|update|latest|recent|rumor|verify|claim|dispute|legal|lawsuit|contract|truth)/i,
-    clusters: ['RESEARCH'],
-    essentialTools: ['verify_claim', 'web_search', 'web_extract', 'fetch_webpage', 'run_subagent', 'run_deep_research', 'global_search']
-  },
-  {
-    type: 'SYSTEM_SKILL',
-    regex: /(skill|learn|teach|tui|system|stats|status|memory|pref|file|dir|directory|สถิติ|จำนวน|ระบบ|สอน)/i,
-    clusters: ['SYSTEM'],
-    essentialTools: ['manage_skill', 'get_system_stats', 'read_local_file', 'list_directory']
-  }
-];
-
-export class DynamicToolRouter {
-  constructor(allTools = toolsSchema) {
-    this.allTools = Array.isArray(allTools) ? allTools : toolsSchema;
-    this.toolsByName = new Map(this.allTools.map(t => [t.function?.name, t]));
-  }
-
-  setTools(allTools) {
-    this.allTools = Array.isArray(allTools) ? allTools : toolsSchema;
-    this.toolsByName = new Map(this.allTools.map(t => [t.function?.name, t]));
-  }
-
-  detectIntents(prompt = '') {
-    const text = String(prompt || '');
-    const matched = [];
-
-    for (const pattern of INTENT_PATTERNS) {
-      if (pattern.regex.test(text)) {
-        matched.push(pattern);
-      }
-    }
-    return matched;
-  }
-
-  extractAtMentions(prompt = '') {
-    const text = String(prompt || '');
-    const matches = text.match(/@([a-zA-Z0-9_-]+)/g);
-    if (!matches) return [];
-    return matches.map(m => m.slice(1));
-  }
-
-  routeToolsForQuery(prompt = '', options = {}) {
-    if (options.showAll || options.disableRouting) {
-      return [...this.allTools];
-    }
-
-    const atMentions = this.extractAtMentions(prompt);
-    const pinnedTools = [];
-    const selectedNames = new Set();
-
-    for (const mention of atMentions) {
-      const mentionLower = mention.toLowerCase();
-      for (const tool of this.allTools) {
-        const name = tool.function?.name;
-        if (!name) continue;
-        const nameLower = name.toLowerCase();
-        if (
-          nameLower === mentionLower ||
-          nameLower === `mcp_${mentionLower}` ||
-          nameLower.endsWith(`_${mentionLower}`) ||
-          nameLower.startsWith(`mcp_${mentionLower}_`)
-        ) {
-          selectedNames.add(name);
-          if (!pinnedTools.some(t => t.function?.name === name)) {
-            pinnedTools.push(tool);
-          }
-        }
-      }
-    }
-
-    const matchedIntents = this.detectIntents(prompt);
-
-    if (matchedIntents.length === 0) {
-      for (const name of DEFAULT_UNIVERSAL_TOOLS) {
-        selectedNames.add(name);
-      }
-    } else {
-      for (const intent of matchedIntents) {
-        for (const toolName of intent.essentialTools) {
-          selectedNames.add(toolName);
-        }
-      }
-      selectedNames.add('global_search');
-      selectedNames.add('web_search');
-      selectedNames.add('web_extract');
-    }
-
-    if (options.includeExtra && Array.isArray(options.includeExtra)) {
-      for (const name of options.includeExtra) {
-        selectedNames.add(name);
-      }
-    }
-
-    const routed = [...pinnedTools];
-    const seenNames = new Set(pinnedTools.map(t => t.function?.name));
-
-   
-    for (const tool of this.allTools) {
-      const name = tool.function?.name;
-      if (name && !name.startsWith('mcp_') && !seenNames.has(name) && selectedNames.has(name)) {
-        seenNames.add(name);
-        routed.push(tool);
-      }
-    }
-
-
-    const wantsMcpExplicitly = options.includeMcp === true || atMentions.some(m => m.toLowerCase().includes('mcp'));
-    if (wantsMcpExplicitly || routed.length < 3) {
-      for (const tool of this.allTools) {
-        const name = tool.function?.name;
-        if (name && name.startsWith('mcp_') && !seenNames.has(name) && (selectedNames.has(name) || wantsMcpExplicitly)) {
-          seenNames.add(name);
-          routed.push(tool);
-        }
-      }
-    }
-
-    if (routed.length === 0) {
-      return this.allTools.slice(0, 8);
-    }
-
-    if (routed.length > 15 && !options.showAll) {
-      return routed.slice(0, 15);
-    }
-
-    return routed;
-  }
-}
-
-export const dynamicToolRouter = new DynamicToolRouter();
+import { toolsSchema } from './tools.js';
+import { resolveQueryEntities, detectPlatforms, detectPromotionIntent } from './catalogEntityResolver.js';
+
+export const TOOL_CLUSTERS = Object.freeze({
+  CATALOG: [
+    'global_search',
+    'search_works',
+    'get_work_detail',
+    'get_character_roles',
+    'search_discography',
+    'get_profile_and_fandom',
+    'get_awards',
+    'get_brand_endorsements',
+    'get_career_timeline',
+    'get_social_feed',
+    'get_gallery_photos',
+    'get_quotes',
+    'record_dynamic_event',
+  ],
+  MEDIA: [
+    'play_music',
+    'stop_music',
+    'pause_music',
+    'resume_music',
+    'next_track',
+    'prev_track',
+    'add_to_queue',
+    'remove_from_queue',
+    'clear_queue',
+    'get_queue',
+    'search_youtube',
+    'get_current_track',
+    'get_music_status',
+    'get_music_videos',
+    'get_media_links',
+  ],
+  RESEARCH: [
+    'web_search',
+    'web_extract',
+    'fetch_webpage',
+    'fetch_api',
+    'fetch_json',
+    'screenshot_webpage',
+    'verify_claim',
+    'run_subagent',
+    'run_deep_research',
+    'search_news',
+    'fetch_rss',
+    'search_encyclopedia',
+    'search_music_platforms',
+    'search_chinese_web',
+    'search_bilibili',
+    'search_web_images',
+  ],
+  SYSTEM: [
+    'get_system_stats',
+    'manage_skill',
+    'read_local_file',
+    'list_directory',
+    'checkpoint_step',
+    'record_failure',
+    'load_active_run',
+  ]
+});
+
+const DEFAULT_UNIVERSAL_TOOLS = Object.freeze([
+  'global_search',
+  'get_profile_and_fandom',
+  'search_works',
+  'search_discography',
+  'get_character_roles',
+  'get_awards',
+  'get_quotes',
+  'get_brand_endorsements',
+  'web_search',
+  'web_extract',
+]);
+
+export const TOOL_DEPENDENCY_BUNDLES = Object.freeze({
+  search_works: ['get_gallery_photos'],
+  get_work_detail: ['get_gallery_photos'],
+  search_discography: ['get_music_videos'],
+  get_brand_endorsements: ['get_gallery_photos'],
+  get_awards: ['get_career_timeline'],
+});
+
+export function expandActiveToolsWithDependencies(selectedTools, allToolsSchema) {
+  if (!Array.isArray(selectedTools)) return [];
+  const tools = [...selectedTools];
+  const toolSet = new Set(tools.map(t => t.function?.name || t.name));
+  const schemaMap = new Map((allToolsSchema || []).map(t => [t.function?.name || t.name, t]));
+
+  for (const name of Array.from(toolSet)) {
+    const dependencies = TOOL_DEPENDENCY_BUNDLES[name] || [];
+    for (const dep of dependencies) {
+      if (!toolSet.has(dep) && schemaMap.has(dep)) {
+        tools.push(schemaMap.get(dep));
+        toolSet.add(dep);
+      }
+    }
+  }
+  return tools;
+}
+
+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,
+    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']
+  },
+  {
+    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,
+    clusters: ['CATALOG'],
+    essentialTools: ['search_works', 'get_work_detail', 'get_character_roles', 'global_search', 'get_career_timeline', 'get_gallery_photos']
+  },
+  {
+    type: 'TIMELINE_ERA',
+    regex: /(ปี\s*\d{4}|ค\.ศ\.\s*\d{4}|พ\.ศ\.\s*\d{4}|\b20\d{2}\b|ไทม์ไลน์|ประวัติการทำงาน|เส้นทางอาชีพ|เดบิวต์|เหตุการณ์|ลำดับเวลา|การเปลี่ยนแปลง|วาไรตี้|ช่วงปี|\byears?\b|\btimelines?\b|\bmilestones?\b|\beras?\b|\bdebut\b|\bevents?\b|\bvariety\b|\bchronolog(?:y|ical)\b|\bhistory\b|年代|时期|出道|发展历程|大事件|演艺经历|时间线)/i,
+    clusters: ['CATALOG'],
+    essentialTools: ['get_career_timeline', 'get_profile_and_fandom', 'get_awards', 'search_works']
+  },
+  {
+    type: 'PROFILE_AWARDS_BRANDS',
+    regex: /(ประวัติ|วันเกิด|เกิด(?!ขึ้น)|อายุ|บ้านเกิด|เมือง|มณฑล|แฟนคลับ|สโลแกน|แบรนด์|พรีเซนเตอร์|พรีเซ็นเตอร์|โฆษณา|แคมเปญ|โปรโมท|โปรโมต|การโปรโมท|การโปรโมต|ทูต|รางวัล|เกียรติยศ|นิตยสาร|แฟชั่น|ปก|โซเชียล|ไอจี|เรียน|การศึกษา|เครื่องดนตรี|ไวโอลิน|ส่วนสูง|สูง(?!สุด)|เลือด|กรุ๊ปเลือด|แมว|คติพจน์|คำขวัญ|สตูดิโอ|\bprofile\b|\bbio(?:graphy)?\b|\bbirthdays?\b|\bbirth\b|\bborn\b|\bbirthplace\b|\bhometown\b|\bcities?\b|\bcity\b|\bprovince\b|\bfandom\b|\bmiju\b|蜜橘|\bbrands?\b|\bambassadors?\b|\bawards?\b|\bhonou?rs?\b|\bendorsements?\b|\bquotes?\b|\bmotto\b|\bfashion\b|\bmagazines?\b|\bcovers?\b|\bcommercial\b|\bcf\b|\bpromos?\b|\bpromotions?\b|\bpromoted\b|\bcampaigns?\b|\bsponsor(?:s|ed|ship)?\b|\bpartnerships?\b|\bsnh48\b|\belections?\b|\bhall of fame\b|\bsenbatsu\b|\bwins?\b|\bsocial\b|\binstagram\b|\bweibo\b|\bdouyin\b|\bwechat\b|\baccounts?\b|\beducation\b|\bschools?\b|\bcolleges?\b|\buniversity\b|\binstruments?\b|\bviolin\b|\bheight\b|\bblood\b|\bcats?\b|\bstudios?\b|\bindependent\b|คำพูด|出生|籍贯|家乡|城市|省份|身高|血型|学历|毕业|乐器|小提琴|猫|座右铭|格言|代言|彩妆|品牌|荣誉|奖项|微博之夜|推广|商务|地广|物料)/i,
+    clusters: ['CATALOG'],
+    essentialTools: ['get_profile_and_fandom', 'get_brand_endorsements', 'get_awards', 'get_quotes', 'get_career_timeline', 'get_gallery_photos', 'get_social_feed']
+  },
+  {
+    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,
+    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']
+  },
+  {
+    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,
+    clusters: ['SYSTEM'],
+    essentialTools: ['manage_skill', 'get_system_stats', 'read_local_file', 'list_directory']
+  }
+];
+
+const MAX_ROUTED_TOOLS = 15;
+
+export class DynamicToolRouter {
+  constructor(allTools = toolsSchema) {
+    this.allTools = Array.isArray(allTools) ? allTools : toolsSchema;
+    this.toolsByName = new Map(this.allTools.map(t => [t.function?.name, t]));
+  }
+
+  setTools(allTools) {
+    this.allTools = Array.isArray(allTools) ? allTools : toolsSchema;
+    this.toolsByName = new Map(this.allTools.map(t => [t.function?.name, t]));
+  }
+
+  detectIntents(prompt = '') {
+    const text = String(prompt || '');
+    const matched = [];
+    const matchedTypes = new Set();
+
+
+    for (const pattern of INTENT_PATTERNS) {
+      if (pattern.regex.test(text)) {
+        matched.push(pattern);
+        matchedTypes.add(pattern.type);
+      }
+    }
+
+  
+    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 (resolution.hasWork && !matchedTypes.has('WORKS')) {
+      const workPattern = INTENT_PATTERNS.find(p => p.type === 'WORKS');
+      if (workPattern) {
+        matched.push(workPattern);
+        matchedTypes.add('WORKS');
+      }
+    }
+
+    if (resolution.hasSong && !matchedTypes.has('MEDIA')) {
+      const mediaPattern = INTENT_PATTERNS.find(p => p.type === 'MEDIA');
+      if (mediaPattern) {
+        matched.push(mediaPattern);
+        matchedTypes.add('MEDIA');
+      }
+    }
+
+    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');
+      }
+    }
+
+    return matched;
+  }
+
+  extractAtMentions(prompt = '') {
+    const text = String(prompt || '');
+    const matches = text.match(/@([a-zA-Z0-9_-]+)/g);
+    if (!matches) return [];
+    return matches.map(m => m.slice(1));
+  }
+
+  routeToolsForQuery(prompt = '', options = {}) {
+    if (options.showAll || options.disableRouting) {
+      return [...this.allTools];
+    }
+
+    const atMentions = this.extractAtMentions(prompt);
+    const pinnedTools = [];
+    const selectedNames = new Set();
+    const highPriorityTools = new Set();
+
+    for (const mention of atMentions) {
+      const mentionLower = mention.toLowerCase();
+      for (const tool of this.allTools) {
+        const name = tool.function?.name;
+        if (!name) continue;
+        const nameLower = name.toLowerCase();
+        if (
+          nameLower === mentionLower ||
+          nameLower === `mcp_${mentionLower}` ||
+          nameLower.endsWith(`_${mentionLower}`) ||
+          nameLower.startsWith(`mcp_${mentionLower}_`)
+        ) {
+          selectedNames.add(name);
+          highPriorityTools.add(name);
+          if (!pinnedTools.some(t => t.function?.name === name)) {
+            pinnedTools.push(tool);
+          }
+        }
+      }
+    }
+
+    const matchedIntents = this.detectIntents(prompt);
+    const resolution = resolveQueryEntities(prompt);
+
+   
+    for (const entity of resolution.matchedEntities) {
+      for (const toolName of (entity.recommendedTools || [])) {
+        selectedNames.add(toolName);
+        highPriorityTools.add(toolName);
+      }
+    }
+
+  
+    if (resolution.hasBrand || resolution.isPromotion) {
+      selectedNames.add('get_brand_endorsements');
+      highPriorityTools.add('get_brand_endorsements');
+    }
+
+    if (resolution.platforms.includes('bilibili')) {
+      selectedNames.add('search_bilibili');
+      selectedNames.add('get_media_links');
+      highPriorityTools.add('search_bilibili');
+    }
+
+    if (resolution.platforms.includes('youtube')) {
+      selectedNames.add('search_youtube');
+      selectedNames.add('get_media_links');
+      highPriorityTools.add('search_youtube');
+    }
+
+    if (matchedIntents.length === 0) {
+      for (const name of DEFAULT_UNIVERSAL_TOOLS) {
+        selectedNames.add(name);
+      }
+    } else {
+      for (const intent of matchedIntents) {
+        for (const toolName of intent.essentialTools) {
+          selectedNames.add(toolName);
+        }
+      }
+      selectedNames.add('global_search');
+      selectedNames.add('web_search');
+      selectedNames.add('web_extract');
+    }
+
+    if (options.includeExtra && Array.isArray(options.includeExtra)) {
+      for (const name of options.includeExtra) {
+        selectedNames.add(name);
+      }
+    }
+
+    const routed = [...pinnedTools];
+    const seenNames = new Set(pinnedTools.map(t => t.function?.name));
+
+    const addToolByName = (name) => {
+      if (!name || name.startsWith('mcp_') || seenNames.has(name)) return;
+      const tool = this.toolsByName.get(name);
+      if (!tool) return;
+      seenNames.add(name);
+      routed.push(tool);
+    };
+
+    for (const tool of this.allTools) {
+      const name = tool.function?.name;
+      if (name && !name.startsWith('mcp_') && !seenNames.has(name) && highPriorityTools.has(name)) {
+        seenNames.add(name);
+        routed.push(tool);
+      }
+    }
+
+    for (const intent of matchedIntents) {
+      for (const toolName of intent.essentialTools) {
+        addToolByName(toolName);
+      }
+    }
+
+    if (matchedIntents.length > 0) {
+      for (const name of ['global_search', 'web_search', 'web_extract']) {
+        addToolByName(name);
+      }
+    }
+
+    for (const tool of this.allTools) {
+      const name = tool.function?.name;
+      if (name && !name.startsWith('mcp_') && !seenNames.has(name) && selectedNames.has(name)) {
+        seenNames.add(name);
+        routed.push(tool);
+      }
+    }
+
+    const wantsMcpExplicitly = options.includeMcp === true || atMentions.some(m => m.toLowerCase().includes('mcp'));
+    if (wantsMcpExplicitly || routed.length < 3) {
+      for (const tool of this.allTools) {
+        const name = tool.function?.name;
+        if (name && name.startsWith('mcp_') && !seenNames.has(name) && (selectedNames.has(name) || wantsMcpExplicitly)) {
+          seenNames.add(name);
+          routed.push(tool);
+        }
+      }
+    }
+
+    const bundled = matchedIntents.length > 0
+      ? expandActiveToolsWithDependencies(routed, this.allTools)
+      : routed;
+
+    if (bundled.length === 0) {
+      return this.allTools.slice(0, 8);
+    }
+
+    if (bundled.length > MAX_ROUTED_TOOLS && !options.showAll) {
+      return bundled.slice(0, MAX_ROUTED_TOOLS);
+    }
+
+    return bundled;
+  }
+}
+
+export const dynamicToolRouter = new DynamicToolRouter();