codemini-cli 0.4.2 → 0.4.3

package/src/core/tools.js

@@ -345,30 +345,107 @@ async function webSearchQuery(config, args = {}) {
   if (!query) throw new Error('web_search requires query');
 
   const maxResults = clampNumber(normalizedArgs.max_results, 1, 20, 8);
-  const [{ search, SafeSearchType }] = await Promise.all([import('duck-duck-scrape')]);
-  const response = await search(query, {
-    safeSearch: SafeSearchType.MODERATE,
-    locale: String(normalizedArgs.locale || 'en-us').trim() || 'en-us',
-    region: String(normalizedArgs.region || 'wt-wt').trim() || 'wt-wt'
+  const locale = String(normalizedArgs.locale || config?.web?.search_locale || 'en-US').trim() || 'en-US';
+  const region = String(normalizedArgs.region || normalizedArgs.cc || config?.web?.search_region || (locale.toLowerCase().endsWith('-cn') ? 'CN' : 'US')).trim() || 'US';
+  const searchUrl = buildBingRssSearchUrl({
+    baseUrl: config?.web?.search_base_url,
+    query,
+    locale,
+    region
   });
+  const timeoutMs = clampNumber(normalizedArgs.timeout_ms || config?.web?.search_timeout_ms, 1_000, 60_000, 15_000);
+  const controller = new AbortController();
+  const timeout = setTimeout(() => controller.abort(), timeoutMs);
+  let response;
+  try {
+    response = await fetch(searchUrl, {
+      redirect: 'follow',
+      signal: controller.signal,
+      headers: {
+        'user-agent': 'CodeMiniCLI/0.4 web_search',
+        accept: 'application/rss+xml, application/xml;q=0.9, text/xml;q=0.8, */*;q=0.5',
+        'accept-language': `${locale},en;q=0.8`
+      }
+    });
+  } finally {
+    clearTimeout(timeout);
+  }
+  if (!response.ok) {
+    throw new Error(`web_search Bing RSS request failed: HTTP ${response.status}`);
+  }
+
+  const xml = await response.text();
+  const cheerio = await import('cheerio');
+  const parsed = parseBingRssResults(cheerio, xml, maxResults);
 
   return {
     query,
-    no_results: response?.noResults === true,
-    results: Array.isArray(response?.results)
-      ? response.results.slice(0, maxResults).map((item) => ({
-          title: String(item?.title || '').trim(),
-          url: String(item?.url || '').trim(),
-          description: normalizeWhitespace(item?.description || item?.rawDescription || ''),
-          hostname: String(item?.hostname || '').trim()
-        }))
-      : [],
-    related: Array.isArray(response?.related)
-      ? response.related.slice(0, 8).map((item) => String(item?.text || item?.raw || '').trim()).filter(Boolean)
-      : []
+    engine: 'bing_rss',
+    source_url: response.url || searchUrl,
+    no_results: parsed.results.length === 0,
+    results: parsed.results,
+    related: []
   };
 }
 
+function buildBingRssSearchUrl({ baseUrl, query, locale, region }) {
+  const url = new URL(String(baseUrl || 'https://cn.bing.com/search'));
+  url.searchParams.set('q', query);
+  url.searchParams.set('mkt', locale);
+  url.searchParams.set('setlang', locale);
+  url.searchParams.set('cc', region);
+  url.searchParams.set('format', 'rss');
+  return url.toString();
+}
+
+function parseBingRssResults(cheerio, xml, maxResults) {
+  const $ = cheerio.load(xml, { xmlMode: true });
+  const results = [];
+  const seenUrls = new Set();
+  $('item').each((_, element) => {
+    if (results.length >= maxResults) return false;
+    const title = normalizeWhitespace($(element).find('title').first().text());
+    const url = normalizeSearchResultUrl($(element).find('link').first().text());
+    if (!title || !url || seenUrls.has(url)) return undefined;
+    seenUrls.add(url);
+    results.push({
+      title,
+      url,
+      description: normalizeRssDescription(cheerio, $(element).find('description').first().text()),
+      hostname: hostnameFromUrl(url),
+      published_at: normalizeWhitespace($(element).find('pubDate').first().text())
+    });
+    return undefined;
+  });
+  return { results };
+}
+
+function normalizeSearchResultUrl(value) {
+  const text = String(value || '').trim();
+  if (!text) return '';
+  try {
+    const parsed = new URL(text);
+    if (!['http:', 'https:'].includes(parsed.protocol)) return '';
+    return parsed.toString();
+  } catch {
+    return '';
+  }
+}
+
+function normalizeRssDescription(cheerio, value) {
+  const text = String(value || '').trim();
+  if (!text) return '';
+  return normalizeWhitespace(cheerio.load(text).text() || text);
+}
+
+function hostnameFromUrl(value) {
+  try {
+    return new URL(value).hostname;
+  } catch {
+    return '';
+  }
+}
+
 function findUniqueLineBlock(lines, blockContent) {
   const probeLines = splitLines(blockContent);
   if (probeLines.length === 0 || (probeLines.length === 1 && probeLines[0] === '')) return null;
@@ -967,7 +1044,7 @@ async function runCommand(root, config, args) {
     command,
     cwd: root,
     shell: config.shell.default,
-    timeoutMs: config.shell.timeout_ms
+    timeoutMs: Number(args?.timeout || args?.timeout_ms || args?.timeoutMs || config.shell.timeout_ms)
   });
   return { ...result, command };
 }
@@ -1842,24 +1919,6 @@ export function getBuiltinTools({ workspaceRoot = process.cwd(), config, onSyste
         }
       }
     },
