Skip to content

merge queue: checking #357 on main (f119b3f), stacked on #390, #377 and #372 - #395

Closed
mergify[bot] wants to merge 22 commits into
mainfrom
mergify/merge-queue/681f2eb27e
Closed

mergify[bot] wants to merge 22 commits into
mainfrom
mergify/merge-queue/681f2eb27e

Conversation

@mergify

@mergify mergify Bot commented Oct 4, 2026 •

Copy link
Copy Markdown
Contributor

🎉 This pull request has been checked successfully and will be merged soon. 🎉

#357 is queued for merge on branch main (f119b3f).

Stacked behind 3 pull requests queued ahead of this batch, not part of it. These checks run on a tip that also carries their commits, so a failure here can come from them as much as from #357.

Queued ahead of this batch:

This pull request has been created by Mergify to speculatively check the mergeability of #357.
You don't need to do anything. Mergify will close this pull request automatically when it is complete.

Required conditions of queue rule default for merge:

Required conditions to stay in the queue:

---
checking_base_sha: eb8cb2ef88ddb11b947d75035fc9c42daa5714b2
previous_check_retries: []
previous_failed_batches: []
pull_requests:
  - number: 357
    scopes: []
scopes: []
...

Cuarroc and others added 22 commits October 4, 2026 20:54
Test-First: src-tauri/src/delivery_recovery/restore.rs::foreign_backup_never_replaces_the_journal_database
Test-First: src-tauri/src/delivery_recovery/restore.rs::modified_backup_never_replaces_the_journal_database
Co-Authored-By: Codex (GPT-5) <noreply@openai.com>
Test-First: src-tauri/src/delivery_recovery/restore.rs::journal_bound_backup_restores_before_write_resume
Test-First: src-tauri/src/delivery_recovery/restore.rs::restore_is_refused_after_writes_resumed
Co-Authored-By: Codex (GPT-5) <noreply@openai.com>
Regression-For: df5c145
Regression-For: 5979c8e
Co-Authored-By: Codex (GPT-5) <noreply@openai.com>
No-Test: append-only activity handoff
Co-Authored-By: Codex (GPT-5) <noreply@openai.com>
…tion

The reader refactor made restore_from_reader borrow the backup file, so the
handle stayed open across replace_file. Take the reader by value and drop it
before the replace, as the comment above it promises.

Test-First: src-tauri/src/db_restore.rs::db_restore::tests::restore_closes_the_source_before_replacing_the_destination

Co-Authored-By: Claude Sonnet 5.5 <noreply@anthropic.com>
Rename the computed releaseEligible to continuousReleaseEligible (keep a
deprecated alias for one release), add appReleaseEligible gated on the
configuration and machineInterface phases plus the user's appReleaseAttested,
and bump the report schemaVersion to 2 (E20 option A).

Test-First: scripts/lib/continuous-readiness.test.mjs::app release is blocked without the user attestation
Test-First: scripts/lib/continuous-readiness.test.mjs::app release attestation does not make continuous mode release-eligible
Test-First: scripts/lib/continuous-readiness.test.mjs::app release still needs configuration and machine interface
Test-First: scripts/lib/continuous-readiness.test.mjs::readiness report is schema version 2

Co-Authored-By: Claude Sonnet 5.5 <noreply@anthropic.com>
Reuses the W3-03a drill kit: polls the updater phases, tolerates the
relaunch gap, compares sessions and the recovery journal before/after.

Test-First: scripts/lib/updater-drill.test.mjs::successful update passes after phases and relaunch with surviving sessions
Test-First: scripts/lib/updater-drill.test.mjs::failed update needs an error phase with a message and no relaunch
Test-First: scripts/lib/updater-drill.test.mjs::cancelled update must return to a resting phase without relaunch
Test-First: scripts/lib/updater-drill.test.mjs::a missing session fails the drill
Test-First: scripts/lib/updater-drill.test.mjs::an unreachable app fails before any step
Test-First: scripts/lib/updater-drill.test.mjs::journal summary records phase and hash but never the content

Co-Authored-By: Claude Sonnet 5.5 <noreply@anthropic.com>
Test-First: scripts/lib/updater-drill.test.mjs::successful update rejects an error state after relaunch

Test-First: scripts/lib/updater-drill.test.mjs::worker evidence does not claim that an inactive row is a live session
No-Test: comment-only correction matching the updater session guard
The user chose option A for E20 on 2026-10-04 in the orchestrator
session: v1.5.0 is an app release through PR -> gates -> Mergify
queue, continuous mode ships off and not release-eligible, and the
user attests acceptance himself. PR #372 review B blocked because
docs/PLAN.md still listed E20 as open.

No-Test: documentation only

Co-Authored-By: Claude Opus 5.5 (1M context) <noreply@anthropic.com>
No-Test: generated activity record
No-Test: conflict resolution only; existing coverage follows in prepush
No-Test: generated activity record
@mergify mergify Bot closed this Oct 4, 2026
@mergify
mergify Bot deleted the mergify/merge-queue/681f2eb27e branch October 4, 2026 22:14
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