Skip to content

Own settings cutover commit replay - #138

Merged
lynnswap merged 3 commits into
mainfrom
codex/settings-cutover-commit-owner-pr
Aug 22, 2026
Merged

Own settings cutover commit replay#138
lynnswap merged 3 commits into
mainfrom
codex/settings-cutover-commit-owner-pr

Conversation

@lynnswap

@lynnswap lynnswap commented Aug 22, 2026

Copy link
Copy Markdown
Owner

Purpose

Keep settings cutover commit and deferred-intent replay alive even when the initiating runtime task is cancelled.

Changes

  • Install one SettingsService-owned commit task and result before replay begins.
  • Make concurrent callers for the same token and snapshot join the same operation.
  • Prevent caller cancellation from cancelling backend replay or losing taken intents.
  • Requeue and reproject raw intents after a genuine backend failure, preserving the real error for all waiters.
  • Preserve token misuse, cancellation, and abort semantics while a commit is active or completed.

Testing

  • Settings cutover suite (15 tests)
  • Caller-cancellation race repeated 20 times
  • swift test --build-system swiftbuild --no-parallel
  • Compatibility consumer, API, and MCP gates
  • ReviewMonitor xcodebuild test (15 tests)
  • Exact concurrency and contract audit

Screenshots

Not applicable.

@lynnswap

Copy link
Copy Markdown
Owner Author

@codex review

@chatgpt-codex-connector chatgpt-codex-connector Bot left a comment

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

💡 Codex Review

Here are some automated review suggestions for this pull request.

Reviewed commit: c4ff426fcd

ℹ️ About Codex in GitHub

Your team has set up Codex to review pull requests in this repo. Reviews are triggered when you

  • Open a pull request for review
  • Mark a draft as ready
  • Comment "@codex review".

If Codex has suggestions, it will comment; otherwise it will react with 👍.

Codex can also answer questions or update the PR. Try commenting "@codex address that feedback".

Comment thread Sources/CodexReview/Settings/CodexReviewSettingsService.swift
Comment thread Sources/CodexReview/Settings/CodexReviewSettingsService.swift Outdated

@lynnswap lynnswap left a comment

Copy link
Copy Markdown
Owner Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@codex review

@chatgpt-codex-connector

Copy link
Copy Markdown

Codex Review: Didn't find any major issues. What shall we delve into next?

Reviewed commit: 5260e0fbe8

ℹ️ About Codex in GitHub

Your team has set up Codex to review pull requests in this repo. Reviews are triggered when you

  • Open a pull request for review
  • Mark a draft as ready
  • Comment "@codex review".

If Codex has suggestions, it will comment; otherwise it will react with 👍.

Codex can also answer questions or update the PR. Try commenting "@codex address that feedback".

@lynnswap
lynnswap merged commit af99a01 into main Aug 22, 2026
2 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant