codemini-cli 0.3.9 → 0.4.1

package/README.md

@@ -74,6 +74,11 @@ CodeMini CLI can optionally use `fff-mcp` as a faster backend for `grep`, `glob`
 | `codemini [prompt]` | Start an interactive coding session with an optional initial prompt |
 | `codemini chat [prompt]` | Chat mode — single-turn or multi-turn conversation |
 | `codemini run <task>` | Run a task non-interactively (e.g. `codemini run "fix the login bug"`) |
+| `codemini run --harness <role> <task>` | Run a task with a specific sub-agent role (e.g. `coder`, `planner`, `reviewer`) |
+| `codemini run --pipeline <task>` | Run a task through the full planning → coding → review pipeline |
+| `codemini run <task> --max-steps N` | Limit the maximum number of agent steps for a run task |
+| `codemini run <task> --model <name>` | Override the default model for a single run |
+| `codemini [prompt] --plain` | Disable TUI and use plain terminal output |
 | `codemini config set\|get\|list <key> [value]` | Manage configuration (gateway, model, shell, UI, soul, etc.) |
 | `codemini doctor` | Run environment diagnostics and validate configuration |
 | `codemini skill list\|install\|enable\|disable\|inspect\|reindex` | Manage skills — list, install, toggle, or inspect bundled/third-party skills |
@@ -88,6 +93,23 @@ Built-in souls: `default`, `professional`, `ceo`, `playful`, `anime`, `caveman`,
 codemini config set soul.preset playful
 ```
 
+### Built-in Skills
+
+Skills are reusable workflow patterns that guide how the agent approaches different types of tasks. They are loaded automatically when applicable.
+
+| Skill | Trigger | Description |
+|-------|---------|-------------|
+| **superpowers-lite** | Default for all coding work | Lightweight operating style: prefer structured tools, keep context tight, use sub-agents, verify before claiming success |
+| **brainstorm** | Multiple reasonable approaches exist | Explores options and tradeoffs before coding; asks one question at a time to resolve uncertainty |
+| **writing-plans** | Non-trivial implementation task | Creates a step-by-step plan with exact file paths, code, and verification steps before touching code |
+
+Skills are installed and managed via `codemini skill`:
+
+```bash
+codemini skill list        # List all available skills
+codemini skill inspect <name>  # Inspect a skill's details
+```
+
 ### How The Tool Model Works
 
 CodeMini CLI intentionally separates tools into two layers:
@@ -122,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
@@ -157,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
@@ -169,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`
@@ -285,6 +307,11 @@ CodeMini CLI 可以可选地使用 `fff-mcp` 作为 `grep`、`glob` 和部分 `l
 | `codemini [prompt]` | 启动交互式编码会话，可附带初始提示 |
 | `codemini chat [prompt]` | 对话模式——单轮或多轮 |
 | `codemini run <task>` | 非交互式执行任务（如 `codemini run "修复登录 bug"`） |
+| `codemini run --harness <role> <task>` | 以指定 sub-agent 角色执行任务（如 `coder`、`planner`、`reviewer`） |
+| `codemini run --pipeline <task>` | 通过完整计划→编码→审查流水线执行任务 |
+| `codemini run <task> --max-steps N` | 限制单次执行的最大 agent 步数 |
+| `codemini run <task> --model <name>` | 单次执行时覆盖默认模型 |
+| `codemini [prompt] --plain` | 禁用 TUI，使用纯文本终端输出 |
 | `codemini config set\|get\|list <key> [value]` | 管理配置（网关、模型、shell、UI、soul 等） |
 | `codemini doctor` | 运行环境诊断并验证配置 |
 | `codemini skill list\|install\|enable\|disable\|inspect\|reindex` | 管理 skill——列表、安装、启用/禁用、检查 |
@@ -299,6 +326,23 @@ CodeMini CLI 支持可切换的 "soul" 人格，仅改变语气和表达风格
 codemini config set soul.preset playful
 ```
 
