Skip to content

fix(server): settle V2 threads after linked PR merges - #12568

Merged
shivamhwp merged 1 commit into
pingdotgg:t3code/codex-turn-mappingfrom
Bil0000:fix/v2-merged-thread-settlement
Sep 19, 2026
Merged

shivamhwp merged 1 commit into
pingdotgg:t3code/codex-turn-mappingfrom
Bil0000:fix/v2-merged-thread-settlement

Conversation

@Bil0000

@Bil0000 Bil0000 commented Sep 19, 2026

Copy link
Copy Markdown
Contributor

Problem

V2 stores PR links in pullRequests, but automatic settlement checked only the older single-PR fields. A merged link could remain active when those fields were empty.

Change

Use visible linked PR snapshots for settlement, matching main's open-link and latest-merge rules. Skip branch lookups when visible links already own the settlement decision.

Verification

  • New worker regression failed before the fix and passed after it.
  • Focused settlement test file: 15 passed.
  • Server typecheck, changed-file lint, and format check passed.

Risk

A linked PR settles after its snapshot syncs, as on main. This changes only V2 server settlement.

Model: GPT-5 in the native Codex harness.

@github-actions github-actions Bot added vouch:trusted PR author is trusted by repo permissions or the VOUCHED list. size:S 10-29 changed lines (additions + deletions). labels Sep 19, 2026
@macroscopeapp

This comment has been minimized.

@macroscopeapp

macroscopeapp Bot commented Sep 19, 2026

Copy link
Copy Markdown
Contributor

Approvability

Verdict: Approved at 6719b61

Macroscope's review found this PR approvable — This is a narrowly scoped server bug fix that aligns V2 linked-pull-request settlement with the existing settlement policy while preserving unlinked-thread behavior. A focused regression test covers the previously missed merged-link case.

You can add or adjust custom eligibility rules. Learn more.

@shivamhwp
shivamhwp merged commit 76288a3 into pingdotgg:t3code/codex-turn-mapping Sep 19, 2026
24 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

size:S 10-29 changed lines (additions + deletions). vouch:trusted PR author is trusted by repo permissions or the VOUCHED list.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants