minimal-agent 0.11.0 → 0.12.0

package/src/tools/agent/agentTypes.js

@@ -35,6 +35,9 @@ export const EXPLORE_ALLOWED_TOOLS = [
     'Read',
     'Glob',
     'Grep',
+    'Snip',
+    'LSP',
+    'Skill',
     'WebSearch',
     'WebFetch',
     'WebBrowser',
@@ -42,6 +45,8 @@ export const EXPLORE_ALLOWED_TOOLS = [
     'ListMemories',
     'ReviewMemories',
     'SearchConversations',
+    'TaskGet',
+    'TaskList',
 ];
 /** 借鉴官方 EXPLORE_AGENT「READ-ONLY MODE」文案中文化。 */
 const EXPLORE_APPENDIX = `# 本次子任务类型：只读调研（explore）

package/src/tools/agent/agentTypes.ts

@@ -53,6 +53,9 @@ export const EXPLORE_ALLOWED_TOOLS: readonly string[] = [
   'Read',
   'Glob',
   'Grep',
+  'Snip',
+  'LSP',
+  'Skill',
   'WebSearch',
   'WebFetch',
   'WebBrowser',
@@ -60,6 +63,8 @@ export const EXPLORE_ALLOWED_TOOLS: readonly string[] = [
   'ListMemories',
   'ReviewMemories',
   'SearchConversations',
+  'TaskGet',
+  'TaskList',
 ];
 
 /** 借鉴官方 EXPLORE_AGENT「READ-ONLY MODE」文案中文化。 */

package/src/tools/bash/bash.js

@@ -56,6 +56,8 @@ import { requestUserChoice } from '../../askBridge.js';
 import { classifyCommand } from '../../irreversible/rules.js';
 import { startBackgroundTask } from '../tasks/backgroundTaskService.js';
 import { processExecutionMetadata } from '../tasks/processEvidence.js';
+import { permanentDeleteReason } from '../shared/permanentDeleteGuard.js';
+import { ToolOutputStore } from '../shared/toolOutputStore.js';
 // ---------------- 0. 常量 ----------------
 const DEFAULT_TIMEOUT_MS = 120_000; // 2 min
 const MAX_TIMEOUT_MS = 600_000; // 10 min
@@ -347,6 +349,9 @@ async function call(input, signal, context) {
             error: `安全检查拒绝执行：${forbiddenReason}\n命令：${command}`,
         };
     }
+    const permanentDelete = permanentDeleteReason(command, 'bash');
+    if (permanentDelete)
+        return { ok: false, error: `永久删除检查拒绝执行：${permanentDelete}\n命令：${command}` };
     // 4a-1. 不可逆动作闸门：毁掉「最后一份副本」的命令要**停下来问人**。
     //
     // 与上面黑名单的分工：黑名单是「灾难且无正当用途」→ 直接拒；这里是
@@ -389,18 +394,19 @@ async function call(input, signal, context) {
         try {
             const cwd = context?.cwd ?? getWorkingDir();
             const task = await startBackgroundTask(WIN_BASH
-                ? { command, executable: WIN_BASH, args: ['-c', command], cwd, env: sanitizedChildEnv(), sessionId: context?.sessionId, shellKind: 'bash' }
+                ? { command, executable: WIN_BASH, args: ['-c', command], cwd, env: sanitizedChildEnv(), sessionId: context?.sessionId, workspaceId: context?.workspaceId, shellKind: 'bash' }
                 : {
                     command: process.platform === 'win32' ? `chcp 65001 >nul & ${command}` : command,
                     cwd,
                     env: sanitizedChildEnv(),
                     shell: true,
                     sessionId: context?.sessionId,
+                    workspaceId: context?.workspaceId,
                     shellKind: 'bash',
                 }, context?.sessionState?.backgroundTasks);
             return {
                 ok: true,
-                content: `${destructiveWarning ? `⚠️ 警告: ${destructiveWarning}\n` : ''}后台任务已启动。task_id=${task.id}\nlog=${task.logPath}\n使用 TaskOutput 增量读取输出，TaskStop 停止进程。`,
+                content: `${destructiveWarning ? `⚠️ 警告: ${destructiveWarning}\n` : ''}后台任务已启动。task_id=${task.id.replace(/^proc_/, '')}\nprocess_id=${task.id}\nlog=${task.logPath}\n使用 TaskOutput 增量读取输出，TaskStop 停止进程。`,
                 metadata: processExecutionMetadata({ shell: 'bash', mode: 'background', command, status: 'started', taskId: task.id }),
             };
         }
@@ -414,6 +420,10 @@ async function call(input, signal, context) {
     //     Windows 无 bash:    cmd.exe，命令前缀 chcp 65001 强制 UTF-8 输出
     let stdout = '';
     let stderr = '';
+    const outputStore = new ToolOutputStore({
+        workspaceId: context?.workspaceId,
+        sessionId: context?.sessionId,
+    });
     let exitCode = null;
     let timedOut = false;
     let killedBySignal = false;
@@ -456,14 +466,16 @@ async function call(input, signal, context) {
             child.stdout?.setEncoding('utf8');
             child.stderr?.setEncoding('utf8');
             child.stdout?.on('data', (chunk) => {
-                // G1：即时封顶，防止狂输出命令在最终截断前撑爆内存（OOM）。不强行 kill，
-                // 让命令自己跑完或被 timeout 收走；超出上限的部分直接丢弃，最终仍按上限截断展示。
-                if (stdout.length < MAX_STREAM_BUFFER_CHARS)
-                    stdout += chunk;
+                if (!outputStore.append('stdout', chunk)) {
+                    child.stdout?.pause();
+                    outputStore.onDrain(() => child.stdout?.resume());
+                }
             });
             child.stderr?.on('data', (chunk) => {
-                if (stderr.length < MAX_STREAM_BUFFER_CHARS)
-                    stderr += chunk;
+                if (!outputStore.append('stderr', chunk)) {
+                    child.stderr?.pause();
+                    outputStore.onDrain(() => child.stderr?.resume());
+                }
             });
             child.on('error', (e) => {
                 ac.signal.removeEventListener('abort', onKill);
@@ -489,6 +501,9 @@ async function call(input, signal, context) {
         clearTimeout(timer);
         signal?.removeEventListener('abort', onAbort);
     }
+    const storedOutput = await outputStore.finish();
+    stdout = storedOutput.stdout;
+    stderr = storedOutput.stderr;
     // 4b-2. ATTACH_IMAGE sentinel：脚本可以打一行 `<<<ATTACH_IMAGE:path>>>` 让模型亲眼看图。
     //       协议行**从 content 剥掉**（那是给宿主看的，不是给模型读的噪声）；被拒的条目
     //       如实写进输出（静默丢弃会让脚本作者以为图发出去了，无从 debug）。
@@ -518,13 +533,18 @@ async function call(input, signal, context) {
         parts.push(`\n[被信号中断]`);
     }
     parts.push(`\n[exit code: ${exitCode === null ? 'killed' : exitCode}]`);
+    const outputReference = storedOutput.path
+        ? `\n[完整输出: ${storedOutput.path}; bytes=${storedOutput.bytes}; sha256=${storedOutput.sha256}; complete=${storedOutput.complete}]`
+        : '';
     let combinedOutput = parts.join('\n');
     // 4d. 大小兜底
-    if (combinedOutput.length > DEFAULT_MAX_RESULT_SIZE_CHARS) {
+    if (combinedOutput.length + outputReference.length > DEFAULT_MAX_RESULT_SIZE_CHARS) {
+        const suffix = `\n\n... (输出超过 ${DEFAULT_MAX_RESULT_SIZE_CHARS} 字符，预览已截断)${outputReference}`;
         combinedOutput =
-            combinedOutput.slice(0, DEFAULT_MAX_RESULT_SIZE_CHARS) +
-                `\n\n... (输出超过 ${DEFAULT_MAX_RESULT_SIZE_CHARS} 字符，已截断)`;
+            combinedOutput.slice(0, Math.max(0, DEFAULT_MAX_RESULT_SIZE_CHARS - suffix.length)) + suffix;
     }
+    else
+        combinedOutput += outputReference;
     // 4e. 中断 / 超时仍然算硬失败
     //     失败也带上已解析的附图：脚本挂掉前截的那张诊断图正是最该看的。
     if (timedOut || killedBySignal) {

package/src/tools/bash/bash.ts

@@ -63,6 +63,8 @@ import { requestUserChoice } from '../../askBridge.js';
 import { classifyCommand } from '../../irreversible/rules.js';
 import { startBackgroundTask } from '../tasks/backgroundTaskService.js';
 import { processExecutionMetadata } from '../tasks/processEvidence.js';
+import { permanentDeleteReason } from '../shared/permanentDeleteGuard.js';
+import { ToolOutputStore } from '../shared/toolOutputStore.js';
 
 // ---------------- 0. 常量 ----------------
 
@@ -372,6 +374,8 @@ async function call(input: BashInput, signal?: AbortSignal, context?: ToolCallCo
       error: `安全检查拒绝执行：${forbiddenReason}\n命令：${command}`,
     };
   }
+  const permanentDelete = permanentDeleteReason(command, 'bash');
+  if (permanentDelete) return { ok:false, error:`永久删除检查拒绝执行：${permanentDelete}\n命令：${command}` };
 
   // 4a-1. 不可逆动作闸门：毁掉「最后一份副本」的命令要**停下来问人**。
   //
@@ -422,20 +426,21 @@ async function call(input: BashInput, signal?: AbortSignal, context?: ToolCallCo
       const cwd = context?.cwd ?? getWorkingDir();
       const task = await startBackgroundTask(
         WIN_BASH
-          ? { command, executable: WIN_BASH, args: ['-c', command], cwd, env: sanitizedChildEnv(), sessionId: context?.sessionId, shellKind: 'bash' as const }
+          ? { command, executable: WIN_BASH, args: ['-c', command], cwd, env: sanitizedChildEnv(), sessionId: context?.sessionId, workspaceId: context?.workspaceId, shellKind: 'bash' as const }
           : {
               command: process.platform === 'win32' ? `chcp 65001 >nul & ${command}` : command,
               cwd,
               env: sanitizedChildEnv(),
               shell: true,
               sessionId: context?.sessionId,
+              workspaceId: context?.workspaceId,
               shellKind: 'bash' as const,
             },
         context?.sessionState?.backgroundTasks,
       );
       return {
         ok: true,
-        content: `${destructiveWarning ? `⚠️ 警告: ${destructiveWarning}\n` : ''}后台任务已启动。task_id=${task.id}\nlog=${task.logPath}\n使用 TaskOutput 增量读取输出，TaskStop 停止进程。`,
+        content: `${destructiveWarning ? `⚠️ 警告: ${destructiveWarning}\n` : ''}后台任务已启动。task_id=${task.id.replace(/^proc_/,'')}\nprocess_id=${task.id}\nlog=${task.logPath}\n使用 TaskOutput 增量读取输出，TaskStop 停止进程。`,
         metadata: processExecutionMetadata({ shell: 'bash', mode: 'background', command, status: 'started', taskId: task.id }),
       };
     } catch (error) {
@@ -449,6 +454,10 @@ async function call(input: BashInput, signal?: AbortSignal, context?: ToolCallCo
   //     Windows 无 bash:    cmd.exe，命令前缀 chcp 65001 强制 UTF-8 输出
   let stdout = '';
   let stderr = '';
+  const outputStore = new ToolOutputStore({
+    workspaceId: context?.workspaceId,
+    sessionId: context?.sessionId,
+  });
   let exitCode: number | null = null;
   let timedOut = false;
   let killedBySignal = false;
@@ -496,12 +505,16 @@ async function call(input: BashInput, signal?: AbortSignal, context?: ToolCallCo
       child.stdout?.setEncoding('utf8');
       child.stderr?.setEncoding('utf8');
       child.stdout?.on('data', (chunk) => {
-        // G1：即时封顶，防止狂输出命令在最终截断前撑爆内存（OOM）。不强行 kill，
-        // 让命令自己跑完或被 timeout 收走；超出上限的部分直接丢弃，最终仍按上限截断展示。
-        if (stdout.length < MAX_STREAM_BUFFER_CHARS) stdout += chunk;
+        if (!outputStore.append('stdout', chunk)) {
+          child.stdout?.pause();
+          outputStore.onDrain(() => child.stdout?.resume());
+        }
       });
       child.stderr?.on('data', (chunk) => {
-        if (stderr.length < MAX_STREAM_BUFFER_CHARS) stderr += chunk;
+        if (!outputStore.append('stderr', chunk)) {
+          child.stderr?.pause();
+          outputStore.onDrain(() => child.stderr?.resume());
+        }
       });
       child.on('error', (e) => {
         ac.signal.removeEventListener('abort', onKill);
@@ -524,6 +537,9 @@ async function call(input: BashInput, signal?: AbortSignal, context?: ToolCallCo
     clearTimeout(timer);
     signal?.removeEventListener('abort', onAbort);
   }
+  const storedOutput = await outputStore.finish();
+  stdout = storedOutput.stdout;
+  stderr = storedOutput.stderr;
 
   // 4b-2. ATTACH_IMAGE sentinel：脚本可以打一行 `<<<ATTACH_IMAGE:path>>>` 让模型亲眼看图。
   //       协议行**从 content 剥掉**（那是给宿主看的，不是给模型读的噪声）；被拒的条目
@@ -555,15 +571,18 @@ async function call(input: BashInput, signal?: AbortSignal, context?: ToolCallCo
     parts.push(`\n[被信号中断]`);
   }
   parts.push(`\n[exit code: ${exitCode === null ? 'killed' : exitCode}]`);
+  const outputReference = storedOutput.path
+    ? `\n[完整输出: ${storedOutput.path}; bytes=${storedOutput.bytes}; sha256=${storedOutput.sha256}; complete=${storedOutput.complete}]`
+    : '';
 
   let combinedOutput = parts.join('\n');
 
   // 4d. 大小兜底
-  if (combinedOutput.length > DEFAULT_MAX_RESULT_SIZE_CHARS) {
+  if (combinedOutput.length + outputReference.length > DEFAULT_MAX_RESULT_SIZE_CHARS) {
+    const suffix = `\n\n... (输出超过 ${DEFAULT_MAX_RESULT_SIZE_CHARS} 字符，预览已截断)${outputReference}`;
     combinedOutput =
-      combinedOutput.slice(0, DEFAULT_MAX_RESULT_SIZE_CHARS) +
-      `\n\n... (输出超过 ${DEFAULT_MAX_RESULT_SIZE_CHARS} 字符，已截断)`;
-  }
+      combinedOutput.slice(0, Math.max(0, DEFAULT_MAX_RESULT_SIZE_CHARS - suffix.length)) + suffix;
+  } else combinedOutput += outputReference;
 
   // 4e. 中断 / 超时仍然算硬失败
   //     失败也带上已解析的附图：脚本挂掉前截的那张诊断图正是最该看的。

package/src/tools/capabilities.js

@@ -1,8 +1,13 @@
 const TOOL_CAPABILITIES = Object.freeze({
     Read: 'files.read', Glob: 'files.read', Grep: 'files.read',
+    Snip: 'files.read',
     Edit: 'files.write', MultiEdit: 'files.write', Write: 'files.write',
     Bash: 'shell',
     PowerShell: 'shell', TaskOutput: 'background.process', TaskStop: 'background.process',
+    Trash: 'files.trash',
+    TaskCreate: 'task.management', TaskGet: 'task.management', TaskUpdate: 'task.management', TaskList: 'task.management',
+    Skill: 'skill.invoke', EnterWorktree: 'worktree.session', ExitWorktree: 'worktree.session',
+    TerminalCapture: 'terminal.capture',
     LSP: 'code.intelligence', NotebookEdit: 'files.write',
     WebSearch: 'web.search', WebFetch: 'web.fetch', WebBrowser: 'web.browser',
     Download: 'network.download',

package/src/tools/capabilities.ts

@@ -14,15 +14,25 @@ export type CapabilityId =
   | 'media'
   | 'memory'
   | 'code.intelligence'
-  | 'background.process';
+  | 'background.process'
+  | 'files.trash'
+  | 'task.management'
+  | 'skill.invoke'
+  | 'worktree.session'
+  | 'terminal.capture';
 
 export type ToolBudgetClass = 'core' | 'task' | 'auxiliary';
 
 const TOOL_CAPABILITIES: Readonly<Record<string, CapabilityId>> = Object.freeze({
   Read: 'files.read', Glob: 'files.read', Grep: 'files.read',
+  Snip: 'files.read',
   Edit: 'files.write', MultiEdit: 'files.write', Write: 'files.write',
   Bash: 'shell',
   PowerShell: 'shell', TaskOutput: 'background.process', TaskStop: 'background.process',
+  Trash: 'files.trash',
+  TaskCreate: 'task.management', TaskGet: 'task.management', TaskUpdate: 'task.management', TaskList: 'task.management',
+  Skill: 'skill.invoke', EnterWorktree: 'worktree.session', ExitWorktree: 'worktree.session',
+  TerminalCapture: 'terminal.capture',
   LSP: 'code.intelligence', NotebookEdit: 'files.write',
   WebSearch: 'web.search', WebFetch: 'web.fetch', WebBrowser: 'web.browser',
   Download: 'network.download',

package/src/tools/edit/edit.js

@@ -20,6 +20,7 @@ import { filePathField } from '../shared/schemas.js';
 import { assertFresh, hashFileBytes, recordRead, wasTruncated } from '../shared/fileState.js';
 import { fileActivityMetadata } from '../shared/fileActivity.js';
 import { emitFileMutation } from '../shared/fileMutationBus.js';
+import { buildPatchSummary } from '../shared/diffSummary.js';
 /** 编辑文件大小上限：1GB。防止模型试图 Edit 超大文件撑爆内存。 */
 const MAX_EDIT_FILE_SIZE_BYTES = 1024 * 1024 * 1024;
 // ---------------- 1. Zod 输入 schema ----------------
@@ -96,10 +97,11 @@ async function call(input, state, cwd) {
             await atomicWriteFile(filePath, new_string);
             recordRead(filePath, { contentHash: hashFileBytes(encodeTextFile(new_string, 'utf8')) }, state);
             emitFileMutation(filePath);
+            const patch = buildPatchSummary('', new_string, input.file_path);
             return {
                 ok: true,
-                content: `已创建新文件：${filePath}（${new_string.length} 字符）`,
-                metadata: await fileActivityMetadata(filePath, 'created', 'not_run', 'support', cwd),
+                content: `已创建新文件：${filePath}（${new_string.length} 字符）\n${patch.unifiedDiff ?? '[diff omitted: too large]'}`,
+                metadata: await fileActivityMetadata(filePath, 'created', 'not_run', 'support', cwd, patch),
             };
         }
         catch (e) {
@@ -186,12 +188,13 @@ async function call(input, state, cwd) {
     // 输出：报告改了几处 + 行变化
     const linesBefore = original.split('\n').length;
     const linesAfter = replaced.split('\n').length;
+    const patch = buildPatchSummary(original, normalizedReplaced, input.file_path);
     return {
         ok: true,
         content: `已编辑 ${filePath}\n` +
             `替换次数：${replaceAll ? occurrences : 1}\n` +
-            `行数：${linesBefore} → ${linesAfter}`,
-        metadata: await fileActivityMetadata(filePath, 'modified', 'not_run', 'support', cwd),
+            `行数：${linesBefore} → ${linesAfter}\n` + (patch.unifiedDiff ?? '[diff omitted: too large]'),
+        metadata: await fileActivityMetadata(filePath, 'modified', 'not_run', 'support', cwd, patch),
     };
 }
 // ---------------- 5. 模糊匹配提示 ----------------

package/src/tools/edit/edit.ts

@@ -35,6 +35,7 @@ import { filePathField } from '../shared/schemas.js';
 import { assertFresh, hashFileBytes, recordRead, wasTruncated, type FileReadState } from '../shared/fileState.js';
 import { fileActivityMetadata } from '../shared/fileActivity.js';
 import { emitFileMutation } from '../shared/fileMutationBus.js';
+import { buildPatchSummary } from '../shared/diffSummary.js';
 
 /** 编辑文件大小上限：1GB。防止模型试图 Edit 超大文件撑爆内存。 */
 const MAX_EDIT_FILE_SIZE_BYTES = 1024 * 1024 * 1024;
@@ -124,10 +125,11 @@ async function call(input: EditInput, state?: FileReadState, cwd?: string): Prom
       await atomicWriteFile(filePath, new_string);
       recordRead(filePath, { contentHash: hashFileBytes(encodeTextFile(new_string, 'utf8')) }, state);
       emitFileMutation(filePath);
+      const patch = buildPatchSummary('', new_string, input.file_path);
       return {
         ok: true,
-        content: `已创建新文件：${filePath}（${new_string.length} 字符）`,
-      metadata: await fileActivityMetadata(filePath, 'created', 'not_run', 'support', cwd),
+        content: `已创建新文件：${filePath}（${new_string.length} 字符）\n${patch.unifiedDiff ?? '[diff omitted: too large]'}`,
+        metadata: await fileActivityMetadata(filePath, 'created', 'not_run', 'support', cwd, patch),
       };
     } catch (e) {
       return { ok: false, error: `创建文件失败：${(e as Error).message}` };
@@ -222,13 +224,14 @@ async function call(input: EditInput, state?: FileReadState, cwd?: string): Prom
   // 输出：报告改了几处 + 行变化
   const linesBefore = original.split('\n').length;
   const linesAfter = replaced.split('\n').length;
+  const patch = buildPatchSummary(original, normalizedReplaced, input.file_path);
   return {
     ok: true,
     content:
       `已编辑 ${filePath}\n` +
       `替换次数：${replaceAll ? occurrences : 1}\n` +
-      `行数：${linesBefore} → ${linesAfter}`,
-      metadata: await fileActivityMetadata(filePath, 'modified', 'not_run', 'support', cwd),
+      `行数：${linesBefore} → ${linesAfter}\n` + (patch.unifiedDiff ?? '[diff omitted: too large]'),
+    metadata: await fileActivityMetadata(filePath, 'modified', 'not_run', 'support', cwd, patch),
   };
 }
 

package/src/tools/edit/multi-edit.js

@@ -22,6 +22,7 @@ import { filePathField } from '../shared/schemas.js';
 import { assertFresh, hashFileBytes, recordRead, wasTruncated } from '../shared/fileState.js';
 import { fileActivityMetadata } from '../shared/fileActivity.js';
 import { emitFileMutation } from '../shared/fileMutationBus.js';
+import { buildPatchSummary } from '../shared/diffSummary.js';
 // ---------------- 1. Zod 输入 schema ----------------
 const editItemSchema = z.object({
     old_string: z.string().min(1).describe('要替换的原文本（不允许为空 —— 创建新文件请用 Edit 工具）'),
@@ -168,10 +169,11 @@ async function call(input, state, cwd) {
     catch (e) {
         return { ok: false, error: `写入失败：${e.message}` };
     }
+    const patch = buildPatchSummary(originalContent, finalContent, input.file_path);
     return {
         ok: true,
-        content: `已对 ${filePath} 应用 ${edits.length} 处修改`,
-        metadata: await fileActivityMetadata(filePath, 'modified', 'not_run', 'support', cwd),
+        content: `已对 ${filePath} 应用 ${edits.length} 处修改\n${patch.unifiedDiff ?? '[diff omitted: too large]'}`,
+        metadata: await fileActivityMetadata(filePath, 'modified', 'not_run', 'support', cwd, patch),
     };
 }
 // ---------------- 5. 导出 ----------------

package/src/tools/edit/multi-edit.ts

@@ -37,6 +37,7 @@ import { filePathField } from '../shared/schemas.js';
 import { assertFresh, hashFileBytes, recordRead, wasTruncated, type FileReadState } from '../shared/fileState.js';
 import { fileActivityMetadata } from '../shared/fileActivity.js';
 import { emitFileMutation } from '../shared/fileMutationBus.js';
+import { buildPatchSummary } from '../shared/diffSummary.js';
 
 // ---------------- 1. Zod 输入 schema ----------------
 const editItemSchema = z.object({
@@ -199,10 +200,11 @@ async function call(input: MultiEditInput, state?: FileReadState, cwd?: string):
     return { ok: false, error: `写入失败：${(e as Error).message}` };
   }
 
+  const patch = buildPatchSummary(originalContent, finalContent, input.file_path);
   return {
     ok: true,
-    content: `已对 ${filePath} 应用 ${edits.length} 处修改`,
-    metadata: await fileActivityMetadata(filePath, 'modified', 'not_run', 'support', cwd),
+    content: `已对 ${filePath} 应用 ${edits.length} 处修改\n${patch.unifiedDiff ?? '[diff omitted: too large]'}`,
+    metadata: await fileActivityMetadata(filePath, 'modified', 'not_run', 'support', cwd, patch),
   };
 }