codemini-cli 0.4.0 → 0.4.1

package/README.md

@@ -144,7 +144,7 @@ Typical flow:
 - Unified shell execution model:
   - one-off commands via `run`
   - long-running commands via `run` with `run_in_background=true`
-- Lightweight project index under `.codemini-project/`
+- Lightweight project index under `.codemini/`
 - Tree-sitter based structured editing for function, class, and method-level changes
 - Reply language control via `ui.reply_language`
 - Safe mode enabled by default
@@ -179,7 +179,7 @@ Execution mode behavior:
 
 ### Project Index
 
-CodeMini CLI maintains a lightweight project index inside `.codemini-project/`:
+CodeMini CLI maintains a lightweight project index inside `.codemini/`:
 
 - `project-map.json` — high-level repository facts such as languages, source roots, test roots, and entry candidates
 - `file-index.json` — per-file structure such as imports, exports, functions, classes, and lightweight symbol hints
@@ -191,7 +191,7 @@ The index is initialized when entering a project and refreshed incrementally aft
 
 - Global session state: `<base-config-dir>/sessions/`
 - Project workspace state: `.codemini/`
-- Lightweight project index: `.codemini-project/`
+- Lightweight project index: `.codemini/`
 - Bundled repo skills: `skills/<name>/SKILL.md`
 - Project-scoped skills: `.codemini/skills/<name>/SKILL.md`
 - Global installed skills: `<base-config-dir>/skills/<name>/SKILL.md`
@@ -377,7 +377,7 @@ CodeMini CLI 把工具分成两层：
 - 统一的 shell 执行模型：
   - 一次性命令直接 `run`
   - 长运行命令通过 `run` + `run_in_background=true`
-- 在 `.codemini-project/` 下维护轻量项目索引，帮助模型更快理解仓库
+- 在 `.codemini/` 下维护轻量项目索引，帮助模型更快理解仓库
 - 基于 Tree-sitter 的结构化编辑能力，适合函数级、类级、方法级改动
 - 支持通过 `ui.reply_language` 控制回复语言
 - safe mode 默认开启
@@ -412,7 +412,7 @@ Inbox 和持久记忆的区别：
 
 ### 项目索引
 
-CodeMini CLI 会在 `.codemini-project/` 下维护一份轻量项目索引：
+CodeMini CLI 会在 `.codemini/` 下维护一份轻量项目索引：
 
 - `project-map.json` — 记录仓库的高层结构事实，比如语言、源码目录、测试目录、入口候选
 - `file-index.json` — 记录文件级结构信息，比如 imports、exports、functions、classes 和轻量 symbol 提示
@@ -424,7 +424,7 @@ CodeMini CLI 会在 `.codemini-project/` 下维护一份轻量项目索引：
 
 - 全局会话状态：`<base-config-dir>/sessions/`
 - 项目工作区状态：`.codemini/`
-- 轻量项目索引：`.codemini-project/`
+- 轻量项目索引：`.codemini/`
 - 仓库内置 skill：`skills/<name>/SKILL.md`
 - 项目级 skill：`.codemini/skills/<name>/SKILL.md`
 - 全局已安装 skill：`<base-config-dir>/skills/<name>/SKILL.md`

package/deployment.md

@@ -13,13 +13,13 @@ npm pack
 Expected output:
 
 ```text
-codemini-cli-0.4.0.tgz
+codemini-cli-0.4.1.tgz
 ```
 
 If you want to verify the package contents:
 
 ```bash
-tar -tf codemini-cli-0.4.0.tgz
+tar -tf codemini-cli-0.4.1.tgz
 ```
 
 ## 2. Copy To The Target Machine
@@ -34,7 +34,7 @@ Copy the generated `.tgz` file to the Win10 machine by one of these methods:
 Recommended target path:
 
 ```powershell
-C:\temp\codemini-cli-0.4.0.tgz
+C:\temp\codemini-cli-0.4.1.tgz
 ```
 
 ## 3. Environment Requirements
@@ -58,7 +58,7 @@ npm -v
 Global install:
 
 ```powershell
-npm install -g C:\temp\codemini-cli-0.4.0.tgz
+npm install -g C:\temp\codemini-cli-0.4.1.tgz
 ```
 
 If global install is blocked by company policy, install in a working directory instead:
