minimal-agent 0.11.0 → 0.12.0

package/src/tools/index.js

@@ -19,6 +19,8 @@ import { advisorTool } from './advisor/advisor.js';
 import { agentTool } from './agent/agent.js';
 import { askUserQuestionTool } from './ask/ask.js';
 import { bashTool } from './bash/bash.js';
+import { assertCapabilityRegistry } from './capabilities.js';
+import { computerUseTool } from './computeruse/computeruse.js';
 import { downloadTool } from './download/download.js';
 import { editTool } from './edit/edit.js';
 import { multiEditTool } from './edit/multi-edit.js';
@@ -26,20 +28,24 @@ import { genImageTool } from './genimage/genimage.js';
 import { generateSpeechTool } from './genspeech/genspeech.js';
 import { globTool } from './glob/glob.js';
 import { grepTool } from './grep/grep.js';
-import { readTool } from './read/read.js';
-import { presentResultTool } from './presentresult/presentresult.js';
-import { clearPersonaTool, confirmMemoryTool, forgetMemoryTool, listMemoriesTool, recallMemoryTool, rememberMemoryTool, reviewMemoriesTool, searchConversationsTool, setPersonaTool, updateMemoryTool, } from './memory/memory.js';
-import { webfetchTool } from './webfetch/webfetch.js';
-import { webbrowserTool } from './webbrowser/webbrowser.js';
-import { webSearchTool } from './websearch/websearch.js';
-import { writeTool } from './write/write.js';
-import { computerUseTool } from './computeruse/computeruse.js';
-import { assertCapabilityRegistry } from './capabilities.js';
 import { lspTool } from './lsp/lsp.js';
+import { clearPersonaTool, confirmMemoryTool, forgetMemoryTool, listMemoriesTool, recallMemoryTool, rememberMemoryTool, reviewMemoriesTool, searchConversationsTool, setPersonaTool, updateMemoryTool, } from './memory/memory.js';
 import { notebookEditTool } from './notebook/notebookEdit.js';
 import { powerShellTool } from './powershell/powershell.js';
+import { presentResultTool } from './presentresult/presentresult.js';
+import { readTool } from './read/read.js';
+import { skillTool } from './skill/skill.js';
+import { snipTool } from './snip/snip.js';
+import { taskCreateTool, taskGetTool, taskListTool, taskUpdateTool, } from './tasks/taskManagement.js';
 import { taskOutputTool } from './tasks/taskOutput.js';
 import { taskStopTool } from './tasks/taskStop.js';
+import { terminalCaptureTool } from './terminal/terminalCapture.js';
+import { trashTool } from './trash/trash.js';
+import { webbrowserTool } from './webbrowser/webbrowser.js';
+import { webfetchTool } from './webfetch/webfetch.js';
+import { webSearchTool } from './websearch/websearch.js';
+import { enterWorktreeTool, exitWorktreeTool, } from './worktree/sessionWorktree.js';
+import { writeTool } from './write/write.js';
 /** 所有内置工具（顺序 = 给 LLM 呈现的顺序，不影响代码执行，但会影响模型的优先级直觉） */
 export const ALL_TOOLS = [
     readTool,
@@ -76,6 +82,17 @@ export const ALL_TOOLS = [
     computerUseTool,
     // 追加在末尾：主循环 tools schema 的原有前缀字节不动（提示词缓存友好）
     agentTool,
+    // Product tools append at the end to preserve the existing schema prefix cache.
+    trashTool,
+    taskCreateTool,
+    taskGetTool,
+    taskUpdateTool,
+    taskListTool,
+    skillTool,
+    enterWorktreeTool,
+    exitWorktreeTool,
+    terminalCaptureTool,
+    snipTool,
 ];
 assertCapabilityRegistry(ALL_TOOLS.map((tool) => tool.name));
 /** 按名字查表 */
@@ -157,12 +174,7 @@ export async function executeTool(name, rawArguments, signal, ctx) {
             .join('\n');
         return {
             ok: false,
-            error: `工具 ${name} 参数校验失败，**请按下面逐条改正后重新调用**：\n${issues}\n\n`
-                + '通用修法：\n'
-                + '  · **只填你这次确实要用的字段**。可选字段不要用 ""、0、{} 之类的默认值占位 ——\n'
-                + '    留空不填即可；填了占位值反而会被当成"你要用它"而触发校验。\n'
-                + '  · 枚举字段只能取列出的值；数值字段注意上下限。\n'
-                + '  · 改完直接重发这次调用，不要因为这个错误就换一条完全不同的路子。',
+            error: `工具 ${name} 参数校验失败，**请按下面逐条改正后重新调用**：\n${issues}\n\n通用修法：\n  · **只填你这次确实要用的字段**。可选字段不要用 ""、0、{} 之类的默认值占位 ——\n    留空不填即可；填了占位值反而会被当成"你要用它"而触发校验。\n  · 枚举字段只能取列出的值；数值字段注意上下限。\n  · 改完直接重发这次调用，不要因为这个错误就换一条完全不同的路子。`,
         };
     }
     // 4. 调用 call()，捕获意外异常
@@ -180,16 +192,22 @@ export async function executeTool(name, rawArguments, signal, ctx) {
     }
 }
 // 导出每个工具，方便测试单独 import
-export { readTool, editTool, writeTool, globTool, grepTool, webSearchTool, webfetchTool, webbrowserTool, computerUseTool, downloadTool, presentResultTool, bashTool, askUserQuestionTool };
+export { readTool, editTool, writeTool, globTool, grepTool, webSearchTool, webfetchTool, webbrowserTool, computerUseTool, downloadTool, presentResultTool, bashTool, askUserQuestionTool, };
 export { clearPersonaTool, confirmMemoryTool, forgetMemoryTool, listMemoriesTool, recallMemoryTool, rememberMemoryTool, reviewMemoriesTool, searchConversationsTool, setPersonaTool, updateMemoryTool, } from './memory/memory.js';
 export { multiEditTool } from './edit/multi-edit.js';
 export { genImageTool } from './genimage/genimage.js';
 export { advisorTool } from './advisor/advisor.js';
 export { agentTool } from './agent/agent.js';
-export { createGenerateSpeechTool, generateSpeechTool } from './genspeech/genspeech.js';
+export { createGenerateSpeechTool, generateSpeechTool, } from './genspeech/genspeech.js';
 export { createWebSearchTool } from './websearch/websearch.js';
 export { lspTool } from './lsp/lsp.js';
 export { notebookEditTool } from './notebook/notebookEdit.js';
 export { powerShellTool } from './powershell/powershell.js';
 export { taskOutputTool } from './tasks/taskOutput.js';
 export { taskStopTool } from './tasks/taskStop.js';
+export { taskCreateTool, taskGetTool, taskUpdateTool, taskListTool, } from './tasks/taskManagement.js';
+export { trashTool } from './trash/trash.js';
+export { skillTool } from './skill/skill.js';
+export { snipTool } from './snip/snip.js';
+export { enterWorktreeTool, exitWorktreeTool, } from './worktree/sessionWorktree.js';
+export { terminalCaptureTool, installTerminalCapture, } from './terminal/terminalCapture.js';

package/src/tools/index.ts

@@ -21,6 +21,8 @@ import { advisorTool } from './advisor/advisor.js';
 import { agentTool } from './agent/agent.js';
 import { askUserQuestionTool } from './ask/ask.js';
 import { bashTool } from './bash/bash.js';
+import { assertCapabilityRegistry } from './capabilities.js';
+import { computerUseTool } from './computeruse/computeruse.js';
 import { downloadTool } from './download/download.js';
 import { editTool } from './edit/edit.js';
 import { multiEditTool } from './edit/multi-edit.js';
@@ -28,8 +30,7 @@ import { genImageTool } from './genimage/genimage.js';
 import { generateSpeechTool } from './genspeech/genspeech.js';
 import { globTool } from './glob/glob.js';
 import { grepTool } from './grep/grep.js';
