@qilin-agent/workspace-changes 3.1.7 → 3.1.8

package/README.i18n.yaml

@@ -15,8 +15,8 @@
   en: d152484eb41ac6b4
   zh: 09388d293f9be9cb
 /qilin-agent-workspace-changes/use-this-package:
-  en: d6364de942d83439
-  zh: b958129205655ba9
+  en: 9dcc7d2769c44ebe
+  zh: dce16dd03d8009df
 /qilin-agent-workspace-changes/understand-the-implementation:
   en: efb5cc9657ce290d
   zh: b659836fb1fba36a

package/README.md

@@ -43,7 +43,7 @@ The shipped Web bundle mounts this plugin. Mount it in any composition with the
 
 Every Session with a working directory and no subagent origin is recorded; subagent Sessions are not. Snapshots are written through a private index into a temporary object directory owned by the Session, with the repository's own object store attached as a read-only alternate; the repository's index, objects, work tree, and refs stay untouched, and the user's earlier uncommitted changes never enter a summary. Session disposal removes the directory. Nested repositories and submodules inside the working directory are recorded as gitlinks, so their internal changes do not appear. A working directory outside any git repository takes no snapshots. Without git — or, on macOS, with only the developer-tools stub at `/usr/bin/git` — no repository is located either, and the plugin logs that once. Either way the summary lists the file-tool edits alone, as described next, with the working directory as the workspace; shell edits are absent.
 
-Before a `write`, `edit`, or mutating `str_replace_editor` call runs, the recorder copies the file at its path into the Session's temporary directory, once per path per turn, and copies it again at turn end; the copies are named by the SHA-1 of their bytes, so identical content is stored once. This needs no git. Paths the snapshots cover keep their git counts; the copies serve the other paths — files matching an ignore pattern, files outside the repository, and every file-tool edit when there is no snapshot — with counts from a line comparison of the two copies, so repeated edits to one file count once and a shell edit after a file-tool edit is included. A path whose content is unchanged at turn end is not listed. A copy larger than `maxFileBytes` is not stored: the file is listed with `oversized` and no counts, and a path whose both sides are that large is listed too, since unread content is never known to be unchanged. A path whose only difference is a missing final newline compares as unchanged, while git still counts that line. Files under `/tmp` or the platform temporary directory are excluded unless they lie inside the repository. Changes made only through shell commands outside the snapshot coverage are not recorded.
+Before a `write`, `edit`, mutating `str_replace_editor`, or `apply_patch` call runs, the recorder copies every file the call will address into the Session's temporary directory, once per path per turn, and copies it again at turn end; an `apply_patch` capture covers every operation path, including both ends of a move, and a syntactically invalid patch captures nothing; the copies are named by the SHA-1 of their bytes, so identical content is stored once. This needs no git. Paths the snapshots cover keep their git counts; the copies serve the other paths — files matching an ignore pattern, files outside the repository, and every file-tool edit when there is no snapshot — with counts from a line comparison of the two copies, so repeated edits to one file count once and a shell edit after a file-tool edit is included. A path whose content is unchanged at turn end is not listed. A copy larger than `maxFileBytes` is not stored: the file is listed with `oversized` and no counts, and a path whose both sides are that large is listed too, since unread content is never known to be unchanged. A path whose only difference is a missing final newline compares as unchanged, while git still counts that line. Files under `/tmp` or the platform temporary directory are excluded unless they lie inside the repository. Changes made only through shell commands outside the snapshot coverage are not recorded.
 
 Each file carries a durable `path` — relative to the working directory inside it, absolute elsewhere — and a `display` path used for ordering and labels: the relative path, a `../` path for repository files above the working directory, a `~` path under the home directory, otherwise the absolute path. Files sort by `display` in code-unit order, which lists parent and absolute paths before the working directory's own files. The `workspace/changes` event carries only the turn number; `ctx.workspaceChanges.summary(sessionId, seq)` returns the summary the event with that sequence announced, or undefined once the Session is disposed or when this Host process never recorded it. `ctx.workspaceChanges.diff(sessionId, seq, index, signal)` compares the listed file at that index: hunks with three context lines from the two snapshot trees or the two copies, `binary` for a side git reported as binary or that holds a NUL byte, `oversized` for a side larger than `maxFileBytes`. A line comparison that runs longer than `diffTimeoutMs` degrades to one hunk replacing every line, marked `coarse`. A conversation reopened after a Host restart therefore has no card, and no comparison, for its earlier turns.
 

package/README.zh.md

