fix(pr): refresh before create, validate base branch, fence comment bodies

tamarazuk · tamarazuk · commit 10fda295fbfc · 2026-03-02T23:14:41.000-05:00
- Refresh VCS state before idempotency check in create() to avoid TOCTOU race (anomalyco#4, anomalyco#12) - Use refreshed branch/defaultBranch in fallback PR return (anomalyco#9) - Validate base branch exists before attempting gh pr create (anomalyco#22) - Wrap review comment bodies in fenced blocks for structural separation (anomalyco#8)
diff --git a/packages/app/src/components/dialog-address-comments.tsx b/packages/app/src/components/dialog-address-comments.tsx
@@ -97,7 +97,7 @@ export function AddressCommentsDialog() {
       if (thread.comments.length === 0) continue
       text += `### File: ${thread.path}${thread.line ? ` (line ${thread.line})` : ""}\n`
       for (const comment of thread.comments) {
-        text += `**@${comment.author}** (comment ID: ${comment.id}): ${comment.body}\n`
+        text += `**@${comment.author}** (comment ID: ${comment.id}):\n\`\`\`\n${comment.body}\n\`\`\`\n`
       }
       text += "\n"
     }
diff --git a/packages/opencode/src/project/pr.ts b/packages/opencode/src/project/pr.ts
@@ -204,6 +204,7 @@ export namespace PR {
   }
 
   export async function create(input: CreateInput): Promise<Vcs.PrInfo> {
+    await Vcs.refresh()
     const { info } = await ensureGithub()
     const cwd = Instance.worktree
 
@@ -219,6 +220,13 @@ export namespace PR {
       throw new PrError({ code: "CREATE_FAILED", message: sanitizeOutput(errorOutput) })
     }
 
+    if (input.base) {
+      const branches = info.branches ?? (await Vcs.fetchBranches())
+      if (!branches.includes(input.base)) {
+        throw new PrError({ code: "CREATE_FAILED", message: `Base branch '${input.base}' does not exist` })
+      }
+    }
+
     const args = ["gh", "pr", "create", "--title", input.title]
     args.push("--body", input.body)
     if (input.base) args.push("--base", input.base)
@@ -257,8 +265,8 @@ export namespace PR {
       url: prUrl,
       title: input.title,
       state: "OPEN",
-      headRefName: info.branch,
-      baseRefName: input.base ?? info.defaultBranch ?? "main",
+      headRefName: updated.branch || info.branch,
+      baseRefName: input.base ?? updated.defaultBranch ?? info.defaultBranch ?? "main",
       isDraft: input.draft ?? false,
       mergeable: "UNKNOWN",
       reviewDecision: null,

Original file line number	Diff line number	Diff line change
`@@ -97,7 +97,7 @@ export function AddressCommentsDialog() {`
`97`	`97`	`if (thread.comments.length === 0) continue`
`98`	`98`	text += `### File: ${thread.path}${thread.line ? ` (line ${thread.line})` : ""}\n`
`99`	`99`	`for (const comment of thread.comments) {`
`100`		- text += `@${comment.author} (comment ID: ${comment.id}): ${comment.body}\n`
	`100`	+ text += `@${comment.author} (comment ID: ${comment.id}):\n\`\`\`\n${comment.body}\n\`\`\`\n`
`101`	`101`	`}`
`102`	`102`	`text += "\n"`
`103`	`103`	`}`