-import { readTool } from './read/read.js';
-import { presentResultTool } from './presentresult/presentresult.js';
+import { lspTool } from './lsp/lsp.js';
 import {
   clearPersonaTool,
   confirmMemoryTool,
@@ -42,17 +43,30 @@ import {
   setPersonaTool,
   updateMemoryTool,
 } from './memory/memory.js';
-import { webfetchTool } from './webfetch/webfetch.js';
-import { webbrowserTool } from './webbrowser/webbrowser.js';
-import { webSearchTool } from './websearch/websearch.js';
-import { writeTool } from './write/write.js';
-import { computerUseTool } from './computeruse/computeruse.js';
-import { assertCapabilityRegistry } from './capabilities.js';
-import { lspTool } from './lsp/lsp.js';
 import { notebookEditTool } from './notebook/notebookEdit.js';
 import { powerShellTool } from './powershell/powershell.js';
+import { presentResultTool } from './presentresult/presentresult.js';
+import { readTool } from './read/read.js';
+import { skillTool } from './skill/skill.js';
+import { snipTool } from './snip/snip.js';
+import {
+  taskCreateTool,
+  taskGetTool,
+  taskListTool,
+  taskUpdateTool,
+} from './tasks/taskManagement.js';
 import { taskOutputTool } from './tasks/taskOutput.js';
 import { taskStopTool } from './tasks/taskStop.js';
+import { terminalCaptureTool } from './terminal/terminalCapture.js';
+import { trashTool } from './trash/trash.js';
+import { webbrowserTool } from './webbrowser/webbrowser.js';
+import { webfetchTool } from './webfetch/webfetch.js';
+import { webSearchTool } from './websearch/websearch.js';
+import {
+  enterWorktreeTool,
+  exitWorktreeTool,
+} from './worktree/sessionWorktree.js';
+import { writeTool } from './write/write.js';
 
 /** 所有内置工具（顺序 = 给 LLM 呈现的顺序，不影响代码执行，但会影响模型的优先级直觉） */
 export const ALL_TOOLS: Tool[] = [
@@ -90,6 +104,17 @@ export const ALL_TOOLS: Tool[] = [
   computerUseTool,
   // 追加在末尾：主循环 tools schema 的原有前缀字节不动（提示词缓存友好）
   agentTool,
+  // Product tools append at the end to preserve the existing schema prefix cache.
+  trashTool,
+  taskCreateTool,
+  taskGetTool,
+  taskUpdateTool,
+  taskListTool,
+  skillTool,
+  enterWorktreeTool,
+  exitWorktreeTool,
+  terminalCaptureTool,
+  snipTool,
 ];
 
 assertCapabilityRegistry(ALL_TOOLS.map((tool) => tool.name));
@@ -103,7 +128,14 @@ export function getToolGateDetails(
   name: string,
   rawArguments: string,
   context: ToolCallContext,
-): Partial<Pick<import('../toolGate.js').ToolGateRequest, 'isReadOnly' | 'runContext' | 'action'>> | undefined {
+):
+  | Partial<
+      Pick<
+        import('../toolGate.js').ToolGateRequest,
+        'isReadOnly' | 'runContext' | 'action'
+      >
+    >
+  | undefined {
   const tool = getToolByName(name);
   if (!tool?.gateRequest) return undefined;
   let parsed: unknown;
@@ -182,20 +214,15 @@ export async function executeTool(
       .join('\n');
     return {
       ok: false,
-      error:
-        `工具 ${name} 参数校验失败，**请按下面逐条改正后重新调用**：\n${issues}\n\n`
-        + '通用修法：\n'
-        + '  · **只填你这次确实要用的字段**。可选字段不要用 ""、0、{} 之类的默认值占位 ——\n'
-        + '    留空不填即可；填了占位值反而会被当成"你要用它"而触发校验。\n'
-        + '  · 枚举字段只能取列出的值；数值字段注意上下限。\n'
-        + '  · 改完直接重发这次调用，不要因为这个错误就换一条完全不同的路子。',
+      error: `工具 ${name} 参数校验失败，**请按下面逐条改正后重新调用**：\n${issues}\n\n通用修法：\n  · **只填你这次确实要用的字段**。可选字段不要用 ""、0、{} 之类的默认值占位 ——\n    留空不填即可；填了占位值反而会被当成"你要用它"而触发校验。\n  · 枚举字段只能取列出的值；数值字段注意上下限。\n  · 改完直接重发这次调用，不要因为这个错误就换一条完全不同的路子。`,
     };
   }
 
   // 4. 调用 call()，捕获意外异常
   //
   try {
-    if (tool.callWithContext) return await tool.callWithContext(checked.data, signal, ctx ?? {});
+    if (tool.callWithContext)
+      return await tool.callWithContext(checked.data, signal, ctx ?? {});
     return await tool.call(checked.data, signal);
   } catch (e) {
     return {
@@ -206,7 +233,21 @@ export async function executeTool(
 }
 
 // 导出每个工具，方便测试单独 import
-export { readTool, editTool, writeTool, globTool, grepTool, webSearchTool, webfetchTool, webbrowserTool, computerUseTool, downloadTool, presentResultTool, bashTool, askUserQuestionTool };
+export {
+  readTool,
+  editTool,
+  writeTool,
+  globTool,
+  grepTool,
+  webSearchTool,
+  webfetchTool,
+  webbrowserTool,
+  computerUseTool,
+  downloadTool,
+  presentResultTool,
+  bashTool,
+  askUserQuestionTool,
+};
 export {
   clearPersonaTool,
   confirmMemoryTool,
@@ -223,10 +264,30 @@ export { multiEditTool } from './edit/multi-edit.js';
 export { genImageTool } from './genimage/genimage.js';
 export { advisorTool } from './advisor/advisor.js';
 export { agentTool } from './agent/agent.js';
-export { createGenerateSpeechTool, generateSpeechTool } from './genspeech/genspeech.js';
+export {
+  createGenerateSpeechTool,
+  generateSpeechTool,
+} from './genspeech/genspeech.js';
 export { createWebSearchTool } from './websearch/websearch.js';
 export { lspTool } from './lsp/lsp.js';
 export { notebookEditTool } from './notebook/notebookEdit.js';
 export { powerShellTool } from './powershell/powershell.js';
 export { taskOutputTool } from './tasks/taskOutput.js';
 export { taskStopTool } from './tasks/taskStop.js';
+export {
+  taskCreateTool,
+  taskGetTool,
+  taskUpdateTool,
+  taskListTool,
+} from './tasks/taskManagement.js';
+export { trashTool } from './trash/trash.js';
+export { skillTool } from './skill/skill.js';
+export { snipTool } from './snip/snip.js';
+export {
+  enterWorktreeTool,
+  exitWorktreeTool,
+} from './worktree/sessionWorktree.js';
+export {
+  terminalCaptureTool,
+  installTerminalCapture,
+} from './terminal/terminalCapture.js';

package/src/tools/lsp/lsp.js

@@ -1,29 +1,71 @@
 import { stat } from 'node:fs/promises';
 import { isAbsolute, relative, resolve, sep } from 'node:path';
 import { pathToFileURL } from 'node:url';
+import { fileURLToPath } from 'node:url';
 import { z } from 'zod';
 import { getWorkingDir } from '../../bootstrap/workingDir.js';
 import { toToolParameters } from '../../utils/zodToJson.js';
 import { DEFAULT_MAX_RESULT_SIZE_CHARS } from '../types.js';
 import { discoverLspServers, lspAvailabilitySignature } from './config.js';
 import { getLspManager } from './service.js';
-const positionOperations = new Set(['goToDefinition', 'findReferences', 'hover', 'goToImplementation', 'incomingCalls', 'outgoingCalls']);
-const inputSchema = z.object({
+const positionOperations = new Set([
+    'goToDefinition',
+    'findReferences',
+    'hover',
+    'goToImplementation',
+    'incomingCalls',
+    'outgoingCalls',
+]);
+const inputSchema = z
+    .object({
     operation: z.enum([
-        'goToDefinition', 'findReferences', 'hover', 'documentSymbols', 'workspaceSymbols',
-        'goToImplementation', 'incomingCalls', 'outgoingCalls', 'diagnostics',
+        'goToDefinition',
+        'findReferences',
+        'hover',
+        'documentSymbols',
+        'workspaceSymbols',
+        'goToImplementation',
+        'incomingCalls',
+        'outgoingCalls',
+        'diagnostics',
     ]),
     file_path: z.string().min(1),
-    line: z.number().int().positive().optional().describe('1-based source line for position operations'),
-    character: z.number().int().positive().optional().describe('1-based UTF-16 character for position operations'),
+    line: z
+        .number()
+        .int()
+        .positive()
+        .optional()
+        .describe('1-based source line for position operations'),
+    character: z
+        .number()
+        .int()
+        .positive()
+        .optional()
+        .describe('1-based UTF-16 character for position operations'),
     query: z.string().optional().describe('Symbol query for workspaceSymbols'),
-    limit: z.number().int().min(1).max(500).optional().describe('Maximum formatted results, default 200'),
-}).superRefine((input, context) => {
-    if (positionOperations.has(input.operation) && (!input.line || !input.character)) {
-        context.addIssue({ code: z.ZodIssueCode.custom, message: `${input.operation} requires line and character` });
+    limit: z
+        .number()
+        .int()
+        .min(1)
+        .max(500)
+        .optional()
+        .describe('Maximum formatted results, default 200'),
+    output_format: z.enum(['compact', 'json']).default('compact').optional(),
+})
+    .superRefine((input, context) => {
+    if (positionOperations.has(input.operation) &&
+        (!input.line || !input.character)) {
+        context.addIssue({
+            code: z.ZodIssueCode.custom,
+            message: `${input.operation} requires line and character`,
+        });
     }
     if (input.operation === 'workspaceSymbols' && !input.query?.trim()) {
-        context.addIssue({ code: z.ZodIssueCode.custom, path: ['query'], message: 'workspaceSymbols requires a non-empty query' });
+        context.addIssue({
+            code: z.ZodIssueCode.custom,
+            path: ['query'],
+            message: 'workspaceSymbols requires a non-empty query',
+        });
     }
 });
 function compact(value, limit) {
@@ -35,6 +77,74 @@ function compact(value, limit) {
         ? `${text.slice(0, DEFAULT_MAX_RESULT_SIZE_CHARS)}\n... (LSP result truncated)`
         : text;
 }
+function compactSemantic(value, cwd, limit) {
+    if (value == null)
+        return 'No results.';
+    const rows = [];
+    const walk = (item, label) => {
+        if (item == null)
+            return;
+        if (Array.isArray(item)) {
+            item.forEach((v) => walk(v, label));
+            return;
+        }
+        if (typeof item !== 'object') {
+            rows.push(String(item));
+            return;
+        }
+        const location = item.location ?? item.fromRanges?.[0] ?? item;
+        const uri = location.uri ?? location.targetUri ?? item.uri;
+        const range = location.range ??
+            location.targetSelectionRange ??
+            item.range ??
+            item.selectionRange;
+        let where = '';
+        if (typeof uri === 'string') {
+            let path = uri;
+            try {
+                path = uri.startsWith('file:') ? fileURLToPath(uri) : uri;
+            }
+            catch { }
+            const rel = relative(resolve(cwd), path);
+            where = (rel && !rel.startsWith('..') ? rel : path).split(sep).join('/');
+        }
+        if (range?.start)
+            where += `:${Number(range.start.line) + 1}:${Number(range.start.character) + 1}`;
+        const message = item.message ?? item.name ?? item.detail ?? item.kind ?? label;
+        const severity = item.severity
+            ? `[${['', 'error', 'warning', 'info', 'hint'][item.severity] ?? item.severity}] `
+            : '';
+        const code = item.code !== undefined ? `(${String(item.code)}) ` : '';
+        if (where || message)
+            rows.push(`${severity}${where || '<symbol>'} — ${code}${typeof message === 'string' ? message : JSON.stringify(message)}`);
+        if (item.contents) {
+            const contents = Array.isArray(item.contents)
+                ? item.contents
+                : [item.contents];
+            for (const c of contents)
+                rows.push(typeof c === 'string'
+                    ? c
+                    : typeof c?.value === 'string'
+                        ? c.value
+                        : JSON.stringify(c));
+        }
+        if (item.from)
+            walk(item.from, 'caller');
+        if (item.to)
+            walk(item.to, 'callee');
+        if (Array.isArray(item.children))
+            item.children.forEach((v) => walk(v));
+    };
+    walk(value);
+    const unique = [...new Set(rows)].sort();
+    const selected = unique.slice(0, limit);
+    let text = selected.join('\n') || 'No results.';
+    if (unique.length > selected.length)
+        text += `\n... (${unique.length - selected.length} more; total=${unique.length})`;
+    return text.length > DEFAULT_MAX_RESULT_SIZE_CHARS
+        ? `${text.slice(0, DEFAULT_MAX_RESULT_SIZE_CHARS)}\n... (LSP result truncated)`
+        : text;
+}
 async function call(input, cwd = getWorkingDir()) {
     const filePath = resolve(cwd, input.file_path);
     const rel = relative(resolve(cwd), filePath);
@@ -52,32 +162,54 @@ async function call(input, cwd = getWorkingDir()) {
     try {
         await server.openFile(filePath);
         const uri = pathToFileURL(filePath).href;
-        const position = { line: (input.line ?? 1) - 1, character: (input.character ?? 1) - 1 };
+        const position = {
+            line: (input.line ?? 1) - 1,
+            character: (input.character ?? 1) - 1,
+        };
         let result;
         switch (input.operation) {
             case 'goToDefinition':
-                result = await server.request('textDocument/definition', { textDocument: { uri }, position });
+                result = await server.request('textDocument/definition', {
+                    textDocument: { uri },
+                    position,
+                });
                 break;
             case 'findReferences':
-                result = await server.request('textDocument/references', { textDocument: { uri }, position, context: { includeDeclaration: true } });
+                result = await server.request('textDocument/references', {
+                    textDocument: { uri },
+                    position,
+                    context: { includeDeclaration: true },
+                });
                 break;
             case 'hover':
-                result = await server.request('textDocument/hover', { textDocument: { uri }, position });
+                result = await server.request('textDocument/hover', {
+                    textDocument: { uri },
+                    position,
+                });
                 break;
             case 'documentSymbols':
-                result = await server.request('textDocument/documentSymbol', { textDocument: { uri } });
+                result = await server.request('textDocument/documentSymbol', {
+                    textDocument: { uri },
+                });
                 break;
             case 'workspaceSymbols':
-                result = await server.request('workspace/symbol', { query: input.query });
+                result = await server.request('workspace/symbol', {
+                    query: input.query,
+                });
                 break;
             case 'goToImplementation':
-                result = await server.request('textDocument/implementation', { textDocument: { uri }, position });
+                result = await server.request('textDocument/implementation', {
+                    textDocument: { uri },
+                    position,
+                });
                 break;
             case 'incomingCalls':
             case 'outgoingCalls': {
                 const prepared = await server.request('textDocument/prepareCallHierarchy', { textDocument: { uri }, position });
                 const item = prepared?.[0];
-                result = item ? await server.request(`callHierarchy/${input.operation}`, { item }) : [];
+                result = item
+                    ? await server.request(`callHierarchy/${input.operation}`, { item })
+                    : [];
                 break;
             }
             case 'diagnostics': {
@@ -87,10 +219,18 @@ async function call(input, cwd = getWorkingDir()) {
                 break;
             }
         }
-        return { ok: true, content: compact(result, input.limit ?? 200) };
+        return {
+            ok: true,
+            content: input.output_format === 'json'
+                ? compact(result, input.limit ?? 200)
+                : compactSemantic(result, cwd, input.limit ?? 200),
+        };
     }
     catch (error) {
-        return { ok: false, error: `LSP ${input.operation} failed: ${error.message}` };
+        return {
+            ok: false,
+            error: `LSP ${input.operation} failed: ${error.message}`,
+        };
     }
 }
 export const lspTool = {
@@ -106,7 +246,10 @@ export const lspTool = {
     maxResultSizeChars: DEFAULT_MAX_RESULT_SIZE_CHARS,
     resolveAvailability(runtime) {
         const servers = discoverLspServers(runtime.cwd);
-        return { available: servers.length > 0, signature: lspAvailabilitySignature(runtime.cwd, servers) };
+        return {
+            available: servers.length > 0,
+            signature: lspAvailabilitySignature(runtime.cwd, servers),
+        };
     },
     call: (input) => call(input),
     callWithContext: (input, _signal, context) => call(input, context.cwd),