@@ -66,7 +66,7 @@ If global install is blocked by company policy, install in a working directory i
 ```powershell
 mkdir C:\temp\coder-test
 cd C:\temp\coder-test
-npm install C:\temp\codemini-cli-0.4.0.tgz
+npm install C:\temp\codemini-cli-0.4.1.tgz
 ```
 
 ## 5. Confirm Installation

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "codemini-cli",
-  "version": "0.4.0",
+  "version": "0.4.1",
   "description": "Coding CLI optimized for small-model workflows and Windows PowerShell",
   "keywords": [
     "cli",

package/src/core/agent-loop.js

@@ -6,6 +6,7 @@ import { trimInline as _trimInline, normalizePath } from './string-utils.js';
 import { captureToInbox, listInbox } from './memory-store.js';
 import { requiresApprovalEvaluation } from './command-risk.js';
 import { getToolOutputSanitizeOptions, sanitizeTextForModel } from './tool-output.js';
+import { normalizeToolArguments } from './tool-args.js';
 
 /**
  * 安全解析 JSON 字符串。
@@ -25,20 +26,6 @@ function safeJsonParse(raw) {
   }
 }
 
-function parseInlineRangePath(value) {
-  const text = String(value || '').trim();
-  if (!text) return null;
-  const match = text.match(/^(.*?):(\d+)(?:-(\d+))?$/);
-  if (!match) return null;
-  const [, maybePath, startRaw, endRaw] = match;
-  if (!maybePath || /^(?:[A-Za-z])$/.test(maybePath)) return null;
-  const start = Number(startRaw);
-  const end = Number(endRaw || startRaw);
-  if (!Number.isFinite(start) || start <= 0) return null;
-  if (!Number.isFinite(end) || end < start) return null;
-  return { path: maybePath, start_line: start, end_line: end };
-}
-
 function buildDeleteApprovalDetails(source, rawPath) {
   const existing =
     source?.approval && typeof source.approval === 'object' && !Array.isArray(source.approval)
@@ -74,90 +61,6 @@ function buildDeleteCancellationResult(args) {
   };
 }
 
-function normalizeToolArguments(toolName, args, rawArguments) {
-  const rawText = typeof rawArguments === 'string' ? rawArguments.trim() : '';
-  const primitive =
-    args == null || Array.isArray(args) || typeof args !== 'object'
-      ? args
-      : null;
-  const source =
-    args && typeof args === 'object' && !Array.isArray(args)
-      ? { ...args }
-      : {};
-
-  if (primitive != null && typeof primitive !== 'object') {
-    source._raw = rawText || String(primitive);
-  } else if (!source._raw && rawText && source._invalid_json) {
-    source._raw = rawText;
-  }
-
-  const stringValue =
-    typeof primitive === 'string'
-      ? primitive.trim()
-      : String(source._raw || '').trim();
-
-  if (toolName === 'read') {
-    const value = String(source.path || source.file_path || source.file || stringValue || '').trim();
-    if (value) source.path = value;
-    if (source.offset != null && source.start_line == null) source.start_line = source.offset;
-    if (source.limit != null && source.end_line == null && Number(source.start_line) > 0) {
-      source.end_line = Number(source.start_line) + Number(source.limit) - 1;
-    }
-    const range = parseInlineRangePath(source.path);
-    if (range) {
-      source.path = range.path;
-      if (source.start_line == null) source.start_line = range.start_line;
-      if (source.end_line == null) source.end_line = range.end_line;
-    }
-    return source;
-  }
-
-  if (toolName === 'list') {
-    const value = String(source.path || source.dir || source.directory || stringValue || '.').trim();
-    return { ...source, path: value || '.' };
-  }
-
-  if (toolName === 'glob') {
-    const pattern = String(source.pattern || source.glob || source.query || stringValue || '').trim();
-    if (pattern) source.pattern = pattern;
-    if (!source.path && source.directory) source.path = source.directory;
-    return source;
-  }
-
-  if (toolName === 'grep') {
-    const pattern = String(source.pattern || source.query || source.symbol || source.q || stringValue || '').trim();
-    if (pattern) source.pattern = pattern;
-    if (!source.path && (source.directory || source.dir || source.cwd)) {
-      source.path = source.directory || source.dir || source.cwd;
-    }
-    return source;
-  }
-
-  if (toolName === 'write') {
-    const value = String(source.path || source.file_path || source.file || stringValue || '').trim();
-    if (value) source.path = value;
-    if (source.content == null && source.text != null) source.content = source.text;
-    if (source.content == null && source.new_content != null) source.content = source.new_content;
-    return source;
-  }
-
-  if (toolName === 'edit') {
-    const value = String(source.path || source.file || source.file_path || '').trim();
-    if (value && !source.path) source.path = value;
-    return source;
-  }
-
-  if (toolName === 'delete') {
-    const value = String(source.path || source.file_path || source.file || source.target || source.directory || source.dir || stringValue || '').trim();
-    if (value) source.path = value;
-    const approval = buildDeleteApprovalDetails(source, source.path);
-    if (approval) source.approval = approval;
-    return source;
-  }
-
-  return source;
-}
-
 function emptyToolResultMarker(toolName) {
   const name = String(toolName || 'tool').trim() || 'tool';
   return `(${name} completed with no output)`;
@@ -408,18 +311,19 @@ function shouldAutoCaptureError(toolName, message) {
   return true;
 }
 
-function fireAndForgetCapture(toolName, message, args) {
+async function captureToolFailure(toolName, message, args, config = {}) {
+  if (config?.memory?.enabled === false || config?.memory?.auto_capture === false) return;
   const summary = `[${toolName}] ${String(message).slice(0, 120)}`;
   const details = args
     ? `Tool: ${toolName}\nError: ${message}\nArgs: ${JSON.stringify(args).slice(0, 300)}`
     : `Tool: ${toolName}\nError: ${message}`;
-  captureToInbox({
-    scope: 'auto',
+  await captureToInbox({
+    scope: 'repo',
     type: 'failure',
     summary,
     details,
     source: 'auto-capture'
-  }).catch(() => {});
+  });
 }
 
 async function checkAutoDreamThreshold(config) {
@@ -750,6 +654,14 @@ function formatToolDisplayName(name, args) {
     const command = trimInline(args?.command || '', 96);
     return command ? `run(${command})` : name;
   }
+  if (name === 'web_fetch') {
+    const url = trimInline(args?.url || args?.href || '', 96);
+    return url ? `web_fetch(${url})` : name;
+  }
+  if (name === 'web_search') {
+    const query = trimInline(args?.query || args?.q || '', 96);
+    return query ? `web_search(${query})` : name;
+  }
   if (name === 'edit') {
     const target = trimInline(args?.path || args?.file || '.', 96) || '.';
     return `edit(${target})`;
@@ -1099,7 +1011,7 @@ export async function runAgentLoop({
           onEvent({ type: 'tool:error', name: displayName, id: call.id, arguments: effectiveArgs, durationMs, summary: trimInline(message, 120) });
         }
         if (shouldAutoCaptureError(toolName, message)) {
-          fireAndForgetCapture(toolName, message, effectiveArgs);
+          await captureToolFailure(toolName, message, effectiveArgs, config).catch(() => {});
         }
         return {
           callId: call.id,
@@ -1122,13 +1034,13 @@ export async function runAgentLoop({
         if (typeof exitCode === 'number' && exitCode !== 0 && stderr) {
           const failMsg = `exit ${exitCode}: ${stderr.slice(0, 120)}`;
           if (shouldAutoCaptureError(toolName, failMsg)) {
-            fireAndForgetCapture(toolName, failMsg, effectiveArgs);
+            await captureToolFailure(toolName, failMsg, effectiveArgs, config).catch(() => {});
           }
         }
         if (toolResult.error) {
           const errMsg = String(toolResult.error).slice(0, 120);
           if (shouldAutoCaptureError(toolName, errMsg)) {
-            fireAndForgetCapture(toolName, errMsg, effectiveArgs);
+            await captureToolFailure(toolName, errMsg, effectiveArgs, config).catch(() => {});
           }
         }
       }

package/src/core/chat-runtime.js

@@ -25,7 +25,7 @@ import { buildSystemPromptWithSoul } from './soul.js';
 import { getProjectPlansDir, getProjectSpecsDir, getProjectWorkspaceDir, getSessionsDir } from './paths.js';
 import { buildProjectContextSnippet, initializeProjectIndex } from './project-index.js';
 import { buildMemorySnapshot } from './memory-prompt.js';
-import { forgetMemory, listMemories, searchMemories, captureToInbox, listInbox } from './memory-store.js';
+import { forgetMemory, listMemories, rememberMemory, searchMemories, captureToInbox, listInbox } from './memory-store.js';
 import { runDreamConsolidation } from './dream-consolidate.js';
 import { normalizePlanState } from './plan-state.js';
 import { countActiveTodos, normalizeTodos } from './todo-state.js';
@@ -3312,6 +3312,75 @@ export async function createChatRuntime({
     await saveSession(currentSession);
   };
 
+  const captureCompactSummary = async ({ summary, mode, beforeTokens, afterTokens }) => {
+    if (config?.memory?.enabled === false || config?.memory?.auto_capture === false) return null;
+    const normalizedSummary = String(summary || '').trim();
+    if (!normalizedSummary) return null;
+    const entrySummary = `Context compacted (${mode}): ${beforeTokens} -> ${afterTokens} tokens`;
+    return captureToInbox({
+      scope: 'repo',
+      type: 'observation',
+      summary: entrySummary,
+      details: normalizedSummary,
+      tags: ['compact', 'context-summary'],
+      source: 'auto-compact'
+    }).catch(() => null);
+  };
+
+  const shouldAutoCaptureUserPrompt = (text) => {
+    if (config?.memory?.enabled === false || config?.memory?.auto_capture === false) return false;
+    const value = String(text || '').replace(/\s+/g, ' ').trim();
+    if (value.length < 12) return false;
+    const actionPattern =
+      /\b(add|build|fix|implement|change|update|refactor|test|debug|remember|capture|continue|review)\b|实现|增加|添加|修复|修改|更新|重构|测试|调试|记住|继续|检查|沉淀|捕获/i;
+    return actionPattern.test(value);
+  };
+
+  const classifyDirectMemoryPrompt = (text) => {
+    if (config?.memory?.enabled === false || config?.memory?.auto_capture === false) return null;
+    const value = String(text || '').replace(/\s+/g, ' ').trim();
+    if (value.length < 6) return null;
+    const userPreferencePattern =
+      /(?:记住|请记住|以后|后续|我偏好|我的偏好|我喜欢|我习惯|不要再|别再|always remember|remember that|i prefer|my preference|don't|do not)/i;
+    if (!userPreferencePattern.test(value)) return null;
+    const projectPattern = /(?:本项目|这个项目|当前项目|这个仓库|当前仓库|repo|repository|project)/i;
+    const isProject = projectPattern.test(value);
+    return {
+      scope: isProject ? 'project' : 'user',
+      kind: isProject ? 'workflow' : 'preference',
+      content: value
+    };
+  };
+
+  const saveDirectMemoryPrompt = async (text) => {
+    const direct = classifyDirectMemoryPrompt(text);
+    if (!direct) return null;
+    return rememberMemory({
+      scope: direct.scope,
+      content: direct.content,
+      kind: direct.kind,
+      summary: direct.content.slice(0, 80),
+      source: 'auto-user-directive',
+      replaceSimilar: true,
+      workspaceRoot: process.cwd(),
+      config
+    }).catch(() => null);
+  };
+
+  const captureUserPromptForDream = async (text) => {
+    if (classifyDirectMemoryPrompt(text)) return null;
+    if (!shouldAutoCaptureUserPrompt(text)) return null;
+    const value = String(text || '').replace(/\s+/g, ' ').trim();
+    return captureToInbox({
+      scope: 'repo',
+      type: 'observation',
+      summary: `User task: ${value.slice(0, 120)}`,
+      details: value,
+      tags: ['user-prompt'],
+      source: 'auto-user-prompt'
+    }).catch(() => null);
+  };
+
   const buildActiveSystemPrompt = async () => {
     const soulPrompt = await buildSystemPromptWithSoul(baseSystemPrompt, config);
     const memorySnapshot = await buildMemorySnapshot({
@@ -4005,6 +4074,12 @@ export async function createChatRuntime({
         compactState.backupMessages = structuredClone(currentSession.messages);
         currentSession.messages = result.compacted.map((m) => ({ ...m, at: new Date().toISOString() }));
         await saveSession(currentSession);
+        await captureCompactSummary({
+          summary: result.summary,
+          mode: compactState.mode,
+          beforeTokens,
+          afterTokens
+        });
         await persistLocalExchange(line, report, { includeUser: false });
         return { type: 'system', text: report };
       }
@@ -4125,6 +4200,12 @@ export async function createChatRuntime({
             at: new Date().toISOString()
           }));
           await saveSession(currentSession);
+          await captureCompactSummary({
+            summary: autoResult.summary,
+            mode: compactState.mode,
+            beforeTokens: currentTokens,
+            afterTokens: estimateMessagesTokens(currentSession.messages)
+          });
           if (onAgentEvent) {
             onAgentEvent({
               type: 'compact:auto',
@@ -4137,6 +4218,7 @@ export async function createChatRuntime({
     }
 
     const expandedText = await expandFileMentions(parsedInput.text, process.cwd());
+    await saveDirectMemoryPrompt(expandedText);
     const autoRoute = classifyAutoRoute(expandedText);
     if (autoRoute.autoPlan) {
       await maybeAutoDreamFromRuntime();
@@ -4188,6 +4270,7 @@ export async function createChatRuntime({
       executionMode,
       signal
     });
+    await captureUserPromptForDream(expandedText);
     return { type: 'assistant', text: result.text, aborted: !!result.aborted };
   };
 

package/src/core/config-store.js

@@ -65,6 +65,7 @@ const DEFAULT_CONFIG = {
   memory: {
     enabled: true,
     auto_write: true,
+    auto_capture: true,
     inject_on_session_start: true,
     auto_dream_threshold: 10,
     max_items_per_scope: 12,
@@ -165,6 +166,7 @@ function normalizePolicyLists(config) {
   next.memory = next.memory || {};
   next.memory.enabled = next.memory.enabled !== false;
   next.memory.auto_write = next.memory.auto_write !== false;
+  next.memory.auto_capture = next.memory.auto_capture !== false;
   next.memory.inject_on_session_start = next.memory.inject_on_session_start !== false;
   next.memory.max_items_per_scope = Math.max(1, Number(next.memory.max_items_per_scope || 12));
   next.memory.auto_dream_threshold = Number(next.memory.auto_dream_threshold ?? 10);

package/src/core/context-compact.js

@@ -37,20 +37,30 @@ function modeToKeepRecent(mode) {
 }
 
 function buildLocalSummary(messages) {
-  const lines = [];
+  const goal = [];
+  const constraints = [];
+  const changedFiles = new Set();
+  const verification = [];
+  const openThreads = [];
   const limit = 16;
   for (const msg of messages.slice(-limit)) {
     if (msg.role === 'tool') {
-      // Try to parse tool result as JSON for semantic summary
       const text = textFromContent(msg.content);
       let parsed;
       try { parsed = JSON.parse(text); } catch { parsed = null; }
       if (parsed && typeof parsed === 'object') {
         const summary = summarizeToolResult(parsed);
-        lines.push(`- tool_result: ${summary}`);
+        if (parsed.path) changedFiles.add(String(parsed.path));
+        if (parsed.command || parsed.code != null || parsed.stderr || parsed.stdout) {
+          verification.push(summary);
+        } else {
+          openThreads.push(`tool_result: ${summary}`);
+        }
       } else {
         const clipped = text.length > 120 ? `${text.slice(0, 117)}...` : text;
-        lines.push(`- tool_result: ${clipped}`);
+        const match = clipped.match(/([A-Za-z0-9_./-]+\.[A-Za-z0-9]+):\d+/);
+        if (match) changedFiles.add(match[1]);
+        openThreads.push(`tool_result: ${clipped}`);
       }
       continue;
     }
@@ -59,21 +69,35 @@ function buildLocalSummary(messages) {
       const toolCallCount = Array.isArray(msg.tool_calls) ? msg.tool_calls.length : 0;
       const toolInfo = toolCallCount > 0 ? ` [called ${toolCallCount} tool(s)]` : '';
       const clipped = text.length > 300 ? `${text.slice(0, 297)}...` : text;
-      lines.push(`- assistant: ${clipped}${toolInfo}`);
+      if (clipped) openThreads.push(`assistant: ${clipped}${toolInfo}`);
       continue;
     }
     if (msg.role === 'user') {
       const text = textFromContent(msg.content).replace(/\s+/g, ' ').trim();
       const clipped = text.length > 200 ? `${text.slice(0, 197)}...` : text;
-      lines.push(`- user: ${clipped}`);
+      if (goal.length === 0) goal.push(clipped);
+      else constraints.push(clipped);
       continue;
     }
     const text = textFromContent(msg.content).replace(/\s+/g, ' ').trim();
     if (!text) continue;
     const clipped = text.length > 160 ? `${text.slice(0, 157)}...` : text;
-    lines.push(`- ${msg.role}: ${clipped}`);
+    openThreads.push(`${msg.role}: ${clipped}`);
   }
-  return `Context Summary\n${lines.join('\n')}`.trim();
+  const lines = [
+    'Context Summary',
+    'Goal:',
+    goal.length > 0 ? `- ${goal[0]}` : '- Unknown from compacted context',
+    'Key Constraints:',
+    ...(constraints.length > 0 ? constraints.slice(-4).map((item) => `- ${item}`) : ['- None recorded']),
+    'Changed Files:',
+    ...(changedFiles.size > 0 ? [...changedFiles].slice(0, 8).map((item) => `- ${item}`) : ['- None recorded']),
+    'Verification:',
+    ...(verification.length > 0 ? verification.slice(-4).map((item) => `- ${item}`) : ['- None recorded']),
+    'Open Threads:',
+    ...(openThreads.length > 0 ? openThreads.slice(-8).map((item) => `- ${item}`) : ['- None recorded'])
+  ];
+  return lines.join('\n').trim();
 }
 
 export function compactMessagesLocally(messages, { mode = 'default' } = {}) {

package/src/core/default-system-prompt.js

@@ -9,14 +9,14 @@ function getToolFewShotBlock() {
 Use these as style examples for tool calls:
 
 Current working directory: ${cwd}
-When a tool takes file_path, build it from the current working directory and prefer absolute paths.
+When a tool takes path, build it from the current working directory and prefer absolute paths.
 If the user mentions a project-relative path like src/app.ts, resolve it from ${cwd} instead of guessing parent directories.
 
 1. File discovery then read
 User: compare the auth flow
 Assistant: first narrow the search with the project index
 Tool: query_project_index({"query":"auth flow","path":"src","max_results":3})
-Tool: read({"file_path":"${cwd}/src/auth/service.ts"})
+Tool: read({"path":"${cwd}/src/auth/service.ts"})
 
 If the visible tool list does not include a needed capability, load it with tool_search instead of assuming it does not exist.
 Example:
@@ -27,7 +27,7 @@ Tool: glob({"pattern":"src/**/*.ts"})
 User: rename loginUser to signInUser
 Assistant: first find the exact occurrences
 Tool: grep({"pattern":"loginUser","path":"src"})
-Tool: edit({"file_path":"${cwd}/src/auth/service.ts","old_string":"loginUser","new_string":"signInUser"})
+Tool: edit({"path":"${cwd}/src/auth/service.ts","old_text":"loginUser","new_text":"signInUser"})
 
 3. Read a specific range
 User: inspect the reducer around line 120
@@ -43,7 +43,7 @@ Assistant: keep the checklist updated as each phase finishes, and do not give a
 5. Create a new file
 User: add a notes file
 Assistant: create the file directly
-Tool: write({"file":"${cwd}/notes.txt","text":"todo\\n"})
+Tool: write({"path":"${cwd}/notes.txt","content":"todo\\n"})
 
 6. Save a high-signal observation to memory
 When you notice a reusable pattern, a user correction, a repeated failure, or a stable preference — save it to persistent memory. Choose scope carefully:
@@ -73,7 +73,7 @@ Tool: tool_search({"query":"web_search"})
 Tool: web_search({"query":"latest pnpm release","max_results":5})
 
 Prefer these direct tool shapes over multi-step metadata reads or shell fallbacks.
-Prefer explicit absolute file_path values when the current working directory is known.`;
+Prefer explicit absolute path values when the current working directory is known.`;
 }
 
 function getEnvBlock() {

package/src/core/fff-adapter.js

@@ -111,7 +111,7 @@ class FffMcpClient {
       capabilities: {},
       clientInfo: {
         name: 'codemini-cli',
-        version: '0.4.0'
+        version: '0.4.1'
       }
     });
     this.sendNotification('notifications/initialized', {});