-    {
-      type: 'function',
-      function: {
-        name: 'glob',
-        description:
-          'Find files by glob pattern. Use this when you already know a filename pattern such as src/**/*.ts.',
-        parameters: {
-          type: 'object',
-          properties: {
-            pattern: { type: 'string', description: 'Glob pattern' },
-            path: { type: 'string', description: 'Directory to search' },
-            include_hidden: { type: 'boolean', description: 'Include dotfiles' },
-            max_results: { type: 'number', description: 'Max results' }
-          },
-          required: ['pattern']
-        }
-      }
-    },
     {
       type: 'function',
       function: {
@@ -2085,6 +2144,24 @@ export function getBuiltinTools({ workspaceRoot = process.cwd(), config, onSyste
   ];
 
   const deferredDefinitions = {
+    glob: {
+      type: 'function',
+      function: {
+        name: 'glob',
+        description:
+          'Find files by glob pattern. Use this when you already know a filename pattern such as src/**/*.ts.',
+        parameters: {
+          type: 'object',
+          properties: {
+            pattern: { type: 'string', description: 'Glob pattern' },
+            path: { type: 'string', description: 'Directory to search' },
+            include_hidden: { type: 'boolean', description: 'Include dotfiles' },
+            max_results: { type: 'number', description: 'Max results' }
+          },
+          required: ['pattern']
+        }
+      }
+    },
     ast_query: {
       type: 'function',
       function: {
@@ -2145,15 +2222,15 @@ export function getBuiltinTools({ workspaceRoot = process.cwd(), config, onSyste
       function: {
         name: 'web_search',
         description:
-          'Run a live web search through DuckDuckGo. Use this for keyword-based internet search. This tool respects config.web.search_enabled and will fail when network search is disabled.',
+          'Run a live web search by fetching Bing RSS results. Use this for keyword-based internet search. This tool respects config.web.search_enabled and will fail when network search is disabled.',
         parameters: {
           type: 'object',
           properties: {
             query: { type: 'string', description: 'Search query' },
             q: { type: 'string', description: 'Alias for query' },
             max_results: { type: 'number', description: 'Max results to return' },
-            locale: { type: 'string', description: 'DuckDuckGo locale such as en-us' },
-            region: { type: 'string', description: 'DuckDuckGo region such as wt-wt' }
+            locale: { type: 'string', description: 'Bing market and language such as en-US or zh-CN' },
+            region: { type: 'string', description: 'Bing country code such as US or CN' }
           },
           required: ['query']
         }

package/src/tui/chat-app.js

@@ -45,6 +45,22 @@ const ROLE_STYLES = {
     badgeText: 'black',
     chrome: 'gray'
   },
+  general: {
+    accent: 'greenBright',
+    border: 'green',
+    text: 'greenBright',
+    badgeBg: 'green',
+    badgeText: 'black',
+    chrome: 'gray'
+  },
+  advisor: {
+    accent: 'blueBright',
+    border: 'blue',
+    text: 'blueBright',
+    badgeBg: 'blue',
+    badgeText: 'white',
+    chrome: 'gray'
+  },
   planner: {
     accent: 'magentaBright',
     border: 'magenta',
@@ -105,7 +121,7 @@ const ROLE_STYLES = {
 
 const TUI_COPY = {
   zh: {
-    roleLabels: { you: '👤 你', coder: '💻 CODER', planner: '📋 PLANNER', reviewer: '🔍 REVIEWER', tester: '🧪 TESTER', summarizer: '📝 SUMMARIZER', system: '⚙️ 系统', error: '❌ 错误', pending: '⏳ 等待中' },
+    roleLabels: { you: '👤 你', general: 'GENERAL', advisor: '💡 ADVISOR', coder: '💻 CODER', planner: '📋 PLANNER', reviewer: '🔍 REVIEWER', tester: '🧪 TESTER', summarizer: '📝 SUMMARIZER', system: '⚙️ 系统', error: '❌ 错误', pending: '⏳ 等待中' },
     generic: {
       waitingForInput: '等待输入',
       ready: '就绪',
@@ -219,6 +235,8 @@ const TUI_COPY = {
       doingProjectIndex: '正在初始化项目索引',
       doneFileIndex: '已刷新文件索引',
       doingFileIndex: '正在刷新文件索引',
+      donePromptBudget: '已测量 Prompt 预算',
+      doingPromptBudget: '正在测量 Prompt 预算',
       toolFailed: (name) => `工具执行失败: ${name}`,
       waitingModelContinue: (detail) => `${detail}，等待模型继续`,
       waitingModelAdjust: (detail) => `${detail}，等待模型调整`
@@ -330,7 +348,7 @@ const TUI_COPY = {
     }
   },
   en: {
-    roleLabels: { you: 'YOU', coder: 'CODER', planner: 'PLANNER', reviewer: 'REVIEWER', tester: 'TESTER', summarizer: 'SUMMARIZER', system: 'SYSTEM', error: 'ERROR', pending: 'PENDING' },
+    roleLabels: { you: 'YOU', general: 'GENERAL', advisor: 'ADVISOR', coder: 'CODER', planner: 'PLANNER', reviewer: 'REVIEWER', tester: 'TESTER', summarizer: 'SUMMARIZER', system: 'SYSTEM', error: 'ERROR', pending: 'PENDING' },
     generic: {
       waitingForInput: 'waiting for input',
       ready: 'ready',
@@ -444,6 +462,8 @@ const TUI_COPY = {
       doingProjectIndex: 'Initializing project index',
       doneFileIndex: 'File index refreshed',
       doingFileIndex: 'Refreshing file index',
+      donePromptBudget: 'Prompt budget measured',
+      doingPromptBudget: 'Measuring prompt budget',
       toolFailed: (name) => `Tool failed: ${name}`,
       waitingModelContinue: (detail) => `${detail}, waiting for model to continue`,
       waitingModelAdjust: (detail) => `${detail}, waiting for model to adjust`
@@ -572,7 +592,7 @@ function roleStyle(label) {
   return ROLE_STYLES[label] || ROLE_STYLES.system;
 }
 
-const PLAN_AGENT_ROLES = new Set(['planner', 'coder', 'reviewer', 'tester', 'summarizer']);
+const PLAN_AGENT_ROLES = new Set(['planner', 'advisor', 'coder', 'reviewer', 'tester', 'summarizer']);
 
 function normalizePlanAgentRole(role) {
   const roleKey = String(role || '').trim().toLowerCase();
@@ -945,7 +965,7 @@ export function buildUiMessagesFromSessionHistory(sessionMessages, nextId) {
       continue;
     }
     if (message.role === 'assistant') {
-      out.push({ id: nextId(), label: 'coder', text, color: 'greenBright' });
+      out.push({ id: nextId(), label: 'general', text, color: 'greenBright' });
       continue;
     }
     if (message.role === 'system') {
@@ -1325,7 +1345,7 @@ export function isIndexSystemToolName(name) {
 export function shouldShowCompletionFooter(msg) {
   if (!msg || msg.loading || (msg.phase || '').trim()) return false;
   const label = (msg.label || '').toLowerCase();
-  return label === 'coder' || label === 'planner' || label === 'reviewer' || label === 'tester';
+  return label === 'general' || label === 'advisor' || label === 'coder' || label === 'planner' || label === 'reviewer' || label === 'tester';
 }
 
 function describeToolActivity(name, copy, { done = false, blocked = false } = {}) {
@@ -2506,13 +2526,27 @@ export function buildMessageRows(msg, showToolDetails, contentWidth = 72, copy)
     }
   };
 
+  const visiblePendingToolCalls = (existingCalls = []) => {
+    const pendingToolCalls = Array.isArray(msg?.pendingToolCalls) ? msg.pendingToolCalls : [];
+    return pendingToolCalls.filter((pending) => {
+      if (!pending) return false;
+      if (pending.id && existingCalls.some((tool) => tool?.id && tool.id === pending.id)) return false;
+      const pendingBase = parseToolDisplayName(pending.name).base;
+      return !existingCalls.some(
+        (tool) => parseToolDisplayName(tool?.name).base === pendingBase && tool?.status === 'running'
+      );
+    });
+  };
+
   if (Array.isArray(msg?.segments) && msg.segments.length > 0) {
-    const totalTools = msg.segments.filter(
+    const segmentTools = msg.segments.filter(
       (segment) =>
         segment.type === 'tool' ||
         segment.type === 'skill' ||
         (segment.type === 'system_tool' && (showToolDetails || !isIndexSystemToolName(segment.name)))
-    ).length;
+    );
+    const pendingToolCalls = visiblePendingToolCalls(segmentTools);
+    const totalTools = segmentTools.length + pendingToolCalls.length;
     let toolIndex = 0;
     for (const segment of msg.segments) {
       if (segment.type === 'tool' || segment.type === 'skill' || segment.type === 'system_tool') {
@@ -2525,19 +2559,14 @@ export function buildMessageRows(msg, showToolDetails, contentWidth = 72, copy)
         pushTextRows(segment.text || '');
       }
     }
+    pendingToolCalls.forEach((tool) => {
+      pushActivityRows(tool, toolIndex, totalTools);
+      toolIndex += 1;
+    });
   } else {
     pushTextRows(msg?.text || '');
     const toolCalls = Array.isArray(msg?.toolCalls) ? msg.toolCalls : [];
-    const pendingToolCalls = Array.isArray(msg?.pendingToolCalls) ? msg.pendingToolCalls : [];
-    const visibleCalls = [
-      ...toolCalls,
-      ...pendingToolCalls.filter((pending) => {
-        if (!pending) return false;
-        if (pending.id && toolCalls.some((tool) => tool?.id && tool.id === pending.id)) return false;
-        const pendingBase = parseToolDisplayName(pending.name).base;
-        return !toolCalls.some((tool) => parseToolDisplayName(tool?.name).base === pendingBase && tool?.status === 'running');
-      })
-    ];
+    const visibleCalls = [...toolCalls, ...visiblePendingToolCalls(toolCalls)];
     visibleCalls.forEach((tool, idx) => pushActivityRows(tool, idx, visibleCalls.length));
   }
 
@@ -3324,6 +3353,7 @@ function formatRuntimeSnapshot(snapshot) {
   if (!snapshot || typeof snapshot !== 'object') return '';
   return [
     `mode=${snapshot.mode || '-'}`,
+    `role=${snapshot.agentRole || 'general'}`,
     `model=${snapshot.model || '-'}`,
     `max_ctx=${snapshot.maxContextTokens || '-'}`,
     `session=${snapshot.sessionId || '-'}`
@@ -3553,7 +3583,7 @@ export function ChatApp({ runtime, sessionId, model, sdkProvider = 'openai-compa
     const current = Number(last[1]);
     const total = Number(last[2]);
     const role = String(last[3] || '').trim().toLowerCase();
-    const normalizedRole = ['planner', 'coder', 'reviewer', 'tester', 'summarizer'].includes(role) ? role : 'coder';
+    const normalizedRole = PLAN_AGENT_ROLES.has(role) ? role : 'coder';
     const title = String(last[4] || '').trim();
 
     // Detect step transition — finalize old assistant and create a new one
@@ -3761,7 +3791,7 @@ export function ChatApp({ runtime, sessionId, model, sdkProvider = 'openai-compa
           ...prev,
           {
             id: nextId(),
-            label: 'coder',
+            label: 'general',
             text: sanitizeRenderableText(displayText),
             color: 'greenBright',
             autoSkillNames: activeAssistantAutoSkillNamesRef.current
@@ -3901,8 +3931,8 @@ export function ChatApp({ runtime, sessionId, model, sdkProvider = 'openai-compa
     const aid = nextId();
     activeAssistantIdRef.current = aid;
     const planRole = activePlanStepRoleRef.current;
-    const label = planRole || 'coder';
-    const style = ROLE_STYLES[label] || ROLE_STYLES.coder;
+    const label = planRole || 'general';
+    const style = ROLE_STYLES[label] || ROLE_STYLES.general;
     const planStepInfo = activePlanStepInfoRef.current;
     const planStepTitle = activePlanStepTitleRef.current;
     const planStepDisplay = planStepInfo ? `${planStepInfo.current}/${planStepInfo.total} · ${planStepTitle}` : undefined;
@@ -4090,7 +4120,7 @@ export function ChatApp({ runtime, sessionId, model, sdkProvider = 'openai-compa
             const cleanedStandaloneText = stripPlanExecutionResult(String(displayText || event.text)).trim();
             setMessages((prev) => [
               ...prev,
-              { id: nextId(), label: 'coder', text: cleanedStandaloneText, color: 'greenBright' }
+              { id: nextId(), label: 'general', text: cleanedStandaloneText, color: 'greenBright' }
             ]);
           }
         }

package/src/tui/tool-activity/presenters/system.js

@@ -10,5 +10,11 @@ export function describeSystemToolActivity(copy, parsed, { done = false, blocked
     if (blocked) return makeBlocked(copy, safeTarget);
     return done ? `${copy.toolActivity.doneFileIndex}: ${safeTarget}` : `${copy.toolActivity.doingFileIndex}: ${safeTarget}`;
   }
+  if (parsed.base === 'prompt_budget') {
+    if (blocked) return makeBlocked(copy, 'prompt_budget');
+    return done
+      ? (copy.toolActivity.donePromptBudget || 'Prompt budget measured')
+      : (copy.toolActivity.doingPromptBudget || 'Measuring prompt budget');
+  }
   return '';
 }