FazBrowse GitHub Viewer | Trending |
URL:
| Home
Tools: [Download Repo ZIP]   [Original HTTPS Page]

Reapply "feat(github): add ability to react to PR Review Comments in … · barracoder/opencode@2fbd462 · GitHub

/ opencode Public
forked from anomalyco/opencode

Commit 2fbd462

Browse files
rekram1-node
committed
Reapply "feat(github): add ability to react to PR Review Comments in Workflow (anomalyco#4705)"
This reverts commit e1cc98d.
1 parent e1cc98d commit 2fbd462

5 files changed

Lines changed: 131 additions & 13 deletions

File tree

‎.github/workflows/opencode.yml‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,8 @@ name: opencode
33
on:
44
issue_comment:
55
types: [created]
6+
pull_request_review_comment:
7+
types: [created]
68

79
jobs:
810
opencode:

‎github/README.md‎

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,24 @@ Leave the following comment on a GitHub PR. opencode will implement the requeste
3030
Delete the attachment from S3 when the note is removed /oc
3131
```
3232

33+
#### Review specific code lines
34+
35+
Leave a comment directly on code lines in the PR's "Files" tab. opencode will automatically detect the file, line numbers, and diff context to provide precise responses.
36+
37+
```
38+
[Comment on specific lines in Files tab]
39+
/oc add error handling here
40+
```
41+
42+
When commenting on specific lines, opencode receives:
43+
44+
- The exact file being reviewed
45+
- The specific lines of code
46+
- The surrounding diff context
47+
- Line number information
48+
49+
This allows for more targeted requests without needing to specify file paths or line numbers manually.
50+
3351
## Installation
3452

3553
Run the following command in the terminal from your GitHub repo:
@@ -51,6 +69,8 @@ This will walk you through installing the GitHub app, creating the workflow, and
5169
on:
5270
issue_comment:
5371
types: [created]
72+
pull_request_review_comment:
73+
types: [created]
5474

5575
jobs:
5676
opencode:
@@ -135,3 +155,9 @@ Replace the image URL `https://github.com/user-attachments/assets/xxxxxxxx` with
135155
```
136156
MOCK_EVENT='{"eventName":"issue_comment","repo":{"owner":"sst","repo":"hello-world"},"actor":"fwang","payload":{"issue":{"number":4,"pull_request":{}},"comment":{"id":1,"body":"hey opencode, summarize thread"}}}'
137157
```
158+
159+
### PR review comment event
160+
161+
```
162+
MOCK_EVENT='{"eventName":"pull_request_review_comment","repo":{"owner":"sst","repo":"hello-world"},"actor":"fwang","payload":{"pull_request":{"number":7},"comment":{"id":1,"body":"hey opencode, add error handling","path":"src/components/Button.tsx","diff_hunk":"@@ -45,8 +45,11 @@\n- const handleClick = () => {\n- console.log('clicked')\n+ const handleClick = useCallback(() => {\n+ console.log('clicked')\n+ doSomething()\n+ }, [doSomething])","line":47,"original_line":45,"position":10,"commit_id":"abc123","original_commit_id":"def456"}}}'
163+
```

‎github/index.ts‎

Lines changed: 44 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ import { graphql } from "@octokit/graphql"
55
import * as core from "@actions/core"
66
import * as github from "@actions/github"
77
import type { Context as GitHubContext } from "@actions/github/lib/context"
8-
import type { IssueCommentEvent } from "@octokit/webhooks-types"
8+
import type { IssueCommentEvent, PullRequestReviewCommentEvent } from "@octokit/webhooks-types"
99
import { createOpencodeClient } from "@opencode-ai/sdk"
1010
import { spawn } from "node:child_process"
1111

@@ -124,7 +124,7 @@ let exitCode = 0
124124
type PromptFiles = Awaited<ReturnType<typeof getUserPrompt>>["promptFiles"]
125125