+### 内置 Skills
+
+Skill 是可复用的工作流模式，指导 agent 如何处理不同类型的任务。适用时会自动加载。
+
+| Skill | 触发条件 | 说明 |
+|-------|----------|------|
+| **superpowers-lite** | 所有编码工作的默认 skill | 轻量操作风格：优先结构化工具、保持上下文精简、使用 sub-agent、验证后再报告完成 |
+| **brainstorm** | 存在多种合理方案时 | 在编码前探索选项和权衡；每次只问一个问题来消除不确定性 |
+| **writing-plans** | 非平凡的实现任务 | 在动手之前创建包含精确文件路径、代码和验证步骤的分步计划 |
+
+通过 `codemini skill` 管理技能：
+
+```bash
+codemini skill list           # 列出所有可用 skill
+codemini skill inspect <name> # 查看某个 skill 的详细信息
+```
+
 ### 工具模型怎么设计
 
 CodeMini CLI 把工具分成两层：
@@ -333,7 +377,7 @@ CodeMini CLI 把工具分成两层：
 - 统一的 shell 执行模型：
   - 一次性命令直接 `run`
   - 长运行命令通过 `run` + `run_in_background=true`
-- 在 `.codemini-project/` 下维护轻量项目索引，帮助模型更快理解仓库
+- 在 `.codemini/` 下维护轻量项目索引，帮助模型更快理解仓库
 - 基于 Tree-sitter 的结构化编辑能力，适合函数级、类级、方法级改动
 - 支持通过 `ui.reply_language` 控制回复语言
 - safe mode 默认开启
@@ -368,7 +412,7 @@ Inbox 和持久记忆的区别：
 
 ### 项目索引
 
-CodeMini CLI 会在 `.codemini-project/` 下维护一份轻量项目索引：
+CodeMini CLI 会在 `.codemini/` 下维护一份轻量项目索引：
 
 - `project-map.json` — 记录仓库的高层结构事实，比如语言、源码目录、测试目录、入口候选
 - `file-index.json` — 记录文件级结构信息，比如 imports、exports、functions、classes 和轻量 symbol 提示
@@ -380,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.1.0.tgz
+codemini-cli-0.4.1.tgz
 ```
 
 If you want to verify the package contents:
 
 ```bash
-tar -tf codemini-cli-0.1.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.1.0.tgz
+C:\temp\codemini-cli-0.4.1.tgz
 ```
 
 ## 3. Environment Requirements
@@ -42,7 +42,7 @@ C:\temp\codemini-cli-0.1.0.tgz
 Target machine requirements:
 
 - Windows 10
-- Node.js 20 or newer
+- Node.js 22 or newer
 - npm available
 - PowerShell available
 
@@ -58,7 +58,7 @@ npm -v
 Global install:
 
 ```powershell