@@ -43,7 +43,7 @@ kind: "package-reference"
 
 有工作目录且不是子代理来源的 Session 都会被记录；子代理 Session 不记录。快照通过私有 index 写入 Session 自己拥有的临时对象目录，仓库自己的对象库以只读 alternate 的方式挂接；仓库的 index、对象、工作树和 ref 保持不变，用户此前未提交的改动也不会进入摘要。Session 释放时删除该目录。工作目录内的嵌套仓库和 submodule 记录为 gitlink，其内部改动不会出现。不在任何 git 仓库内的工作目录不做快照。没有 git 时——或者 macOS 上只有 `/usr/bin/git` 的开发者工具桩程序时——同样定位不到仓库，插件记录一次日志。两种情况下摘要都只列下文所述的文件工具编辑，并以工作目录作为工作区；shell 的改动不会出现。
 
-在 `write`、`edit` 或有修改作用的 `str_replace_editor` 调用运行之前，记录器把该路径上的文件复制到 Session 的临时目录，每轮每个路径只复制第一次，轮次结束时再复制一次；副本按其字节的 SHA-1 命名，相同内容只存一份。这一步不需要 git。快照覆盖到的路径保留 git 的行数；其余路径由副本提供，也就是匹配忽略模式的文件、仓库之外的文件，以及没有快照时的每一次文件工具编辑，行数来自两份副本的逐行对比，因此同一文件的重复编辑只计一次，文件工具编辑之后的 shell 改动也包含在内。轮次结束时内容没有变化的路径不会列出。超过 `maxFileBytes` 的副本不会保存：该文件列出时带 `oversized`，没有行数；两侧都这么大的路径同样列出，因为没读过的内容永远不能认定为没有改动。只差一个末尾换行的路径对比为两侧相同，而 git 仍会把那一行计入行数。`/tmp` 与平台临时目录下的文件被排除，除非它们位于仓库内。快照覆盖范围之外只通过 shell 命令做出的改动不会被记录。
+在 `write`、`edit`、有修改作用的 `str_replace_editor` 或 `apply_patch` 调用运行之前，记录器把该调用将要触及的每个文件复制到 Session 的临时目录，每轮每个路径只复制第一次，轮次结束时再复制一次；`apply_patch` 的捕获覆盖每个操作路径（含移动的两端），语法无效的补丁不捕获任何路径；副本按其字节的 SHA-1 命名，相同内容只存一份。这一步不需要 git。快照覆盖到的路径保留 git 的行数；其余路径由副本提供，也就是匹配忽略模式的文件、仓库之外的文件，以及没有快照时的每一次文件工具编辑，行数来自两份副本的逐行对比，因此同一文件的重复编辑只计一次，文件工具编辑之后的 shell 改动也包含在内。轮次结束时内容没有变化的路径不会列出。超过 `maxFileBytes` 的副本不会保存：该文件列出时带 `oversized`，没有行数；两侧都这么大的路径同样列出，因为没读过的内容永远不能认定为没有改动。只差一个末尾换行的路径对比为两侧相同，而 git 仍会把那一行计入行数。`/tmp` 与平台临时目录下的文件被排除，除非它们位于仓库内。快照覆盖范围之外只通过 shell 命令做出的改动不会被记录。
 
 每个文件携带持久的 `path`——位于工作目录内时为相对路径，否则为绝对路径——以及用于排序和标签的 `display` 路径：相对路径，仓库内位于工作目录之上的文件为 `../` 路径，家目录下的文件为 `~` 路径，其余为绝对路径。文件按 `display` 的码元顺序排序，因此上级路径和绝对路径排在工作目录自身文件之前。`workspace/changes` 事件只携带轮号；`ctx.workspaceChanges.summary(sessionId, seq)` 返回该序号的事件宣告的摘要，Session 已释放或本 Host 进程从未记录时返回 undefined。`ctx.workspaceChanges.diff(sessionId, seq, index, signal)` 对比该下标所列的文件：从两棵快照树或两份副本得出带三行上下文的 hunk；git 报告为二进制或某一侧含 NUL 字节时返回 `binary`；某一侧超过 `maxFileBytes` 时返回 `oversized`。逐行对比运行超过 `diffTimeoutMs` 时退化为一个替换全部行的 hunk，并标记 `coarse`。因此 Host 重启后重新打开的对话，先前轮次既没有卡片也没有对比。
 

package/lib/index.js

@@ -3,6 +3,7 @@ import z from "@qilin-agent/schemastery";
 import { copyFile, mkdir, mkdtemp, open, readFile, realpath, rm, writeFile } from "node:fs/promises";
 import { basename, dirname, isAbsolute, join, relative, resolve, sep } from "node:path";
 import { createHash } from "node:crypto";
