minimal-agent 0.18.9 → 0.18.10

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "minimal-agent",
-  "version": "0.18.9",
+  "version": "0.18.10",
   "description": "Bun-first 的本地 Agent 内核，支持工具、插件、工作流、上下文压缩、长期记忆与 OpenAI 兼容接口；Tauri 桌面宿主和 Node.js npm 发布可复用同一内核",
   "license": "SEE LICENSE IN LICENSE",
   "author": "Bill Wang <leiwang0359@gmail.com>",

package/src/loop.js

@@ -50,6 +50,7 @@ import { assembleContextBundle, contextFragment, resizeContextBundle } from './c
 import { chat as defaultChat } from './llm/client.js';
 import { buildUserContent } from './multimodal.js';
 import { ALL_TOOLS, executeTool as defaultExecuteTool, getToolByName, getToolGateDetails, } from './tools/index.js';
+import { createReadBudget } from './tools/shared/readBudget.js';
 import { configService } from './config/configService.js';
 import { capabilityForToolName } from './tools/capabilities.js';
 import { createEffectiveToolSet } from './tools/effectiveToolSet.js';
@@ -713,6 +714,7 @@ export async function* runQuery(userInput, options) {
                 message: `当前模型窗口压力过高，本次请求临时省略工具 Schema：${emergencyFit.removedNames.join(', ')}；下一轮会重新评估并恢复。`,
             };
         }
+        toolCallContext.reserveReadChars = createReadBudget(finalRequestBudget.inputLimit - finalRequestBudget.totalInputTokens);
         if (finalRequestBudget.overBudget) {
             yield {
                 type: 'error',

package/src/loop.ts

@@ -72,6 +72,7 @@ import {
   getToolGateDetails,
 } from './tools/index.js';
 import type { ToolGate } from './toolGate.js';
+import { createReadBudget } from './tools/shared/readBudget.js';
 import type {
   DeliverableManifest,
   ImageDetail,
@@ -938,6 +939,7 @@ export async function* runQuery(
         message: `当前模型窗口压力过高，本次请求临时省略工具 Schema：${emergencyFit.removedNames.join(', ')}；下一轮会重新评估并恢复。`,
       };
     }
+    toolCallContext.reserveReadChars = createReadBudget(finalRequestBudget.inputLimit - finalRequestBudget.totalInputTokens);
     if (finalRequestBudget.overBudget) {
       yield {
         type: 'error',

package/src/tools/applypatch/applyPatch.js

@@ -341,7 +341,7 @@ async function call(input, context) {
                 contentHash: hashFileBytes(encodeTextFile(file.after, file.encoding)),
             }, context?.sessionState?.fileReads);
         emitFileMutation(file.path);
-        summaries.push(`${file.activity}: ${file.label} (+${patch.additions} -${patch.deletions})`);
+        summaries.push(`${file.activity}: ${file.label} (${patch.additions === undefined ? 'diff 未统计' : `+${patch.additions} -${patch.deletions}`})`);
     }
     return {
         ok: true,

package/src/tools/applypatch/applyPatch.ts

@@ -403,7 +403,7 @@ async function call(
       );
     emitFileMutation(file.path);
     summaries.push(
-      `${file.activity}: ${file.label} (+${patch.additions} -${patch.deletions})`,
+      `${file.activity}: ${file.label} (${patch.additions === undefined ? 'diff 未统计' : `+${patch.additions} -${patch.deletions}`})`,
     );
   }
   return {

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/read/read.js

@@ -1,7 +1,6 @@
 import { createReadStream } from 'node:fs';
 import { open, readFile, stat, writeFile } from 'node:fs/promises';
 import { extname } from 'node:path';
-import { createInterface } from 'node:readline';
 import { runBoundedProcess } from '../../runtime/boundedProcess.js';
 import { mkdir } from 'node:fs/promises';
 import { join } from 'node:path';
@@ -18,6 +17,8 @@ import { pruneRuntimeOutputs, sessionRuntimeDir, } from '../../session/runtimeSt
 import { detectImageMime, resolveLocalImage, } from '../../images/imageResolver.js';
 const inputSchema = z.object({
     file_path: filePathField('读取'),
+    column: z.number().int().positive().optional().describe('超长行续读：起始行内的 1-based UTF-16 字符位置；普通阅读省略。'),
+    max_chars: z.number().int().min(1000).max(1_000_000).optional().describe('期望正文字符预算，最多 100 万；Runtime 会按剩余上下文与并发读取预算收紧。'),
     offset: z
         .number()
         .int()
@@ -56,7 +57,6 @@ const IMAGE_EXTENSIONS = new Set([
 ]);
 const MAX_IMAGE_BYTES = 25 * 1024 * 1024;
 const MAX_NOTEBOOK_BYTES = 32 * 1024 * 1024;
-const SMALL_TEXT_BYTES = 16 * 1024 * 1024;
 const description = `Reads local text files, images, and Jupyter notebooks.
 
 Usage:
@@ -114,7 +114,7 @@ function renderNotebook(raw, offset, limit) {
         partial: start > 0 || end < parsed.cells.length,
     };
 }
-async function readStreamedText(filePath, offset, limit, signal) {
+async function readStreamedText(filePath, offset, limit, signal, maxChars = DEFAULT_MAX_RESULT_SIZE_CHARS, column = 1) {
     const handle = await open(filePath, 'r');
     const prefix = Buffer.alloc(3);
     const { bytesRead } = await handle.read(prefix, 0, 3, 0);
@@ -132,31 +132,81 @@ async function readStreamedText(filePath, offset, limit, signal) {
                 ? 3
                 : 0,
     });
-    const rl = createInterface({ input: stream, crlfDelay: Infinity });
     const lines = [];
-    let line = 0;
+    let line = 1;
     let hasMore = false;
-    for await (const value of rl) {
-        line += 1;
-        if (line >= offset && lines.length < limit)
-            lines.push(`${line}\t${value}`);
-        else if (line >= offset + limit) {
+    let chars = 0;
+    let clippedLine;
+    let pending = '';
+    let skip = column - 1;
+    let sawData = false;
+    const append = (part, end) => {
+        if (line < offset) {
+            if (end)
+                line++;
+            return true;
+        }
+        if (line === offset && skip) {
+            const consumed = Math.min(skip, part.length);
+            part = part.slice(consumed);
+            skip -= consumed;
+        }
+        if (lines.length >= limit) {
             hasMore = true;
-            rl.close();
-            stream.destroy();
-            break;
+            return false;
+        }
+        const allowance = maxChars - chars - String(line).length - 1;
+        if (pending.length + part.length > allowance) {
+            if (!lines.length) {
+                const preview = (pending + part).slice(0, Math.max(0, allowance)).replace(/[\uD800-\uDBFF]$/, '');
+                lines.push(`${line}\t${preview}`);
+                clippedLine = line;
+            }
+            hasMore = true;
+            return false;
         }
+        pending += part;
+        if (end) {
+            const numbered = `${line}\t${pending.replace(/\r$/, '')}`;
+            lines.push(numbered);
+            chars += numbered.length + 1;
+            pending = '';
+            line++;
+        }
+        return true;
+    };
+    try {
+        outer: for await (const chunk of stream) {
+            sawData = true;
+            const text = String(chunk);
+            let start = 0;
+            for (let end = text.indexOf('\n'); end !== -1; end = text.indexOf('\n', start)) {
+                if (!append(text.slice(start, end), true))
+                    break outer;
+                start = end + 1;
+            }
+            if (start < text.length && !append(text.slice(start), false))
+                break;
+        }
+        if (!hasMore && sawData)
+            append('', true);
+    }
+    finally {
+        stream.destroy();
     }
     return {
         numbered: lines.join('\n'),
-        totalKnown: line,
+        totalKnown: hasMore ? line : sawData ? line - 1 : 0,
         selectedCount: lines.length,
         hasMore,
+        clippedLine,
     };
 }
-async function call(input, state, cwd, runtimeIdentity, signal) {
+async function call(input, state, cwd, runtimeIdentity, signal, maxChars = DEFAULT_MAX_RESULT_SIZE_CHARS) {
     if (signal?.aborted)
         return { ok: false, error: 'aborted' };
+    if (maxChars < 1000)
+        return { ok: false, error: '本批读取上下文预算已用完；请先处理已有结果或压缩上下文，再继续读取。' };
     const offset = input.offset ?? 1;
     const limit = input.limit ?? MAX_LINES_TO_READ;
     const resolved = resolveToolPath(input.file_path, cwd);
@@ -351,45 +401,39 @@ async function call(input, state, cwd, runtimeIdentity, signal) {
         let hasMore;
         let completeBytes;
         let totalUnits;
-        if (info.size <= SMALL_TEXT_BYTES) {
-            const snapshot = await readTextFile(filePath);
-            completeBytes = snapshot.bytes;
-            const all = snapshot.content.length === 0 ? [] : snapshot.content.split('\n');
-            const start = offset - 1;
-            const selected = all.slice(start, start + limit);
-            content = selected
-                .map((line, index) => `${start + index + 1}\t${line}`)
-                .join('\n');
-            totalLines = all.length;
-            selectedCount = selected.length;
-            hasMore = start + selected.length < all.length;
-            totalUnits = totalLines;
-        }
-        else {
-            const streamed = await readStreamedText(filePath, offset, limit, signal);
-            content = streamed.numbered;
-            totalLines = streamed.totalKnown;
-            selectedCount = streamed.selectedCount;
-            hasMore = streamed.hasMore;
-            // A streamed read only knows the complete total after consuming EOF.
-            totalUnits = hasMore ? undefined : totalLines;
-        }
+        let clippedLine;
+        const streamed = await readStreamedText(filePath, offset, limit, signal, maxChars, input.column);
+        content = streamed.numbered;
+        totalLines = streamed.totalKnown;
+        selectedCount = streamed.selectedCount;
+        hasMore = streamed.hasMore;
+        clippedLine = streamed.clippedLine;
+        totalUnits = hasMore ? undefined : totalLines;
+        if (!hasMore && offset === 1 && (input.column ?? 1) === 1)
+            completeBytes = await readFile(filePath, { signal });
+        const afterRead = await stat(filePath);
+        if (afterRead.mtimeMs !== info.mtimeMs || afterRead.size !== info.size || afterRead.ino !== info.ino)
+            return { ok: false, error: '读取期间文件发生变化，请重新读取；本次不登记读取覆盖范围。' };
         if (!content)
             content = totalLines === 0 ? '<file is empty>' : `<offset=${offset} 已超出文件末尾，共 ${totalLines} 行>`;
         let truncated = false;
-        if (content.length > DEFAULT_MAX_RESULT_SIZE_CHARS) {
-            content = `${content.slice(0, DEFAULT_MAX_RESULT_SIZE_CHARS)}\n\n⚠️ 重要：Read 输出已截断；截断范围外仍有内容。请用较小 limit 重新读取本区间，避免跳过截断行；精确修改用 Edit/ApplyPatch，Write 覆盖要求完整读取（可分段覆盖全部范围）。`;
+        if (content.length > maxChars || clippedLine !== undefined) {
+            const nextColumn = (input.column ?? 1) + Math.max(0, content.length - String(offset).length - 1);
+            content = `${content.slice(0, maxChars)}\n\n⚠️ 重要：Read 输出已截断；截断范围外仍有内容。超长行请提高 max_chars 或使用流式处理，不能跳过未显示内容。`;
+            if (clippedLine !== undefined)
+                content += `\n继续读取 offset=${clippedLine} column=${nextColumn}`;
             truncated = true;
         }
-        const partial = offset !== 1 || hasMore;
+        const partial = offset !== 1 || hasMore || (input.column ?? 1) > 1;
         if (hasMore && !truncated)
-            content += `\n\n... (还有更多内容；继续使用 offset=${offset + limit})`;
+            content += `\n\n... (还有更多内容；继续使用 offset=${offset + selectedCount})`;
         const reads = recordRead(filePath, {
             offset,
+            column: input.column,
             limit,
             partial,
             truncated,
-            range: selectedCount > 0
+            range: selectedCount > 0 && (input.column ?? 1) === 1
                 ? {
                     start: offset,
                     end: offset + selectedCount - 1,
@@ -412,7 +456,7 @@ async function call(input, state, cwd, runtimeIdentity, signal) {
                 path: filePath,
                 unit: 'line',
                 // A truncated response does not establish coverage of its full range.
-                ...(!truncated && selectedCount > 0
+                ...(!truncated && selectedCount > 0 && (input.column ?? 1) === 1
                     ? { start: offset, end: offset + selectedCount - 1 }
                     : {}),
                 truncated,
@@ -544,8 +588,8 @@ export const readTool = {
     parameters: toToolParameters(inputSchema),
     isReadOnly: true,
     isConcurrencySafe: true,
-    maxResultSizeChars: DEFAULT_MAX_RESULT_SIZE_CHARS,
+    maxResultSizeChars: 1_010_000,
     interruptBehavior: () => 'cancel',
-    call: (input, signal) => call(input, undefined, undefined, undefined, signal),
-    callWithContext: (input, signal, context) => call(input, context.sessionState?.fileReads, context.cwd, context, signal),
+    call: (input, signal) => call(input, undefined, undefined, undefined, signal, input.max_chars ?? DEFAULT_MAX_RESULT_SIZE_CHARS),
+    callWithContext: (input, signal, context) => call(input, context.sessionState?.fileReads, context.cwd, context, signal, context.reserveReadChars?.(input.max_chars) ?? input.max_chars ?? DEFAULT_MAX_RESULT_SIZE_CHARS),
 };

package/src/tools/read/read.ts

@@ -1,7 +1,6 @@
 import { createReadStream } from 'node:fs';
 import { open, readFile, stat, writeFile } from 'node:fs/promises';
 import { extname } from 'node:path';
-import { createInterface } from 'node:readline';
 import { runBoundedProcess } from '../../runtime/boundedProcess.js';
 import { mkdir } from 'node:fs/promises';
 import { join } from 'node:path';
@@ -41,6 +40,8 @@ import {
 
 const inputSchema = z.object({
   file_path: filePathField('读取'),
+  column: z.number().int().positive().optional().describe('超长行续读：起始行内的 1-based UTF-16 字符位置；普通阅读省略。'),
+  max_chars: z.number().int().min(1000).max(1_000_000).optional().describe('期望正文字符预算，最多 100 万；Runtime 会按剩余上下文与并发读取预算收紧。'),
   offset: z
     .number()
     .int()
@@ -83,7 +84,6 @@ const IMAGE_EXTENSIONS = new Set([
 ]);
 const MAX_IMAGE_BYTES = 25 * 1024 * 1024;
 const MAX_NOTEBOOK_BYTES = 32 * 1024 * 1024;
-const SMALL_TEXT_BYTES = 16 * 1024 * 1024;
 
 const description = `Reads local text files, images, and Jupyter notebooks.
 
@@ -164,11 +164,14 @@ async function readStreamedText(
   offset: number,
   limit: number,
   signal?: AbortSignal,
+  maxChars = DEFAULT_MAX_RESULT_SIZE_CHARS,
+  column = 1,
 ): Promise<{
   numbered: string;
   totalKnown: number;
   selectedCount: number;
   hasMore: boolean;
+  clippedLine?: number;
 }> {
   const handle = await open(filePath, 'r');
   const prefix = Buffer.alloc(3);
@@ -187,25 +190,57 @@ async function readStreamedText(
         ? 3
         : 0,
   });
-  const rl = createInterface({ input: stream, crlfDelay: Infinity });
   const lines: string[] = [];
-  let line = 0;
+  let line = 1;
   let hasMore = false;
-  for await (const value of rl) {
-    line += 1;
-    if (line >= offset && lines.length < limit) lines.push(`${line}\t${value}`);
-    else if (line >= offset + limit) {
-      hasMore = true;
-      rl.close();
-      stream.destroy();
-      break;
+  let chars = 0;
+  let clippedLine: number | undefined;
+  let pending = '';
+  let skip = column - 1;
+  let sawData = false;
+  const append = (part: string, end: boolean): boolean => {
+    if (line < offset) { if (end) line++; return true; }
+    if (line === offset && skip) {
+      const consumed = Math.min(skip, part.length);
+      part = part.slice(consumed); skip -= consumed;
     }
-  }
+    if (lines.length >= limit) { hasMore = true; return false; }
+    const allowance = maxChars - chars - String(line).length - 1;
+    if (pending.length + part.length > allowance) {
+      if (!lines.length) {
+        const preview = (pending + part).slice(0, Math.max(0, allowance)).replace(/[\uD800-\uDBFF]$/, '');
+        lines.push(`${line}\t${preview}`);
+        clippedLine = line;
+      }
+      hasMore = true; return false;
+    }
+    pending += part;
+    if (end) {
+      const numbered = `${line}\t${pending.replace(/\r$/, '')}`;
+      lines.push(numbered); chars += numbered.length + 1;
+      pending = ''; line++;
+    }
+    return true;
+  };
+  try {
+    outer: for await (const chunk of stream) {
+      sawData = true;
+      const text = String(chunk);
+      let start = 0;
+      for (let end = text.indexOf('\n'); end !== -1; end = text.indexOf('\n', start)) {
+        if (!append(text.slice(start, end), true)) break outer;
+        start = end + 1;
+      }
+      if (start < text.length && !append(text.slice(start), false)) break;
+    }
+    if (!hasMore && sawData) append('', true);
+  } finally { stream.destroy(); }
   return {
     numbered: lines.join('\n'),
-    totalKnown: line,
+    totalKnown: hasMore ? line : sawData ? line - 1 : 0,
     selectedCount: lines.length,
     hasMore,
+    clippedLine,
   };
 }
 
@@ -215,8 +250,10 @@ async function call(
   cwd?: string,
   runtimeIdentity?: RuntimeIdentity,
   signal?: AbortSignal,
+  maxChars = DEFAULT_MAX_RESULT_SIZE_CHARS,
 ): Promise<ToolResult> {
   if (signal?.aborted) return { ok: false, error: 'aborted' };
+  if (maxChars < 1000) return { ok: false, error: '本批读取上下文预算已用完；请先处理已有结果或压缩上下文，再继续读取。' };
   const offset = input.offset ?? 1;
   const limit = input.limit ?? MAX_LINES_TO_READ;
   const resolved = resolveToolPath(input.file_path, cwd);
@@ -454,47 +491,40 @@ async function call(
     let hasMore: boolean;
     let completeBytes: Buffer | undefined;
     let totalUnits: number | undefined;
-    if (info.size <= SMALL_TEXT_BYTES) {
-      const snapshot = await readTextFile(filePath);
-      completeBytes = snapshot.bytes;
-      const all =
-        snapshot.content.length === 0 ? [] : snapshot.content.split('\n');
-      const start = offset - 1;
-      const selected = all.slice(start, start + limit);
-      content = selected
-        .map((line, index) => `${start + index + 1}\t${line}`)
-        .join('\n');
-      totalLines = all.length;
-      selectedCount = selected.length;
-      hasMore = start + selected.length < all.length;
-      totalUnits = totalLines;
-    } else {
-      const streamed = await readStreamedText(filePath, offset, limit, signal);
-      content = streamed.numbered;
-      totalLines = streamed.totalKnown;
-      selectedCount = streamed.selectedCount;
-      hasMore = streamed.hasMore;
-      // A streamed read only knows the complete total after consuming EOF.
-      totalUnits = hasMore ? undefined : totalLines;
-    }
+    let clippedLine: number | undefined;
+    const streamed = await readStreamedText(filePath, offset, limit, signal, maxChars, input.column);
+    content = streamed.numbered;
+    totalLines = streamed.totalKnown;
+    selectedCount = streamed.selectedCount;
+    hasMore = streamed.hasMore;
+    clippedLine = streamed.clippedLine;
+    totalUnits = hasMore ? undefined : totalLines;
+    if (!hasMore && offset === 1 && (input.column ?? 1) === 1)
+      completeBytes = await readFile(filePath, { signal });
+    const afterRead = await stat(filePath);
+    if (afterRead.mtimeMs !== info.mtimeMs || afterRead.size !== info.size || afterRead.ino !== info.ino)
+      return { ok: false, error: '读取期间文件发生变化，请重新读取；本次不登记读取覆盖范围。' };
     if (!content) content = totalLines === 0 ? '<file is empty>' : `<offset=${offset} 已超出文件末尾，共 ${totalLines} 行>`;
     let truncated = false;
-    if (content.length > DEFAULT_MAX_RESULT_SIZE_CHARS) {
-      content = `${content.slice(0, DEFAULT_MAX_RESULT_SIZE_CHARS)}\n\n⚠️ 重要：Read 输出已截断；截断范围外仍有内容。请用较小 limit 重新读取本区间，避免跳过截断行；精确修改用 Edit/ApplyPatch，Write 覆盖要求完整读取（可分段覆盖全部范围）。`;
+    if (content.length > maxChars || clippedLine !== undefined) {
+      const nextColumn = (input.column ?? 1) + Math.max(0, content.length - String(offset).length - 1);
+      content = `${content.slice(0, maxChars)}\n\n⚠️ 重要：Read 输出已截断；截断范围外仍有内容。超长行请提高 max_chars 或使用流式处理，不能跳过未显示内容。`;
+      if (clippedLine !== undefined) content += `\n继续读取 offset=${clippedLine} column=${nextColumn}`;
       truncated = true;
     }
-    const partial = offset !== 1 || hasMore;
+    const partial = offset !== 1 || hasMore || (input.column ?? 1) > 1;
     if (hasMore && !truncated)
-      content += `\n\n... (还有更多内容；继续使用 offset=${offset + limit})`;
+      content += `\n\n... (还有更多内容；继续使用 offset=${offset + selectedCount})`;
     const reads = recordRead(
       filePath,
       {
         offset,
+        column: input.column,
         limit,
         partial,
         truncated,
         range:
-          selectedCount > 0
+          selectedCount > 0 && (input.column ?? 1) === 1
             ? {
                 start: offset,
                 end: offset + selectedCount - 1,
@@ -519,7 +549,7 @@ async function call(
         path: filePath,
         unit: 'line',
         // A truncated response does not establish coverage of its full range.
-        ...(!truncated && selectedCount > 0
+        ...(!truncated && selectedCount > 0 && (input.column ?? 1) === 1
           ? { start: offset, end: offset + selectedCount - 1 }
           : {}),
         truncated,
@@ -687,9 +717,10 @@ export const readTool: Tool<ReadInput> = {
   parameters: toToolParameters(inputSchema),
   isReadOnly: true,
   isConcurrencySafe: true,
-  maxResultSizeChars: DEFAULT_MAX_RESULT_SIZE_CHARS,
+  maxResultSizeChars: 1_010_000,
   interruptBehavior: () => 'cancel',
-  call: (input, signal) => call(input, undefined, undefined, undefined, signal),
+  call: (input, signal) => call(input, undefined, undefined, undefined, signal, input.max_chars ?? DEFAULT_MAX_RESULT_SIZE_CHARS),
   callWithContext: (input, signal, context: ToolCallContext) =>
-    call(input, context.sessionState?.fileReads, context.cwd, context, signal),
+    call(input, context.sessionState?.fileReads, context.cwd, context, signal,
+      context.reserveReadChars?.(input.max_chars) ?? input.max_chars ?? DEFAULT_MAX_RESULT_SIZE_CHARS),
 };

package/src/tools/shared/diffSummary.js

@@ -12,16 +12,38 @@ export function buildPatchSummary(before, after, label) {
     const totalBytes = Buffer.byteLength(before) + Buffer.byteLength(after);
     const totalLines = (before.match(/\n/g)?.length ?? 0) + (after.match(/\n/g)?.length ?? 0) + 2;
     if (totalBytes > MAX_BYTES || totalLines > MAX_LINES) {
+        // Strip identical outer lines before expensive diff work. A large file with
+        // a small edit still gets a real preview with original line coordinates.
+        let prefix = 0;
+        while (prefix < Math.min(before.length, after.length) && before[prefix] === after[prefix])
+            prefix++;
+        const start = before.lastIndexOf('\n', Math.max(0, prefix - 1)) + 1;
+        let suffix = 0;
+        while (suffix < Math.min(before.length, after.length) - start &&
+            before[before.length - suffix - 1] === after[after.length - suffix - 1])
+            suffix++;
+        const tail = before.indexOf('\n', before.length - suffix);
+        const suffixLength = tail < 0 ? 0 : before.length - tail - 1;
+        const oldWindow = before.slice(start, before.length - suffixLength);
+        const newWindow = after.slice(start, after.length - suffixLength);
+        if (Buffer.byteLength(oldWindow) + Buffer.byteLength(newWindow) <= MAX_BYTES &&
+            (oldWindow.match(/\n/g)?.length ?? 0) + (newWindow.match(/\n/g)?.length ?? 0) + 2 <= MAX_LINES) {
+            const local = buildPatchSummary(oldWindow, newWindow, label);
+            const shift = (before.slice(0, start).match(/\n/g)?.length ?? 0);
+            return { ...local, beforeHash, afterHash,
+                unifiedDiff: local.unifiedDiff?.replace(/@@ -(\d+)(,\d+)? \+(\d+)(,\d+)? @@/g, (_, a, ac = '', b, bc = '') => `@@ -${Number(a) + shift}${ac} +${Number(b) + shift}${bc} @@`) };
+        }
         return {
             beforeHash,
             afterHash,
-            additions: 0,
-            deletions: 0,
             truncated: true,
             omittedReason: 'too_large',
         };
     }
-    const changes = diffLines(before, after);
+    const changes = diffLines(before, after, { timeout: 500, maxEditLength: 10_000 });
+    if (!changes)
+        return { beforeHash, afterHash,
+            truncated: true, omittedReason: 'too_large' };
     const additions = changes
         .filter((change) => change.added)
         .reduce((sum, change) => sum + (change.count ?? 0), 0);

package/src/tools/shared/diffSummary.ts

@@ -22,17 +22,37 @@ export function buildPatchSummary(
   const totalLines =
     (before.match(/\n/g)?.length ?? 0) + (after.match(/\n/g)?.length ?? 0) + 2;
   if (totalBytes > MAX_BYTES || totalLines > MAX_LINES) {
+    // Strip identical outer lines before expensive diff work. A large file with
+    // a small edit still gets a real preview with original line coordinates.
+    let prefix = 0;
+    while (prefix < Math.min(before.length, after.length) && before[prefix] === after[prefix]) prefix++;
+    const start = before.lastIndexOf('\n', Math.max(0, prefix - 1)) + 1;
+    let suffix = 0;
+    while (suffix < Math.min(before.length, after.length) - start &&
+      before[before.length - suffix - 1] === after[after.length - suffix - 1]) suffix++;
+    const tail = before.indexOf('\n', before.length - suffix);
+    const suffixLength = tail < 0 ? 0 : before.length - tail - 1;
+    const oldWindow = before.slice(start, before.length - suffixLength);
+    const newWindow = after.slice(start, after.length - suffixLength);
+    if (Buffer.byteLength(oldWindow) + Buffer.byteLength(newWindow) <= MAX_BYTES &&
+      (oldWindow.match(/\n/g)?.length ?? 0) + (newWindow.match(/\n/g)?.length ?? 0) + 2 <= MAX_LINES) {
+      const local = buildPatchSummary(oldWindow, newWindow, label);
+      const shift = (before.slice(0, start).match(/\n/g)?.length ?? 0);
+      return { ...local, beforeHash, afterHash,
+        unifiedDiff: local.unifiedDiff?.replace(/@@ -(\d+)(,\d+)? \+(\d+)(,\d+)? @@/g,
+          (_, a, ac = '', b, bc = '') => `@@ -${Number(a) + shift}${ac} +${Number(b) + shift}${bc} @@`) };
+    }
     return {
       beforeHash,
       afterHash,
-      additions: 0,
-      deletions: 0,
       truncated: true,
       omittedReason: 'too_large',
     };
   }
 
-  const changes = diffLines(before, after);
+  const changes = diffLines(before, after, { timeout: 500, maxEditLength: 10_000 });
+  if (!changes) return { beforeHash, afterHash,
+    truncated: true, omittedReason: 'too_large' };
   const additions = changes
     .filter((change) => change.added)
     .reduce((sum, change) => sum + (change.count ?? 0), 0);

package/src/tools/shared/editTransaction.js

@@ -0,0 +1,45 @@
+import { readFile, stat, realpath } from 'node:fs/promises';
+import { atomicWriteFile, encodeTextFile, readTextFile } from './fileUtils.js';
+import { hashFileBytes } from './fileState.js';
+// Bound the in-memory replacement engine independently of model context size.
+export const MAX_EDIT_BYTES = 128 * 1024 * 1024;
+const commits = new Map();
+export async function readEditSnapshot(path) {
+    if ((await stat(path)).size > MAX_EDIT_BYTES)
+        throw new Error('文件超过 128 MiB 内存编辑边界；请使用流式转换写入临时文件并校验，不要用 Write 全文覆盖。');
+    const snapshot = await readTextFile(path);
+    if (snapshot.bytes.length > MAX_EDIT_BYTES)
+        throw new Error('读取期间文件超过编辑边界');
+    return snapshot;
+}
+export async function commitEdit(path, snapshot, content) {
+    const key = await realpath(path);
+    const previous = commits.get(key) ?? Promise.resolve();
+    let release;
+    const current = new Promise(resolve => { release = resolve; });
+    commits.set(key, current);
+    await previous;
+    try {
+        return await commitSnapshot(key, snapshot, content);
+    }
+    finally {
+        release();
+        if (commits.get(key) === current)
+            commits.delete(key);
+    }
+}
+async function commitSnapshot(path, snapshot, content) {
+    const bytes = encodeTextFile(content, snapshot.encoding);
+    if (bytes.length > MAX_EDIT_BYTES)
+        throw new Error('编辑结果超过 128 MiB 内存编辑边界');
+    const beforeHash = hashFileBytes(snapshot.bytes);
+    if (hashFileBytes(await readFile(path)) !== beforeHash)
+        throw new Error('编辑期间文件已被其他操作修改，未提交；请重新读取后再编辑。');
+    // Optimistic conflict check, not an OS-wide compare-and-swap guarantee.
+    if (!bytes.equals(snapshot.bytes))
+        await atomicWriteFile(path, bytes);
+    const afterHash = hashFileBytes(bytes);
+    if (hashFileBytes(await readFile(path)) !== afterHash)
+        throw new Error('提交后文件内容与预期不一致（可能被外部进程改写）；请读取核验，不要盲目重复替换。');
+    return { beforeHash, afterHash };
+}

package/src/tools/shared/editTransaction.ts

@@ -0,0 +1,39 @@
+import { readFile, stat, realpath } from 'node:fs/promises';
+import { atomicWriteFile, encodeTextFile, readTextFile } from './fileUtils.js';
+import { hashFileBytes } from './fileState.js';
+
+// Bound the in-memory replacement engine independently of model context size.
+export const MAX_EDIT_BYTES = 128 * 1024 * 1024;
+const commits = new Map<string, Promise<void>>();
+export async function readEditSnapshot(path: string) {
+  if ((await stat(path)).size > MAX_EDIT_BYTES)
+    throw new Error('文件超过 128 MiB 内存编辑边界；请使用流式转换写入临时文件并校验，不要用 Write 全文覆盖。');
+  const snapshot = await readTextFile(path);
+  if (snapshot.bytes.length > MAX_EDIT_BYTES) throw new Error('读取期间文件超过编辑边界');
+  return snapshot;
+}
+
+export async function commitEdit(path: string, snapshot: Awaited<ReturnType<typeof readEditSnapshot>>, content: string) {
+  const key = await realpath(path);
+  const previous = commits.get(key) ?? Promise.resolve();
+  let release!: () => void;
+  const current = new Promise<void>(resolve => { release = resolve; });
+  commits.set(key, current);
+  await previous;
+  try { return await commitSnapshot(key, snapshot, content); }
+  finally { release(); if (commits.get(key) === current) commits.delete(key); }
+}
+
+async function commitSnapshot(path: string, snapshot: Awaited<ReturnType<typeof readEditSnapshot>>, content: string) {
+  const bytes = encodeTextFile(content, snapshot.encoding);
+  if (bytes.length > MAX_EDIT_BYTES) throw new Error('编辑结果超过 128 MiB 内存编辑边界');
+  const beforeHash = hashFileBytes(snapshot.bytes);
+  if (hashFileBytes(await readFile(path)) !== beforeHash)
+    throw new Error('编辑期间文件已被其他操作修改，未提交；请重新读取后再编辑。');
+  // Optimistic conflict check, not an OS-wide compare-and-swap guarantee.
+  if (!bytes.equals(snapshot.bytes)) await atomicWriteFile(path, bytes);
+  const afterHash = hashFileBytes(bytes);
+  if (hashFileBytes(await readFile(path)) !== afterHash)
+    throw new Error('提交后文件内容与预期不一致（可能被外部进程改写）；请读取核验，不要盲目重复替换。');
+  return { beforeHash, afterHash };
+}

package/src/tools/shared/fileActivity.js

@@ -1,5 +1,6 @@
 import { createHash } from 'node:crypto';
-import { readFile, realpath } from 'node:fs/promises';
+import { realpath, stat } from 'node:fs/promises';
+import { createReadStream } from 'node:fs';
 import { extname, isAbsolute, relative, resolve, sep } from 'node:path';
 import { getWorkingDir } from '../../bootstrap/workingDir.js';
 const MIME_BY_EXT = {
@@ -32,7 +33,14 @@ export async function fileActivityMetadata(filePath, activity, verification = 'n
     let sha256;
     if (activity !== 'deleted') {
         try {
-            sha256 = createHash('sha256').update(await readFile(candidate)).digest('hex');
+            // A range Read must not secretly load/hash a gigabyte for UI metadata.
+            // Hash is optional for sources; committed artifacts use bounded buffers.
+            if (activity !== 'read' || (await stat(candidate)).size <= 8 * 1024 * 1024) {
+                const hash = createHash('sha256');
+                for await (const chunk of createReadStream(candidate))
+                    hash.update(chunk);
+                sha256 = hash.digest('hex');
+            }
         }
         catch { /* The file activity remains useful even when hashing fails. */ }
     }

package/src/tools/shared/fileActivity.ts

@@ -1,5 +1,6 @@
 import { createHash } from 'node:crypto';
-import { readFile, realpath } from 'node:fs/promises';
+import { realpath, stat } from 'node:fs/promises';
+import { createReadStream } from 'node:fs';
 import { extname, isAbsolute, relative, resolve, sep } from 'node:path';
 
 import { getWorkingDir } from '../../bootstrap/workingDir.js';
@@ -48,7 +49,15 @@ export async function fileActivityMetadata(
 
   let sha256: string | undefined;
   if (activity !== 'deleted') {
-    try { sha256 = createHash('sha256').update(await readFile(candidate)).digest('hex'); }
+    try {
+      // A range Read must not secretly load/hash a gigabyte for UI metadata.
+      // Hash is optional for sources; committed artifacts use bounded buffers.
+      if (activity !== 'read' || (await stat(candidate)).size <= 8 * 1024 * 1024) {
+        const hash = createHash('sha256');
+        for await (const chunk of createReadStream(candidate)) hash.update(chunk);
+        sha256 = hash.digest('hex');
+      }
+    }
     catch { /* The file activity remains useful even when hashing fails. */ }
   }
   return {

package/src/tools/shared/fileState.js

@@ -16,6 +16,7 @@ export function recordRead(absPath, opts, state = defaultState) {
             && st.size === prev.size;
         const sameRegionUnchanged = sameSnapshot
             && prev.offset === opts?.offset
+            && prev.column === opts?.column
             && prev.limit === opts?.limit;
         const reads = sameRegionUnchanged ? (prev.reads ?? 1) + 1 : 1;
         // A bounded Read may be repeated in several adjacent calls.  Keep the
@@ -64,6 +65,7 @@ export function recordRead(absPath, opts, state = defaultState) {
             truncated: opts?.truncated ?? false,
             partial,
             offset: opts?.offset,
+            column: opts?.column,
             limit: opts?.limit,
             reads,
             ...(opts?.contentHash ? { contentHash: opts.contentHash } : {}),

package/src/tools/shared/fileState.ts

@@ -7,6 +7,7 @@ export interface FileStateEntry {
   truncated: boolean;
   partial: boolean;
   offset?: number;
+  column?: number;
   limit?: number;
   reads?: number;
   /** SHA-256 is recorded only for a complete read. */
@@ -42,6 +43,7 @@ export function recordRead(
     truncated?: boolean;
     partial?: boolean;
     offset?: number;
+    column?: number;
     limit?: number;
     contentHash?: string;
     range?: FileReadRange;
@@ -57,6 +59,7 @@ export function recordRead(
       && st.size === prev.size;
     const sameRegionUnchanged = sameSnapshot
       && prev.offset === opts?.offset
+      && prev.column === opts?.column
       && prev.limit === opts?.limit;
     const reads = sameRegionUnchanged ? (prev.reads ?? 1) + 1 : 1;
 
@@ -107,6 +110,7 @@ export function recordRead(
       truncated: opts?.truncated ?? false,
       partial,
       offset: opts?.offset,
+      column: opts?.column,
       limit: opts?.limit,
       reads,
       ...(opts?.contentHash ? { contentHash: opts.contentHash } : {}),

package/src/tools/shared/readBudget.js

@@ -0,0 +1,12 @@
+/** Conservative chars/token reservation works for mixed code and CJK text.
+ * A response's parallel Read calls share this closure, not separate quotas.
+ */
+export function createReadBudget(remainingTokens) {
+    let available = Math.max(0, Math.floor(remainingTokens * 0.5));
+    const perRead = Math.min(1_000_000, Math.max(1000, Math.floor(available / 2)));
+    return (requested = Math.min(240_000, perRead)) => {
+        const granted = Math.min(Math.max(0, requested), perRead, available);
+        available -= granted;
+        return granted;
+    };
+}

package/src/tools/shared/readBudget.ts

@@ -0,0 +1,12 @@
+/** Conservative chars/token reservation works for mixed code and CJK text.
+ * A response's parallel Read calls share this closure, not separate quotas.
+ */
+export function createReadBudget(remainingTokens: number) {
+  let available = Math.max(0, Math.floor(remainingTokens * 0.5));
+  const perRead = Math.min(1_000_000, Math.max(1000, Math.floor(available / 2)));
+  return (requested = Math.min(240_000, perRead)) => {
+    const granted = Math.min(Math.max(0, requested), perRead, available);
+    available -= granted;
+    return granted;
+  };
+}

package/src/tools/toolPromptGuides.js

@@ -88,7 +88,7 @@ export const BUILTIN_TOOL_PROMPT_GUIDES = {
 //      测试就是从这次真实回归里补的，锁住"压缩后仍要包含这些内容"而不是简单地
 //      锁住某个具体的压缩产物。
 export const CONTRACT_DESCRIPTION_OVERRIDES = {
-    Read: '读取文本、图片、Notebook 或 PDF。文本 offset 从 1 开始；截断后缩小 limit 重读区间，不能跳过未显示内容。PDF 用 pages 指定范围，一次最多 20 页。',
+    Read: '读取文本、图片、Notebook 或 PDF。offset 从 1 开始；大范围阅读可提高 limit/max_chars，实际预算由 Runtime 分配。按回执 offset/column 续读，不能跳过截断行。PDF 用 pages，一次最多 20 页。',
     Edit: '精确替换已有文本。先 Read 最新内容，old_string 必须唯一；多处相同替换传 replace_all=true。new_string 按字面写入。',
     Write: '创建文件或整体覆盖；新文件可直接写入。覆盖已有文件前须完整 Read（一次全量或分段覆盖全部范围）且内容未变化；仅有局部读取时使用 Edit/ApplyPatch。',
     ApplyPatch: '提交 Codex 格式补丁，必须用 *** Begin Patch / *** End Patch 包络，不接受裸 git diff。支持 Add/Update/Delete File、Move to；路径相对工作区。先校验，写入失败尝试回滚，不保证跨文件断电原子性。',
@@ -112,7 +112,7 @@ export const CONTRACT_DESCRIPTION_OVERRIDES = {
     Advisor: '向无工具权限的顾问模型请求一次结构化第二意见。默认 reviewMode=brief 只给重点短评；完整代码审查用 full，并提供范围、基线和证据。full 不扩大上下文或输出预算，材料不足时必须说明未完成。',
     // 保留决策必填条件，与 schema 的 superRefine 一致；不能只概括成“记录决定”。
     AdvisorDecision: '记录主 Agent 对顾问第二意见的 accept、partial 或 reject 判断；是否采纳由主 Agent 决定，登记不是执行许可。partial 同时填 acceptedPoints/rejectedPoints；reject 填 rejectedPoints，列出被拒绝点及依据；evidenceRefs 只引用真实 tool_call_id，没有引用则记录待验证。登记失败不阻止任务继续。',
-    MultiEdit: '同文件有序批量精确替换，先 Read；全部匹配成功才写盘。old_string 非空且唯一，或显式 replace_all。后续匹配前序生成文本会被拒绝，请合并 edits。',
+    MultiEdit: '同文件有序批量精确替换，先 Read 相关范围；全部匹配成功才写盘。old_string 非空且唯一，或显式 replace_all。后续匹配前序生成文本会被拒绝，请合并 edits。操作条数不等于替换次数，diff 预览可能不完整。',
     LSP: '查询定义、引用、类型、符号和诊断。line/character 为 1-based UTF-16；尚未收到诊断不等于没有错误，编辑前读取源码。',
     WebFetch: '读取已知 HTTP(S) URL 的静态文本，HTML 转 Markdown；不执行 JavaScript、不继承登录态。PDF/图片用 Download 后 Read；动态页面用 WebBrowser。',
     WebSearch: 'Tavily 搜索返回标题、URL、片段及可选综合答案，不是完整原文或浏览器。重要结论读取来源正文；按子问题查询，重试改变关键词或来源。recency 控制时效，历史范围用 start_date/end_date，none 关闭自动时效；advanced 更慢，news 偏新闻。需配置 Tavily。',

package/src/tools/toolPromptGuides.ts

@@ -105,7 +105,7 @@ export const BUILTIN_TOOL_PROMPT_GUIDES: Readonly<Record<string, ToolPromptGuide
 //      测试就是从这次真实回归里补的，锁住"压缩后仍要包含这些内容"而不是简单地
 //      锁住某个具体的压缩产物。
 export const CONTRACT_DESCRIPTION_OVERRIDES: Readonly<Record<string, string | (() => string)>> = {
-  Read: '读取文本、图片、Notebook 或 PDF。文本 offset 从 1 开始；截断后缩小 limit 重读区间，不能跳过未显示内容。PDF 用 pages 指定范围，一次最多 20 页。',
+  Read: '读取文本、图片、Notebook 或 PDF。offset 从 1 开始；大范围阅读可提高 limit/max_chars，实际预算由 Runtime 分配。按回执 offset/column 续读，不能跳过截断行。PDF 用 pages，一次最多 20 页。',
   Edit: '精确替换已有文本。先 Read 最新内容，old_string 必须唯一；多处相同替换传 replace_all=true。new_string 按字面写入。',
   Write: '创建文件或整体覆盖；新文件可直接写入。覆盖已有文件前须完整 Read（一次全量或分段覆盖全部范围）且内容未变化；仅有局部读取时使用 Edit/ApplyPatch。',
   ApplyPatch: '提交 Codex 格式补丁，必须用 *** Begin Patch / *** End Patch 包络，不接受裸 git diff。支持 Add/Update/Delete File、Move to；路径相对工作区。先校验，写入失败尝试回滚，不保证跨文件断电原子性。',
@@ -130,7 +130,7 @@ export const CONTRACT_DESCRIPTION_OVERRIDES: Readonly<Record<string, string | ((
   Advisor: '向无工具权限的顾问模型请求一次结构化第二意见。默认 reviewMode=brief 只给重点短评；完整代码审查用 full，并提供范围、基线和证据。full 不扩大上下文或输出预算，材料不足时必须说明未完成。',
   // 保留决策必填条件，与 schema 的 superRefine 一致；不能只概括成“记录决定”。
   AdvisorDecision: '记录主 Agent 对顾问第二意见的 accept、partial 或 reject 判断；是否采纳由主 Agent 决定，登记不是执行许可。partial 同时填 acceptedPoints/rejectedPoints；reject 填 rejectedPoints，列出被拒绝点及依据；evidenceRefs 只引用真实 tool_call_id，没有引用则记录待验证。登记失败不阻止任务继续。',
-  MultiEdit: '同文件有序批量精确替换，先 Read；全部匹配成功才写盘。old_string 非空且唯一，或显式 replace_all。后续匹配前序生成文本会被拒绝，请合并 edits。',
+  MultiEdit: '同文件有序批量精确替换，先 Read 相关范围；全部匹配成功才写盘。old_string 非空且唯一，或显式 replace_all。后续匹配前序生成文本会被拒绝，请合并 edits。操作条数不等于替换次数，diff 预览可能不完整。',
   LSP: '查询定义、引用、类型、符号和诊断。line/character 为 1-based UTF-16；尚未收到诊断不等于没有错误，编辑前读取源码。',
   WebFetch: '读取已知 HTTP(S) URL 的静态文本，HTML 转 Markdown；不执行 JavaScript、不继承登录态。PDF/图片用 Download 后 Read；动态页面用 WebBrowser。',
   WebSearch: 'Tavily 搜索返回标题、URL、片段及可选综合答案，不是完整原文或浏览器。重要结论读取来源正文；按子问题查询，重试改变关键词或来源。recency 控制时效，历史范围用 start_date/end_date，none 关闭自动时效；advanced 更慢，news 偏新闻。需配置 Tavily。',

package/src/tools/types.js

@@ -11,11 +11,7 @@ export const DEFAULT_MAX_RESULT_SIZE_CHARS = 30_000;
 /** Read 工具默认行数上限（与 kakadeai 主仓库一致） */
 export const MAX_LINES_TO_READ = 2000;
 /**
- * Read 工具默认字节上限（防止超大文件灌进上下文）。
- * 基于 200K 上下文窗口设计：
- * - system prompt + 工具定义 ≈ 30KB
- * - 对话历史 ≈ 100KB
- * - 单次读取安全上限 ≈ 256KB（~64K tokens）
- * 超过此限制请用 offset/limit 分段读。
+ * Text input IO ceiling, independent of the model's returned-content budget.
+ * Read windows are bounded separately and can reserve runtime context capacity.
  */
 export const MAX_FILE_SIZE_BYTES = 1024 * 1024 * 1024; // 1 GiB; returned content remains independently bounded

package/src/tools/types.ts

@@ -14,11 +14,7 @@ export const DEFAULT_MAX_RESULT_SIZE_CHARS = 30_000;
 export const MAX_LINES_TO_READ = 2000;
 
 /**
- * Read 工具默认字节上限（防止超大文件灌进上下文）。
- * 基于 200K 上下文窗口设计：
- * - system prompt + 工具定义 ≈ 30KB
- * - 对话历史 ≈ 100KB
- * - 单次读取安全上限 ≈ 256KB（~64K tokens）
- * 超过此限制请用 offset/limit 分段读。
+ * Text input IO ceiling, independent of the model's returned-content budget.
+ * Read windows are bounded separately and can reserve runtime context capacity.
  */
 export const MAX_FILE_SIZE_BYTES = 1024 * 1024 * 1024; // 1 GiB; returned content remains independently bounded

package/src/types.ts

@@ -291,8 +291,8 @@ export interface FilePatchSummary {
   unifiedDiff?: string;
   beforeHash?: string;
   afterHash: string;
-  additions: number;
-  deletions: number;
+  additions?: number;
+  deletions?: number;
   truncated: boolean;
   omittedReason?: 'too_large';
 }
@@ -570,6 +570,8 @@ export type ToolResult = { problem?: ToolProblemOutcome; observation?: ReadObser
  * 避免按工具名写特判分支。
  */
 export interface ToolCallContext {
+  /** Shared per-model-response read allowance; reservations happen before IO. */
+  reserveReadChars?: (requested?: number) => number;
   /** Host presentation only; cannot grant tools to a delegated agent. */
   output?: import('./runtime/outputContract.js').OutputContract;
   /** Live effective catalog, including per-turn restrictions. */