package/src/core/provider/openai-compatible.js

@@ -54,6 +54,36 @@ async function parseJsonResponse(response) {
   return response.json();
 }
 
+function isRetryableStatus(status) {
+  return status === 408 || status === 409 || status === 425 || status === 429 || status >= 500;
+}
+
+function isRetryableError(error) {
+  const name = String(error?.name || '');
+  if (name === 'AbortError' || name === 'TimeoutError') return false;
+  const message = String(error?.message || error || '');
+  return /fetch failed|network|socket|ECONNRESET|ETIMEDOUT|EAI_AGAIN/i.test(message);
+}
+
+async function fetchWithRetry(url, init, { maxRetries = 0 } = {}) {
+  const attempts = Math.max(0, Number(maxRetries) || 0) + 1;
+  let lastError;
+  for (let attempt = 0; attempt < attempts; attempt += 1) {
+    try {
+      const response = await fetch(url, init);
+      if (response.ok || !isRetryableStatus(response.status) || attempt === attempts - 1) {
+        return response;
+      }
+      await response.arrayBuffer().catch(() => null);
+    } catch (error) {
+      lastError = error;
+      if (!isRetryableError(error) || attempt === attempts - 1) throw error;
+    }
+    await new Promise((resolve) => setTimeout(resolve, 50 * (attempt + 1)));
+  }
+  throw lastError || new Error('Gateway request failed');
+}
+
 async function* iterateSseEvents(stream) {
   const decoder = new TextDecoder();
   let buffer = '';
@@ -318,12 +348,12 @@ export async function createChatCompletion({
   maxRetries = 2
 }) {
   const payload = buildPayload({ model, temperature, messages, tools });
-  const response = await fetch(buildChatCompletionsUrl(baseUrl), {
+  const response = await fetchWithRetry(buildChatCompletionsUrl(baseUrl), {
     method: 'POST',
     headers: createHeaders(apiKey),
     body: JSON.stringify(payload),
     signal: AbortSignal.timeout(timeoutMs)
-  });
+  }, { maxRetries });
   const data = await parseJsonResponse(response);
   const message = data?.choices?.[0]?.message || {};
   const text = sanitizeMiniMaxText(model, extractTextContent(message.content));
@@ -386,12 +416,12 @@ export async function createChatCompletionStream({
     }
   }
   const payload = buildPayload({ model, temperature, messages, tools, stream: true });
-  const response = await fetch(buildChatCompletionsUrl(baseUrl), {
+  const response = await fetchWithRetry(buildChatCompletionsUrl(baseUrl), {
     method: 'POST',
     headers: createHeaders(apiKey),
     body: JSON.stringify(payload),
     signal: controller.signal
-  });
+  }, { maxRetries });
   if (!response.ok || !response.body) {
     const text = await response.text().catch(() => '');
     throw new Error(`Gateway error ${response.status}: ${text || response.statusText}`);
@@ -402,7 +432,8 @@ export async function createChatCompletionStream({
   let usage = null;
   let miniMaxStreamState = { rawContent: '', visibleText: '' };
 
-  for await (const chunk of iterateSseEvents(response.body)) {
+  try {
+    for await (const chunk of iterateSseEvents(response.body)) {
     usage = chunk?.usage || usage;
     const choice0 = chunk?.choices?.[0] || {};
     const delta = choice0?.delta || {};
@@ -452,6 +483,10 @@ export async function createChatCompletionStream({
     if (choice0?.finish_reason) {
       break;
     }
+    }
+  } finally {
+    timeoutSignal.removeEventListener('abort', onAbort);
+    if (externalSignal) externalSignal.removeEventListener('abort', onAbort);
   }
 
   const result = buildFinalStreamResult(text, toolCallsByIndex, usage, messages);

package/src/core/shell-profile.js

@@ -146,11 +146,11 @@ export function getShellSystemPrompt(value) {
 ALWAYS prefer dedicated tools over raw shell commands:
 - The visible default tool list is intentionally small. If a needed capability is not currently listed, do not assume it is unavailable — call tool_search to load additional tools first
 - Use query_project_index first for broad repository understanding. It combines project-map metadata with indexed file symbols so you can narrow candidates before reading source files
-- Use read to inspect files — NEVER use cat, head, or tail via run. read returns content directly by default; demo-style shapes like {file_path:"src/app.ts"}, {path:"src/app.ts:10-40"}, or {file_path:"src/app.ts", offset:10, limit:30} are accepted
+- Use read to inspect files — NEVER use cat, head, or tail via run. Use canonical shapes like {path:"src/app.ts"}, {path:"src/app.ts:10-40"}, or {path:"src/app.ts", start_line:10, end_line:40}
 - Use grep to search file contents — NEVER use grep or rg via run
 - Use list for directory-by-directory filesystem discovery. If you specifically need pattern-based file lookup like src/**/*.ts, load glob with tool_search instead of falling back to run
-- Use edit to modify existing files — this is the DEFAULT path for code changes. Demo-style aliases like {file_path:"src/app.ts", old_string:"foo", new_string:"bar"} are accepted
-- Use write only for creating new files or complete rewrites (set full_file_rewrite=true for existing code files). Aliases like {file:"notes.txt", text:"..."} are accepted
+- Use edit to modify existing files — this is the DEFAULT path for code changes. Prefer {path:"src/app.ts", old_text:"foo", new_text:"bar"}
+- Use write only for creating new files or complete rewrites (set full_file_rewrite=true for existing code files). Prefer {path:"notes.txt", content:"..."}
 - Use update_todos to manage the session todo checklist for complex work. Provide the full current list each time and usually keep exactly one item in_progress
 - Use read_plan and update_plan to recover or sync structured plan state when plan progress was interrupted (for example by transient gateway/model errors)
 - Use run for shell commands. For long-running processes (dev servers, watchers), set run_in_background=true when you know you do not need the final result immediately. Long-running commands may also be backgrounded automatically
@@ -181,15 +181,15 @@ For background commands: use run to launch. If you need management tools that ar
 Common tool call patterns:
 - Query the project index first: {query:"login auth flow", path:"src", max_results:5}
 - Load a deferred tool when needed: {query:"glob"} or {query:"all"}
-- Read a file: {path:"src/app.ts"} or {file_path:"src/app.ts", offset:20, limit:40}
+- Read a file: {path:"src/app.ts"} or {path:"src/app.ts", start_line:20, end_line:60}
 - Read a specific range inline: {path:"src/app.ts:20-60"}
 - Search text: {pattern:"loginUser", path:"src"} or {query:"loginUser", directory:"src"}
 - List a directory first: {path:"src"}
 - After loading glob, find files by pattern: {pattern:"src/**/*.ts"} or {query:"src/**/*.ts"}
-- Edit exact text: {file_path:"src/app.ts", old_string:"foo", new_string:"bar"}
+- Edit exact text: {path:"src/app.ts", old_text:"foo", new_text:"bar"}
 - Edit with shorthand: {path:"src/app.ts", old_text:"foo", content:"bar"}
-- Write a new file: {file:"notes.txt", text:"..."} or {path:"src/page.tsx", content:"..."}
-- When the environment provides a Working directory, prefer absolute file_path values rooted there instead of guessing prefixes
+- Write a new file: {path:"notes.txt", content:"..."} or {path:"src/page.tsx", content:"..."}
+- When the environment provides a Working directory, prefer absolute path values rooted there instead of guessing prefixes
 - If the user gives a relative path like src/app.ts, resolve it from the current Working directory rather than inventing ../ or sibling folders
 
 # Doing tasks
@@ -218,7 +218,7 @@ Common tool call patterns:
 - Keep answers compact and easy to scan
 - Lead with the answer or next action, not scene-setting
 - Do not restate the user's request unless a brief restatement prevents ambiguity
-- When referencing code, use file_path:line_number format
+- When referencing code, use path:line_number format
 - Keep technical wording, commands, paths, and error details exact
 - Only use emojis if the user explicitly requests it`;
 }

package/src/core/tool-args.js

@@ -0,0 +1,181 @@
+import path from 'node:path';
+
+export function parseInlineRangePath(value) {
+  const text = String(value || '').trim();
+  if (!text) return null;
+  const match = text.match(/^(.*?):(\d+)(?:-(\d+))?$/);
+  if (!match) return null;
+  const [, maybePath, startRaw, endRaw] = match;
+  if (!maybePath || /^(?:[A-Za-z])$/.test(maybePath)) return null;
+  const startLine = Number(startRaw);
+  const endLine = Number(endRaw || startRaw);
+  if (!Number.isFinite(startLine) || startLine <= 0) return null;
+  if (!Number.isFinite(endLine) || endLine < startLine) return null;
+  return {
+    path: maybePath,
+    start_line: startLine,
+    end_line: endLine
+  };
+}
+
+export function normalizeReadArgs(rawArgs) {
+  const source =
+    rawArgs && typeof rawArgs === 'object' && !Array.isArray(rawArgs)
+      ? { ...rawArgs }
+      : { path: typeof rawArgs === 'string' ? rawArgs : '' };
+
+  const normalized = { ...source };
+  const aliasPath = String(source.path || source.file_path || source.file || source.target || '').trim();
+  if (aliasPath) normalized.path = aliasPath;
+
+  if (!Number.isFinite(Number(normalized.start_line)) && Number.isFinite(Number(source.offset))) {
+    normalized.start_line = Number(source.offset);
+  }
+
+  if (!Number.isFinite(Number(normalized.end_line)) && Number.isFinite(Number(source.limit))) {
+    const startLine = Number(normalized.start_line);
+    const limit = Number(source.limit);
+    if (startLine > 0 && limit > 0) {
+      normalized.end_line = startLine + limit - 1;
+    }
+  }
+
+  const inlineRange = parseInlineRangePath(normalized.path);
+  if (inlineRange) {
+    normalized.path = inlineRange.path;
+    if (!Number.isFinite(Number(normalized.start_line))) normalized.start_line = inlineRange.start_line;
+    if (!Number.isFinite(Number(normalized.end_line))) normalized.end_line = inlineRange.end_line;
+  }
+
+  return normalized;
+}
+
+export function normalizePathArgs(rawArgs, aliases = []) {
+  const source =
+    rawArgs && typeof rawArgs === 'object' && !Array.isArray(rawArgs)
+      ? { ...rawArgs }
+      : { path: typeof rawArgs === 'string' ? rawArgs : '' };
+  const normalized = { ...source };
+  const keys = ['path', ...aliases];
+  for (const key of keys) {
+    const value = String(source?.[key] || '').trim();
+    if (value) {
+      normalized.path = value;
+      break;
+    }
+  }
+  return normalized;
+}
+
+export function normalizePatternArgs(rawArgs, aliases = [], defaultPathAliases = []) {
+  const source =
+    rawArgs && typeof rawArgs === 'object' && !Array.isArray(rawArgs)
+      ? { ...rawArgs }
+      : { pattern: typeof rawArgs === 'string' ? rawArgs : '' };
+  const normalized = { ...source };
+  for (const key of ['pattern', ...aliases]) {
+    const value = String(source?.[key] || '').trim();
+    if (value) {
+      normalized.pattern = value;
+      break;
+    }
+  }
+  for (const key of ['path', ...defaultPathAliases]) {
+    const value = String(source?.[key] || '').trim();
+    if (value) {
+      normalized.path = value;
+      break;
+    }
+  }
+  return normalized;
+}
+
+export function normalizeWriteArgs(rawArgs) {
+  const source =
+    rawArgs && typeof rawArgs === 'object' && !Array.isArray(rawArgs)
+      ? { ...rawArgs }
+      : { path: typeof rawArgs === 'string' ? rawArgs : '' };
+  const normalized = { ...source };
+  const filePath = String(source.path || source.file_path || source.file || '').trim();
+  if (filePath) normalized.path = filePath;
+  if (normalized.content == null) {
+    if (source.text != null) normalized.content = source.text;
+    if (source.new_content != null) normalized.content = source.new_content;
+  }
+  return normalized;
+}
+
+export function normalizeWebFetchArgs(rawArgs) {
+  const normalized = normalizePathArgs(rawArgs, ['url', 'href', 'link', 'target']);
+  const url = String(normalized.url || normalized.path || '').trim();
+  return { ...normalized, url };
+}
+
+export function normalizeWebSearchArgs(rawArgs) {
+  const normalized = normalizePatternArgs(rawArgs, ['query', 'q', 'keyword']);
+  const query = String(normalized.query || normalized.pattern || '').trim();
+  return { ...normalized, query };
+}
+
+function buildDeleteApprovalDetails(source, rawPath) {
+  const existing =
+    source?.approval && typeof source.approval === 'object' && !Array.isArray(source.approval)
+      ? source.approval
+      : {};
+  const approvalPath = String(existing.path || rawPath || '').trim();
+  const approvalName = String(existing.name || (approvalPath ? path.basename(approvalPath) : '') || '').trim();
+  const approvalType = String(existing.type || '').trim();
+
+  const approval = {};
+  if (approvalPath) approval.path = approvalPath;
+  if (approvalName) approval.name = approvalName;
+  if (approvalType) approval.type = approvalType;
+  return Object.keys(approval).length > 0 ? approval : undefined;
+}
+
+export function normalizeToolArguments(toolName, args, rawArguments) {
+  const rawText = typeof rawArguments === 'string' ? rawArguments.trim() : '';
+  const primitive =
+    args == null || Array.isArray(args) || typeof args !== 'object'
+      ? args
+      : null;
+  const source =
+    args && typeof args === 'object' && !Array.isArray(args)
+      ? { ...args }
+      : {};
+
+  if (primitive != null && typeof primitive !== 'object') {
+    source._raw = rawText || String(primitive);
+  } else if (!source._raw && rawText && source._invalid_json) {
+    source._raw = rawText;
+  }
+
+  const stringValue =
+    typeof primitive === 'string'
+      ? primitive.trim()
+      : String(source._raw || '').trim();
+
+  if (toolName === 'read') return normalizeReadArgs({ ...source, ...(stringValue && !source.path ? { path: stringValue } : {}) });
+  if (toolName === 'list') return normalizePathArgs({ ...source, ...(stringValue && !source.path ? { path: stringValue } : {}) }, ['dir', 'directory']);
+  if (toolName === 'glob') return normalizePatternArgs({ ...source, ...(stringValue && !source.pattern ? { pattern: stringValue } : {}) }, ['glob', 'query'], ['directory']);
+  if (toolName === 'grep') return normalizePatternArgs({ ...source, ...(stringValue && !source.pattern ? { pattern: stringValue } : {}) }, ['query', 'symbol', 'q'], ['directory', 'dir', 'cwd']);
+  if (toolName === 'write') return normalizeWriteArgs({ ...source, ...(stringValue && !source.path ? { path: stringValue } : {}) });
+
+  if (toolName === 'edit') {
+    const value = String(source.path || source.file || source.file_path || '').trim();
+    if (value && !source.path) source.path = value;
+    return source;
+  }
+
+  if (toolName === 'delete') {
+    const normalized = normalizePathArgs(
+      { ...source, ...(stringValue && !source.path ? { path: stringValue } : {}) },
+      ['file_path', 'file', 'target', 'directory', 'dir']
+    );
+    const approval = buildDeleteApprovalDetails(normalized, normalized.path);
+    if (approval) normalized.approval = approval;
+    return normalized;
+  }
+
+  return source;
+}

package/src/core/tools.js

@@ -29,6 +29,14 @@ import {
   sanitizeTextForModel,
   summarizeRunOutput
 } from './tool-output.js';
+import {
+  normalizePathArgs,
+  normalizePatternArgs,
+  normalizeReadArgs,
+  normalizeWebFetchArgs,
+  normalizeWebSearchArgs,
+  normalizeWriteArgs
+} from './tool-args.js';
 const BACKGROUND_TASK_RECENT_OUTPUT_LIMIT = 80;
 const BACKGROUND_TASK_POLL_MS = 150;
 const MAX_AST_ENCLOSING_BYTES = 300_000;
@@ -100,133 +108,6 @@ function splitLines(text) {
   return String(text || '').split('\n');
 }
 
-function parseInlineReadRange(value) {
-  const text = String(value || '').trim();
-  if (!text) return null;
-  const match = text.match(/^(.*?):(\d+)(?:-(\d+))?$/);
-  if (!match) return null;
-  const [, maybePath, startRaw, endRaw] = match;
-  if (!maybePath || /^(?:[A-Za-z])$/.test(maybePath)) return null;
-  const startLine = Number(startRaw);
-  const endLine = Number(endRaw || startRaw);
-  if (!Number.isFinite(startLine) || startLine <= 0) return null;
-  if (!Number.isFinite(endLine) || endLine < startLine) return null;
-  return {
-    path: maybePath,
-    start_line: startLine,
-    end_line: endLine
-  };
-}
-
-function normalizeReadArgs(rawArgs) {
-  const source =
-    rawArgs && typeof rawArgs === 'object' && !Array.isArray(rawArgs)
-      ? { ...rawArgs }
-      : { path: typeof rawArgs === 'string' ? rawArgs : '' };
-
-  const normalized = { ...source };
-  const aliasPath = String(source.path || source.file_path || source.file || source.target || '').trim();
-  if (aliasPath) normalized.path = aliasPath;
-
-  if (!Number.isFinite(Number(normalized.start_line)) && Number.isFinite(Number(source.offset))) {
-    normalized.start_line = Number(source.offset);
-  }
-
-  if (!Number.isFinite(Number(normalized.end_line)) && Number.isFinite(Number(source.limit))) {
-    const startLine = Number(normalized.start_line);
-    const limit = Number(source.limit);
-    if (startLine > 0 && limit > 0) {
-      normalized.end_line = startLine + limit - 1;
-    }
-  }
-
-  const inlineRange = parseInlineReadRange(normalized.path);
-  if (inlineRange) {
-    normalized.path = inlineRange.path;
-    if (!Number.isFinite(Number(normalized.start_line))) normalized.start_line = inlineRange.start_line;
-    if (!Number.isFinite(Number(normalized.end_line))) normalized.end_line = inlineRange.end_line;
-  }
-
-  return normalized;
-}
-
-function normalizePathArgs(rawArgs, aliases = []) {
-  const source =
-    rawArgs && typeof rawArgs === 'object' && !Array.isArray(rawArgs)
-      ? { ...rawArgs }
-      : { path: typeof rawArgs === 'string' ? rawArgs : '' };
-  const normalized = { ...source };
-  const keys = ['path', ...aliases];
-  for (const key of keys) {
-    const value = String(source?.[key] || '').trim();
-    if (value) {
-      normalized.path = value;
-      break;
-    }
-  }
-  return normalized;
-}
-
-function normalizePatternArgs(rawArgs, aliases = [], defaultPathAliases = []) {
-  const source =
-    rawArgs && typeof rawArgs === 'object' && !Array.isArray(rawArgs)
-      ? { ...rawArgs }
-      : { pattern: typeof rawArgs === 'string' ? rawArgs : '' };
-  const normalized = { ...source };
-  for (const key of ['pattern', ...aliases]) {
-    const value = String(source?.[key] || '').trim();
-    if (value) {
-      normalized.pattern = value;
-      break;
-    }
-  }
-  for (const key of ['path', ...defaultPathAliases]) {
-    const value = String(source?.[key] || '').trim();
-    if (value) {
-      normalized.path = value;
-      break;
-    }
-  }
-  return normalized;
-}
-
-function normalizeWriteArgs(rawArgs) {
-  const source =
-    rawArgs && typeof rawArgs === 'object' && !Array.isArray(rawArgs)
-      ? { ...rawArgs }
-      : { path: typeof rawArgs === 'string' ? rawArgs : '' };
-  const normalized = { ...source };
-  const filePath = String(source.path || source.file_path || source.file || '').trim();
-  if (filePath) normalized.path = filePath;
-  if (normalized.content == null) {
-    if (source.text != null) normalized.content = source.text;
-    if (source.new_content != null) normalized.content = source.new_content;
-  }
-  return normalized;
-}
-
-function normalizeWebFetchArgs(rawArgs) {
-  const source =
-    rawArgs && typeof rawArgs === 'object' && !Array.isArray(rawArgs)
-      ? { ...rawArgs }
-      : { url: typeof rawArgs === 'string' ? rawArgs : '' };
-  const normalized = { ...source };
-  const url = String(source.url || source.href || source.link || source.target || '').trim();
-  if (url) normalized.url = url;
-  return normalized;
-}
-
-function normalizeWebSearchArgs(rawArgs) {
-  const source =
-    rawArgs && typeof rawArgs === 'object' && !Array.isArray(rawArgs)
-      ? { ...rawArgs }
-      : { query: typeof rawArgs === 'string' ? rawArgs : '' };
-  const normalized = { ...source };
-  const query = String(source.query || source.q || source.keyword || '').trim();
-  if (query) normalized.query = query;
-  return normalized;
-}
-
 function clampNumber(value, min, max, fallback) {
   const num = Number(value);
   if (!Number.isFinite(num)) return fallback;
@@ -1819,20 +1700,14 @@ export function getBuiltinTools({ workspaceRoot = process.cwd(), config, onSyste
       function: {
         name: 'read',
         description:
-          'Inspect code or text files. Use read(path) for normal file or line-window reads, read(ast_target=...) for a node-scoped AST read, and read(path, query=..., capture_name=...) to run an inline Tree-sitter query before returning the first matched node. Prefer the AST forms when targeting a function, class, or method and you want tighter context. Demo-style aliases like file_path, offset, and limit are accepted. Use metadata_only=true only when you want file metadata without content. Do not use run with cat, head, or tail for file reads.',
+          'Inspect code or text files. Use read(path) for normal file or line-window reads. Use start_line and end_line for ranges, or path:"src/app.ts:10-40" for inline ranges. Prefer this over run with cat, head, or tail.',
         parameters: {
           type: 'object',
           properties: {
             path: { type: 'string', description: 'File path to read. You can also include an inline range like src/app.ts:10-40.' },
-            file_path: { type: 'string', description: 'Alias for path' },
             start_line: { type: 'number', description: '1-based start line' },
             end_line: { type: 'number', description: 'Inclusive end line' },
-            offset: { type: 'number', description: 'Alias for start_line' },
-            limit: { type: 'number', description: 'Number of lines to read starting from offset/start_line' },
             max_chars: { type: 'number', description: 'Max chars to return' },
-            include_content: { type: 'boolean', description: 'Legacy compatibility flag. Content is returned by default.' },
-            read_token: { type: 'string', description: 'Legacy compatibility token. No longer required for content reads.' },
-            metadata_only: { type: 'boolean', description: 'Set true to return metadata without content.' },
             ast_target: { type: 'object', description: 'AST target from ast_query or a prior AST selection. When provided, read returns that node instead of a line window.' },
             query: { type: 'string', description: 'Optional Tree-sitter query to run inline before reading the first matched AST node. Use with path for one-shot function/class/method reads.' },
             capture_name: { type: 'string', description: 'Optional capture name to select when query is provided.' },
@@ -1847,14 +1722,12 @@ export function getBuiltinTools({ workspaceRoot = process.cwd(), config, onSyste
       function: {
         name: 'grep',
         description:
-          'Search file contents. Use this for code search before read or edit. Aliases like query and directory are accepted. Do not use run with grep or rg for normal code search.',
+          'Search file contents. Use this for code search before read or edit. Do not use run with grep or rg for normal code search.',
         parameters: {
           type: 'object',
           properties: {
             pattern: { type: 'string', description: 'Search pattern' },
-            query: { type: 'string', description: 'Alias for pattern' },
             path: { type: 'string', description: 'Directory or file to search' },
-            directory: { type: 'string', description: 'Alias for path' },
             regex: { type: 'boolean', description: 'Treat pattern as regex' },
             case_sensitive: { type: 'boolean', description: 'Case-sensitive matching' },
             max_results: { type: 'number', description: 'Max matches to return' },
@@ -1869,12 +1742,11 @@ export function getBuiltinTools({ workspaceRoot = process.cwd(), config, onSyste
       type: 'function',
       function: {
         name: 'list',
-        description: 'List files and directories in a workspace path. Use this for quick directory discovery before deeper reads. Aliases like directory are accepted, and plain string paths are tolerated by the runtime.',
+        description: 'List files and directories in a workspace path. Use this for quick directory discovery before deeper reads.',
         parameters: {
           type: 'object',
           properties: {
             path: { type: 'string', description: 'Directory path to list' },
-            directory: { type: 'string', description: 'Alias for path' },
             include_hidden: { type: 'boolean', description: 'Include dotfiles' }
           }
         }
@@ -1885,14 +1757,12 @@ export function getBuiltinTools({ workspaceRoot = process.cwd(), config, onSyste
       function: {
         name: 'glob',
         description:
-          'Find files by glob pattern. Use this when you already know a filename pattern such as src/**/*.ts. Aliases like query and directory are accepted.',
+          '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' },
-            query: { type: 'string', description: 'Alias for pattern' },
-            directory: { type: 'string', description: 'Alias for path' },
             include_hidden: { type: 'boolean', description: 'Include dotfiles' },
             max_results: { type: 'number', description: 'Max results' }
           },
@@ -1923,18 +1793,14 @@ export function getBuiltinTools({ workspaceRoot = process.cwd(), config, onSyste
       function: {
         name: 'edit',
         description:
-          'Edit existing files. Prefer one of these shapes: 1) {file, old_text, new_text} for exact text replacement, 2) {file, symbol, edit:{kind:"replace_block", new_content:"..."}} for block replacement, 3) {file, anchor_text, position:"before"|"after", content:"..."} for inserts. Demo-style aliases {file_path, old_string, new_string} are also accepted. Read first unless the exact target is already known, and prefer read(ast_target=...) or read(path, query=...) before symbol- or block-level edits when you want tighter context. Prefer this over write for existing code changes.',
+          'Edit existing files. Prefer one of these shapes: 1) {path, old_text, new_text} for exact text replacement, 2) {path, symbol, edit:{kind:"replace_block", new_content:"..."}} for block replacement, 3) {path, anchor_text, position:"before"|"after", content:"..."} for inserts. Read first unless the exact target is already known. Prefer this over write for existing code changes.',
         parameters: {
           type: 'object',
           properties: {
-            file: { type: 'string', description: 'File path to edit' },
-            path: { type: 'string', description: 'Alias for file' },
-            file_path: { type: 'string', description: 'Alias for file, compatible with simpler demo-style tool calls' },
+            path: { type: 'string', description: 'File path to edit' },
             new_content: { type: 'string', description: 'Replacement content' },
             old_text: { type: 'string', description: 'Exact text to replace' },
             new_text: { type: 'string', description: 'Replacement text' },
-            old_string: { type: 'string', description: 'Alias for old_text' },
-            new_string: { type: 'string', description: 'Alias for new_text' },
             anchor_text: { type: 'string', description: 'Anchor text for inserts' },
             content: { type: 'string', description: 'Content to insert or append' },
             position: { type: 'string', description: 'before or after' },
@@ -1945,7 +1811,7 @@ export function getBuiltinTools({ workspaceRoot = process.cwd(), config, onSyste
             line: { type: 'number', description: 'Line to target' },
             edit: { type: 'object', description: 'Structured edit input' }
           },
-          required: ['file']
+          required: ['path']
         }
       }
     },
@@ -1954,16 +1820,12 @@ export function getBuiltinTools({ workspaceRoot = process.cwd(), config, onSyste
       function: {
         name: 'write',
         description:
-          'Create a new file or overwrite a file. Always include path and content. Aliases like file, file_path, text, and new_content are accepted. Use this for new files or explicit full rewrites only. Example: {path:"src/page.html", content:"..."} . If the file path is not decided yet, do not call write yet. Prefer edit for existing code changes.',
+          'Create a new file or overwrite a file. Always include path and content. Use this for new files or explicit full rewrites only. Example: {path:"src/page.html", content:"..."} . If the file path is not decided yet, do not call write yet. Prefer edit for existing code changes.',
         parameters: {
           type: 'object',
           properties: {
             path: { type: 'string', description: 'Required file path like src/app.js or pages/index.html. Never omit this.' },
-            file_path: { type: 'string', description: 'Alias for path, compatible with simpler demo-style tool calls' },
-            file: { type: 'string', description: 'Alias for path' },
             content: { type: 'string', description: 'Content to write' },
-            text: { type: 'string', description: 'Alias for content' },
-            new_content: { type: 'string', description: 'Alias for content' },
             append: { type: 'boolean', description: 'Append instead of overwrite' },
             full_file_rewrite: { type: 'boolean', description: 'Set true for whole-file rewrites' }
           },
@@ -1976,15 +1838,11 @@ export function getBuiltinTools({ workspaceRoot = process.cwd(), config, onSyste
       function: {
         name: 'delete',
         description:
-          'Delete a file or directory inside the workspace. Use path, file, or file_path to point at the target. Missing targets fail. Workspace escape attempts are rejected.',
+          'Delete a file or directory inside the workspace. Missing targets fail. Workspace escape attempts are rejected.',
         parameters: {
           type: 'object',
           properties: {
-            path: { type: 'string', description: 'File or directory path to delete' },
-            file: { type: 'string', description: 'Alias for path' },
-            file_path: { type: 'string', description: 'Alias for path' },
-            directory: { type: 'string', description: 'Alias for path' },
-            dir: { type: 'string', description: 'Alias for path' }
+            path: { type: 'string', description: 'File or directory path to delete' }
           },
           required: ['path']
         }

package/src/tui/chat-app.js

@@ -180,6 +180,10 @@ const TUI_COPY = {
       doingGlob: '正在按模式查找文件',
       doneGrep: '已搜索关键词',
       doingGrep: '正在搜索关键词',
+      doneWebFetch: '已抓取网页',
+      doingWebFetch: '正在抓取网页',
+      doneWebSearch: '已搜索网页',
+      doingWebSearch: '正在搜索网页',
       doneCommand: '已执行命令',
       doingCommand: '正在执行命令',
       doneUpdateTodos: '已更新待办',
@@ -388,6 +392,10 @@ const TUI_COPY = {
       doingGlob: 'Matching files by pattern',
       doneGrep: 'Searched keywords',
       doingGrep: 'Searching keywords',
+      doneWebFetch: 'Fetched page',
+      doingWebFetch: 'Fetching page',
+      doneWebSearch: 'Searched web',
+      doingWebSearch: 'Searching web',
       doneCommand: 'Ran command',
       doingCommand: 'Running command',
       doneUpdateTodos: 'Updated todos',
@@ -1175,6 +1183,8 @@ function getActivityDisplayParts(activity) {
     patch: 'Patch',
     run: 'Run',
     grep: 'Search',
+    web_fetch: 'Fetch',
+    web_search: 'Web Search',
     glob: 'Glob',
     list: 'List',
     list_background_tasks: 'Tasks',
@@ -1193,6 +1203,8 @@ function getActivityDisplayParts(activity) {
     patch: '🩹',
     run: '⚙️',
     grep: '🔍',
+    web_fetch: '🌐',
+    web_search: '🌐',
     glob: '🧭',
     list: '📂',
     list_background_tasks: '🗃️',
@@ -2401,7 +2413,17 @@ export function buildMessageRows(msg, showToolDetails, contentWidth = 72, copy)
   } else {
     pushTextRows(msg?.text || '');
     const toolCalls = Array.isArray(msg?.toolCalls) ? msg.toolCalls : [];
-    toolCalls.forEach((tool, idx) => pushActivityRows(tool, idx, toolCalls.length));
+    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');
+      })
+    ];
+    visibleCalls.forEach((tool, idx) => pushActivityRows(tool, idx, visibleCalls.length));
   }
 
   const codeGenerationRows = getCodeGenerationActivityRows(msg);

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

@@ -12,5 +12,19 @@ export function describeMiscToolActivity(copy, parsed, rawName, { done = false,
   if (parsed.base === 'update_todos') {
     return blocked ? makeBlocked(copy, 'update_todos') : done ? copy.toolActivity.doneUpdateTodos : copy.toolActivity.doingUpdateTodos;
   }
+  if (parsed.base === 'web_fetch') {
+    const target = parsed.target || parsed.raw;
+    const label = done
+      ? (copy.toolActivity.doneWebFetch || copy.toolActivity.doneGeneric)
+      : (copy.toolActivity.doingWebFetch || copy.toolActivity.doingGeneric);
+    return blocked ? makeBlocked(copy, target) : `${label}: ${target}`;
+  }
+  if (parsed.base === 'web_search') {
+    const target = parsed.target || parsed.raw;
+    const label = done
+      ? (copy.toolActivity.doneWebSearch || copy.toolActivity.doneGeneric)
+      : (copy.toolActivity.doingWebSearch || copy.toolActivity.doingGeneric);
+    return blocked ? makeBlocked(copy, target) : `${label}: ${target}`;
+  }
   return blocked ? `${copy.toolActivity.blocked}: ${parsed.raw}` : done ? `${copy.toolActivity.doneGeneric}: ${parsed.raw}` : `${copy.toolActivity.doingGeneric}: ${parsed.raw}`;
 }