minimal-agent 0.18.8 → 0.18.10

package/src/tools/edit/edit.js

@@ -7,7 +7,7 @@
  *
  *  v0.2 增强：
  *    - 路径安全校验（null byte / UNC 路径）
- *    - 文件大小上限（1GB）
+ *    - 共享有界编辑事务与提交后回读核验
  *    - old_string 找不到时提供模糊匹配提示（最常见模型错误）
  * ============================================================
  */
@@ -15,14 +15,13 @@ import { existsSync } from 'node:fs';
 import { z } from 'zod';
 import { DEFAULT_MAX_RESULT_SIZE_CHARS } from '../types.js';
 import { toToolParameters } from '../../utils/zodToJson.js';
-import { resolveToolPath, findActualString, preserveQuoteStyle, detectLineEndingsForString, applyLineEnding, countOccurrences, splitReplaceAll, tryAutoSnapshot, atomicWriteFile, encodeTextFile, readTextFile, } from '../shared/fileUtils.js';
+import { resolveToolPath, findActualString, preserveQuoteStyle, detectLineEndingsForString, applyLineEnding, countOccurrences, splitReplaceAll, tryAutoSnapshot, atomicWriteFile, encodeTextFile, } from '../shared/fileUtils.js';
 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;
+import { readEditSnapshot, commitEdit } from '../shared/editTransaction.js';
 // ---------------- 1. Zod 输入 schema ----------------
 const inputSchema = z.object({
     file_path: filePathField('编辑'),
@@ -43,7 +42,7 @@ const description = `Performs exact string replacements in files.
 Usage:
 - You MUST use your \`Read\` tool to read the current content of the file BEFORE calling Edit.
   Memory is unreliable — if you think you "remember" how the code looks, you are probably wrong.
-  Re-read the relevant sections (function, module, or area you plan to change) every time.
+  Read the relevant sections; reuse unchanged read evidence instead of repeatedly reading the whole file.
 - To create a new file, pass an empty \`old_string\` and the desired contents as \`new_string\`. When creating a new file (path does not yet exist), you may call Edit directly — no prior Read is needed.
 - If the file already exists and you pass an empty \`old_string\`, the edit is rejected with a clear error. To replace the entire content of an existing file, use the Write tool instead.
 - ALWAYS prefer editing existing files in the codebase. NEVER write new files unless explicitly required.
@@ -116,9 +115,11 @@ async function call(input, state, cwd) {
         };
     }
     let original;
+    let editSnapshot;
     let sourceEncoding;
     try {
-        const snapshot = await readTextFile(filePath);
+        const snapshot = await readEditSnapshot(filePath);
+        editSnapshot = snapshot;
         original = snapshot.content;
         sourceEncoding = snapshot.encoding;
     }
@@ -127,14 +128,6 @@ async function call(input, state, cwd) {
     }
     // 5d-1. 记录原文件行尾符风格（写入时保持一致）
     const originalLineEnding = detectLineEndingsForString(original);
-    // 5d. 文件大小上限检查
-    const fileSize = Buffer.byteLength(original, 'utf8');
-    if (fileSize > MAX_EDIT_FILE_SIZE_BYTES) {
-        return {
-            ok: false,
-            error: `文件过大（${fileSize} 字节 > ${MAX_EDIT_FILE_SIZE_BYTES} 字节 ≈ 1GB）。Edit 不适合操作超大文件，请用 Write 工具。`,
-        };
-    }
     // 唯性检查
     if (old_string === '') {
         return {
@@ -176,7 +169,7 @@ async function call(input, state, cwd) {
     // 5f. 保持原文件行尾符风格
     const normalizedReplaced = applyLineEnding(replaced, originalLineEnding);
     try {
-        await atomicWriteFile(filePath, normalizedReplaced, sourceEncoding);
+        await commitEdit(filePath, editSnapshot, normalizedReplaced);
         recordRead(filePath, {
             contentHash: hashFileBytes(encodeTextFile(normalizedReplaced, sourceEncoding)),
         }, state);
@@ -193,6 +186,7 @@ async function call(input, state, cwd) {
         ok: true,
         content: `已编辑 ${filePath}\n` +
             `替换次数：${replaceAll ? occurrences : 1}\n` +
+            `已回读核验提交内容（不代表代码测试通过）。\n` +
             `行数：${linesBefore} → ${linesAfter}\n` + (patch.unifiedDiff ?? '[diff omitted: too large]'),
         metadata: await fileActivityMetadata(filePath, 'modified', 'not_run', 'support', cwd, patch),
     };
@@ -208,6 +202,8 @@ async function call(input, state, cwd) {
  *   3. 返回重叠率最高的前 N 行作为提示
  */
 function findFuzzyMatchHint(fileContent, target) {
+    if (fileContent.length > 200_000 || target.length > 2_000)
+        return '大文件不执行全文件模糊匹配；用 Grep 定位，再 Read 目标范围获取精确文本。';
     const MIN_OVERLAP_RATIO = 0.5; // 至少 50% 字符重叠才认为"接近"
     const MAX_HINTS = 3; // 最多提示 3 个候选
     const targetTrimmed = target.trim();

package/src/tools/edit/edit.ts

@@ -7,7 +7,7 @@
  *
  *  v0.2 增强：
  *    - 路径安全校验（null byte / UNC 路径）
- *    - 文件大小上限（1GB）
+ *    - 共享有界编辑事务与提交后回读核验
  *    - old_string 找不到时提供模糊匹配提示（最常见模型错误）
  * ============================================================
  */
@@ -36,9 +36,8 @@ import { assertFresh, hashFileBytes, recordRead, wasTruncated, type FileReadStat
 import { fileActivityMetadata } from '../shared/fileActivity.js';
 import { emitFileMutation } from '../shared/fileMutationBus.js';
 import { buildPatchSummary } from '../shared/diffSummary.js';
+import { readEditSnapshot, commitEdit } from '../shared/editTransaction.js';
 
-/** 编辑文件大小上限：1GB。防止模型试图 Edit 超大文件撑爆内存。 */
-const MAX_EDIT_FILE_SIZE_BYTES = 1024 * 1024 * 1024;
 
 // ---------------- 1. Zod 输入 schema ----------------
 const inputSchema = z.object({
@@ -65,7 +64,7 @@ const description = `Performs exact string replacements in files.
 Usage:
 - You MUST use your \`Read\` tool to read the current content of the file BEFORE calling Edit.
   Memory is unreliable — if you think you "remember" how the code looks, you are probably wrong.
-  Re-read the relevant sections (function, module, or area you plan to change) every time.
+  Read the relevant sections; reuse unchanged read evidence instead of repeatedly reading the whole file.
 - To create a new file, pass an empty \`old_string\` and the desired contents as \`new_string\`. When creating a new file (path does not yet exist), you may call Edit directly — no prior Read is needed.
 - If the file already exists and you pass an empty \`old_string\`, the edit is rejected with a clear error. To replace the entire content of an existing file, use the Write tool instead.
 - ALWAYS prefer editing existing files in the codebase. NEVER write new files unless explicitly required.
@@ -145,9 +144,11 @@ async function call(input: EditInput, state?: FileReadState, cwd?: string): Prom
   }
 
   let original: string;
+  let editSnapshot: Awaited<ReturnType<typeof readEditSnapshot>>;
   let sourceEncoding: Awaited<ReturnType<typeof readTextFile>>['encoding'];
   try {
-    const snapshot = await readTextFile(filePath);
+    const snapshot = await readEditSnapshot(filePath);
+    editSnapshot = snapshot;
     original = snapshot.content;
     sourceEncoding = snapshot.encoding;
   } catch (e) {
@@ -157,15 +158,6 @@ async function call(input: EditInput, state?: FileReadState, cwd?: string): Prom
   // 5d-1. 记录原文件行尾符风格（写入时保持一致）
   const originalLineEnding = detectLineEndingsForString(original);
 
-  // 5d. 文件大小上限检查
-  const fileSize = Buffer.byteLength(original, 'utf8');
-  if (fileSize > MAX_EDIT_FILE_SIZE_BYTES) {
-    return {
-      ok: false,
-      error: `文件过大（${fileSize} 字节 > ${MAX_EDIT_FILE_SIZE_BYTES} 字节 ≈ 1GB）。Edit 不适合操作超大文件，请用 Write 工具。`,
-    };
-  }
-
   // 唯性检查
   if (old_string === '') {
     return {
@@ -212,7 +204,7 @@ async function call(input: EditInput, state?: FileReadState, cwd?: string): Prom
   const normalizedReplaced = applyLineEnding(replaced, originalLineEnding);
 
   try {
-    await atomicWriteFile(filePath, normalizedReplaced, sourceEncoding);
+    await commitEdit(filePath, editSnapshot, normalizedReplaced);
     recordRead(filePath, {
       contentHash: hashFileBytes(encodeTextFile(normalizedReplaced, sourceEncoding)),
     }, state);
@@ -230,6 +222,7 @@ async function call(input: EditInput, state?: FileReadState, cwd?: string): Prom
     content:
       `已编辑 ${filePath}\n` +
       `替换次数：${replaceAll ? occurrences : 1}\n` +
+      `已回读核验提交内容（不代表代码测试通过）。\n` +
       `行数：${linesBefore} → ${linesAfter}\n` + (patch.unifiedDiff ?? '[diff omitted: too large]'),
     metadata: await fileActivityMetadata(filePath, 'modified', 'not_run', 'support', cwd, patch),
   };
@@ -247,6 +240,8 @@ async function call(input: EditInput, state?: FileReadState, cwd?: string): Prom
  *   3. 返回重叠率最高的前 N 行作为提示
  */
 function findFuzzyMatchHint(fileContent: string, target: string): string | null {
+  if (fileContent.length > 200_000 || target.length > 2_000)
+    return '大文件不执行全文件模糊匹配；用 Grep 定位，再 Read 目标范围获取精确文本。';
   const MIN_OVERLAP_RATIO = 0.5; // 至少 50% 字符重叠才认为"接近"
   const MAX_HINTS = 3; // 最多提示 3 个候选
 

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

@@ -17,12 +17,13 @@ import { existsSync } from 'node:fs';
 import { z } from 'zod';
 import { DEFAULT_MAX_RESULT_SIZE_CHARS } from '../types.js';
 import { toToolParameters } from '../../utils/zodToJson.js';
-import { resolveToolPath, detectLineEndingsForString, applyLineEnding, findActualString, preserveQuoteStyle, countOccurrences, splitReplaceAll, tryAutoSnapshot, atomicWriteFile, encodeTextFile, readTextFile, } from '../shared/fileUtils.js';
+import { resolveToolPath, detectLineEndingsForString, applyLineEnding, findActualString, preserveQuoteStyle, countOccurrences, splitReplaceAll, tryAutoSnapshot, encodeTextFile, } from '../shared/fileUtils.js';
 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';
+import { readEditSnapshot, commitEdit } from '../shared/editTransaction.js';
 // ---------------- 1. Zod 输入 schema ----------------
 const editItemSchema = z.object({
     old_string: z.string().min(1).describe('要替换的原文本（不允许为空 —— 创建新文件请用 Edit 工具）'),
@@ -108,9 +109,11 @@ async function call(input, state, cwd) {
     }
     // 4e. 读原文
     let originalContent;
+    let editSnapshot;
     let sourceEncoding;
     try {
-        const snapshot = await readTextFile(filePath);
+        const snapshot = await readEditSnapshot(filePath);
+        editSnapshot = snapshot;
         originalContent = snapshot.content;
         sourceEncoding = snapshot.encoding;
     }
@@ -119,6 +122,8 @@ async function call(input, state, cwd) {
     }
     // 4f. 在内存中顺序应用所有 edit（任一失败立即返回，磁盘不动）
     let currentContent = originalContent;
+    let replacements = 0;
+    let unchanged = 0;
     const lineEnding = detectLineEndingsForString(originalContent);
     const truncHint = wasTruncated(filePath, state)
         ? `\n\n⚠️ 上次 Read 该文件时被截断了（只看到部分内容）。当前 old_string 可能在截断范围外。请用更小的 limit + offset 精确读取目标行号附近后再 MultiEdit。`
@@ -153,6 +158,11 @@ async function call(input, state, cwd) {
                 error: `edits[${i}].old_string 在当前内容中出现 ${occurrences} 次，不唯一。请扩大 old_string 包含更多上下文，或显式传 replace_all=true。${truncHint}`,
             };
         }
+        if (searchTarget === processedNewString) {
+            unchanged++;
+            continue;
+        }
+        replacements += replaceAll ? occurrences : 1;
         currentContent = replaceAll
             ? splitReplaceAll(currentContent, searchTarget, processedNewString)
             : currentContent.replace(searchTarget, () => processedNewString);
@@ -160,7 +170,7 @@ async function call(input, state, cwd) {
     // 4g. 全部成功 → 保持原文件行尾符风格，写盘
     const finalContent = applyLineEnding(currentContent, lineEnding);
     try {
-        await atomicWriteFile(filePath, finalContent, sourceEncoding);
+        await commitEdit(filePath, editSnapshot, finalContent);
         recordRead(filePath, {
             contentHash: hashFileBytes(encodeTextFile(finalContent, sourceEncoding)),
         }, state);
@@ -172,7 +182,7 @@ async function call(input, state, cwd) {
     const patch = buildPatchSummary(originalContent, finalContent, input.file_path);
     return {
         ok: true,
-        content: `已对 ${filePath} 应用 ${edits.length} 处修改\n${patch.unifiedDiff ?? '[diff omitted: too large]'}`,
+        content: `已编辑 ${filePath}：${edits.length} 条操作，实际替换 ${replacements} 次，${unchanged} 条无变化。已回读核验提交内容。\n${patch.unifiedDiff ?? '[diff 未统计：文件过大；不代表无变化]'}`,
         metadata: await fileActivityMetadata(filePath, 'modified', 'not_run', 'support', cwd, patch),
     };
 }

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

@@ -29,7 +29,6 @@ import {
   countOccurrences,
   splitReplaceAll,
   tryAutoSnapshot,
-  atomicWriteFile,
   encodeTextFile,
   readTextFile,
 } from '../shared/fileUtils.js';
@@ -38,6 +37,7 @@ import { assertFresh, hashFileBytes, recordRead, wasTruncated, type FileReadStat
 import { fileActivityMetadata } from '../shared/fileActivity.js';
 import { emitFileMutation } from '../shared/fileMutationBus.js';
 import { buildPatchSummary } from '../shared/diffSummary.js';
+import { readEditSnapshot, commitEdit } from '../shared/editTransaction.js';
 
 // ---------------- 1. Zod 输入 schema ----------------
 const editItemSchema = z.object({
@@ -134,9 +134,11 @@ async function call(input: MultiEditInput, state?: FileReadState, cwd?: string):
 
   // 4e. 读原文
   let originalContent: string;
+  let editSnapshot: Awaited<ReturnType<typeof readEditSnapshot>>;
   let sourceEncoding: Awaited<ReturnType<typeof readTextFile>>['encoding'];
   try {
-    const snapshot = await readTextFile(filePath);
+    const snapshot = await readEditSnapshot(filePath);
+    editSnapshot = snapshot;
     originalContent = snapshot.content;
     sourceEncoding = snapshot.encoding;
   } catch (e) {
@@ -145,6 +147,8 @@ async function call(input: MultiEditInput, state?: FileReadState, cwd?: string):
 
   // 4f. 在内存中顺序应用所有 edit（任一失败立即返回，磁盘不动）
   let currentContent = originalContent;
+  let replacements = 0;
+  let unchanged = 0;
   const lineEnding = detectLineEndingsForString(originalContent);
   const truncHint = wasTruncated(filePath, state)
     ? `\n\n⚠️ 上次 Read 该文件时被截断了（只看到部分内容）。当前 old_string 可能在截断范围外。请用更小的 limit + offset 精确读取目标行号附近后再 MultiEdit。`
@@ -182,6 +186,8 @@ async function call(input: MultiEditInput, state?: FileReadState, cwd?: string):
       };
     }
 
+    if (searchTarget === processedNewString) { unchanged++; continue; }
+    replacements += replaceAll ? occurrences : 1;
     currentContent = replaceAll
       ? splitReplaceAll(currentContent, searchTarget, processedNewString)
       : currentContent.replace(searchTarget, () => processedNewString);
@@ -191,7 +197,7 @@ async function call(input: MultiEditInput, state?: FileReadState, cwd?: string):
   const finalContent = applyLineEnding(currentContent, lineEnding);
 
   try {
-    await atomicWriteFile(filePath, finalContent, sourceEncoding);
+    await commitEdit(filePath, editSnapshot, finalContent);
     recordRead(filePath, {
       contentHash: hashFileBytes(encodeTextFile(finalContent, sourceEncoding)),
     }, state);
@@ -203,7 +209,7 @@ async function call(input: MultiEditInput, state?: FileReadState, cwd?: string):
   const patch = buildPatchSummary(originalContent, finalContent, input.file_path);
   return {
     ok: true,
-    content: `已对 ${filePath} 应用 ${edits.length} 处修改\n${patch.unifiedDiff ?? '[diff omitted: too large]'}`,
+    content: `已编辑 ${filePath}：${edits.length} 条操作，实际替换 ${replacements} 次，${unchanged} 条无变化。已回读核验提交内容。\n${patch.unifiedDiff ?? '[diff 未统计：文件过大；不代表无变化]'}`,
     metadata: await fileActivityMetadata(filePath, 'modified', 'not_run', 'support', cwd, patch),
   };
 }

package/src/tools/memory/maintenance.js

@@ -1,4 +1,5 @@
 import { z } from 'zod';
+import { backgroundLearningHealth } from '../../memory/jobPolicy.js';
 import { getWorkingDir } from '../../bootstrap/workingDir.js';
 import { sha256 } from '../../memory/codec.js';
 import { captureDependencies } from '../../memory/dependencies.js';
@@ -289,6 +290,7 @@ export const memoryMaintenanceTool = {
                 ok: true,
                 content: JSON.stringify({
                     ...(await persistedLearningStatus(ctx.workspaceId)),
+                    recentBackgroundFailures: backgroundLearningHealth(ctx.workspaceId),
                     revision: store.revision,
                     taskSummaries: {
                         count: store.taskSummaries?.length ?? 0,

package/src/tools/memory/maintenance.ts

@@ -1,4 +1,5 @@
 import { z } from 'zod';
+import { backgroundLearningHealth } from '../../memory/jobPolicy.js';
 import { getWorkingDir } from '../../bootstrap/workingDir.js';
 import { sha256 } from '../../memory/codec.js';
 import { captureDependencies } from '../../memory/dependencies.js';
@@ -388,6 +389,7 @@ export const memoryMaintenanceTool: Tool<z.infer<typeof schema>> = {
         content: JSON.stringify(
           {
             ...(await persistedLearningStatus(ctx.workspaceId)),
+            recentBackgroundFailures: backgroundLearningHealth(ctx.workspaceId),
             revision: store.revision,
             taskSummaries: {
               count: store.taskSummaries?.length ?? 0,

package/src/tools/memory/memory.js

@@ -6,7 +6,7 @@ import { memoryRecordPath } from '../../memory/fileStore.js';
 import { memoryService, } from '../../memory/memoryService.js';
 import { toToolParameters } from '../../utils/zodToJson.js';
 import { DEFAULT_MAX_RESULT_SIZE_CHARS } from '../types.js';
-import { EXPLICIT_CROSS_WORKSPACE_INTENT, EXPLICIT_FORGET_INTENT, EXPLICIT_MEMORY_INTENT, EXPLICIT_PERSONA_INTENT, confirmSensitiveMemory, denyUnlessLocalOwner, requireCurrentEvidence, } from './policy.js';
+import { EXPLICIT_CROSS_WORKSPACE_INTENT, EXPLICIT_FORGET_INTENT, EXPLICIT_MEMORY_INTENT, EXPLICIT_PERSONA_INTENT, confirmSensitiveMemory, confirmMemoryCorrection, denyUnlessLocalOwner, requireCurrentEvidence, } from './policy.js';
 const scopeSchema = z.enum(['personal', 'workspace']);
 const categorySchema = z.enum([
     'profile',
@@ -21,7 +21,7 @@ function formatRecord(record, version) {
         ? ` workspace=${record.workspaceId}`
         : '';
     const lifecycle = ` status=${record.status ?? 'active'} revision=${record.revision ?? 1}`;
-    return `- [${record.id}] scope=${record.scope} ${record.category}/${record.subject}${workspace}${lifecycle}${version ? ` version=${version}` : ''}: ${record.statement}（${record.evidence}，${new Date(record.updatedAt).toISOString()}）`;
+    return `- [${record.id}] scope=${record.scope} ${record.category}/${record.subject}${workspace}${lifecycle}${version ? ` version=${version}` : ''}: ${record.statement}（${record.evidence}，${new Date(record.updatedAt).toISOString()}）${record.status === 'needs_review' && record.confirmationContext ? `\n复核线索（非事实）：${record.confirmationContext}` : ''}`;
 }
 function diagnosticSuffix(diagnostics) {
     if (!diagnostics.length)
@@ -159,15 +159,18 @@ export const rememberMemoryTool = {
     },
 };
 const updateSchema = z.object({
+    action: z.enum(['update', 'review', 'confirm']).optional().describe('默认 update：当前用户原话纠正；review：仅标记待复核，不改事实；confirm：通过宿主向用户确认拟更新内容后保存'),
+    reason: z.string().min(1).max(1000).optional().describe('review/confirm 必填：冲突或纠正依据，注明来源；不得伪造用户陈述'),
     id: z.string().uuid(),
     scope: scopeSchema,
     category: categorySchema.optional(),
     subject: z.string().min(1).max(120).optional(),
-    statement: z.string().min(1).max(1000),
+    statement: z.string().min(1).max(1000).optional(),
     evidenceQuote: z
         .string()
         .min(1)
         .max(1000)
+        .optional()
         .describe('当前用户消息中的逐字证据片段'),
     sensitivity: z.enum(['normal', 'sensitive']).optional(),
     aliases: z.array(z.string().min(1).max(120)).max(20).optional(),
@@ -184,7 +187,7 @@ const updateSchema = z.object({
 });
 export const updateMemoryTool = {
     name: 'UpdateMemory',
-    description: '在用户当前陈述纠正或替换旧事实时，按 RecallMemory 返回的 ID 整条更新。必须先读取旧记录，evidenceQuote 必须逐字来自当前用户消息；不得用推断补写历史。',
+    description: '纠正用户事实记忆：先 RecallMemory 读取 ID/version。默认 update 需要 statement 与当前用户原话 evidenceQuote；review 需要 reason，仅标记待复核、保留原事实与证据；confirm 需要 statement/reason，通过宿主展示新旧内容并取得用户确认再更新。拒绝或无法交互不写入。项目知识和经验走 MemoryMaintenance，不伪造用户证据。',
     inputSchema: updateSchema,
     parameters: toToolParameters(updateSchema),
     isReadOnly: false,
@@ -196,9 +199,23 @@ export const updateMemoryTool = {
         if (denied)
             return denied;
         const current = ctx.currentUserInput ?? '';
-        const invalidEvidence = requireCurrentEvidence(ctx, input.evidenceQuote);
-        if (invalidEvidence)
-            return invalidEvidence;
+        const action = input.action ?? 'update';
+        if (action === 'review' && (input.statement !== undefined || input.evidenceQuote !== undefined)) {
+            return { ok: false, error: 'review 仅提交 reason，不提交 statement/evidenceQuote；标记疑点不代表确认新事实' };
+        }
+        if (action !== 'update' && (input.category !== undefined || input.subject !== undefined || input.aliases !== undefined || input.supersedesIds !== undefined || input.sensitivity !== undefined)) {
+            return { ok: false, error: 'review/confirm 只处理当前记录的复核状态或正文，不同时修改分类、敏感级别、别名或替代其他记录' };
+        }
+        if (action === 'update') {
+            if (!input.statement || !input.evidenceQuote)
+                return { ok: false, error: 'update 需要 statement 和当前用户原话 evidenceQuote' };
+            const invalidEvidence = requireCurrentEvidence(ctx, input.evidenceQuote);
+            if (invalidEvidence)
+                return invalidEvidence;
+        }
+        else if (!input.reason || (action === 'confirm' && !input.statement)) {
+            return { ok: false, error: 'review 需要 reason；confirm 需要 reason 和 statement' };
+        }
         if (input.scope === 'workspace' && !ctx.workspaceId) {
             return {
                 ok: false,
@@ -206,7 +223,7 @@ export const updateMemoryTool = {
             };
         }
         if (!(await memoryService.settings()).autoRemember &&
-            !EXPLICIT_MEMORY_INTENT.test(current)) {
+            !EXPLICIT_MEMORY_INTENT.test(current) && action !== 'confirm') {
             return {
                 ok: false,
                 error: '用户已关闭自动记忆；当前消息没有明确要求更新记忆',
@@ -215,18 +232,43 @@ export const updateMemoryTool = {
         const currentRecord = await memoryService.readWithVersion(input.id, input.scope, input.scope === 'workspace' ? ctx.workspaceId : undefined);
         if (!currentRecord)
             return { ok: false, error: '未找到该记忆，未做修改' };
-        const sensitivity = input.sensitivity ?? currentRecord.record.sensitivity ?? 'normal';
+        const expectedVersion = input.expectedVersion ?? currentRecord.version;
+        if (expectedVersion !== currentRecord.version) {
+            return {
+                ok: false,
+                error: '记忆已被手工或并发修改。未应用本次更新；保留以下当前记录的并发修改后可直接重试，不存在时重新定位。\n'
+                    + JSON.stringify({ current: currentRecord }),
+            };
+        }
+        if (action === 'review') {
+            signal?.throwIfAborted();
+            try {
+                const reviewed = await memoryService.updateWithVersion(input.id, input.scope, expectedVersion, { status: 'needs_review', confirmationContext: `待复核原因（非确认事实）：${input.reason}` }, input.scope === 'workspace' ? ctx.workspaceId : undefined);
+                return reviewed ? { ok: true, content: `已标记待复核，原事实和证据未改写。id=${input.id}\nversion=${reviewed.version}` }
+                    : { ok: false, error: '记录已不存在，未做修改' };
+            }
+            catch (error) {
+                if (error.message === 'MEMORY_VERSION_CONFLICT')
+                    return { ok: false, error: '记忆并发变更，请重新读取；未标记待复核' };
+                throw error;
+            }
+        }
+        const statement = input.statement;
+        const confirmed = action === 'confirm' && await confirmMemoryCorrection(currentRecord.record.subject, currentRecord.record.statement, statement, input.reason, signal);
+        if (action === 'confirm' && !confirmed)
+            return { ok: false, error: '未获得用户确认（拒绝或宿主无法交互），原记忆未改写；可标记待复核，不要重复请求确认' };
+        const evidenceQuote = confirmed ? `用户通过纠正记忆确认：${statement}` : input.evidenceQuote;
+        const sensitivity = currentRecord.record.sensitivity === 'sensitive' ? 'sensitive' : input.sensitivity ?? 'normal';
         if (sensitivity === 'sensitive' &&
-            input.statement.trim() === input.evidenceQuote.trim()) {
+            !confirmed && statement.trim() === evidenceQuote.trim()) {
             return {
                 ok: false,
                 error: '敏感内容不得逐字更新；请先概括、去除不必要细节后再请求确认',
             };
         }
-        const evidence = await confirmSensitiveMemory(input.statement, sensitivity, signal);
+        const evidence = confirmed ? 'user_confirmed' : await confirmSensitiveMemory(statement, sensitivity, signal);
         if (!evidence)
             return { ok: false, error: '敏感记忆更新未获确认' };
-        const expectedVersion = input.expectedVersion ?? currentRecord.version;
         let updated;
         try {
             updated = await memoryService.updateWithVersion(input.id, input.scope, expectedVersion, {
@@ -234,9 +276,11 @@ export const updateMemoryTool = {
                     ? { category: input.category }
                     : {}),
                 ...(input.subject ? { subject: input.subject } : {}),
-                statement: input.statement,
+                statement,
+                status: 'active',
                 evidence,
-                evidenceQuote: input.evidenceQuote,
+                evidenceQuote,
+                confirmationContext: confirmed ? `宿主确认纠正：${input.reason}` : '',
                 sourceSessionId: ctx.sessionId ?? 'unknown',
                 sourceMessageId: ctx.userMessageId ?? 'unknown',
                 sensitivity,

package/src/tools/memory/memory.ts

@@ -18,6 +18,7 @@ import {
   EXPLICIT_MEMORY_INTENT,
   EXPLICIT_PERSONA_INTENT,
   confirmSensitiveMemory,
+  confirmMemoryCorrection,
   denyUnlessLocalOwner,
   requireCurrentEvidence,
 } from './policy.js';
@@ -39,7 +40,7 @@ function formatRecord(
     ? ` workspace=${record.workspaceId}`
     : '';
   const lifecycle = ` status=${record.status ?? 'active'} revision=${record.revision ?? 1}`;
-  return `- [${record.id}] scope=${record.scope} ${record.category}/${record.subject}${workspace}${lifecycle}${version ? ` version=${version}` : ''}: ${record.statement}（${record.evidence}，${new Date(record.updatedAt).toISOString()}）`;
+  return `- [${record.id}] scope=${record.scope} ${record.category}/${record.subject}${workspace}${lifecycle}${version ? ` version=${version}` : ''}: ${record.statement}（${record.evidence}，${new Date(record.updatedAt).toISOString()}）${record.status === 'needs_review' && record.confirmationContext ? `\n复核线索（非事实）：${record.confirmationContext}` : ''}`;
 }
 
 function diagnosticSuffix(
@@ -188,15 +189,18 @@ export const rememberMemoryTool: Tool<z.infer<typeof rememberSchema>> = {
 };
 
 const updateSchema = z.object({
+  action: z.enum(['update', 'review', 'confirm']).optional().describe('默认 update：当前用户原话纠正；review：仅标记待复核，不改事实；confirm：通过宿主向用户确认拟更新内容后保存'),
+  reason: z.string().min(1).max(1000).optional().describe('review/confirm 必填：冲突或纠正依据，注明来源；不得伪造用户陈述'),
   id: z.string().uuid(),
   scope: scopeSchema,
   category: categorySchema.optional(),
   subject: z.string().min(1).max(120).optional(),
-  statement: z.string().min(1).max(1000),
+  statement: z.string().min(1).max(1000).optional(),
   evidenceQuote: z
     .string()
     .min(1)
     .max(1000)
+    .optional()
     .describe('当前用户消息中的逐字证据片段'),
   sensitivity: z.enum(['normal', 'sensitive']).optional(),
   aliases: z.array(z.string().min(1).max(120)).max(20).optional(),
@@ -217,7 +221,7 @@ const updateSchema = z.object({
 export const updateMemoryTool: Tool<z.infer<typeof updateSchema>> = {
   name: 'UpdateMemory',
   description:
-    '在用户当前陈述纠正或替换旧事实时，按 RecallMemory 返回的 ID 整条更新。必须先读取旧记录，evidenceQuote 必须逐字来自当前用户消息；不得用推断补写历史。',
+    '纠正用户事实记忆：先 RecallMemory 读取 ID/version。默认 update 需要 statement 与当前用户原话 evidenceQuote；review 需要 reason，仅标记待复核、保留原事实与证据；confirm 需要 statement/reason，通过宿主展示新旧内容并取得用户确认再更新。拒绝或无法交互不写入。项目知识和经验走 MemoryMaintenance，不伪造用户证据。',
   inputSchema: updateSchema,
   parameters: toToolParameters(updateSchema),
   isReadOnly: false,
@@ -228,8 +232,20 @@ export const updateMemoryTool: Tool<z.infer<typeof updateSchema>> = {
     const denied = denyUnlessLocalOwner(ctx);
     if (denied) return denied;
     const current = ctx.currentUserInput ?? '';
-    const invalidEvidence = requireCurrentEvidence(ctx, input.evidenceQuote);
-    if (invalidEvidence) return invalidEvidence;
+    const action = input.action ?? 'update';
+    if (action === 'review' && (input.statement !== undefined || input.evidenceQuote !== undefined)) {
+      return { ok: false, error: 'review 仅提交 reason，不提交 statement/evidenceQuote；标记疑点不代表确认新事实' };
+    }
+    if (action !== 'update' && (input.category !== undefined || input.subject !== undefined || input.aliases !== undefined || input.supersedesIds !== undefined || input.sensitivity !== undefined)) {
+      return { ok: false, error: 'review/confirm 只处理当前记录的复核状态或正文，不同时修改分类、敏感级别、别名或替代其他记录' };
+    }
+    if (action === 'update') {
+      if (!input.statement || !input.evidenceQuote) return { ok: false, error: 'update 需要 statement 和当前用户原话 evidenceQuote' };
+      const invalidEvidence = requireCurrentEvidence(ctx, input.evidenceQuote);
+      if (invalidEvidence) return invalidEvidence;
+    } else if (!input.reason || (action === 'confirm' && !input.statement)) {
+      return { ok: false, error: 'review 需要 reason；confirm 需要 reason 和 statement' };
+    }
     if (input.scope === 'workspace' && !ctx.workspaceId) {
       return {
         ok: false,
@@ -238,7 +254,7 @@ export const updateMemoryTool: Tool<z.infer<typeof updateSchema>> = {
     }
     if (
       !(await memoryService.settings()).autoRemember &&
-      !EXPLICIT_MEMORY_INTENT.test(current)
+      !EXPLICIT_MEMORY_INTENT.test(current) && action !== 'confirm'
     ) {
       return {
         ok: false,
@@ -251,23 +267,49 @@ export const updateMemoryTool: Tool<z.infer<typeof updateSchema>> = {
       input.scope === 'workspace' ? ctx.workspaceId : undefined,
     );
     if (!currentRecord) return { ok: false, error: '未找到该记忆，未做修改' };
-    const sensitivity = input.sensitivity ?? currentRecord.record.sensitivity ?? 'normal';
+    const expectedVersion = input.expectedVersion ?? currentRecord.version;
+    if (expectedVersion !== currentRecord.version) {
+      return {
+        ok: false,
+        error:
+          '记忆已被手工或并发修改。未应用本次更新；保留以下当前记录的并发修改后可直接重试，不存在时重新定位。\n'
+          + JSON.stringify({ current: currentRecord }),
+      };
+    }
+    if (action === 'review') {
+      signal?.throwIfAborted();
+      try {
+        const reviewed = await memoryService.updateWithVersion(input.id, input.scope, expectedVersion,
+          { status: 'needs_review', confirmationContext: `待复核原因（非确认事实）：${input.reason}` },
+          input.scope === 'workspace' ? ctx.workspaceId : undefined);
+        return reviewed ? { ok: true, content: `已标记待复核，原事实和证据未改写。id=${input.id}\nversion=${reviewed.version}` }
+          : { ok: false, error: '记录已不存在，未做修改' };
+      } catch (error) {
+        if ((error as Error).message === 'MEMORY_VERSION_CONFLICT') return { ok: false, error: '记忆并发变更，请重新读取；未标记待复核' };
+        throw error;
+      }
+    }
+    const statement = input.statement!;
+    const confirmed = action === 'confirm' && await confirmMemoryCorrection(currentRecord.record.subject,
+      currentRecord.record.statement, statement, input.reason!, signal);
+    if (action === 'confirm' && !confirmed) return { ok: false, error: '未获得用户确认（拒绝或宿主无法交互），原记忆未改写；可标记待复核，不要重复请求确认' };
+    const evidenceQuote = confirmed ? `用户通过纠正记忆确认：${statement}` : input.evidenceQuote!;
+    const sensitivity = currentRecord.record.sensitivity === 'sensitive' ? 'sensitive' : input.sensitivity ?? 'normal';
     if (
       sensitivity === 'sensitive' &&
-      input.statement.trim() === input.evidenceQuote.trim()
+      !confirmed && statement.trim() === evidenceQuote.trim()
     ) {
       return {
         ok: false,
         error: '敏感内容不得逐字更新；请先概括、去除不必要细节后再请求确认',
       };
     }
-    const evidence = await confirmSensitiveMemory(
-      input.statement,
+    const evidence = confirmed ? 'user_confirmed' : await confirmSensitiveMemory(
+      statement,
       sensitivity,
       signal,
     );
     if (!evidence) return { ok: false, error: '敏感记忆更新未获确认' };
-    const expectedVersion = input.expectedVersion ?? currentRecord.version;
     let updated: Awaited<ReturnType<typeof memoryService.updateWithVersion>>;
     try {
       updated = await memoryService.updateWithVersion(
@@ -279,9 +321,11 @@ export const updateMemoryTool: Tool<z.infer<typeof updateSchema>> = {
             ? { category: input.category as MemoryCategory }
             : {}),
           ...(input.subject ? { subject: input.subject } : {}),
-          statement: input.statement,
+          statement,
+          status: 'active',
           evidence,
-          evidenceQuote: input.evidenceQuote,
+          evidenceQuote,
+          confirmationContext: confirmed ? `宿主确认纠正：${input.reason}` : '',
           sourceSessionId: ctx.sessionId ?? 'unknown',
           sourceMessageId: ctx.userMessageId ?? 'unknown',
           sensitivity,

package/src/tools/memory/policy.js

@@ -25,9 +25,24 @@ export function requireCurrentEvidence(ctx, evidenceQuote) {
         ? null
         : {
             ok: false,
-            error: 'evidenceQuote 不是当前用户消息的逐字片段，拒绝写入推断性记忆',
+            error: 'evidenceQuote 不是当前用户消息的逐字片段，未写入。不要改写或伪造引用重试：用户事实可用 UpdateMemory(action=confirm) 请求确认，或 action=review 标记待复核；项目知识/经验使用 MemoryMaintenance，不把工具证据当用户原话。',
         };
 }
+export async function confirmMemoryCorrection(subject, previous, proposed, reason, signal) {
+    if (!hasAskHandler())
+        return false;
+    signal?.throwIfAborted();
+    const [answer] = await requestUserChoice([{
+            header: '纠正记忆',
+            question: `是否更新“${subject}”？\n原记录：${previous}\n拟更新为：${proposed}\n纠正依据：${reason}`,
+            options: [
+                { label: '暂不更新', description: '保留原记录，不把建议视为事实。' },
+                { label: '确认更新', description: '确认拟更新内容准确，并保存为本机长期记忆。' },
+            ],
+        }], signal);
+    signal?.throwIfAborted();
+    return answer?.selected.length === 1 && answer.selected[0] === '确认更新';
+}
 export async function confirmSensitiveMemory(statement, sensitivity, signal) {
     if (sensitivity === 'normal')
         return 'user_stated';