7ea50aac14
* tweak: use theme tokens for debug bar surface * chore: update nix node_modules hashes * feat(tui): add heap snapshot functionality for TUI and server (#19028) * ci * change model for changelog * release: v1.3.2 * fix(opencode): skip typechecking generated models snapshot (#19018) * Revert "fix(app): more startup efficiency (#18985)" This reverts commit98b3340cee. * Revert "fix(app): startup efficiency (#18854)" This reverts commit546748a461. * effectify Worktree service (#18679) * fix: increase operations-per-run to 1000 and pin stale action to v10.2.0 The stale-issues workflow was hitting the default 30 operations limit, preventing it from processing all 2900+ issues/PRs. Increased to 1000 to handle the full backlog. Also pinned to exact v10.2.0 for reproducibility. * Add close-issues script and GitHub Action - Create script/github/close-issues.ts to close stale issues after 60 days - Add GitHub Action workflow to run daily at 2 AM - Remove old stale-issues workflow to avoid conflicts * Fix close-issues workflow permissions - Add contents: read permission for checkout - Use github.token instead of secrets.GITHUB_TOKEN * Process issues sequentially to avoid rate limits * Change issue close reason from not_planned to completed * fix(opencode): avoid snapshotting files over 2MB (#19043) * fix: provide merge context to beta conflict resolver (#19055) * tweak: only spawn lsp servers for files in current instance (or cwd if instance is global) (#19058) * fix: beta resolver typecheck + build smoke check (#19060) * fix: unblock beta conflict recovery (#19068) * electron: add createDirectory to open directory picker (#19071) * electron: remove file extension from electron-store wrapper (#19082) * app: pre-warm project globalSync state when navigate project via keybind (#19088) * fix(app): move message navigation off cmd+arrow (#18728) * Reapply "fix(app): startup efficiency (#18854)" This reverts commita379eb3867. * Reapply "fix(app): more startup efficiency (#18985)" This reverts commitcbe1337f24. * fix(app): hash inline script for csp * Revert "fix(app): startup efficiency" * Reapply "fix(app): startup efficiency" This reverts commit898456a25c. * fix(app): opencode web server url * chore(app): markdown playground in storyboard * chore(app): markdown playground in storyboard * feat(core): initial implementation of syncing (#17814) * chore: generate * chore: bump modelcontextprotocol/sdk to 1.27.1 (#19064) * chore: storybook tweaks * feat: restore git-backed review modes with effectful git service (#18900) * chore: generate * chore: update nix node_modules hashes * chore: cleanup * chore: remove dead code for todoread tool (#19128) * chore: storybook tweaks * fix(opencode): classify ZlibError from Bun fetch as retryable instead of unknown (#19104) Co-authored-by: Aiden Cline <63023139+rekram1-node@users.noreply.github.com> * fix(task): respect agent permission config for todowrite tool (#19125) * fix(app): agent normalization (#19169) * fix: Windows e2e stability (CrossSpawnSpawner, snapshot isolation, session race guards) (#19163) * fix+refactor(mcp): lifecycle tests, cancelPending fix, Effect migration (#19042) * effectify Bus service: migrate to Effect PubSub + InstanceState (#18579) * file: use Effect.cached for scan deduplication (#19164) * ignore: update disavowed list (#19184) * skill: use Effect.cached for load deduplication (#19165) * chore: generate * fix: bump gitlab-ai-provider to 5.3.3 for DWS tool approval support (#19185) * test: restore 5 workers on Windows e2e (#19188) * fix(opencode): image paste on Windows Terminal 1.25+ with kitty keyboard (#17674) * chore: update nix node_modules hashes * wip: zen * wip: zen * go: do not respect disabled zen models * fix: ensure enterprise url is set properly during auth flow (#19212) * revert: roll back git-backed review modes (#19295) * chore: generate * tui: bypass local SSE event streaming in worker (#19183) * feat: embed WebUI in binary with proxy flags (#19299) Co-authored-by: BlankParticle <blankparticle@gmail.com> * release: v1.3.3 * refactor: kilo compat for v1.3.3 * fix: Typecheck issues * fix(build): normalize backslashes in web UI bundle import paths Replace backslashes with forward slashes in embedded web UI file import paths to ensure correct module resolution on Windows. * fix: Add mcp reconnect error handling * chore(script): use forward slashes in web UI bundle export keys Ensure embedded file map keys use POSIX-style paths so lookups are consistent across platforms. * chore: regenerate source links --------- Co-authored-by: Jay V <air@live.ca> Co-authored-by: opencode-agent[bot] <opencode-agent[bot]@users.noreply.github.com> Co-authored-by: Dax <mail@thdxr.com> Co-authored-by: Dax Raad <d@ironbay.co> Co-authored-by: opencode <opencode@sst.dev> Co-authored-by: Kit Langton <kit.langton@gmail.com> Co-authored-by: Adam <2363879+adamdotdevin@users.noreply.github.com> Co-authored-by: Luke Parker <10430890+Hona@users.noreply.github.com> Co-authored-by: Aiden Cline <63023139+rekram1-node@users.noreply.github.com> Co-authored-by: Brendan Allan <brendonovich@outlook.com> Co-authored-by: Shoubhit Dash <shoubhit2005@gmail.com> Co-authored-by: James Long <longster@gmail.com> Co-authored-by: André Cruz <acruz@cloudflare.com> Co-authored-by: Ariane Emory <97994360+ariane-emory@users.noreply.github.com> Co-authored-by: Vladimir Glafirov <vglafirov@gitlab.com> Co-authored-by: Frank <frank@anoma.ly> Co-authored-by: BlankParticle <blankparticle@gmail.com> Co-authored-by: Imanol Maiztegui <imanol.mzd@gmail.com>
682 lines
20 KiB
TypeScript
682 lines
20 KiB
TypeScript
import { afterEach, describe, test, expect } from "bun:test"
|
|
import path from "path"
|
|
import fs from "fs/promises"
|
|
import { EditTool } from "../../src/tool/edit"
|
|
import { Instance } from "../../src/project/instance"
|
|
import { tmpdir } from "../fixture/fixture"
|
|
import { FileTime } from "../../src/file/time"
|
|
import { SessionID, MessageID } from "../../src/session/schema"
|
|
|
|
const ctx = {
|
|
sessionID: SessionID.make("ses_test-edit-session"),
|
|
messageID: MessageID.make(""),
|
|
callID: "",
|
|
agent: "build",
|
|
abort: AbortSignal.any([]),
|
|
messages: [],
|
|
metadata: () => {},
|
|
ask: async () => {},
|
|
}
|
|
|
|
afterEach(async () => {
|
|
await Instance.disposeAll()
|
|
})
|
|
|
|
async function touch(file: string, time: number) {
|
|
const date = new Date(time)
|
|
await fs.utimes(file, date, date)
|
|
}
|
|
|
|
describe("tool.edit", () => {
|
|
describe("creating new files", () => {
|
|
test("creates new file when oldString is empty", async () => {
|
|
await using tmp = await tmpdir()
|
|
const filepath = path.join(tmp.path, "newfile.txt")
|
|
|
|
await Instance.provide({
|
|
directory: tmp.path,
|
|
fn: async () => {
|
|
const edit = await EditTool.init()
|
|
const result = await edit.execute(
|
|
{
|
|
filePath: filepath,
|
|
oldString: "",
|
|
newString: "new content",
|
|
},
|
|
ctx,
|
|
)
|
|
|
|
expect(result.metadata.diff).toContain("new content")
|
|
|
|
const content = await fs.readFile(filepath, "utf-8")
|
|
expect(content).toBe("new content")
|
|
},
|
|
})
|
|
})
|
|
|
|
test("creates new file with nested directories", async () => {
|
|
await using tmp = await tmpdir()
|
|
const filepath = path.join(tmp.path, "nested", "dir", "file.txt")
|
|
|
|
await Instance.provide({
|
|
directory: tmp.path,
|
|
fn: async () => {
|
|
const edit = await EditTool.init()
|
|
await edit.execute(
|
|
{
|
|
filePath: filepath,
|
|
oldString: "",
|
|
newString: "nested file",
|
|
},
|
|
ctx,
|
|
)
|
|
|
|
const content = await fs.readFile(filepath, "utf-8")
|
|
expect(content).toBe("nested file")
|
|
},
|
|
})
|
|
})
|
|
|
|
test("emits add event for new files", async () => {
|
|
await using tmp = await tmpdir()
|
|
const filepath = path.join(tmp.path, "new.txt")
|
|
|
|
await Instance.provide({
|
|
directory: tmp.path,
|
|
fn: async () => {
|
|
const { Bus } = await import("../../src/bus")
|
|
const { File } = await import("../../src/file")
|
|
const { FileWatcher } = await import("../../src/file/watcher")
|
|
|
|
const events: string[] = []
|
|
const unsubUpdated = Bus.subscribe(FileWatcher.Event.Updated, () => events.push("updated"))
|
|
|
|
const edit = await EditTool.init()
|
|
await edit.execute(
|
|
{
|
|
filePath: filepath,
|
|
oldString: "",
|
|
newString: "content",
|
|
},
|
|
ctx,
|
|
)
|
|
|
|
expect(events).toContain("updated")
|
|
unsubUpdated()
|
|
},
|
|
})
|
|
})
|
|
})
|
|
|
|
describe("editing existing files", () => {
|
|
test("replaces text in existing file", async () => {
|
|
await using tmp = await tmpdir()
|
|
const filepath = path.join(tmp.path, "existing.txt")
|
|
await fs.writeFile(filepath, "old content here", "utf-8")
|
|
|
|
await Instance.provide({
|
|
directory: tmp.path,
|
|
fn: async () => {
|
|
await FileTime.read(ctx.sessionID, filepath)
|
|
|
|
const edit = await EditTool.init()
|
|
const result = await edit.execute(
|
|
{
|
|
filePath: filepath,
|
|
oldString: "old content",
|
|
newString: "new content",
|
|
},
|
|
ctx,
|
|
)
|
|
|
|
expect(result.output).toContain("Edit applied successfully")
|
|
|
|
const content = await fs.readFile(filepath, "utf-8")
|
|
expect(content).toBe("new content here")
|
|
},
|
|
})
|
|
})
|
|
|
|
test("throws error when file does not exist", async () => {
|
|
await using tmp = await tmpdir()
|
|
const filepath = path.join(tmp.path, "nonexistent.txt")
|
|
|
|
await Instance.provide({
|
|
directory: tmp.path,
|
|
fn: async () => {
|
|
await FileTime.read(ctx.sessionID, filepath)
|
|
|
|
const edit = await EditTool.init()
|
|
await expect(
|
|
edit.execute(
|
|
{
|
|
filePath: filepath,
|
|
oldString: "old",
|
|
newString: "new",
|
|
},
|
|
ctx,
|
|
),
|
|
).rejects.toThrow("not found")
|
|
},
|
|
})
|
|
})
|
|
|
|
test("throws error when oldString equals newString", async () => {
|
|
await using tmp = await tmpdir()
|
|
const filepath = path.join(tmp.path, "file.txt")
|
|
await fs.writeFile(filepath, "content", "utf-8")
|
|
|
|
await Instance.provide({
|
|
directory: tmp.path,
|
|
fn: async () => {
|
|
const edit = await EditTool.init()
|
|
await expect(
|
|
edit.execute(
|
|
{
|
|
filePath: filepath,
|
|
oldString: "same",
|
|
newString: "same",
|
|
},
|
|
ctx,
|
|
),
|
|
).rejects.toThrow("identical")
|
|
},
|
|
})
|
|
})
|
|
|
|
test("throws error when oldString not found in file", async () => {
|
|
await using tmp = await tmpdir()
|
|
const filepath = path.join(tmp.path, "file.txt")
|
|
await fs.writeFile(filepath, "actual content", "utf-8")
|
|
|
|
await Instance.provide({
|
|
directory: tmp.path,
|
|
fn: async () => {
|
|
await FileTime.read(ctx.sessionID, filepath)
|
|
|
|
const edit = await EditTool.init()
|
|
await expect(
|
|
edit.execute(
|
|
{
|
|
filePath: filepath,
|
|
oldString: "not in file",
|
|
newString: "replacement",
|
|
},
|
|
ctx,
|
|
),
|
|
).rejects.toThrow()
|
|
},
|
|
})
|
|
})
|
|
|
|
test("throws error when file was not read first (FileTime)", async () => {
|
|
await using tmp = await tmpdir()
|
|
const filepath = path.join(tmp.path, "file.txt")
|
|
await fs.writeFile(filepath, "content", "utf-8")
|
|
|
|
await Instance.provide({
|
|
directory: tmp.path,
|
|
fn: async () => {
|
|
const edit = await EditTool.init()
|
|
await expect(
|
|
edit.execute(
|
|
{
|
|
filePath: filepath,
|
|
oldString: "content",
|
|
newString: "modified",
|
|
},
|
|
ctx,
|
|
),
|
|
).rejects.toThrow("You must read file")
|
|
},
|
|
})
|
|
})
|
|
|
|
test("throws error when file has been modified since read", async () => {
|
|
await using tmp = await tmpdir()
|
|
const filepath = path.join(tmp.path, "file.txt")
|
|
await fs.writeFile(filepath, "original content", "utf-8")
|
|
await touch(filepath, 1_000)
|
|
|
|
await Instance.provide({
|
|
directory: tmp.path,
|
|
fn: async () => {
|
|
// Read first
|
|
await FileTime.read(ctx.sessionID, filepath)
|
|
|
|
// Simulate external modification
|
|
await fs.writeFile(filepath, "modified externally", "utf-8")
|
|
await touch(filepath, 2_000)
|
|
|
|
// Try to edit with the new content
|
|
const edit = await EditTool.init()
|
|
await expect(
|
|
edit.execute(
|
|
{
|
|
filePath: filepath,
|
|
oldString: "modified externally",
|
|
newString: "edited",
|
|
},
|
|
ctx,
|
|
),
|
|
).rejects.toThrow("modified since it was last read")
|
|
},
|
|
})
|
|
})
|
|
|
|
test("replaces all occurrences with replaceAll option", async () => {
|
|
await using tmp = await tmpdir()
|
|
const filepath = path.join(tmp.path, "file.txt")
|
|
await fs.writeFile(filepath, "foo bar foo baz foo", "utf-8")
|
|
|
|
await Instance.provide({
|
|
directory: tmp.path,
|
|
fn: async () => {
|
|
await FileTime.read(ctx.sessionID, filepath)
|
|
|
|
const edit = await EditTool.init()
|
|
await edit.execute(
|
|
{
|
|
filePath: filepath,
|
|
oldString: "foo",
|
|
newString: "qux",
|
|
replaceAll: true,
|
|
},
|
|
ctx,
|
|
)
|
|
|
|
const content = await fs.readFile(filepath, "utf-8")
|
|
expect(content).toBe("qux bar qux baz qux")
|
|
},
|
|
})
|
|
})
|
|
|
|
test("emits change event for existing files", async () => {
|
|
await using tmp = await tmpdir()
|
|
const filepath = path.join(tmp.path, "file.txt")
|
|
await fs.writeFile(filepath, "original", "utf-8")
|
|
|
|
await Instance.provide({
|
|
directory: tmp.path,
|
|
fn: async () => {
|
|
await FileTime.read(ctx.sessionID, filepath)
|
|
|
|
const { Bus } = await import("../../src/bus")
|
|
const { FileWatcher } = await import("../../src/file/watcher")
|
|
|
|
const events: string[] = []
|
|
const unsubUpdated = Bus.subscribe(FileWatcher.Event.Updated, () => events.push("updated"))
|
|
|
|
const edit = await EditTool.init()
|
|
await edit.execute(
|
|
{
|
|
filePath: filepath,
|
|
oldString: "original",
|
|
newString: "modified",
|
|
},
|
|
ctx,
|
|
)
|
|
|
|
expect(events).toContain("updated")
|
|
unsubUpdated()
|
|
},
|
|
})
|
|
})
|
|
})
|
|
|
|
describe("edge cases", () => {
|
|
test("handles multiline replacements", async () => {
|
|
await using tmp = await tmpdir()
|
|
const filepath = path.join(tmp.path, "file.txt")
|
|
await fs.writeFile(filepath, "line1\nline2\nline3", "utf-8")
|
|
|
|
await Instance.provide({
|
|
directory: tmp.path,
|
|
fn: async () => {
|
|
await FileTime.read(ctx.sessionID, filepath)
|
|
|
|
const edit = await EditTool.init()
|
|
await edit.execute(
|
|
{
|
|
filePath: filepath,
|
|
oldString: "line2",
|
|
newString: "new line 2\nextra line",
|
|
},
|
|
ctx,
|
|
)
|
|
|
|
const content = await fs.readFile(filepath, "utf-8")
|
|
expect(content).toBe("line1\nnew line 2\nextra line\nline3")
|
|
},
|
|
})
|
|
})
|
|
|
|
test("handles CRLF line endings", async () => {
|
|
await using tmp = await tmpdir()
|
|
const filepath = path.join(tmp.path, "file.txt")
|
|
await fs.writeFile(filepath, "line1\r\nold\r\nline3", "utf-8")
|
|
|
|
await Instance.provide({
|
|
directory: tmp.path,
|
|
fn: async () => {
|
|
await FileTime.read(ctx.sessionID, filepath)
|
|
|
|
const edit = await EditTool.init()
|
|
await edit.execute(
|
|
{
|
|
filePath: filepath,
|
|
oldString: "old",
|
|
newString: "new",
|
|
},
|
|
ctx,
|
|
)
|
|
|
|
const content = await fs.readFile(filepath, "utf-8")
|
|
expect(content).toBe("line1\r\nnew\r\nline3")
|
|
},
|
|
})
|
|
})
|
|
|
|
test("throws error when oldString equals newString", async () => {
|
|
await using tmp = await tmpdir()
|
|
const filepath = path.join(tmp.path, "file.txt")
|
|
await fs.writeFile(filepath, "content", "utf-8")
|
|
|
|
await Instance.provide({
|
|
directory: tmp.path,
|
|
fn: async () => {
|
|
const edit = await EditTool.init()
|
|
await expect(
|
|
edit.execute(
|
|
{
|
|
filePath: filepath,
|
|
oldString: "",
|
|
newString: "",
|
|
},
|
|
ctx,
|
|
),
|
|
).rejects.toThrow("identical")
|
|
},
|
|
})
|
|
})
|
|
|
|
test("throws error when path is directory", async () => {
|
|
await using tmp = await tmpdir()
|
|
const dirpath = path.join(tmp.path, "adir")
|
|
await fs.mkdir(dirpath)
|
|
|
|
await Instance.provide({
|
|
directory: tmp.path,
|
|
fn: async () => {
|
|
await FileTime.read(ctx.sessionID, dirpath)
|
|
|
|
const edit = await EditTool.init()
|
|
await expect(
|
|
edit.execute(
|
|
{
|
|
filePath: dirpath,
|
|
oldString: "old",
|
|
newString: "new",
|
|
},
|
|
ctx,
|
|
),
|
|
).rejects.toThrow("directory")
|
|
},
|
|
})
|
|
})
|
|
|
|
test("tracks file diff statistics", async () => {
|
|
await using tmp = await tmpdir()
|
|
const filepath = path.join(tmp.path, "file.txt")
|
|
await fs.writeFile(filepath, "line1\nline2\nline3", "utf-8")
|
|
|
|
await Instance.provide({
|
|
directory: tmp.path,
|
|
fn: async () => {
|
|
await FileTime.read(ctx.sessionID, filepath)
|
|
|
|
const edit = await EditTool.init()
|
|
const result = await edit.execute(
|
|
{
|
|
filePath: filepath,
|
|
oldString: "line2",
|
|
newString: "new line a\nnew line b",
|
|
},
|
|
ctx,
|
|
)
|
|
|
|
expect(result.metadata.filediff).toBeDefined()
|
|
expect(result.metadata.filediff.file).toBe(filepath)
|
|
expect(result.metadata.filediff.additions).toBeGreaterThan(0)
|
|
},
|
|
})
|
|
})
|
|
})
|
|
|
|
describe("line endings", () => {
|
|
const old = "alpha\nbeta\ngamma"
|
|
const next = "alpha\nbeta-updated\ngamma"
|
|
const alt = "alpha\nbeta\nomega"
|
|
|
|
const normalize = (text: string, ending: "\n" | "\r\n") => {
|
|
const normalized = text.replaceAll("\r\n", "\n")
|
|
if (ending === "\n") return normalized
|
|
return normalized.replaceAll("\n", "\r\n")
|
|
}
|
|
|
|
const count = (content: string) => {
|
|
const crlf = content.match(/\r\n/g)?.length ?? 0
|
|
const lf = content.match(/\n/g)?.length ?? 0
|
|
return {
|
|
crlf,
|
|
lf: lf - crlf,
|
|
}
|
|
}
|
|
|
|
const expectLf = (content: string) => {
|
|
const counts = count(content)
|
|
expect(counts.crlf).toBe(0)
|
|
expect(counts.lf).toBeGreaterThan(0)
|
|
}
|
|
|
|
const expectCrlf = (content: string) => {
|
|
const counts = count(content)
|
|
expect(counts.lf).toBe(0)
|
|
expect(counts.crlf).toBeGreaterThan(0)
|
|
}
|
|
|
|
type Input = {
|
|
content: string
|
|
oldString: string
|
|
newString: string
|
|
replaceAll?: boolean
|
|
}
|
|
|
|
const apply = async (input: Input) => {
|
|
await using tmp = await tmpdir({
|
|
init: async (dir) => {
|
|
await Bun.write(path.join(dir, "test.txt"), input.content)
|
|
},
|
|
})
|
|
|
|
return await Instance.provide({
|
|
directory: tmp.path,
|
|
fn: async () => {
|
|
const edit = await EditTool.init()
|
|
const filePath = path.join(tmp.path, "test.txt")
|
|
await FileTime.read(ctx.sessionID, filePath)
|
|
await edit.execute(
|
|
{
|
|
filePath,
|
|
oldString: input.oldString,
|
|
newString: input.newString,
|
|
replaceAll: input.replaceAll,
|
|
},
|
|
ctx,
|
|
)
|
|
return await Bun.file(filePath).text()
|
|
},
|
|
})
|
|
}
|
|
|
|
test("preserves LF with LF multi-line strings", async () => {
|
|
const content = normalize(old + "\n", "\n")
|
|
const output = await apply({
|
|
content,
|
|
oldString: normalize(old, "\n"),
|
|
newString: normalize(next, "\n"),
|
|
})
|
|
expect(output).toBe(normalize(next + "\n", "\n"))
|
|
expectLf(output)
|
|
})
|
|
|
|
test("preserves CRLF with CRLF multi-line strings", async () => {
|
|
const content = normalize(old + "\n", "\r\n")
|
|
const output = await apply({
|
|
content,
|
|
oldString: normalize(old, "\r\n"),
|
|
newString: normalize(next, "\r\n"),
|
|
})
|
|
expect(output).toBe(normalize(next + "\n", "\r\n"))
|
|
expectCrlf(output)
|
|
})
|
|
|
|
test("preserves LF when old/new use CRLF", async () => {
|
|
const content = normalize(old + "\n", "\n")
|
|
const output = await apply({
|
|
content,
|
|
oldString: normalize(old, "\r\n"),
|
|
newString: normalize(next, "\r\n"),
|
|
})
|
|
expect(output).toBe(normalize(next + "\n", "\n"))
|
|
expectLf(output)
|
|
})
|
|
|
|
test("preserves CRLF when old/new use LF", async () => {
|
|
const content = normalize(old + "\n", "\r\n")
|
|
const output = await apply({
|
|
content,
|
|
oldString: normalize(old, "\n"),
|
|
newString: normalize(next, "\n"),
|
|
})
|
|
expect(output).toBe(normalize(next + "\n", "\r\n"))
|
|
expectCrlf(output)
|
|
})
|
|
|
|
test("preserves LF when newString uses CRLF", async () => {
|
|
const content = normalize(old + "\n", "\n")
|
|
const output = await apply({
|
|
content,
|
|
oldString: normalize(old, "\n"),
|
|
newString: normalize(next, "\r\n"),
|
|
})
|
|
expect(output).toBe(normalize(next + "\n", "\n"))
|
|
expectLf(output)
|
|
})
|
|
|
|
test("preserves CRLF when newString uses LF", async () => {
|
|
const content = normalize(old + "\n", "\r\n")
|
|
const output = await apply({
|
|
content,
|
|
oldString: normalize(old, "\r\n"),
|
|
newString: normalize(next, "\n"),
|
|
})
|
|
expect(output).toBe(normalize(next + "\n", "\r\n"))
|
|
expectCrlf(output)
|
|
})
|
|
|
|
test("preserves LF with mixed old/new line endings", async () => {
|
|
const content = normalize(old + "\n", "\n")
|
|
const output = await apply({
|
|
content,
|
|
oldString: "alpha\nbeta\r\ngamma",
|
|
newString: "alpha\r\nbeta\nomega",
|
|
})
|
|
expect(output).toBe(normalize(alt + "\n", "\n"))
|
|
expectLf(output)
|
|
})
|
|
|
|
test("preserves CRLF with mixed old/new line endings", async () => {
|
|
const content = normalize(old + "\n", "\r\n")
|
|
const output = await apply({
|
|
content,
|
|
oldString: "alpha\r\nbeta\ngamma",
|
|
newString: "alpha\nbeta\r\nomega",
|
|
})
|
|
expect(output).toBe(normalize(alt + "\n", "\r\n"))
|
|
expectCrlf(output)
|
|
})
|
|
|
|
test("replaceAll preserves LF for multi-line blocks", async () => {
|
|
const blockOld = "alpha\nbeta"
|
|
const blockNew = "alpha\nbeta-updated"
|
|
const content = normalize(blockOld + "\n" + blockOld + "\n", "\n")
|
|
const output = await apply({
|
|
content,
|
|
oldString: normalize(blockOld, "\n"),
|
|
newString: normalize(blockNew, "\n"),
|
|
replaceAll: true,
|
|
})
|
|
expect(output).toBe(normalize(blockNew + "\n" + blockNew + "\n", "\n"))
|
|
expectLf(output)
|
|
})
|
|
|
|
test("replaceAll preserves CRLF for multi-line blocks", async () => {
|
|
const blockOld = "alpha\nbeta"
|
|
const blockNew = "alpha\nbeta-updated"
|
|
const content = normalize(blockOld + "\n" + blockOld + "\n", "\r\n")
|
|
const output = await apply({
|
|
content,
|
|
oldString: normalize(blockOld, "\r\n"),
|
|
newString: normalize(blockNew, "\r\n"),
|
|
replaceAll: true,
|
|
})
|
|
expect(output).toBe(normalize(blockNew + "\n" + blockNew + "\n", "\r\n"))
|
|
expectCrlf(output)
|
|
})
|
|
})
|
|
|
|
describe("concurrent editing", () => {
|
|
test("serializes concurrent edits to same file", async () => {
|
|
await using tmp = await tmpdir()
|
|
const filepath = path.join(tmp.path, "file.txt")
|
|
await fs.writeFile(filepath, "0", "utf-8")
|
|
|
|
await Instance.provide({
|
|
directory: tmp.path,
|
|
fn: async () => {
|
|
await FileTime.read(ctx.sessionID, filepath)
|
|
|
|
const edit = await EditTool.init()
|
|
|
|
// Two concurrent edits
|
|
const promise1 = edit.execute(
|
|
{
|
|
filePath: filepath,
|
|
oldString: "0",
|
|
newString: "1",
|
|
},
|
|
ctx,
|
|
)
|
|
|
|
// Need to read again since FileTime tracks per-session
|
|
await FileTime.read(ctx.sessionID, filepath)
|
|
|
|
const promise2 = edit.execute(
|
|
{
|
|
filePath: filepath,
|
|
oldString: "0",
|
|
newString: "2",
|
|
},
|
|
ctx,
|
|
)
|
|
|
|
// Both should complete without error (though one might fail due to content mismatch)
|
|
const results = await Promise.allSettled([promise1, promise2])
|
|
expect(results.some((r) => r.status === "fulfilled")).toBe(true)
|
|
},
|
|
})
|
|
})
|
|
})
|
|
})
|