+import { PatchParseError, parsePatch } from "@qilin-agent/fs-patch";
 import { structuredPatch } from "diff";
 //#region lib/types/numstat.js
 /** Parsing of `git diff-tree --numstat -z` output. */
@@ -519,21 +520,39 @@ function text(value) {
 	return typeof value === "string" && value.trim() !== "" ? value : void 0;
 }
 /**
-* The path a first-party file-tool call is about to mutate: `write`, `edit`,
-* and the mutating `str_replace_editor` commands. Other tools, reads, and
-* incomplete arguments yield undefined.
+* The paths a first-party file-tool call is about to mutate: `write`, `edit`,
+* the mutating `str_replace_editor` commands, and every path a
+* syntax-valid `apply_patch` addresses (both ends of a move). Other tools,
+* reads, and incomplete arguments yield nothing.
 * @param name - wire tool name.
 * @param args - parsed call arguments.
-* @returns the model-facing path, or undefined.
+* @returns the model-facing paths, empty when the call mutates no known path.
 */
-function mutationPath(name, args) {
-	if (typeof args !== "object" || args === null || Array.isArray(args)) return void 0;
+function mutationPaths(name, args) {
+	if (typeof args !== "object" || args === null || Array.isArray(args)) return [];
 	const record = args;
 	switch (name) {
-		case "write": return typeof record.content === "string" ? text(record.file_path) : void 0;
-		case "edit": return typeof record.old_string === "string" && typeof record.new_string === "string" ? text(record.file_path) : void 0;
-		case "str_replace_editor": return record.command === "create" || record.command === "str_replace" || record.command === "insert" ? text(record.path) : void 0;
-		default: return;
+		case "write": {
+			const path = typeof record.content === "string" ? text(record.file_path) : void 0;
+			return path === void 0 ? [] : [path];
+		}
+		case "edit": {
+			const path = typeof record.old_string === "string" && typeof record.new_string === "string" ? text(record.file_path) : void 0;
+			return path === void 0 ? [] : [path];
+		}
+		case "str_replace_editor": {
+			const path = record.command === "create" || record.command === "str_replace" || record.command === "insert" ? text(record.path) : void 0;
+			return path === void 0 ? [] : [path];
+		}
+		case "apply_patch":
+			if (typeof record.input !== "string" || record.input.trim() === "") return [];
+			try {
+				return parsePatch(record.input).flatMap((operation) => operation.kind === "update" && operation.moveTo !== void 0 ? [operation.path, operation.moveTo] : [operation.path]);
+			} catch (error) {
+				if (error instanceof PatchParseError) return [];
+				throw error;
+			}
+		default: return [];
 	}
 }
 //#endregion
@@ -674,23 +693,25 @@ var TurnRecorder = class {
 		});
 	}
 	/**
-	* Queue the capture of the path a file tool is about to mutate, before the
+	* Queue the capture of every path a file tool is about to mutate, before the
 	* tool runs; only the turn's first mutation of a path captures it. Await
 	* {@link settled} afterwards so the tool cannot overtake the capture.
 	* @param name - wire tool name.
 	* @param args - parsed call arguments.
 	*/
 	capture(name, args) {
-		const path = mutationPath(name, args);
-		if (path === void 0) return;
+		const targets = mutationPaths(name, args);
+		if (targets.length === 0) return;
 		const state = this.state;
 		this.enqueue(async () => {
 			const paths = this.paths;
 			if (paths === void 0) return;
-			const absolute = await canonicalPath(resolve(paths.cwd, path));
-			if (state.captures.has(absolute)) return;
-			const capture = await captureFile(absolute, join(await this.scratchDir(), "captures"), this.env.maxFileBytes);
-			if (capture !== void 0) state.captures.set(absolute, capture);
+			for (const target of targets) {
+				const absolute = await canonicalPath(resolve(paths.cwd, target));
+				if (state.captures.has(absolute)) continue;
+				const capture = await captureFile(absolute, join(await this.scratchDir(), "captures"), this.env.maxFileBytes);
+				if (capture !== void 0) state.captures.set(absolute, capture);
+			}
 		});
 	}
 	/**

package/lib/types/capture.d.ts

@@ -36,12 +36,13 @@ export declare function captureFile(absolute: string, directory: string, maxByte
  */
 export declare function sameCapture(a: Capture, b: Capture): boolean;
 /**
- * The path a first-party file-tool call is about to mutate: `write`, `edit`,
- * and the mutating `str_replace_editor` commands. Other tools, reads, and
- * incomplete arguments yield undefined.
+ * The paths a first-party file-tool call is about to mutate: `write`, `edit`,
+ * the mutating `str_replace_editor` commands, and every path a
+ * syntax-valid `apply_patch` addresses (both ends of a move). Other tools,
+ * reads, and incomplete arguments yield nothing.
  * @param name - wire tool name.
  * @param args - parsed call arguments.
- * @returns the model-facing path, or undefined.
+ * @returns the model-facing paths, empty when the call mutates no known path.
  */
