smashimo/oh-my-pi
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix(tools): preserve workspace-relative path in read hashline headers

Browse Source 
formatReadHashlineHeader collapsed every relative in-workspace path to its
basename, so reading a nested file (e.g. src/settings.json) emitted
[settings.json#tag]. When a same-basename file existed at the session cwd,
a verbatim follow-up edit resolved against the cwd file; Patcher.prepare only
runs snapshot-tag path recovery when the authored path is missing, so the
valid edit was deterministically rejected with "hash is not from this
session". Keep the workspace-relative path, which names the file uniquely and
stays directly resolvable against cwd. Out-of-workspace absolute paths remain
shortened; root-level files are unchanged.

Fixes #8482
This commit is contained in:
roboomp
2026-08-13 21:59:48 +00:00
committed by can1357
parent 5dd0aca4b8
commit a02f88994b
5 changed files with 33 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files
packages/coding-agent/test/read-multi-range.test.ts
+5 -4
View File
@@ -53,7 +53,7 @@ describe("read tool multi-range selector", () => {
await removeWithRetries(tmpDir);
});
it("uses only the filename in hashline headers for nested files", async () => {
it("keeps the workspace-relative path in hashline headers for nested files", async () => {
const filePath = path.join(tmpDir, "src", "nested", "numbered.txt");
await fs.mkdir(path.dirname(filePath), { recursive: true });
await fs.writeFile(filePath, "alpha\nbeta\n");
@@ -62,8 +62,9 @@ describe("read tool multi-range selector", () => {
const text = textOutput(await tool.execute("call-filename-header", { path: filePath }));
const firstLine = text.split("\n")[0];
expect(firstLine).toMatch(/^\[numbered\.txt#[0-9A-F]{4}\]$/);
expect(firstLine).not.toContain("src");
// A same-basename file elsewhere in the tree must not capture a
// follow-up edit, so the header retains the workspace-relative path.
expect(firstLine).toBe(`[${path.join("src", "nested", "numbered.txt")}#${firstLine.slice(-5, -1)}]`);
});
it("returns both ranges separated by an elision marker", async () => {
@@ -75,7 +76,7 @@ describe("read tool multi-range selector", () => {
const result = await tool.execute("call-multi", { path: `${filePath}:3-5,20-22` });
const text = textOutput(result);
const firstLine = text.split("\n")[0];
expect(firstLine).toMatch(/^\[numbered\.txt#[0-9A-F]{4}\]$/);
expect(firstLine).toMatch(/^\[src\/numbered\.txt#[0-9A-F]{4}\]$/);
expect(text).toContain("line 3");
expect(text).toContain("line 4");