Skip to content

fix: make remote reconciliation transactional - #57

Merged
Nickfost merged 4 commits into
mainfrom
fix/remote-reconciliation-review-repair
Jul 28, 2026
Merged

fix: make remote reconciliation transactional#57
Nickfost merged 4 commits into
mainfrom
fix/remote-reconciliation-review-repair

Conversation

@Nickfost

Copy link
Copy Markdown
Member

Summary

Follow-up to #56 that repairs the remaining remote-reconciliation failure modes at their shared transaction and identity boundaries.

  • keep the reconciliation lock held across installer checks, upgrades, and last-known-good rollback
  • distinguish a fetched local checkout from its durable repository identity so state, drift checks, rollback, and timer activation agree
  • repair same-revision drift instead of accepting a running controller as convergence
  • fail closed when the reconciliation timer cannot be restored
  • include remote reconciliation in controller health reporting

Verification

  • ./scripts/test-install-worker-controller.sh
  • python3 -m unittest discover -s scripts -p 'test_*.py'
  • shellcheck scripts/*.sh examples/project/scripts/ci/*.sh templates/config-repository/scripts/*.sh
  • python3 scripts/scan_committed_secrets.py --commit <commit>
  • bash -n scripts/*.sh examples/project/scripts/ci/*.sh templates/config-repository/scripts/*.sh

@Nickfost

Copy link
Copy Markdown
Member 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: dcadbb7a67

ℹ️ 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 scripts/install-worker-controller.sh
Comment thread scripts/install-worker-controller.sh
@Nickfost

Copy link
Copy Markdown
Member 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: e32d35fa0b

ℹ️ 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 scripts/health.py
@Nickfost

Copy link
Copy Markdown
Member 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: 5c6eca8f3e

ℹ️ 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 scripts/health.py Outdated
Comment thread scripts/health.py Outdated
@Nickfost

Copy link
Copy Markdown
Member Author

@codex review

@chatgpt-codex-connector

Copy link
Copy Markdown

Codex Review: Didn't find any major issues. 🚀

Reviewed commit: 07f5413952

ℹ️ 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".

@Nickfost
Nickfost merged commit 80e219a into main Jul 28, 2026
1 check passed
@Nickfost
Nickfost deleted the fix/remote-reconciliation-review-repair branch July 28, 2026 07:02
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