Skip to content

[codex-backend] Prefer sqlite git info for rollout-path reads#20228

Merged
joeytrasatti-openai merged 1 commit intomainfrom
joeytrasatti-openai/codex-backend-resume-git-info-fix
Apr 29, 2026
Merged

[codex-backend] Prefer sqlite git info for rollout-path reads#20228
joeytrasatti-openai merged 1 commit intomainfrom
joeytrasatti-openai/codex-backend-resume-git-info-fix

Conversation

@joeytrasatti-openai
Copy link
Copy Markdown
Contributor

Summary

  • Path-based local thread reads currently return rollout/session git metadata directly, so thread/resume can disagree with persisted SQLite metadata for the same thread.
  • Merge non-null SQLite git fields over rollout-path reads while keeping rollout values as fallbacks for fields SQLite does not know.
  • Add focused regression coverage for rollout-path reads so persisted branch updates are preserved during resume.

Testing

  • cargo test -p codex-thread-store

@joeytrasatti-openai joeytrasatti-openai marked this pull request as ready for review April 29, 2026 17:02
@joeytrasatti-openai joeytrasatti-openai enabled auto-merge (squash) April 29, 2026 17:08
@joeytrasatti-openai joeytrasatti-openai merged commit 47fba5d into main Apr 29, 2026
35 of 36 checks passed
@joeytrasatti-openai joeytrasatti-openai deleted the joeytrasatti-openai/codex-backend-resume-git-info-fix branch April 29, 2026 17:54
@github-actions github-actions Bot locked and limited conversation to collaborators Apr 29, 2026
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants