[WRONG BRANCH] release: promote 2.69.0 to main - #6138
Merged
Merged
Conversation
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Carried from #6015 into merge train round 3. Co-authored-by: Ingwannu <ingwannu@users.noreply.github.com>
Carried from #6034 into merge train round 3. Co-authored-by: Ingwannu <ingwannu@users.noreply.github.com>
Carried from #6019 into merge train round 3. Co-authored-by: Ingwannu <ingwannu@users.noreply.github.com>
Carried from #6041 into merge train round 3. Co-authored-by: Ingwannu <ingwannu@users.noreply.github.com>
Carried from #6006 into merge train round 3. Co-authored-by: Ingwannu <ingwannu@users.noreply.github.com>
Carried from #6011 into merge train round 3. Co-authored-by: Ingwannu <ingwannu@users.noreply.github.com>
A retried install that finds the drain already settled clears wanted again without replacing the update snapshot, so a startup retry recorded only in wanted was lost when that install failed. resume() now promotes a pending snapshot as well. Found in the round 3 review of #6041.
…s scope in ADR-4191
Carried from #6057 into merge train round 3. Co-authored-by: luvs01 <27862058+luvs01@users.noreply.github.com>
Carried from #6035 into merge train round 3. Co-authored-by: Epinephrine <luvs01@hanmail.net>
Carried from #6022 into merge train round 3. Co-authored-by: mdwsk88 <924038395@qq.com>
…irst-party off Follow-up to #6046: the management route reports shared_proxy_retained, but the human CLI output dropped it.
Carried from #6036 into merge train round 3. Co-authored-by: Epinephrine <luvs01@hanmail.net>
Follow-up to #6036. Its tri-state comparison reported any realpath failure as unknown, so a differently spelled recorded home that no longer exists stopped refusing ocx restore, which fails the WP13 composed acceptance contract on dev. A missing path cannot be an alias of the current home, so ENOENT and ENOTDIR compare different; EACCES and other unproven errors stay unknown.
Carried from #6038 into merge train round 3. Co-authored-by: Epinephrine <luvs01@hanmail.net>
Carried from #6048 into merge train round 3. Co-authored-by: Epinephrine <luvs01@hanmail.net>
Co-authored-by: shawn-kim-ai <246239437+shawn-kim-ai@users.noreply.github.com>
Co-authored-by: shawn-kim-ai <246239437+shawn-kim-ai@users.noreply.github.com>
Co-authored-by: shawn-kim-ai <246239437+shawn-kim-ai@users.noreply.github.com>
Route keyless Droid exports through the live listener policy, retain recorded ownership during catalog loss, and localize the setup guide. Align CLI help and freeze coordinated inputs before path resolution. Co-authored-by: shawn-kim-ai <246239437+shawn-kim-ai@users.noreply.github.com>
Co-authored-by: shawn-kim-ai <246239437+shawn-kim-ai@users.noreply.github.com>
Align translated integration counts, CLI help, and the unsettled GUI overview assertion with the combined Kilo and Factory Droid roster. Co-authored-by: imranshaiedi-byte <235239556+imranshaiedi-byte@users.noreply.github.com> Co-authored-by: shawn-kim-ai <246239437+shawn-kim-ai@users.noreply.github.com>
Keep the combined seventeen-client roster invariant and refuse a Factory Droid write if a competing settings file appears after preflight. Co-authored-by: shawn-kim-ai <246239437+shawn-kim-ai@users.noreply.github.com>
Keep Qoder PR #5950 and issue #5660 open, describe Kilo JSONC mutation and restore accurately, and align translated Droid integration and export guidance. Co-authored-by: luvs01 <27862058+luvs01@users.noreply.github.com> Co-authored-by: codingbo <9621077+codingbooo@users.noreply.github.com> Co-authored-by: imranshaiedi-byte <235239556+imranshaiedi-byte@users.noreply.github.com> Co-authored-by: shawn-kim-ai <246239437+shawn-kim-ai@users.noreply.github.com>
Use an unambiguous combo baseline key, include owned Kilo conflicts in Disable all, publish test-layout seeds atomically, reuse the JEV field bound, and warn on degraded memory settings after config repair or salvage. Co-authored-by: NorD <6949669+nordz0r@users.noreply.github.com> Co-authored-by: Robin Bially <7304732+robin-bially@users.noreply.github.com> Co-authored-by: imranshaiedi-byte <235239556+imranshaiedi-byte@users.noreply.github.com> Co-authored-by: shawn-kim-ai <246239437+shawn-kim-ai@users.noreply.github.com>
Co-authored-by: Robin Bially <7304732+robin-bially@users.noreply.github.com>
Release train 4: clients/proxy lane (JEV notes, memory routing, macOS proxy, Kilo, Factory Droid, test recipe)
Documentation-only record of the release-train 4 provider-compat lane; verified locally (privacy scan, structure check, repo-hygiene 15/15) per the train's local-verification merge rule.
Carries #6087 with review fixes: pause excluded from selection, failover, refresh, quota probes, Muse key reads, web-search eligibility and Kiro model evidence; refresh rechecks pause under its lock; reauth hands selection over from a paused active account. Co-authored-by: chilung <b0423031@gmail.com>
Narrow reimplementation of the 401 idea from #5099: after same-account refresh, a second pre-output 401 or terminal refresh failure switches once to a live sibling within existing budgets; structured validation-required 403s get a clearer bounded message. Co-authored-by: MerryEcho <126861868+MerryEcho@users.noreply.github.com>
Windows environment names are case-insensitive, so NO_PROXY and no_proxy are one variable there. Five macOS "auto" proxy cases assert that the two bypass lists differ and failed on windows 6/9 of the final train 4 dev CI run. Skip them on win32 the same way the neighbouring WebSocket bypass case already does; the macOS discovery path itself only runs on darwin.
Codex Review SummaryThis comment shows the latest Codex review activity on this pull request.
ℹ️ About Codex in GitHubYour team has set up Codex to review pull requests in this repo. Reviews are triggered when you
Codex reacts with 👀 while any review is running, comments if it has suggestions, and reacts with 👍 once all reviews finish with no findings. |
Contributor
|
Important Review skippedToo many files! This PR contains 521 files, which is 221 over the limit of 300. To get a review, reduce the PR to 300 files or fewer by splitting it into smaller PRs or changing its base branch. Usage-priced reviews support at most 300 files. ⚙️ Run configurationConfiguration used: Repository: lidge-jun/opencodex/.coderabbit.yaml Review profile: ASSERTIVE Plan: Advanced Run ID: ⛔ Files ignored due to path filters (2)
📒 Files selected for processing (521)
You can disable this status message by setting the Thanks for using CodeRabbit! It's free for OSS, and your support helps us grow. If you like it, consider giving us a shout-out. Comment |
Contributor
|
✅ Deterministic PR hygiene checks passed. |
Contributor
⏳ DRAFT
What to do
Its title has been prefixed with |
github-actions
Bot
changed the title
This was referenced Sep 27, 2026
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
11 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Summary
Promote the verified 2.69.0 candidate
870f39e75etomain. It is merged with-s oursovermain; the tree is the candidate unchanged.The candidate is dev after release train 4: 20 merges on top of 2.68.0, including the picker CA fix for the external dev→main audit's R1–R3 (#6103). The final Cross-platform CI run on this exact SHA (36348371944, workflow_dispatch) passed; privacy gate was skipped by its path condition.
devis already at 2.70.0 (#6136).Verification
bun scripts/release-version-sources.ts check 2.69.0passes on this branch.git diff 870f39e75e HEADis empty.Checklist