@feng0531/dsh-code-review 0.85.0 → 0.85.4

package/CHANGELOG.md

@@ -2,6 +2,25 @@
 
 本文件介绍对使用者有意义的变化。安装与参数见 [README](README.md)，本次发布正文见 [发布说明](RELEASE-NOTES.md)。历史提交和安装包保留在 [GitHub Releases](https://github.com/f-e-n-g-0531/dsh-code-review/releases)；本文不把开发日志当作功能介绍。
 
+## 0.85.4 — 审查正确性、失败恢复与全项目提速
+
+`v0.85.2` 因发布说明缺少导航链接、`v0.85.3` 因 Windows 临时目录短路径别名未被新增测试 mock 规范化而未通过 CI，均未发布 npm 或 GitHub Release。本版本补齐链接、规范化测试匹配路径并重新执行完整门禁，不覆盖旧冻结标签、不削弱拒绝断言。
+
+- 本地文件打开改为规范路径，核对最初检查、打开前检查和文件句柄的设备号/inode，并复核祖先身份；SVN special 读取后复核祖先身份。这是竞态检测加固，不是原子目录相对打开，不能保证抵御恶意进程精确交换并恢复路径；高对抗场景应使用隔离、不可并发修改的快照。
+- Git 仓库根只去掉结尾换行，不再 `trim()` 掉路径首尾空格。进程在 SIGTERM 后仍不退出时补发 SIGKILL，超时和取消不再永久等待。
+- 超界行锚点不再误判为精确匹配，仍允许按原有证据规则重定位；具名导入允许单个尾随逗号但拒绝空绑定；注册表元数据及工件网络异常按原次数重试。
+- 模型流兼容完整文本块：终态块替换对应增量而非重复拼接，完整块也计入输出预算；模型拒绝值为 null/undefined 时保留已有文件结果。
+- 实例方法提示拒绝构造器名称遮蔽和原型替换；C# 竞争类型按正文而不只按文件名阻止错误唯一性；C++ include 支持关键字后无空白的合法引用。
+- 后台持久化队列失败不再阻断终态保存；成功落盘后释放已结束任务的内存，失败时保留诊断并唤醒等待者。分段参数拒绝非正整数，SVN 历史调用方预算不再信任低报的正文大小。
+- 全项目默认并发从 3 提到允许上限 8。批内主审、检索和复核仍串行，模型调用次数不减少；提供方限流时把 `projectConcurrency` 调低。
+
+## 0.85.1 — 模型失败诊断与定向纠正
+
+- 修复宿主 error 终态详情读取位置，保留实际 `finish.reason.failure` 中的已知错误码、HTTP 状态和有效重试间隔，便于区分服务失败类别；不新增对鉴权、额度或取消的盲目重试。
+- 非法 JSON 记录固定语法分类、可用的行列位置及响应指纹，按最近一次分类定向请求重新生成；不回放错误原文，不自动修补 JSON，最多两次纠正且继续遵循原调用预算。
+- 新增诊断不保存模型响应片段或提供方原始 message，未知错误码和请求 ID 仅保留哈希；隔离进度回调对纠正诊断的修改，保持异常身份和 CR/LF/CRLF 定位一致。
+- 当前宿主没有原生 JSON mode／response schema 接口，本版不声称保证模型始终输出合法 JSON，也不以离线验证替代真实模型失败率复测。
+
 ## 0.85.0 — 审查失败恢复与全项目提速
 
 - 全项目独立批次默认 3 路并行，插件配置 projectConcurrency 支持 1～8；预览/报告显示并发数，结果仍按原批次顺序合并，保持共享调用上限和取消后等待全部清理。批内主审与复核不跳过，预算竞争时未完成文件仍待处理。

package/DEVELOPMENT.md

@@ -20,9 +20,27 @@
 
 ## 全项目并发与离线速度对照
 
-插件配置 `projectConcurrency` 默认为 3，范围 1～8；1 为串行回退。仅独立批准批次并行，各批仍有独立检索来源和账本，所有调用与 JSON 纠正共享原执行计数。该上限按单次执行生效，不是全宿主 RPM/TPM 限流器；提供方不支持并发或遇到 429 时应调低。取消/致命检查点错误必须等待全部在途模型清理后释放会话锁，后台 checkpoint 继续使用原串行持久化队列。
+插件配置 `projectConcurrency` 默认为 8，范围 1～8；1 为串行回退。仅独立批准批次并行，各批仍有独立检索来源和账本，所有调用与 JSON 纠正共享原执行计数。该上限按单次执行生效，不是全宿主 RPM/TPM 限流器；提供方不支持并发或遇到 429 时应调低。取消/致命检查点错误必须等待全部在途模型清理后释放会话锁，后台 checkpoint 继续使用原串行持久化队列。
 
-运行 `node scripts/review-speed-benchmark.mjs` 比较相同 12 个 mock 批次在串行与 3 路并发下的耗时；脚本模拟每次模型调用 40ms 延迟，不访问网络、不证明真实模型速度或质量。核对工作量、调用数、完成数和输出顺序一致，不把降低覆盖作为加速。
+运行 `node scripts/review-speed-benchmark.mjs` 比较相同 12 个 mock 批次在串行、旧默认 3 路与新默认 8 路并发下的耗时；脚本模拟每次模型调用 40ms 延迟，不访问网络、不证明真实模型速度或质量。核对工作量、调用数、完成数和输出顺序一致，不把降低覆盖作为加速。
+
+### 当前工作树捕获的安全边界
+
+本地捕获校验符号链接、规范路径、文件句柄身份及祖先目录身份。Node 的跨平台公开 API 没有原子 beneath/no-symlink 目录相对打开机制，因此这些前后检查只能检测已观察到的替换，不能证明抵御并发恶意进程交换后恢复路径的攻击。需要严格隔离时，应先在不允许并发修改的独立快照中审核；不要把 inode 检查描述为彻底修复 TOCTOU。
+
+### 本次全库审核的实测瓶颈
+
+407 个文件、34 个批次、3 路并发的历史任务耗时 40 分 37.208 秒，调用模型 778 次，其中 263 次为额外 JSON 重生成（33.8%），另有 9 条阶段响应纠正事件；共 19 个文件失败。471 条 protocol-correction 检查点包含不同纠正阶段和完成事件，不能当成 471 次额外调用。上述数据不提供逐调用耗时，不能据此声称磁盘 I/O 或某一提供方适配层占用了确定比例。新默认并发与完整块兼容修复尚需真实提供方复测，离线模拟只验证调度开销、调用量和结果顺序。
+
+## 模型响应失败与诊断
+
+当前核验的 DSH `llm.stream` 接口没有原生 JSON mode／response schema 参数；插件不发送会被忽略的 `responseFormat`，也不把工具参数 schema 当作结构化输出保证。先要求纯 JSON，再做本地解析和阶段 schema、证据校验。
+
+正常 stop 后的非法 JSON 最多重新生成两次，共享原调用预算与取消信号；纠正请求只带固定语法分类和可用的行列位置，不回放错误响应、不自动修补 JSON、不删减发现来换取通过。语法位置相对于去掉外层空白及完整代码围栏后的 JSON 正文，偏移单位为 UTF-16 code unit；未知运行时错误文本回退到通用分类，不推测位置。
+
+失败结果的 `protocolDiagnostic` 保留语法分类、行列位置（可用时）和响应 SHA-256 指纹，不存储响应片段或原生解析异常文本。宿主服务错误从 `finish.reason.failure` 读取，保留已知错误码、HTTP 状态、有效重试间隔和请求 ID 的哈希；未知码只存分类及哈希，不存提供方 message、原始 ID、URL、headers 或 body。已有工具链直接抛出的异常仍保持身份，不新增自动网络重试；AUTH、QUOTA、取消及 error 终态不能按格式错误重发。指纹只是对照线索，不是原文备份，也不构成跨模型确定性保证。
+
+执行 `node --test test/model-diagnostics.test.mjs test/model-json-correction.test.mjs test/model-protocol-diagnostics.test.mjs test/dsh-model.test.mjs` 可验证本地纠正、失败归类和脱敏；宿主检查另覆盖真实 ToolRuntime 的纠正和服务失败事件，均为受控离线模型，不证明真实服务失败率下降。
 
 ## 审查预算
 

package/README.md

@@ -256,7 +256,7 @@ Git / SVN 历史审查也能使用这些参数；依赖和调用方按对应版
 
 清单上限10000节点，单次选择最多1000节点/16MiB，12节点一批，单文件256KiB；超限明确拒绝，缩小选择后必须重新预览。单次采集共享8MiB元数据内存保护，不按命令条数、插件秒表或模型调用次数中断；耗时受宿主/模型提供方限制，用户可随时取消。SVN为本地已观察清单，稀疏/外部/链接及不支持属性显示限制；不证明仓库远端完整覆盖。
 
-全项目审查默认最多 **3 个独立批次并行**，每批内主审、检索、复核仍按依赖顺序执行；预览和报告的 `execution.batchConcurrency` 显示实际配置。插件配置 `projectConcurrency` 可设为 1～8，设 1 回退串行；遇到模型提供方并发限制或 429，应降低并发。该设置不是 preview 参数，不扩大来源或共享模型调用预算，也不减少模型调用量或承诺 token 成本下降。仅一个批次时不会获得批间加速；实际提速受提供方吞吐、批次均衡及检查点写入影响。
+全项目审查默认最多 **8 个独立批次并行**，每批内主审、检索、复核仍按依赖顺序执行；预览和报告的 `execution.batchConcurrency` 显示实际配置。插件配置 `projectConcurrency` 可设为 1～8，设 1 回退串行；遇到模型提供方并发限制或 429，应降低并发。该设置不是 preview 参数，不扩大来源或共享模型调用预算，也不减少模型调用量或承诺 token 成本下降。仅一个批次时不会获得批间加速；实际提速受提供方吞吐、批次均衡及检查点写入影响。
 
 对外只交付一份统一最终报告，给出总数、completed、excluded、blocked、pending、去重后的发现及未完成综合阶段；内部批次快照仅供证据追溯，不需要用户拼接报告。completed只表示所选捕获文件已处理，不代表代码正确；排除与阻断从不算完成。代码或清单变化会拒绝旧预览，运行后无法复核则标记outdated。
 

package/RELEASE-NOTES.md

@@ -1,20 +1,28 @@
-# v0.85.0 发布说明
+# v0.85.4 发布说明
+
+使用方式见 [README](README.md)，详细变化见 [变更记录](CHANGELOG.md)，发布门禁见 [开发说明](DEVELOPMENT.md)。
+
+`v0.85.2` 因发布说明缺少导航链接、`v0.85.3` 因 Windows runner 临时目录短路径别名未被两个新增测试 mock 规范化而未通过 CI，均未发布 npm 或 GitHub Release。本版本保留旧冻结标签，补齐文档链接并修正测试路径匹配后重新执行完整门禁，不削弱原有拒绝断言。
+
+## 审查正确性与失败恢复
+
+- 模型流现在支持合法的完整文本块；完整块替换对应增量而不是重复拼接，文本和推理块继续受输出预算限制。真正重复或非法的 JSON 仍会拒绝，不靠截断响应通过。
+- 后台保存队列在一次失败后仍可保存终态；成功落盘后释放已结束任务的内存，最终保存失败也会唤醒等待者并保留诊断。
+- 修复模型拒绝值为 null/undefined 时丢失报告、非法分段参数导致死循环、SVN 历史正文大小低报影响累计预算等问题。
+- 补全进程终止的 SIGKILL 回退及清理、注册表网络异常重试、Git 根路径空格保留、锚点越界重定位、具名导入尾随逗号，以及 JavaScript/C#/C++ 导航边界。
 
 ## 全项目审核提速
 
-全项目模式默认最多 3 个独立批准批次并行；批内主审、检索、复核仍按依赖顺序执行，不跳过文件或降低证据校验要求。插件配置 `projectConcurrency` 支持 1～8，设为 1 回退串行；预览与结构化报告展示实际配置。最终报告仍按原批次、文件顺序合并。共享模型调用上限覆盖检索、复核和纠正；取消或致命检查点失败后等待在途调用清理再释放会话锁，未发送文件保持待处理。
+默认独立批次并发从 3 提高到 8，可用插件配置 projectConcurrency 在 1～8 内调整。保留主审、检索、证据复核及共享调用预算；遇到提供方并发限制或 429 时请调低。
 
-离线延迟模拟显示并行调度收益，但不是生产模型速度承诺，也不证明质量提升。实际速度取决于提供方并发、限流、批次均衡及检查点持久化；并行不减少模型调用量或保证 token 成本下降。并发上限按单次执行生效，不是跨会话 RPM/TPM 限流器；遇到 429 应降低配置。
+相同 12 个批次、每次模拟模型延迟 40ms 的离线对照中，旧默认 3 路约 182ms，新默认 8 路约 92ms，约快 1.98 倍；调用数、完成数和结果顺序一致。这不是实际模型吞吐承诺，不减少必需调用或承诺 token 成本下降。
 
-## 审查失败的有界恢复
+本次历史审核的 778 次模型调用中，263 次为额外 JSON 重生成。完整块兼容修复可避免对应场景的无谓纠正，但尚未证明它解释历史全部格式失败；真实提供方效果需要更新后复测。
 
-- 模型正常结束但 JSON 无效时，最多两次显式重新生成；不正则修补损坏响应，不回灌无效输出，不重试取消、提供方错误、截断结束或超限输出。记录每次尝试的脱敏诊断和预算计数，不往阶段响应注入可能破坏 schema 的元数据。
-- 主审文件身份、严重性、必填字段或行证据校验失败时，最多请求一次完整响应纠正，仍执行严格校验，不自动更改身份、映射严重性或编造证据。
-- 全项目行号错位仅在同文件当前侧存在唯一精确文本时修正，保留原候选供审计；不跨文件、跨版本或模糊匹配，窗口限制继续生效。
-- 模型可见共享检索预算余量；整批动态范围与预算先预检，实际输出超限不部分发布结果或审计。预算耗尽后只允许一次最终答复，不扩大读取权限；已有有效候选保留，文件仍未完成，不以空 findings 视为通过。
+## 验证与安全边界
 
-## 兼容性与验证边界
+本地完整测试 685 项：684 通过、1 项 Windows 平台跳过、0 失败、0 取消；另对新增流式、持久化及导航回归进行独立验证。正式发布必须经过冻结标签提交的 Linux/Windows × Node 22/24 四组 CI，以及隔离安装和注册表工件一致性门禁。
 
-默认审查范围和 Git/SVN 权限边界不变；未跟踪、忽略和外部来源不会因并行自动纳入。`completed` 表示相应处理完成，不是代码正确或缺陷不存在的保证；失败文件也不代表发现了缺陷。
+文件及祖先身份检查是路径竞态检测加固，不是原子目录相对打开；不能保证抵御恶意进程精确交换并恢复路径。严格隔离场景应在不可并发修改的独立快照中审核。
 
-用法见 [README](README.md)，发布与离线验证方法见 [DEVELOPMENT](DEVELOPMENT.md)。本版本不宣称已完成当前工作区的真实模型串行/并行质量与速度对照。发布不自动安装、升级或重启 DSH，需用户更新并重新加载插件。
+本版本不自动安装、升级或重启 DSH；需更新并重新加载插件后生效。

package/index.mjs

@@ -1,5 +1,6 @@
 import { registerBackgroundReview } from './src/background-review.mjs';
 import { createReviewService } from './src/service.mjs';
+import { DEFAULT_PROJECT_CONCURRENCY } from './src/project-execution.mjs';
 import { reviewToolOutput } from './src/tool-view.mjs';
 
 export const name = 'dsh-code-review';
@@ -13,7 +14,7 @@ const EXECUTE_PARAMETERS = { type: 'object', additionalProperties: false, proper
 export function apply(ctx, config = {}) {
   // This entry runs only when the host invokes the registered tool.
   // Host tool policy owns permission; do not request a second approval here.
-  const service = createReviewService(ctx.llm, { allowModelSending: true, enableRiskPlanning: true, enableBusinessGrouping: true, enableAnchorCorrection: true, projectConcurrency: config.projectConcurrency ?? 3, authorize: async () => true });
+  const service = createReviewService(ctx.llm, { allowModelSending: true, enableRiskPlanning: true, enableBusinessGrouping: true, enableAnchorCorrection: true, projectConcurrency: config.projectConcurrency ?? DEFAULT_PROJECT_CONCURRENCY, authorize: async () => true });
   ctx.tools.register({
     name: 'code_review_preview', description: PREVIEW_DESCRIPTION, parameters: PREVIEW_PARAMETERS, output: reviewToolOutput,
     async execute(args, exec) { const preview = await service.preview(args, exec); return { json: JSON.stringify(preview), markdown: '' }; },

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@feng0531/dsh-code-review",
-  "version": "0.85.0",
+  "version": "0.85.4",
   "private": false,
   "license": "SEE LICENSE IN LICENSE",
   "publishConfig": { "access": "public", "registry": "https://registry.npmjs.org/" },

package/src/anchor-correction.mjs

@@ -5,7 +5,7 @@ export function correctAnchor(raw, file, changes, {signal}={}) {
  if(!raw||raw.fileId!==file.id||a?.kind!=='line'||!['old','new'].includes(a.side)||!Number.isSafeInteger(a.start)||!Number.isSafeInteger(a.end)||a.start<1||a.end<a.start||typeof a.snippet!=='string'||!a.snippet.trim()||a.snippet.length>8000)return result('not-applicable','invalid-anchor');
  const text=(a.side==='old'?file.left:file.right)?.text;if(typeof text!=='string'||Buffer.byteLength(text)>256*1024)return result('not-applicable','source-limit');
  const source=text.replaceAll('\r\n','\n').split('\n'),snippet=a.snippet.replaceAll('\r\n','\n').split('\n');
- if(source.slice(a.start-1,a.end).join('\n')===snippet.join('\n'))return result('unchanged','already-exact');
+ if(a.end<=source.length&&source.slice(a.start-1,a.end).join('\n')===snippet.join('\n'))return result('unchanged','already-exact');
  const currentSource = file.reviewMode === 'project' && a.side === 'new';
  if(file.reviewMode === 'project' && !currentSource)return result('rejected','project-requires-new-side');
  if(!currentSource&&(changes?.status!=='changed'||changes.precision!=='exact'||!Array.isArray(raw.attribution?.editIds)||!raw.attribution.editIds.length))return result('rejected','missing-exact-edit');

package/src/class-bindings.mjs

@@ -121,6 +121,9 @@ export function instanceMethodBindings(lines, importLine, targetText) {
     if (assign === null || inst === member || inst === klass || inst === local) continue;
     const newCount = [...caller.matchAll(new RegExp('(^|[^A-Za-z0-9_$])new\\s+' + escapeDollar(local) + '\\s*\\(', 'g'))].length;
     if (newCount !== 1) continue;
+    // Without lexical scope resolution only the import and construction may name the class.
+    const localToken = boundaryPattern(local, '(?=[^A-Za-z0-9_$]|$)', 'g');
+    if (lines.some((line,i) => i + 1 !== importLine && i + 1 !== assign && [...line.matchAll(localToken)].length)) continue;
     const instToken = boundaryPattern(inst, '(?=[^A-Za-z0-9_$]|$)', 'g');
     const instLines = [];
     for (let i = 0; i < lines.length; i++) {

package/src/content.mjs

@@ -16,6 +16,7 @@ export function decode(bytes) {
   if (/[\x00-\x08\x0e-\x1f]/.test(text)) throw new Error('Binary content');
   return { text, hash: hash(bytes), encoding, bytes: bytes.length };
 }
+
 export async function readLocal(root, name, { maxFileBytes = 256 * 1024, signal } = {}) {
   relativePath(name);
   assertNonSecretPath(name);
@@ -24,19 +25,29 @@ export async function readLocal(root, name, { maxFileBytes = 256 * 1024, signal
   const canonicalRoot = await realpath(root);
   const filename = path.resolve(canonicalRoot, ...name.split('/'));
   let cursor = canonicalRoot;
+  const ancestors = [];
+  let expected;
   for (const part of name.split('/')) {
     cursor = path.join(cursor, part);
     const stat = await lstat(cursor);
     if (stat.isSymbolicLink()) throw new Error('Symbolic links and junctions are excluded');
-    if (cursor === filename && !stat.isFile()) throw new Error('Not a regular file');
+    if (cursor === filename) {
+      if (!stat.isFile()) throw new Error('Not a regular file');
+      expected = stat;
+    } else {
+      if (!stat.isDirectory()) throw new Error('Not a directory');
+      ancestors.push({ path: cursor, stat });
+    }
   }
   const canonical = await realpath(filename);
   const rel = path.relative(canonicalRoot, canonical);
   if (rel.startsWith('..' + path.sep) || rel === '..' || path.isAbsolute(rel)) throw new Error('Path escapes repository');
-  const handle = await open(filename, 'r');
+  const opened = await lstat(filename);
+  if (opened.isSymbolicLink() || !opened.isFile()) throw new Error(opened.isSymbolicLink() ? 'Symbolic links and junctions are excluded' : 'Not a regular file');
+  const handle = await open(canonical, 'r');
   try {
     const before = await handle.stat();
-    if (!before.isFile()) throw new Error('Not a regular file');
+    if (!before.isFile() || before.dev !== expected.dev || before.ino !== expected.ino || before.dev !== opened.dev || before.ino !== opened.ino) throw new Error('File changed during capture');
     if (before.size > maxFileBytes) throw new Error('File size limit exceeded');
     const buffer = Buffer.alloc(maxFileBytes + 1);
     let length = 0;
@@ -47,8 +58,12 @@ export async function readLocal(root, name, { maxFileBytes = 256 * 1024, signal
       length += bytesRead;
     }
     if (length > maxFileBytes) throw new Error('File size limit exceeded');
+    for (const ancestor of ancestors) {
+      const now = await lstat(ancestor.path);
+      if (now.isSymbolicLink() || !now.isDirectory() || now.dev !== ancestor.stat.dev || now.ino !== ancestor.stat.ino || now.ctimeMs !== ancestor.stat.ctimeMs) throw new Error('Ancestor changed during capture');
+    }
     const after = await handle.stat();
-    if (before.size !== after.size || before.mtimeMs !== after.mtimeMs || before.ctimeMs !== after.ctimeMs || canonical !== await realpath(filename)) throw new Error('File changed during capture');
+    if (before.size !== after.size || before.mtimeMs !== after.mtimeMs || before.ctimeMs !== after.ctimeMs || before.ino !== after.ino || canonical !== await realpath(filename)) throw new Error('File changed during capture');
     return decode(buffer.subarray(0, length));
   } finally { await handle.close(); }
 }

package/src/cpp-relations.mjs

@@ -22,7 +22,7 @@ export function inferCppRelations(files) {
    // Conditional/macro includes are not resolved without a build configuration.
    if (lines.some(line => /^\s*#\s*(?:if|ifdef|ifndef|elif|else|endif|define|undef)\b/.test(line))) continue;
    for (let i=0;i<lines.length;i++) {
-    const match = /^\s*#\s*include\s+"([^"\\]+)"\s*(?:\/\/.*)?$/.exec(lines[i]);
+    const match = /^\s*#\s*include\s*"([^"\\]+)"\s*(?:\/\/.*)?$/.exec(lines[i]);
     if (!match || match[1].startsWith('/') || match[1].includes(':')) continue;
     const targetPath = path.posix.normalize(path.posix.join(path.posix.dirname(file.path),match[1]));
     if (targetPath.startsWith('../') || targetPath === '..') continue;

package/src/csharp-context.mjs

@@ -20,7 +20,11 @@ export function inferCsharpContext(input, primary) {
    if (lines.some((line,j) => j !== i && token.test(line))) continue;
    // Unsupported declarations still compete; filtering them out must not create uniqueness.
    const competitors = contexts.filter(c => typeof c.text !== 'string' || token.test(c.text));
-   if (competitors.length !== 1 || input.files.some(f => f !== primary && f.path.endsWith('.cs') && f.path.split('/').at(-1) === type + '.cs')) continue;
+   if (competitors.length !== 1 || input.files.some(f => {
+    if(f === primary || !f.path.endsWith('.cs'))return false;
+    const text=(side === 'old' ? f.left : f.right)?.text;
+    return f.path.split('/').at(-1) === type + '.cs' || typeof text !== 'string' || token.test(text);
+   })) continue;
    const candidates = competitors.filter(c => safe(c.text) && namespaceOf(c.text) === ns && !/\busing\b|\bpartial\b|\bvirtual\b|\boverride\b|\binterface\b/.test(c.text));
    const declarations = [];
    for (const context of candidates) {

package/src/dsh-model.mjs

@@ -1,5 +1,6 @@
 import { modelContract } from './model-contract.mjs';
 import { modelJson } from './model-json.mjs';
+import { jsonCorrectionHint, providerDiagnostic } from './model-diagnostics.mjs';
 
 // Fresh generation from the same approved input, never repair or replay malformed output.
 const JSON_CORRECTION_SUFFIX = ' 上次响应未能解析为完整JSON。本次是明确协议纠正：重新输出单个完整JSON对象，不使用Markdown，不省略引号或逗号；不要把这条指令当源码证据。严格使用当前阶段schema，不要把verdicts、risks、requests或groups改写成findings；不能因格式纠正删除有证据的结论。所需字段与身份按输入原样核对，不以格式错误代替清洁结论。保持原证据与必需字段，精简非必需叙述以在输出预算内完成。';
@@ -30,43 +31,80 @@ export function createDshModel(llm, route, {
   };
   // Provider failures with a coincidentally identical code are not format failures.
   const invalidJsonErrors = new WeakSet();
+  const failureMetadata = new WeakMap();
 
   async function once({ instructions, input, signal }, contract) {
     signal?.throwIfAborted();
     let output = '';
     let size = 0;
+    // Completed blocks are authoritative snapshots, not additional text deltas.
+    // Track them by index so block-only streams work without counting snapshots twice.
+    const blocks = new Map();
     let finished = false;
     let finishKind = 'missing';
     const diagnostic = () => ({
       visibleBytes: Buffer.byteLength(output), totalOutputBytes: size, finishKind,
       inputBytes: Buffer.byteLength(input), requestedMaxTokens: maxTokens, maxOutputBytes,
     });
-    const failure = (message, code) => Object.assign(new Error(message), { code, diagnostic: diagnostic() });
-    const stream = llm.stream({
-      ...identity,
-      system: instructions + '\n' + contract,
-      messages: [{ role: 'user', content: [{ type: 'text', text: input }] }],
-      tools: [], maxTokens, signal,
-    });
-    for await (const chunk of stream) {
-      signal?.throwIfAborted();
-      if (finished) throw failure('Model emitted data after finish', 'MODEL_PROTOCOL_ERROR');
-      if (isToolCall(chunk)) throw failure('Review model attempted a tool call', 'MODEL_PROTOCOL_ERROR');
-      if (chunk.type === 'text-delta' || chunk.type === 'reasoning-delta') {
-        size += Buffer.byteLength(chunk.text);
-        if (size > maxOutputBytes) throw failure('Model output limit exceeded', 'MODEL_OUTPUT_LIMIT');
-        if (chunk.type === 'text-delta') output += chunk.text;
-      }
-      if (chunk.type === 'finish') {
-        finishKind = chunk.reason.kind;
-        if (finishKind !== 'stop') {
-          const error = failure('Model did not complete: ' + finishKind, 'MODEL_INCOMPLETE_OUTPUT');
-          const providerCode = chunk.reason.error?.code ?? chunk.reason.code;
-          if (typeof providerCode === 'string') error.diagnostic.providerCode = providerCode;
-          throw error;
+    const failure = (message, code) => {
+      const error = Object.assign(new Error(message), { code, diagnostic: diagnostic() });
+      failureMetadata.set(error, { code, diagnostic: error.diagnostic });
+      return error;
+    };
+    try {
+      const stream = llm.stream({
+        ...identity,
+        system: instructions + '\n' + contract,
+        messages: [{ role: 'user', content: [{ type: 'text', text: input }] }],
+        tools: [], maxTokens, signal,
+      });
+      for await (const chunk of stream) {
+        signal?.throwIfAborted();
+        if (finished) throw failure('Model emitted data after finish', 'MODEL_PROTOCOL_ERROR');
+        if (isToolCall(chunk)) throw failure('Review model attempted a tool call', 'MODEL_PROTOCOL_ERROR');
+        const delta = chunk.type === 'text-delta' || chunk.type === 'reasoning-delta';
+        const completed = chunk.type === 'block-end' &&
+          (chunk.block.type === 'text' || chunk.block.type === 'reasoning');
+        if (delta || completed) {
+          const type = completed ? chunk.block.type : chunk.type === 'text-delta' ? 'text' : 'reasoning';
+          // Unindexed delta-only streams remain supported for older callers.
+          const key = chunk.index ?? type;
+          const previous = blocks.get(key);
+          if (previous && previous.type !== type) throw failure('Model changed block type', 'MODEL_PROTOCOL_ERROR');
+          // Like the host BlockAssembler, first close wins; never append stragglers.
+          if (previous?.closed) continue;
+          const text = completed ? chunk.block.text : (previous?.text ?? '') + chunk.text;
+          const bytes = Buffer.byteLength(text);
+          // A shorter final snapshot must not refund previously consumed output budget.
+          const chargedBytes = Math.max(previous?.chargedBytes ?? 0, bytes);
+          size += chargedBytes - (previous?.chargedBytes ?? 0);
+          if (size > maxOutputBytes) throw failure('Model output limit exceeded', 'MODEL_OUTPUT_LIMIT');
+          blocks.set(key, { type, text, chargedBytes, closed: completed });
+          output = [...blocks.values()].filter(block => block.type === 'text').map(block => block.text).join('');
+        }
+        if (chunk.type === 'finish') {
+          finishKind = chunk.reason.kind;
+          if (finishKind !== 'stop') {
+            const error = failure('Model did not complete: ' + finishKind, 'MODEL_INCOMPLETE_OUTPUT');
+            Object.assign(error.diagnostic, providerDiagnostic(chunk.reason));
+            throw error;
+          }
+          finished = true;
         }
-        finished = true;
       }
+    } catch (error) {
+      // Keep thrown provider/cancellation identity, including frozen and primitive values.
+      // Only add safe structured metadata when the error permits it.
+      if (error && (typeof error === 'object' || typeof error === 'function') && !failureMetadata.has(error)) {
+        const safeDiagnostic = { ...diagnostic(), ...providerDiagnostic(error) };
+        failureMetadata.set(error, { code: safeDiagnostic.providerCode, diagnostic: safeDiagnostic });
+        try {
+          if (Object.isExtensible(error) && !Object.hasOwn(error, 'diagnostic')) {
+            Object.defineProperty(error, 'diagnostic', { value: structuredClone(safeDiagnostic), configurable: true, enumerable: true, writable: true });
+          }
+        } catch { /* Diagnostic accessors/proxies must not replace the primary failure. */ }
+      }
+      throw error;
     }
     // Cancellation during iterator cleanup/end must not become an invalid-JSON correction.
     signal?.throwIfAborted();
@@ -76,6 +114,7 @@ export function createDshModel(llm, route, {
     } catch (error) {
       error.diagnostic = { ...diagnostic(), ...error.diagnostic };
       invalidJsonErrors.add(error);
+      failureMetadata.set(error, { code: error.code, diagnostic: error.diagnostic });
       throw error;
     }
   }
@@ -90,24 +129,28 @@ export function createDshModel(llm, route, {
       let result;
       try {
         result = await once({ ...original, instructions: original.instructions +
-          (attempt > 1 ? JSON_CORRECTION_SUFFIX + ' 纠正次数：' + (attempt - 1) + '/' + correctionLimit + '。' : '') }, contract);
+          (attempt > 1 ? JSON_CORRECTION_SUFFIX + jsonCorrectionHint(attempts.at(-1)?.diagnostic) + ' 纠正次数：' + (attempt - 1) + '/' + correctionLimit + '。' : '') }, contract);
       } catch (error) {
-        attempts.push({ attempt, code: error?.code, diagnostic: error?.diagnostic });
+        const metadata = failureMetadata.get(error) ?? {};
+        failureMetadata.delete(error);
+        attempts.push({ attempt, ...structuredClone(metadata) });
         const invalidJson = invalidJsonErrors.delete(error);
         if (!invalidJson || attempt > correctionLimit) {
-          if (attempts.length > 1 && error && typeof error === 'object' && Object.isExtensible(error)) {
-            error.attempts = attempts;
-            if (invalidJson) {
-              error.message = 'Model response is not complete JSON after ' + (attempt - 1) +
-                ' explicit JSON correction(s) (' + attempt + ' model calls); correction budget exhausted; no malformed output accepted';
+          try {
+            if (attempts.length > 1 && error && typeof error === 'object' && Object.isExtensible(error)) {
+              Object.defineProperty(error, 'attempts', { value: structuredClone(attempts), configurable: true, enumerable: true, writable: true });
+              if (invalidJson) {
+                error.message = 'Model response is not complete JSON after ' + (attempt - 1) +
+                  ' explicit JSON correction(s) (' + attempt + ' model calls); correction budget exhausted; no malformed output accepted';
+              }
             }
-          }
+          } catch { /* Preserve provider identity even with hostile accessors/proxies. */ }
           throw error;
         }
         original.signal?.throwIfAborted();
         // Exactly one reservation per extra call; a thrown budget/cancellation veto is final.
         await request.onProtocolCorrection?.({
-          code: error.code, diagnostic: error.diagnostic, attempts: [...attempts],
+          ...structuredClone(metadata), attempts: structuredClone(attempts),
           action: 'explicit-json-correction', attempt: attempt + 1,
           correction: attempt, maxJsonCorrections: correctionLimit,
           notice: 'Additional model response requested; original output not repaired or accepted.',
@@ -119,7 +162,7 @@ export function createDshModel(llm, route, {
         // Out-of-band audit only: never inject metadata into stage-specific model schemas.
         await request.onProtocolEvent?.({
           action: 'json-correction-complete', attempt, corrections: attempt - 1,
-          attempts: [...attempts, { attempt, diagnostic: result.diagnostic }],
+          attempts: structuredClone([...attempts, { attempt, diagnostic: result.diagnostic }]),
           notice: 'Fresh complete JSON accepted; malformed outputs discarded; extra model calls occurred.',
         });
         original.signal?.throwIfAborted();

package/src/git-history.mjs

@@ -68,7 +68,7 @@ export async function captureGitHistory(cwd, options = {}) {
   if (!Number.isSafeInteger(maxFiles) || maxFiles < 1 || maxFiles > 200 || !Number.isSafeInteger(maxFileBytes) || maxFileBytes < 1 || maxFileBytes > 256 * 1024 || !Number.isSafeInteger(maxSnapshotBytes) || maxSnapshotBytes < 1 || maxSnapshotBytes > 4 * 1024 * 1024) throw new Error('Invalid historical capture limits');
   if (selectedPaths !== undefined && (!Array.isArray(selectedPaths) || selectedPaths.some(p => relativePath(p) !== p))) throw new Error('Invalid selected paths');
 
-  const root = await realpath(utf8(await gitAt(cwd, ['rev-parse', '--show-toplevel'], options)).trim());
+  const root = await realpath(utf8(await gitAt(cwd, ['rev-parse', '--show-toplevel'], options)).replace(/\r?\n$/, ''));
 
   // Resolve the two endpoints: commit compares against its sole parent; range uses explicit endpoints.
   let base, target;

package/src/git.mjs

@@ -10,7 +10,7 @@ const git = (cwd, args, options) => checked('git', [...flags, ...args], { ...opt
 const text = bytes => new TextDecoder('utf-8', { fatal: true }).decode(bytes);
 
 async function resolveRoot(cwd, options) {
-  const top = text(await git(cwd, ['rev-parse', '--show-toplevel'], options)).trim();
+  const top = text(await git(cwd, ['rev-parse', '--show-toplevel'], options)).replace(/\r?\n$/, '');
   return realpath(top);
 }
 

package/src/import-call-sites.mjs

@@ -17,7 +17,10 @@ export function importedCallSites(lines, importLine, callIndex = indexStandalone
   const identifier = /^[A-Za-z_$][A-Za-z0-9_$]*$/;
   if (identifier.test(match[1])) names.push(match[1]);
   else if (match[1].startsWith('{') && match[1].endsWith('}')) {
-    for (const part of match[1].slice(1, -1).split(',')) {
+    const parts = match[1].slice(1, -1).split(',');
+    // A single trailing comma is valid; leading or interior holes are not.
+    if (!parts.at(-1).trim()) parts.pop();
+    for (const part of parts) {
       const binding = /^\s*([A-Za-z_$][A-Za-z0-9_$]*)(?:\s+as\s+([A-Za-z_$][A-Za-z0-9_$]*))?\s*$/.exec(part);
       if (!binding) return [];
       names.push(binding[2] ?? binding[1]);

package/src/model-diagnostics.mjs

@@ -0,0 +1,62 @@
+import { createHash } from 'node:crypto';
+
+// Never persist provider messages, response excerpts, headers, URLs or raw request IDs.
+const digest = text => createHash('sha256').update(text).digest('hex');
+const own = (value, key) => {
+  try { const d = value != null ? Object.getOwnPropertyDescriptor(value, key) : undefined; return d && 'value' in d ? d.value : undefined; }
+  catch { return undefined; }
+};
+const PROVIDER_CODES = new Set(['RATE_LIMIT','CONTEXT_WINDOW_EXCEEDED','QUOTA','ACCOUNT_QUOTA','AUTH','AUTHENTICATION','INVALID_CREDENTIAL','MISSING_CREDENTIAL','PERMISSION','TIMEOUT','NETWORK','SERVER_ERROR','SERVER','SERVICE_UNAVAILABLE','INVALID_ARGS','INVALID_REQUEST','BAD_REQUEST','EMPTY_RESPONSE','UNKNOWN','NO_ADAPTER','ABORTED','CANCELLED']);
+export function providerDiagnostic(value) {
+  const carried = own(value, 'failure');
+  const code = own(carried, 'code') ?? own(value, 'code');
+  const status = own(carried, 'status') ?? own(value, 'status');
+  const retry = own(carried, 'providerRetryAfterMs') ?? own(value, 'providerRetryAfterMs');
+  const requestId = own(carried, 'requestId') ?? own(value, 'requestId');
+  return {
+    ...(typeof code === 'string' && code.length > 0 && code.length <= 256 ? { providerCode: PROVIDER_CODES.has(code) ? code : 'UNRECOGNIZED', ...(PROVIDER_CODES.has(code) ? {} : { providerCodeHash: digest(code) }) } : {}),
+    ...(Number.isInteger(status) && status >= 100 && status <= 599 ? { providerStatus: status } : {}),
+    ...(Number.isFinite(retry) && retry > 0 && retry <= 86400000 ? { providerRetryAfterMs: retry } : {}),
+    ...(typeof requestId === 'string' && requestId.length > 0 && requestId.length <= 512 ? { providerRequestIdHash: digest(requestId) } : {}),
+  };
+}
+
+const SYNTAX_HINTS = {
+  'property-name': '对象属性名必须使用双引号，不允许单引号、裸键或尾逗号。',
+  colon: '属性名与值之间必须有冒号。',
+  separator: '相邻属性或数组元素之间必须有逗号，结束处不可多加逗号。',
+  'invalid-escape': 'JSON 字符串中的反斜杠必须合法转义；换行、引号和路径须按 JSON 编码。',
+  'control-character': 'JSON 字符串中不能包含裸换行或控制字符，必须正确转义。',
+  'unterminated-string': '字符串必须闭合；不要用多行裸文本或截断字符串。',
+  'unexpected-end': '只输出一个语法完整且闭合的对象，不省略结尾。',
+  'trailing-content': 'JSON 对象结束后不得附加解释、第二个对象或 Markdown。',
+  syntax: '逐项检查双引号、转义、冒号、逗号和括号，输出完整严格 JSON。',
+};
+export function jsonSyntaxDiagnostic(body, error) {
+  const message = error instanceof SyntaxError ? error.message : '';
+  let category = 'syntax';
+  if (/^Expected (?:property name|double-quoted property name)/.test(message)) category = 'property-name';
+  else if (/^Expected ':'/.test(message)) category = 'colon';
+  else if (/^Expected ','/.test(message)) category = 'separator';
+  else if (/^Bad (?:escaped character|Unicode escape)/.test(message)) category = 'invalid-escape';
+  else if (/^Bad control character/.test(message)) category = 'control-character';
+  else if (/^Unterminated string/.test(message)) category = 'unterminated-string';
+  else if (/^Unexpected end of JSON input/.test(message)) category = 'unexpected-end';
+  else if (/^Unexpected non-whitespace character after JSON/.test(message)) category = 'trailing-content';
+  const match = / at position ([0-9]+)(?: \(line [0-9]+ column [0-9]+\))?$/.exec(message);
+  const offset = match ? Number(match[1]) : category === 'unexpected-end' ? body.length : undefined;
+  let location = {};
+  if (Number.isSafeInteger(offset) && offset >= 0 && offset <= body.length) {
+    const before = body.slice(0, offset);
+    const lines = before.split(/\r\n|\r|\n/);
+    location = { offset, line: lines.length, column: lines.at(-1).length + 1 };
+  }
+  return { syntaxCategory: category, ...location, offsetUnit: 'utf16-code-unit-in-json-body', responseHash: digest(body) };
+}
+export function jsonCorrectionHint(diagnostic) {
+  const category = diagnostic?.syntaxCategory;
+  if (typeof category !== 'string' || !Object.hasOwn(SYNTAX_HINTS, category)) return '';
+  const { line, column } = diagnostic;
+  const location = Number.isSafeInteger(line) && line > 0 && Number.isSafeInteger(column) && column > 0 ? '，JSON正文第' + line + '行第' + column + '列' : '';
+  return ' 本地解析诊断（不含原响应）：' + category + location + '。' + SYNTAX_HINTS[category];
+}

package/src/model-json.mjs

@@ -1,3 +1,5 @@
+import { jsonSyntaxDiagnostic } from './model-diagnostics.mjs';
+
 // Accept one complete JSON value, optionally inside one exact Markdown fence.
 // This parser never repairs bytes or invokes a model; orchestration owns corrections.
 export function modelJson(text) {
@@ -7,12 +9,12 @@ export function modelJson(text) {
   const body = fence ? fence[1] : trimmed;
   try {
     JSON.parse(body);
-  } catch {
+  } catch (parseError) {
     const envelope = fence ? 'json-fence' : 'plain';
     const shape = !trimmed ? 'empty' : trimmed.startsWith('```') && !fence ? 'non-exact-fence' : /^[{\[]/.test(body) ? 'json-like-invalid' : 'non-json-leading';
     const error = new Error('Model response is not complete JSON (bytes=' + bytes + ', envelope=' + envelope + ', shape=' + shape + '); no repair or retry performed by JSON parser');
     error.code = 'MODEL_INVALID_JSON';
-    error.diagnostic = { jsonBytes: bytes, envelope, shape };
+    error.diagnostic = { jsonBytes: bytes, envelope, shape, ...jsonSyntaxDiagnostic(body, parseError) };
     throw error;
   }
   return body;

package/src/process.mjs

@@ -14,13 +14,21 @@ export function run(command, args, { cwd, signal, timeoutMs = 0, maxBytes = 8 *
       env: childEnv,
     });
     const stdout = [], stderr = [];
-    let bytes = 0, failure;
-    const stop = error => { failure ??= error; child.kill(); };
+    let bytes = 0, failure, killer, stopped = false;
+    const stop = error => {
+      failure ??= error;
+      if (stopped) return;
+      stopped = true;
+      child.kill();
+      killer = setTimeout(() => { if (child.exitCode === null && child.signalCode === null) child.kill('SIGKILL'); }, 1000);
+      killer.unref?.();
+    };
     const abort = () => stop(signal.reason ?? new Error('Cancelled'));
     signal?.addEventListener('abort', abort, { once: true });
     if (signal?.aborted) abort();
     const timer = timeoutMs>0?setTimeout(() => stop(new Error('Command timeout')), timeoutMs):undefined;
     const capture = chunks => data => {
+      if (stopped) return;
       bytes += data.length;
       if (bytes > maxBytes) stop(new Error('Command output limit exceeded'));
       else chunks.push(data);
@@ -30,6 +38,7 @@ export function run(command, args, { cwd, signal, timeoutMs = 0, maxBytes = 8 *
     child.on('error', error => { failure ??= error; });
     child.on('close', code => {
       clearTimeout(timer);
+      clearTimeout(killer);
       signal?.removeEventListener('abort', abort);
       if (failure) reject(failure);
       else resolve({ code, stdout: Buffer.concat(stdout), stderr: Buffer.concat(stderr) });

package/src/project-execution.mjs

@@ -1,6 +1,6 @@
 import { reviewSnapshot } from './review.mjs';
 
-export const DEFAULT_PROJECT_CONCURRENCY = 3;
+export const DEFAULT_PROJECT_CONCURRENCY = 8;
 export function projectConcurrency(value = DEFAULT_PROJECT_CONCURRENCY) {
   if (!Number.isSafeInteger(value) || value < 1 || value > 8) throw new Error('Project concurrency must be an integer from 1 to 8');
   return value;

package/src/project-review-service.mjs

@@ -5,7 +5,7 @@ import { hash } from './content.mjs';
 import { resolveWorkspaceRepository } from './workspace-repository.mjs';
 import { detectVcs } from './snapshot.mjs';
 import { projectInventory, captureProjectBatch } from './project-snapshot.mjs';
-import { reviewProjectBatches, projectConcurrency as validateProjectConcurrency } from './project-execution.mjs';
+import { reviewProjectBatches, projectConcurrency as validateProjectConcurrency, DEFAULT_PROJECT_CONCURRENCY } from './project-execution.mjs';
 import { createDshModel } from './dsh-model.mjs';
 
 const PREVIEW_NOTICE_SUFFIX = ' Full current source audit, not regression-only diff. Shared session execution budget: no internal elapsed-time or model-call cutoff, 16MiB capture memory protection. Blocked/excluded/pending files are not reviewed successfully. No untracked/ignored/external bodies; no complete semantic call graph. Independent approved batches run with bounded concurrency; per-batch evidence and global model-call budgets remain enforced. Show scope and model before confirmed execute.';
@@ -66,7 +66,7 @@ async function captureProject(cwd, args, signal) {
   return { ...result, id: hash(JSON.stringify(result)) };
 }
 
-export function createProjectReviewService(llm, { allowModelSending = false, authorize = async () => false, now = Date.now, ttlMs = 300000, maxPreviews = 8, projectMaxCalls = Number.MAX_SAFE_INTEGER, projectConcurrency = 3 } = {}) {
+export function createProjectReviewService(llm, { allowModelSending = false, authorize = async () => false, now = Date.now, ttlMs = 300000, maxPreviews = 8, projectMaxCalls = Number.MAX_SAFE_INTEGER, projectConcurrency = DEFAULT_PROJECT_CONCURRENCY } = {}) {
   for (const n of [ttlMs, maxPreviews]) if (!Number.isSafeInteger(n) || n < 1) throw new Error('Invalid project preview limit');
   if (!Number.isSafeInteger(projectMaxCalls) || projectMaxCalls < 1) throw new Error('Invalid project model call limit');
 

package/src/project-snapshot.mjs

@@ -13,7 +13,7 @@ const INVENTORY_NOTICE = 'Tracked current working files only, including unchange
 
 async function inventoryGit(root, options) {
   const args = ['--no-optional-locks', '-c', 'core.fsmonitor=false', '-c', 'core.untrackedCache=false'];
-  const actual = text(await checked('git', [...args, 'rev-parse', '--show-toplevel'], { ...options, cwd: root })).trim();
+  const actual = text(await checked('git', [...args, 'rev-parse', '--show-toplevel'], { ...options, cwd: root })).replace(/\r?\n$/, '');
   if (await realpath(actual) !== root) throw new Error('Full project requires explicit repository root');
   const index = await checked('git', [...args, 'ls-files', '--stage', '-z'], { ...options, cwd: root, maxBytes: 2 * 1024 * 1024 });
   const records = [];

package/src/review-jobs.mjs

@@ -16,12 +16,15 @@ export function createReviewJobs({directory}={}){
  async function save(job){await safeDirectory();const tmp=path.join(directory,job.id+'.'+randomUUID()+'.tmp');await writeFile(tmp,JSON.stringify(job.record),{mode:0o600,flag:'wx'});await rename(tmp,filename(job.id));changed(job.id);}
  async function owned(id,exec){const who=identity(exec),job=jobs.get(id);if(job){if(!same(who,job.record.owner))throw new Error('Foreign review job');return job.record;}await safeDirectory();const name=filename(id),stat=await lstat(name);if(stat.isSymbolicLink()||!stat.isFile())throw new Error('Unsafe report file');const r=JSON.parse(await readFile(name,'utf8'));if(!same(who,r.owner))throw new Error('Foreign review job');if(['queued','running'].includes(r.status)){r.status='interrupted';r.notice='Host restarted or plugin disposed. Saved checkpoints are available; resending requires a fresh preview and approval.';}return r;}
  return {
-  async start(exec,work){if(disposed)throw new Error('Review job service disposed');exec.signal?.throwIfAborted();const who=identity(exec);const relative=path.relative(path.resolve(who.cwd),directory);if(relative===''||(!relative.startsWith('..'+path.sep)&&relative!=='..'&&!path.isAbsolute(relative)))throw new Error('Report store must be outside reviewed workspace');if([...jobs.values()].some(j=>j.record.owner.sessionId===who.sessionId&&['queued','running'].includes(j.record.status)))throw new Error('Session review job already active');const id=randomUUID(),controller=new AbortController(),job={id,controller,record:{jobId:id,owner:who,status:'queued',stage:'queued',checkpoints:[],createdAt:new Date().toISOString()},pending:Promise.resolve()};jobs.set(id,job);try{await save(job);}catch(error){jobs.delete(id);throw error;}const enqueue=fn=>{job.pending=job.pending.then(fn);return job.pending;};
+  async start(exec,work){if(disposed)throw new Error('Review job service disposed');exec.signal?.throwIfAborted();const who=identity(exec);const relative=path.relative(path.resolve(who.cwd),directory);if(relative===''||(!relative.startsWith('..'+path.sep)&&relative!=='..'&&!path.isAbsolute(relative)))throw new Error('Report store must be outside reviewed workspace');if([...jobs.values()].some(j=>j.record.owner.sessionId===who.sessionId&&['queued','running'].includes(j.record.status)))throw new Error('Session review job already active');const id=randomUUID(),controller=new AbortController(),job={id,controller,record:{jobId:id,owner:who,status:'queued',stage:'queued',checkpoints:[],createdAt:new Date().toISOString()},pending:Promise.resolve()};jobs.set(id,job);try{await save(job);}catch(error){jobs.delete(id);throw error;}
+   // Keep the serialization tail usable after failure, but return the original
+   // rejecting operation so checkpoint callers still observe durability failures.
+   const enqueue=fn=>{const operation=job.pending.then(fn);job.pending=operation.catch(()=>{});return operation;};
    // Own cancellation explicitly. The short start RPC ending is NOT task cancellation.
-   job.done=(async()=>{await Promise.resolve();try{job.record.status='running';await enqueue(()=>save(job));const result=await work({signal:controller.signal,checkpoint:async value=>enqueue(async()=>{job.record.stage=value.stage??'reviewing';job.record.checkpoints.push(structuredClone(value));await save(job);})});job.record.result=result;job.record.status=controller.signal.aborted?'cancelled':'completed';}catch(error){job.record.status=controller.signal.aborted?'cancelled':'failed';job.record.error=error?.message??String(error);}finally{job.record.finishedAt=new Date().toISOString();try{await enqueue(()=>save(job));}catch(error){job.record.status='failed';job.record.persistenceError=error.message;}}})();return {jobId:id,status:'queued',nextAction:'Call code_review_wait until terminal status; do not finish the user request at start.',notice:'Background job accepted. Poll status; start is not a completed review. Explicit cancel or plugin disposal stops it.'};
+   job.done=(async()=>{await Promise.resolve();try{job.record.status='running';await enqueue(()=>save(job));const result=await work({signal:controller.signal,checkpoint:async value=>enqueue(async()=>{job.record.stage=value.stage??'reviewing';job.record.checkpoints.push(structuredClone(value));await save(job);})});job.record.result=result;job.record.status=controller.signal.aborted?'cancelled':'completed';}catch(error){job.record.status=controller.signal.aborted?'cancelled':'failed';job.record.error=error?.message??String(error);}finally{job.record.finishedAt=new Date().toISOString();try{await enqueue(()=>save(job));jobs.delete(id);}catch(error){job.record.status='failed';job.record.persistenceError=error?.message??String(error);}finally{changed(id);}}})();return {jobId:id,status:'queued',nextAction:'Call code_review_wait until terminal status; do not finish the user request at start.',notice:'Background job accepted. Poll status; start is not a completed review. Explicit cancel or plugin disposal stops it.'};
   },
   async status(id,exec,page){const r=structuredClone(await owned(id,exec));r.recovery=recoveryCoverage(r);r.progress=jobProgress(r);r.waitRevision=r.checkpoints.length;r.nextAction=['queued','running'].includes(r.status)?'Call code_review_wait; do not end the user review request while task runs.':r.result?.previewId?'Show preview and request user confirmation before execute.':'Collect final report and unfinished scope, then provide one final answer.';if(!page)return r;const {offset=0,limit=20,checkpointIndex}=page;if(!Number.isSafeInteger(offset)||offset<0||!Number.isSafeInteger(limit)||limit<1||limit>100)throw new Error('Invalid result page');if(checkpointIndex!==undefined){if(!Number.isSafeInteger(checkpointIndex)||checkpointIndex<0||checkpointIndex>=r.checkpoints.length)throw new Error('Invalid checkpoint index');return {jobId:r.jobId,status:r.status,checkpointIndex,checkpoint:pageCheckpoint(r.checkpoints[checkpointIndex],offset,limit),page:{offset,limit}};}const result=r.result;const report=result?.report;return {...r,result:undefined,recovery:{...r.recovery,unfinishedStages:r.recovery.unfinishedStages.slice(offset,offset+limit),files:r.recovery.files.slice(offset,offset+limit),windows:r.recovery.windows.slice(offset,offset+limit),suggestedPaths:r.recovery.suggestedPaths.slice(offset,offset+limit),totalObservedFiles:r.recovery.files.length},checkpoints:r.checkpoints.slice(offset,offset+limit).map(c=>pageCheckpoint(c,0,limit)),checkpointPage:{offset,limit,total:r.checkpoints.length},...(result?{resultSummary:report?{status:report.status,coverage:report.coverage,model:report.model,snapshotId:report.snapshotId}:({...result,files:result.files?.slice(offset,offset+limit),filePage:result.files?{offset,limit,total:result.files.length}:undefined}),resultPage:report?{files:report.files?.slice(offset,offset+limit),findings:report.findings?.slice(offset,offset+limit),totalFiles:report.files?.length,totalFindings:report.findings?.length}:undefined}: {})};},
-  async wait(id,exec,{after,timeoutMs=25000,signal}={}){const r=await owned(id,exec);if(!Number.isSafeInteger(timeoutMs)||timeoutMs<1||timeoutMs>60000)throw new Error('Invalid wait duration');if(after!==undefined&&(!Number.isSafeInteger(after)||after<0))throw new Error('Invalid wait revision');const revision=r.checkpoints.length;if(!['queued','running'].includes(r.status)||(after!==undefined&&after!==revision))return {changed:true};signal?.throwIfAborted();await new Promise((resolve,reject)=>{let timer;const cleanup=()=>{clearTimeout(timer);signal?.removeEventListener('abort',abort);listeners.get(id)?.delete(done);};const done=()=>{cleanup();resolve();},abort=()=>{cleanup();reject(signal.reason);};if(!listeners.has(id))listeners.set(id,new Set());listeners.get(id).add(done);signal?.addEventListener('abort',abort,{once:true});timer=setTimeout(done,timeoutMs);const latest=jobs.get(id)?.record;if(latest&&(latest.checkpoints.length!==revision||!['queued','running'].includes(latest.status)))done();if(signal?.aborted)abort();});return {changed:true};},
+  async wait(id,exec,{after,timeoutMs=25000,signal}={}){const r=await owned(id,exec);if(!Number.isSafeInteger(timeoutMs)||timeoutMs<1||timeoutMs>60000)throw new Error('Invalid wait duration');if(after!==undefined&&(!Number.isSafeInteger(after)||after<0))throw new Error('Invalid wait revision');const revision=r.checkpoints.length;if(!['queued','running'].includes(r.status)||(after!==undefined&&after!==revision))return {changed:true};signal?.throwIfAborted();await new Promise((resolve,reject)=>{let timer;const cleanup=()=>{clearTimeout(timer);signal?.removeEventListener('abort',abort);const waiting=listeners.get(id);waiting?.delete(done);if(waiting?.size===0)listeners.delete(id);};const done=()=>{cleanup();resolve();},abort=()=>{cleanup();reject(signal.reason);};if(!listeners.has(id))listeners.set(id,new Set());listeners.get(id).add(done);signal?.addEventListener('abort',abort,{once:true});timer=setTimeout(done,timeoutMs);const latest=jobs.get(id)?.record;if(!latest||latest.checkpoints.length!==revision||!['queued','running'].includes(latest.status))done();if(signal?.aborted)abort();});return {changed:true};},
   async cancel(id,exec){await owned(id,exec);const j=jobs.get(id);if(j)j.controller.abort(new Error('User cancelled review job'));return {jobId:id,cancelRequested:!!j};},
   async dispose(){disposed=true;for(const j of jobs.values())j.controller.abort(new Error('Review plugin disposed'));await Promise.all([...jobs.values()].map(j=>j.done));}
  };

package/src/review.mjs

@@ -326,9 +326,9 @@ export async function reviewSnapshot(snapshot, model, options = {}) {
     } catch (error) {
       state.status = signal?.aborted ? 'cancelled' : error?.code === 'PROJECT_MODEL_CALL_LIMIT' ? 'pending' : 'failed';
       state.reason = error?.message ?? String(error);
-      if(error.attempts)state.protocolAttempts=error.attempts;
-      if(error.responseAttempts)state.responseAttempts=error.responseAttempts;
-      if(error.diagnostic)state.protocolDiagnostic=error.diagnostic;
+      if(error?.attempts)state.protocolAttempts=error.attempts;
+      if(error?.responseAttempts)state.responseAttempts=error.responseAttempts;
+      if(error?.diagnostic)state.protocolDiagnostic=error.diagnostic;
       for(const pass of state.reviewPasses??[])if(pass.status==='running')pass.status=signal?.aborted?'cancelled':'failed';
       state.failureCode = signal?.aborted ? 'CANCELLED' : ['MODEL_INVALID_JSON','MODEL_INCOMPLETE_OUTPUT','MODEL_TIMEOUT','MODEL_INVALID_READ_REQUEST','MODEL_OUTPUT_LIMIT','MODEL_PROTOCOL_ERROR','MODEL_INVALID_REVIEW_RESPONSE','MODEL_INVALID_FINDING_IDENTITY','MODEL_INVALID_FINDING_SEVERITY','MODEL_MISSING_FINDING_FIELD','MODEL_INVALID_ANCHOR','MODEL_ANCHOR_MISMATCH','READER_CALL_BUDGET_EXCEEDED','READER_OUTPUT_BUDGET_EXCEEDED','RETRIEVAL_ROUND_BUDGET_EXCEEDED','RETRIEVAL_FINAL_RESPONSE_REQUIRED','PROJECT_MODEL_CALL_LIMIT'].includes(error?.code) ? error.code : 'REVIEW_EXECUTION_FAILED';
     }

package/src/source-segments.mjs

@@ -1,5 +1,6 @@
 // Linear segmentation of approved text. Coordinates remain original one-based lines.
 export function sourceSegments(windows,{maxBytes=12000,maxLines=100}={}){
+ if(!Number.isSafeInteger(maxBytes)||maxBytes<1||!Number.isSafeInteger(maxLines)||maxLines<1)throw new Error('Invalid source segment limits');
  const out=[];for(const w of windows){if(w.old.count<=maxLines&&w.new.count<=maxLines&&Buffer.byteLength(w.old.text)<=maxBytes&&Buffer.byteLength(w.new.text)<=maxBytes){out.push(w);continue;}const sides={old:w.old.text.match(/[^\n]*\n|[^\n]+$/g)??[],new:w.new.text.match(/[^\n]*\n|[^\n]+$/g)??[]},pos={old:0,new:0};let i=0;
   while(pos.old<sides.old.length||pos.new<sides.new.length){const item={id:w.id+'-s'+(++i),editIds:[...w.editIds]};for(const side of ['old','new']){const start=pos[side],parts=[];let bytes=0;while(pos[side]<sides[side].length&&parts.length<maxLines){const line=sides[side][pos[side]],n=Buffer.byteLength(line);if(parts.length&&bytes+n>maxBytes)break;parts.push(line);bytes+=n;pos[side]++;if(bytes>=maxBytes)break;}item[side]={start:w[side].start+start,count:parts.length,text:parts.join('')};}out.push(item);}
   if(!i)out.push(w);

package/src/svn-history-callers.mjs

@@ -24,7 +24,8 @@ export async function svnHistoryCallers(files,history,scopes,context,{index,look
    if(typeof value?.content?.text!=='string'||value.kind!=='file'||value.source?.operativeRevision!==revision)throw new Error('Invalid fixed SVN caller body');
    const bodyBytes=value.content.bytes??Buffer.byteLength(value.content.text);
    if(!Number.isSafeInteger(bodyBytes)||bodyBytes<0||bodyBytes>256*1024||Buffer.byteLength(value.content.text)>256*1024)throw new Error('Invalid fixed SVN caller size');
-   scanBytes+=bodyBytes;
+   // Raw encoding bytes may differ from UTF-8; never charge less than the text retained.
+   scanBytes+=Math.max(bodyBytes,Buffer.byteLength(value.content.text));
    if(scanBytes>1024*1024)throw new Error('SVN historical caller scan source limit exceeded');
    const source={path:name,...value.content,svnSource:value.source,side,revision};sources.push(source);scanned.push(source);
   }

package/src/svn-working-special.mjs

@@ -8,13 +8,15 @@ import {svnSpecialData} from './svn-special.mjs';
 export async function readWorkingSvnSpecial(root,name,properties,options={}){
  relativePath(name);assertNonSecretPath(name);options.signal?.throwIfAborted();
  const canonical=await realpath(root);let cursor=canonical;const parts=name.split('/');
- for(const part of parts.slice(0,-1)){cursor=path.join(cursor,part);const stat=await lstat(cursor);if(stat.isSymbolicLink()||!stat.isDirectory())throw new Error('SVN special ancestor must be a real directory');}
+ const ancestors=[];
+ for(const part of parts.slice(0,-1)){cursor=path.join(cursor,part);const stat=await lstat(cursor);if(stat.isSymbolicLink()||!stat.isDirectory())throw new Error('SVN special ancestor must be a real directory');ancestors.push({path:cursor,dev:stat.dev,ino:stat.ino,ctimeMs:stat.ctimeMs});}
  const filename=path.join(cursor,parts.at(-1)),before=await lstat(filename);let content;
  if(before.isSymbolicLink()){
   const target=await readlink(filename,{encoding:'buffer'});if(target.length>16384)throw new Error('SVN link target byte limit exceeded');
   const bytes=Buffer.concat([Buffer.from('link '),target]);if(bytes.length>(options.maxFileBytes??256*1024))throw new Error('SVN special file size limit exceeded');
   content=decode(bytes);const after=await lstat(filename);const again=await readlink(filename,{encoding:'buffer'});
-  if(!after.isSymbolicLink()||before.ino!==after.ino||before.mtimeMs!==after.mtimeMs||before.ctimeMs!==after.ctimeMs||!again.equals(target))throw new Error('SVN link changed during capture');
+  for(const ancestor of ancestors){const now=await lstat(ancestor.path);if(now.isSymbolicLink()||!now.isDirectory()||now.dev!==ancestor.dev||now.ino!==ancestor.ino||now.ctimeMs!==ancestor.ctimeMs)throw new Error('SVN special ancestor changed during capture');}
+  if(!after.isSymbolicLink()||before.ino!==after.ino||before.dev!==after.dev||before.mtimeMs!==after.mtimeMs||before.ctimeMs!==after.ctimeMs||!again.equals(target))throw new Error('SVN link changed during capture');
  }else{
   if(!before.isFile())throw new Error('SVN special working node is neither link nor regular link record');
   content=await readLocal(canonical,name,options);