-export declare function mutationPath(name: string, args: unknown): string | undefined;
+export declare function mutationPaths(name: string, args: unknown): string[];
 //# sourceMappingURL=capture.d.ts.map

package/lib/types/capture.js

@@ -7,6 +7,7 @@
 import { createHash } from 'node:crypto';
 import { mkdir, open, writeFile } from 'node:fs/promises';
 import { join } from 'node:path';
+import { parsePatch, PatchParseError } from '@qilin-agent/fs-patch';
 /** Bytes git inspects for a NUL byte before treating content as binary. */
 const BINARY_PROBE_BYTES = 8000;
 /** Whether a filesystem error names a missing path. */
@@ -82,26 +83,48 @@ function text(value) {
     return typeof value === 'string' && value.trim() !== '' ? value : undefined;
 }
 /**
- * The path a first-party file-tool call is about to mutate: `write`, `edit`,
- * and the mutating `str_replace_editor` commands. Other tools, reads, and
- * incomplete arguments yield undefined.
+ * The paths a first-party file-tool call is about to mutate: `write`, `edit`,
+ * the mutating `str_replace_editor` commands, and every path a
+ * syntax-valid `apply_patch` addresses (both ends of a move). Other tools,
+ * reads, and incomplete arguments yield nothing.
  * @param name - wire tool name.
  * @param args - parsed call arguments.
- * @returns the model-facing path, or undefined.
+ * @returns the model-facing paths, empty when the call mutates no known path.
  */
-export function mutationPath(name, args) {
+export function mutationPaths(name, args) {
     if (typeof args !== 'object' || args === null || Array.isArray(args))
-        return undefined;
+        return [];
     const record = args;
     switch (name) {
-        case 'write':
-            return typeof record.content === 'string' ? text(record.file_path) : undefined;
-        case 'edit':
-            return typeof record.old_string === 'string' && typeof record.new_string === 'string' ? text(record.file_path) : undefined;
-        case 'str_replace_editor':
-            return record.command === 'create' || record.command === 'str_replace' || record.command === 'insert' ? text(record.path) : undefined;
+        case 'write': {
+            const path = typeof record.content === 'string' ? text(record.file_path) : undefined;
+            return path === undefined ? [] : [path];
+        }
+        case 'edit': {
+            const path = typeof record.old_string === 'string' && typeof record.new_string === 'string' ? text(record.file_path) : undefined;
+            return path === undefined ? [] : [path];
+        }
+        case 'str_replace_editor': {
+            const path = record.command === 'create' || record.command === 'str_replace' || record.command === 'insert' ? text(record.path) : undefined;
+            return path === undefined ? [] : [path];
+        }
+        case 'apply_patch': {
+            if (typeof record.input !== 'string' || record.input.trim() === '')
+                return [];
+            try {
+                return parsePatch(record.input).flatMap(operation => operation.kind === 'update' && operation.moveTo !== undefined
+                    ? [operation.path, operation.moveTo]
+                    : [operation.path]);
+            }
+            catch (error) {
+                // A malformed patch changes nothing; the tool reports the syntax error itself.
+                if (error instanceof PatchParseError)
+                    return [];
+                throw error;
+            }
+        }
         default:
-            return undefined;
+            return [];
     }
 }
 //# sourceMappingURL=capture.js.map

package/lib/types/recorder.d.ts

@@ -50,7 +50,7 @@ export declare class TurnRecorder {
      */
     start(turn: number): void;
     /**
-     * Queue the capture of the path a file tool is about to mutate, before the
+     * Queue the capture of every path a file tool is about to mutate, before the
      * tool runs; only the turn's first mutation of a path captures it. Await
      * {@link settled} afterwards so the tool cannot overtake the capture.
      * @param name - wire tool name.

package/lib/types/recorder.js

@@ -2,7 +2,7 @@
 import { mkdtemp, readFile, realpath, rm } from 'node:fs/promises';
 import { homedir } from 'node:os';
 import { join, relative, resolve } from 'node:path';
-import { captureFile, mutationPath, sameCapture } from "./capture.js";
+import { captureFile, mutationPaths, sameCapture } from "./capture.js";
 import { compareText } from "./compare.js";
 import { blobText, diffTrees, gitlinkPaths, ignoredPaths, locateGitWorkspace, snapshotTree, treeBlob, } from "./git.js";
 import { canonicalPath, compareDisplay, displayPathOf, durablePathOf, isInside, isTemporaryPath, temporaryRoots, toPosix } from "./paths.js";
@@ -67,27 +67,29 @@ export class TurnRecorder {
         });
     }
     /**
-     * Queue the capture of the path a file tool is about to mutate, before the
+     * Queue the capture of every path a file tool is about to mutate, before the
      * tool runs; only the turn's first mutation of a path captures it. Await
      * {@link settled} afterwards so the tool cannot overtake the capture.
      * @param name - wire tool name.
      * @param args - parsed call arguments.
      */
     capture(name, args) {
-        const path = mutationPath(name, args);
-        if (path === undefined)
+        const targets = mutationPaths(name, args);
+        if (targets.length === 0)
             return;
         const state = this.state;
         void this.enqueue(async () => {
             const paths = this.paths;
             if (paths === undefined)
                 return;
-            const absolute = await canonicalPath(resolve(paths.cwd, path));
-            if (state.captures.has(absolute))
-                return;
-            const capture = await captureFile(absolute, join(await this.scratchDir(), 'captures'), this.env.maxFileBytes);
-            if (capture !== undefined)
-                state.captures.set(absolute, capture);
+            for (const target of targets) {
+                const absolute = await canonicalPath(resolve(paths.cwd, target));
+                if (state.captures.has(absolute))
+                    continue;
+                const capture = await captureFile(absolute, join(await this.scratchDir(), 'captures'), this.env.maxFileBytes);
+                if (capture !== undefined)
+                    state.captures.set(absolute, capture);
+            }
         });
     }
     /**

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@qilin-agent/workspace-changes",
   "description": "Per-turn workspace file changes recorded from git working-tree snapshots and whole-file captures, with per-file comparisons, for the QiLin",
-  "version": "3.1.7",
+  "version": "3.1.8",
   "publishConfig": {
     "access": "public"
   },
@@ -35,25 +35,26 @@
     "lib/types/**/*.d.ts"
   ],
   "dependencies": {
-    "diff": "^9.0.0",
-    "@qilin-agent/schemastery": "~3.18.5"
+    "@qilin-agent/fs-patch": "3.1.8",
+    "@qilin-agent/schemastery": "~3.18.6-alpha.2",
+    "diff": "^9.0.0"
   },
   "peerDependencies": {
-    "@qilin-agent/kylin": "~4.0.5",
-    "@qilin-agent/subprocess": "3.1.7",
-    "@qilin-agent/tools": "3.1.7",
-    "@qilin-agent/agent": "3.1.7",
-    "@qilin-agent/session": "3.1.7"
+    "@qilin-agent/kylin": "~4.0.6-alpha.2",
+    "@qilin-agent/agent": "3.1.8",
+    "@qilin-agent/session": "3.1.8",
+    "@qilin-agent/subprocess": "3.1.8",
+    "@qilin-agent/tools": "3.1.8"
   },
   "devDependencies": {
-    "@qilin-agent/kylin": "~4.0.5",
-    "@qilin-agent/agent": "3.1.7",
-    "@qilin-agent/session": "3.1.7",
-    "@qilin-agent/kylin-plugin-loader": "~1.0.6",
-    "@qilin-agent/kylin-plugin-include": "~1.0.10",
-    "@qilin-agent/tools": "3.1.7",
-    "@qilin-agent/llm": "3.1.7",
-    "@qilin-agent/subprocess-local": "3.1.7",
-    "@qilin-agent/subprocess": "3.1.7"
+    "@qilin-agent/kylin": "~4.0.6-alpha.2",
+    "@qilin-agent/kylin-plugin-include": "~1.0.11-alpha.2",
+    "@qilin-agent/kylin-plugin-loader": "~1.0.7-alpha.2",
+    "@qilin-agent/agent": "3.1.8",
+    "@qilin-agent/session": "3.1.8",
+    "@qilin-agent/subprocess": "3.1.8",
+    "@qilin-agent/subprocess-local": "3.1.8",
+    "@qilin-agent/tools": "3.1.8",
+    "@qilin-agent/llm": "3.1.8"
   }
 }