Skip to content

fix(opencode): ACP Attach structured diff content for edit permissions #15517

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
MaxDillon wants to merge 4 commits into
base: dev
Choose a base branch
from
+19 −14
Open

fix(opencode): ACP Attach structured diff content for edit permissions #15517

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
f810946
fix(acp): add diff context to acp edit event
MaxDillon Feb 28, 2026
697ced9
fix(acp): create newText from oldText and diff
MaxDillon Feb 28, 2026
091e246
fix(acp): diffContent not diffContext
MaxDillon Mar 1, 2026
aa0041a
Merge branch 'dev' into dev
MaxDillon Mar 5, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
33 changes: 19 additions & 14 deletions packages/opencode/src/acp/agent.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -190,6 +190,18 @@ export namespace ACP {
.then(async () => {
const directory = session.cwd

let diffContent: ToolCallContent | undefined
if (permission.permission === "edit") {
const metadata = permission.metadata || {}
const filepath = typeof metadata["filepath"] === "string" ? metadata["filepath"] : ""
const diff = typeof metadata["diff"] === "string" ? metadata["diff"] : ""
if (filepath && diff) {
const oldText = (await Filesystem.exists(filepath)) ? await Filesystem.readText(filepath) : ""
const newText = getNewContent(oldText, diff) ?? ""
diffContent = { type: "diff", path: filepath, oldText, newText }
}
}

const res = await this.connection
.requestPermission({
sessionId: permission.sessionID,
Expand All @@ -200,6 +212,7 @@ export namespace ACP {
rawInput: permission.metadata,
kind: toToolKind(permission.permission),
locations: toLocations(permission.permission, permission.metadata),
...(diffContent && { content: [diffContent] })
},
options: this.permissionOptions,
})
Expand Down Expand Up @@ -227,20 +240,12 @@ export namespace ACP {
return
}

if (res.outcome.optionId !== "reject" && permission.permission == "edit") {
const metadata = permission.metadata || {}
const filepath = typeof metadata["filepath"] === "string" ? metadata["filepath"] : ""
const diff = typeof metadata["diff"] === "string" ? metadata["diff"] : ""
const content = (await Filesystem.exists(filepath)) ? await Filesystem.readText(filepath) : ""
const newContent = getNewContent(content, diff)

if (newContent) {
this.connection.writeTextFile({
sessionId: session.id,
path: filepath,
content: newContent,
})
}
if (res.outcome.optionId !== "reject" && diffContent?.type == "diff" && diffContent.newText) {
this.connection.writeTextFile({
sessionId: session.id,
path: diffContent.path,
content: diffContent.newText,
})
}

await this.sdk.permission.reply({
Expand Down
Loading