126126
try {
127-
assertContextEvent("issue_comment")
127+
assertContextEvent("issue_comment", "pull_request_review_comment")
128128
assertPayloadKeyword()
129129
await assertOpencodeConnected()
130130

@@ -241,19 +241,43 @@ function createOpencode() {
241241
}
242242

243243
function assertPayloadKeyword() {
244-
const payload = useContext().payload as IssueCommentEvent
244+
const payload = useContext().payload as IssueCommentEvent | PullRequestReviewCommentEvent
245245
const body = payload.comment.body.trim()
246246
if (!body.match(/(?:^|\s)(?:\/opencode|\/oc)(?=$|\s)/)) {
247247
throw new Error("Comments must mention `/opencode` or `/oc`")
248248
}
249249
}
250250

251+
function getReviewCommentContext() {
252+
const context = useContext()
253+
if (context.eventName !== "pull_request_review_comment") {
254+
return null
255+
}
256+
257+
const payload = context.payload as PullRequestReviewCommentEvent
258+
return {
259+
file: payload.comment.path,
260+
diffHunk: payload.comment.diff_hunk,
261+
line: payload.comment.line,
262+
originalLine: payload.comment.original_line,
263+
position: payload.comment.position,
264+
commitId: payload.comment.commit_id,
265+
originalCommitId: payload.comment.original_commit_id,
266+
}
267+
}
268+
251269
async function assertOpencodeConnected() {
252270
let retry = 0
253271
let connected = false
254272
do {
255273
try {
256-
await client.app.get<true>()
274+
await client.app.log<true>({
275+
body: {
276+
service: "github-workflow",
277+
level: "info",
278+
message: "Prepare to react to Github Workflow event",
279+
},
280+
})
257281
connected = true
258282
break
259283
} catch (e) {}
@@ -383,11 +407,24 @@ async function createComment() {
383407
}
384408

385409
async function getUserPrompt() {
410+
const context = useContext()
411+
const payload = context.payload as IssueCommentEvent | PullRequestReviewCommentEvent
412+
const reviewContext = getReviewCommentContext()
413+
386414
let prompt = (() => {
387-
const payload = useContext().payload as IssueCommentEvent
388415
const body = payload.comment.body.trim()
389-
if (body === "/opencode" || body === "/oc") return "Summarize this thread"
390-
if (body.includes("/opencode") || body.includes("/oc")) return body
416+
if (body === "/opencode" || body === "/oc") {
417+
if (reviewContext) {
418+
return `Review this code change and suggest improvements for the commented lines:\n\nFile: ${reviewContext.file}\nLines: ${reviewContext.line}\n\n${reviewContext.diffHunk}`
419+
}
420+
return "Summarize this thread"
421+
}
422+
if (body.includes("/opencode") || body.includes("/oc")) {
423+
if (reviewContext) {
424+
return `${body}\n\nContext: You are reviewing a comment on file "${reviewContext.file}" at line ${reviewContext.line}.\n\nDiff context:\n${reviewContext.diffHunk}`
425+
}
426+
return body
427+
}
391428
throw new Error("Comments must mention `/opencode` or `/oc`")
392429
})()
393430

‎packages/opencode/src/cli/cmd/github.ts‎

Lines changed: 40 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ import { graphql } from "@octokit/graphql"
77
import * as core from "@actions/core"
88
import * as github from "@actions/github"
99
import type { Context } from "@actions/github/lib/context"
10-
import type { IssueCommentEvent } from "@octokit/webhooks-types"
10+
import type { IssueCommentEvent, PullRequestReviewCommentEvent } from "@octokit/webhooks-types"
1111
import { UI } from "../ui"
1212
import { cmd } from "./cmd"
1313
import { ModelsDev } from "../../provider/models"
@@ -328,6 +328,8 @@ export const GithubInstallCommand = cmd({
328328
on:
329329
issue_comment:
330330
types: [created]
331+
pull_request_review_comment:
332+
types: [created]
331333
332334
jobs:
333335
opencode:
@@ -378,7 +380,7 @@ export const GithubRunCommand = cmd({
378380
const isMock = args.token || args.event
379381

380382
const context = isMock ? (JSON.parse(args.event!) as Context) : github.context
381-
if (context.eventName !== "issue_comment") {
383+
if (context.eventName !== "issue_comment" && context.eventName !== "pull_request_review_comment") {
382384
core.setFailed(`Unsupported event type: ${context.eventName}`)
383385
process.exit(1)
384386
}
@@ -387,9 +389,13 @@ export const GithubRunCommand = cmd({
387389
const runId = normalizeRunId()
388390
const share = normalizeShare()
389391
const { owner, repo } = context.repo
390-
const payload = context.payload as IssueCommentEvent
392+
const payload = context.payload as IssueCommentEvent | PullRequestReviewCommentEvent
391393
const actor = context.actor
392-
const issueId = payload.issue.number
394+
395+
const issueId =
396+
context.eventName === "pull_request_review_comment"
397+
? (payload as PullRequestReviewCommentEvent).pull_request.number
398+
: (payload as IssueCommentEvent).issue.number
393399
const runUrl = `/${owner}/${repo}/actions/runs/${runId}`
394400
const shareBaseUrl = isMock ? "https://dev.opencode.ai" : "https://opencode.ai"
395401

@@ -531,11 +537,39 @@ export const GithubRunCommand = cmd({
531537
throw new Error(`Invalid share value: ${value}. Share must be a boolean.`)
532538
}
533539

540+
function getReviewCommentContext() {
541+
if (context.eventName !== "pull_request_review_comment") {
542+
return null
543+
}
544+
545+
const reviewPayload = payload as PullRequestReviewCommentEvent
546+
return {
547+
file: reviewPayload.comment.path,
548+
diffHunk: reviewPayload.comment.diff_hunk,
549+
line: reviewPayload.comment.line,
550+
originalLine: reviewPayload.comment.original_line,
551+
position: reviewPayload.comment.position,
552+
commitId: reviewPayload.comment.commit_id,
553+
originalCommitId: reviewPayload.comment.original_commit_id,
554+
}
555+
}
556+
534557
async function getUserPrompt() {
558+
const reviewContext = getReviewCommentContext()
535559
let prompt = (() => {
536560
const body = payload.comment.body.trim()
537-
if (body === "/opencode" || body === "/oc") return "Summarize this thread"
538-
if (body.includes("/opencode") || body.includes("/oc")) return body
561+
if (body === "/opencode" || body === "/oc") {
562+
if (reviewContext) {
563+
return `Review this code change and suggest improvements for the commented lines:\n\nFile: ${reviewContext.file}\nLines: ${reviewContext.line}\n\n${reviewContext.diffHunk}`
564+
}
565+
return "Summarize this thread"
566+
}
567+
if (body.includes("/opencode") || body.includes("/oc")) {
568+
if (reviewContext) {
569+
return `${body}\n\nContext: You are reviewing a comment on file "${reviewContext.file}" at line ${reviewContext.line}.\n\nDiff context:\n${reviewContext.diffHunk}`
570+
}
571+
return body
572+
}
539573
throw new Error("Comments must mention `/opencode` or `/oc`")
540574
})()
541575

‎packages/web/src/content/docs/github.mdx‎

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,8 @@ Or you can set it up manually.
4545
on:
4646
issue_comment:
4747
types: [created]
48+
pull_request_review_comment:
49+
types: [created]
4850

4951
jobs:
5052
opencode:
@@ -129,3 +131,20 @@ Here are some examples of how you can use opencode in GitHub.
129131
```
130132

131133
opencode will implement the requested change and commit it to the same PR.
134+
135+
- **Review specific code lines**
136+
137+
Leave a comment directly on code lines in the PR's "Files" tab. opencode automatically detects the file, line numbers, and diff context to provide precise responses.
138+
139+
```
140+
[Comment on specific lines in Files tab]
141+
/oc add error handling here
142+
```
143+
144+
When commenting on specific lines, opencode receives:
145+
- The exact file being reviewed
146+
- The specific lines of code
147+
- The surrounding diff context
148+
- Line number information
149+
150+
This allows for more targeted requests without needing to specify file paths or line numbers manually.

0 commit comments

Comments
 (0)
Back | FazBrowse Home | New Git URL