dsh-patch-edit-plus 0.2.4 → 0.2.5

package/CHANGELOG.md

@@ -1,6 +1,14 @@
 # Changelog
 
 
+
+## [0.2.5] — 2026-10-01
+
+### Fixed
+- **A bare multi-file unified diff collapsed into one file section.** The parser only opened a new file section at `--- ` when no section existed; the second file's `--- `/`+++ ` headers therefore REWROTE the previous section's paths and its hunks were matched against the wrong file's content, failing every section after the first with `Hunk N of "..." does not apply: the context does not match the file` (one-call-per-file was the only workaround). `--- ` now opens a new section whenever the current one has already been claimed by a path or a hunk; `diff --git`-delimited diffs are unaffected (their `--- ` always follows a fresh section). Regression-tested at the parser level and end-to-end with a two-file bare patch.
+
+### Changed
+- none
 ## [0.2.4] — 2026-10-01
 
 ### Changed

package/CHANGELOG.zh.md

@@ -1,6 +1,14 @@
 # 更新日志
 
 
+
+## [0.2.5] — 2026-10-01
+
+### 修复
+- **裸多文件 unified diff 被折叠进同一个文件 section。** 解析器只在"当前无 section"时才在 `--- ` 处开新 section；第二个文件的 `--- `/`+++ ` 头因此直接改写了前一个 section 的路径，前一个文件的 hunk 被拿到错误文件的内容上匹配，第一个文件之后的每个 section 都报 `Hunk N of "..." does not apply: the context does not match the file`（此前只能逐文件调用绕过）。现在只要当前 section 已被路径或 hunk 认领，`--- ` 就开新 section；带 `diff --git` 分隔的 diff 不受影响（其 `--- ` 总是紧跟新 section）。解析层与端到端双层回归测试（双文件裸补丁）。
+
+### 变更
+- 无
 ## [0.2.4] — 2026-10-01
 
 ### 变更

package/dsh.plugin.json

@@ -1,7 +1,7 @@
 {
   "id": "dsh-patch-edit-plus",
   "name": "dsh-patch-edit-plus",
-  "version": "0.2.4",
+  "version": "0.2.5",
   "description": {
     "en": "Patch-style file editing: one apply_patch tool for git/unified diff and Codex apply_patch syntax (both enabled by default), with all-or-nothing application and sandbox-aware delete/move.",
     "zh": "补丁风格文件编辑：单个 apply_patch 工具，接受 git/unified diff 与 Codex apply_patch 语法（两种语法均默认开启），全量验证后原子应用，删除/移动走沙箱感知 shell。"

package/lib/parse/unified.js

@@ -55,8 +55,12 @@ export function parseUnifiedDiff(patch) {
             continue;
         }
         if (line.startsWith('--- ')) {
-            if (current === null) {
-                // Bare unified diff without a git header: open an implicit section.
+            // A bare multi-file unified diff repeats `--- `/`+++ ` per file with no
+            // `diff --git` separator. Once the current section has been claimed by
+            // a path or a hunk, this header therefore opens the NEXT file section;
+            // reusing the section would drag the previous file's hunks into this
+            // one and fail them against the wrong content.
+            if (current === null || current.oldPath !== null || current.newPath !== null || current.hunks.length > 0) {
                 current = { oldPath: null, newPath: null, newFile: false, deletedFile: false, renameFrom: null, renameTo: null, hunks: [], startLine: lineNo };
                 sections.push(current);
             }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dsh-patch-edit-plus",
-  "version": "0.2.4",
+  "version": "0.2.5",
   "description": "Patch-style file editing for DeepSeek Harness: one apply_patch tool accepting git/unified diff and Codex apply_patch syntax (both enabled by default), with all-or-nothing application, read-before-write intent dance, sandbox-aware delete/move, with a DSH 0.1.7+ line (declarative volatile settings).",
   "type": "module",
   "repository": {