-npm install -g C:\temp\codemini-cli-0.1.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.1.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.3.9",
+  "version": "0.4.1",
   "description": "Coding CLI optimized for small-model workflows and Windows PowerShell",
   "keywords": [
     "cli",
@@ -48,10 +48,12 @@
   "dependencies": {
     "@cursorless/tree-sitter-wasms": "^0.8.1",
     "cheerio": "^1.1.2",
+    "cli-truncate": "^6.0.0",
     "duck-duck-scrape": "^2.2.7",
     "ink": "^7.0.0",
     "playwright": "^1.54.2",
     "react": "^19.2.5",
+    "strip-ansi": "^7.2.0",
     "web-tree-sitter": "^0.26.8"
   },
   "license": "MIT"

package/src/core/agent-loop.js

@@ -4,6 +4,9 @@ import fs from 'node:fs/promises';
 import { BoundedCache } from './bounded-cache.js';
 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 字符串。
@@ -23,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)
@@ -72,97 +61,13 @@ 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)`;
 }
 
 function clipToolResult(result, maxChars = 12000) {
-  const raw = typeof result === 'string' ? result : JSON.stringify(result);
+  const raw = sanitizeTextForModel(typeof result === 'string' ? result : JSON.stringify(result));
   if (!maxChars || raw.length <= maxChars) return raw;
   return `${raw.slice(0, maxChars)}\n... [tool result truncated ${raw.length - maxChars} chars]`;
 }
@@ -170,8 +75,9 @@ function clipToolResult(result, maxChars = 12000) {
 function compactToolResult(result, toolName, args, maxChars = 12000) {
   if (result === null || result === undefined) return 'no output';
   if (typeof result === 'string') {
-    if (result.length <= maxChars) return result;
-    return `${result.slice(0, maxChars)}\n... [tool result truncated ${result.length - maxChars} chars, original: ${result.length}]`;
+    const sanitized = sanitizeTextForModel(result);
+    if (sanitized.length <= maxChars) return sanitized;
+    return `${sanitized.slice(0, maxChars)}\n... [tool result truncated ${sanitized.length - maxChars} chars, original: ${sanitized.length}]`;
   }
   if (typeof result !== 'object') return String(result);
 
@@ -387,25 +293,37 @@ function shouldAutoCaptureError(toolName, message) {
     /not found$/i,
     /already exists$/i,
     /cancelled/i,
-    /aborted/i
+    /aborted/i,
+    /blocked by (?:safe mode|policy|dangerous command)/i,
+    /exit 127/i,
+    /command not found/i,
+    /permission denied/i,
+    /args\?\s/i,
+    /Raw tool arguments/i,
+    /edit requires/i,
+    /write requires/i,
+    /requires file/i,
+    /path.*outside workspace/i,
+    /escapes workspace/i
   ];
   if (noisePatterns.some((p) => p.test(message))) return false;
   lastAutoCaptureByTool.set(toolName, now);
   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: 'global',
+  await captureToInbox({
+    scope: 'repo',
     type: 'failure',
     summary,
     details,
     source: 'auto-capture'
-  }).catch(() => {});
+  });
 }
 
 async function checkAutoDreamThreshold(config) {
@@ -421,6 +339,33 @@ async function checkAutoDreamThreshold(config) {
 
 // ─── Exported helpers ────────────────────────────────────────────────
 
+function extractFileChange(toolName, result) {
+  if (!result || typeof result !== 'object') return null;
+  const FILE_TOOLS = new Set(['edit', 'write', 'delete']);
+  if (!FILE_TOOLS.has(toolName)) return null;
+
+  /* delete */
+  if ('deleted' in result && result.deleted) {
+    return { path: String(result.path || ''), action: 'delete', linesAdded: 0, linesRemoved: 0 };
+  }
+
+  /* edit / write */
+  if ('path' in result && 'action' in result) {
+    const action = String(result.action || '');
+    const isCreate = action === 'create';
+    const added = Number(result.lines_added || 0);
+    const removed = Number(result.lines_removed || 0);
+    return {
+      path: String(result.path || ''),
+      action: isCreate ? 'create' : 'edit',
+      linesAdded: added,
+      linesRemoved: removed
+    };
+  }
+
+  return null;
+}
+
 export function summarizeToolResult(result) {
   if (result === null || result === undefined) return 'no output';
   if (typeof result === 'string') {
@@ -640,7 +585,7 @@ function blockedExplorationReason(toolName, args, state) {
   const top = topLevelPath(target);
   if (!top) return '';
 
-  if (['skills', 'souls', 'templates', '.codemini', '.codemini-project'].includes(top)) {
+  if (['skills', 'souls', 'templates', '.codemini', '.codemini-global'].includes(top)) {
     return `Skip ${top}/ for broad repository analysis unless the user explicitly asks for it. Inspect relevant source files first.`;
   }
   return '';
@@ -709,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})`;
@@ -736,14 +689,17 @@ function formatToolDisplayName(name, args) {
 // ─── Format a single tool result using per-tool formatter or fallback ──
 
 function formatToolResult(toolResult, toolName, args, toolFormatters, toolResultMaxChars) {
+  const sanitizeOptions = getToolOutputSanitizeOptions(toolName);
   if (toolFormatters && typeof toolFormatters[toolName] === 'function') {
     const formatted = toolFormatters[toolName](toolResult, args);
     if (typeof formatted === 'string') {
-      return formatted.trim() ? formatted : emptyToolResultMarker(toolName);
+      const sanitized = sanitizeTextForModel(formatted, sanitizeOptions);
+      return sanitized.trim() ? sanitized : emptyToolResultMarker(toolName);
     }
   }
   const fallback = compactToolResult(toolResult, toolName, args, toolResultMaxChars);
-  return String(fallback || '').trim() ? fallback : emptyToolResultMarker(toolName);
+  const sanitizedFallback = sanitizeTextForModel(fallback, sanitizeOptions);
+  return String(sanitizedFallback || '').trim() ? sanitizedFallback : emptyToolResultMarker(toolName);
 }
 
 // ─── Main agent loop ────────────────────────────────────────────────
@@ -924,7 +880,11 @@ export async function runAgentLoop({
       let approved = true;
       let approvalArgs = args;
       let preflightErrorContent = '';
-      const needsApproval = toolName === 'delete' || (executionMode === 'normal' && !alwaysAllowSet.has(toolName));
+      const isSafeModeRun = toolName === 'run'
+        && config?.policy?.safe_mode !== false
+        && requiresApprovalEvaluation(args?.command || '', config?.shell?.default);
+      const needsApproval = toolName === 'delete' || isSafeModeRun
+        || (executionMode === 'normal' && !alwaysAllowSet.has(toolName));
       if (needsApproval) {
         approved = false;
         const handler = toolHandlers[toolName];
@@ -940,6 +900,31 @@ export async function runAgentLoop({
             preflightErrorContent = clipToolResult({ error: message }, toolResultMaxChars);
           }
         }
+        /* Run tool: safe mode LLM-based command evaluation */
+        if (toolName === 'run' && isSafeModeRun && !preflightErrorContent) {
+          try {
+            const { evaluateCommandWithLLM } = await import('./command-evaluator.js');
+            const evaluation = await evaluateCommandWithLLM({
+              command: args?.command || '',
+              config,
+              workspaceRoot: config?.workspaceRoot || process.cwd()
+            });
+            approvalArgs = { ...args, _risk: evaluation.risk, _evaluation: evaluation };
+            /* LLM says low-risk + allow → auto-approve, skip confirmation panel */
+            if (evaluation.risk === 'low' && evaluation.recommendation === 'allow') {
+              approvalResults.set(call.id, { approved: true, args: approvalArgs });
+              continue;
+            }
+          } catch (_) {
+            approvalArgs = { ...args, _risk: 'high', _evaluation: null };
+          }
+          if (typeof handler?.prepareApproval === 'function') {
+            try {
+              const approval = await handler.prepareApproval(approvalArgs);
+              approvalArgs = { ...approvalArgs, approval };
+            } catch (_) { /* skip */ }
+          }
+        }
         if (preflightErrorContent) {
           approvalResults.set(call.id, {
             approved: false,
@@ -954,7 +939,8 @@ export async function runAgentLoop({
             name: toolName,
             displayName,
             arguments: approvalArgs,
-            approvalDetails: toolName === 'delete' ? approvalArgs.approval : undefined
+            approvalDetails: toolName === 'delete' ? approvalArgs.approval
+              : (toolName === 'run' ? approvalArgs.approval : undefined)
           });
           approved = Boolean(decision?.approved);
         }
@@ -1025,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,
@@ -1035,8 +1021,10 @@ export async function runAgentLoop({
       }
 
       const durationMs = Date.now() - startedAt;
+      /* 提取文件改动统计 */
+      const fileChange = extractFileChange(toolName, toolResult);
       if (onEvent) {
-        onEvent({ type: 'tool:end', name: displayName, id: call.id, arguments: effectiveArgs, durationMs, summary: summarizeToolResult(toolResult) });
+        onEvent({ type: 'tool:end', name: displayName, id: call.id, arguments: effectiveArgs, durationMs, summary: summarizeToolResult(toolResult), fileChange });
       }
 
       // Auto-capture non-throwing tool failures (e.g. shell non-zero exit)
@@ -1046,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(() => {});
           }
         }
       }