sync: upstream v2.47.0 with verified CI repairs - #322
Merged
335 commits merged intoSep 7, 2026
Merged
Conversation
…rts [skip ci] Maintainer integration authorized by @lidge-jun under MAINTAINERS.md. Integrates PR lidge-jun#3804 at exact head 2aac0b6. Final combined cross-platform verification: https://github.com/lidge-jun/opencodex/actions/runs/34058496989 at 4a75971, containing this head and dev eff908e. Independent source/security reviews and remote documentation build are recorded in the PR. Local suites were not run per maintainer instruction. Lower skipped checks are not represented as passed. Reviewed integration baseline: f89b815. Combined source bf5ce1c3a0ada78f8e506334a82c64b525b859da passed remote Bun 1.4.0 typecheck, 541 focused tests and 425-page docs build. Final dev tree will be checked against it.
…kip ci] Maintainer integration authorized by @lidge-jun under MAINTAINERS.md. Integrates PR lidge-jun#3805 at exact head 14ee44b. Final combined cross-platform verification: https://github.com/lidge-jun/opencodex/actions/runs/34058496989 at 4a75971, containing this head and dev eff908e. Independent source/security reviews and remote documentation build are recorded in the PR. Local suites were not run per maintainer instruction. Lower skipped checks are not represented as passed. Reviewed integration baseline: f89b815. Combined source bf5ce1c3a0ada78f8e506334a82c64b525b859da passed remote Bun 1.4.0 typecheck, 541 focused tests and 425-page docs build. Final dev tree will be checked against it.
… Windows fixture repairs [skip ci] Maintainer integration authorized by @lidge-jun under MAINTAINERS.md. Integrates PR lidge-jun#3808 at exact head 9dc8988. Final combined cross-platform verification: https://github.com/lidge-jun/opencodex/actions/runs/34058496989 at 4a75971, containing this head and dev eff908e. Independent source/security reviews and remote documentation build are recorded in the PR. Local suites were not run per maintainer instruction. Lower skipped checks are not represented as passed. Reviewed integration baseline: f89b815. Combined source bf5ce1c3a0ada78f8e506334a82c64b525b859da passed remote Bun 1.4.0 typecheck, 541 focused tests and 425-page docs build. Final dev tree will be checked against it. History-only integration head 9dc8988 has the exact remotely checked combined tree eb4473d. Full cross-platform evidence remains attributed to 4a75971; combined source verification remains attributed to bf5ce1c3a.
) [skip ci] docs(credits): record four-track contributor attribution [skip ci] Record the original titles, authors and scoped landings of 12 carried PRs, plus eight issue-report acknowledgements. Confirm existing reachable human attribution and reinforce it with verified account-linked forward trailers. Preserve historical commits and tags. The owner explicitly requested this documentation-only follow-up be merged into dev like lidge-jun#3787, without running or waiting for CI. No tests, typecheck or build were run. Co-authored-by: ingwannu <186453546+Ingwannu@users.noreply.github.com> Co-authored-by: luvs01 <27862058+luvs01@users.noreply.github.com> Co-authored-by: SB Yoon <44089734+yansigit@users.noreply.github.com> Co-authored-by: Siddarth Reddy <221318067+ideabib@users.noreply.github.com> Co-authored-by: Hong Liu <88263959+Hylouis233@users.noreply.github.com> Co-authored-by: Makhmeto <88025750+mashfromband@users.noreply.github.com> Co-authored-by: Fred Amartey <43480311+FredAmartey@users.noreply.github.com> Co-authored-by: WU, CHI-LUNG <215337896+chilung-cgu@users.noreply.github.com> Co-authored-by: Amr Obaid <98298256+x3M3x@users.noreply.github.com>
…#3812) Move dev to 2.46.0 before publishing 2.45.0. The owner explicitly authorized this release train and maintainer integration. Official pre-move workflow34061256762 passed the unused-version and release-version-line checks. This PR changes package.json only. Frozen release source cf9f662 is being validated by Cross-platform CI34061274315 and Service lifecycle34061276621; those pending runs are not claimed passing. Release publication remains gated on candidate and exact release-branch evidence. Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Promote frozen dev source cf9f662; no new runtime changes. Candidate CI34061274315 and service34061276621 are the validation references. Publication waits for successful validation and the final main push CI at the exact release SHA.
Promote frozen dev source cf9f662 as 2.45.0. The repository owner explicitly authorized this main/preview release promotion and admin PR-only merge. This is a release-specific owner decision, not an independent approval or the dev-only maintainer exception. Frozen candidate full CI34061274315 passed all25jobs after one unchanged-source rerun of Windows5; the initial holder busy assertion remains recorded without a root-cause resolution claim. Service lifecycle34061276621 passed Linux/macOS/Windows. Dev version pre-move3812 is merged. Publication still requires this actual main merge SHA's own successful push CI and Service lifecycle. No local suites were run.
Record scoped roadmap and independent plan audit. Local suites are excluded by owner instruction; final remote CI will verify the combined candidate.
Carry PR lidge-jun#3815 through 76e07d1. Preserve original contributor work and its bounded retention, signature-only reasoning and documentation follow-ups. Remote combined validation follows; local suites intentionally not run under maintainer instruction. Co-authored-by: SB Yoon <44089734+yansigit@users.noreply.github.com> Co-authored-by: Yumi <automation@sbyoon.com>
Carry PR lidge-jun#3816 at d5e0a9a. Keep original frames on the proxy inspection branch and scope projection to the existing Grok HTTP/SSE client marker. Co-authored-by: Danh Thanh <danhthanh418@gmail.com>
Record source-delta audits, manual PR delivery and final-head CI strategy. Co-authored-by: Éverton Toffanetto <evertondgn@hotmail.com> Co-authored-by: Zig Zag <shafishahin786@proton.me> Co-authored-by: 투린 <me@turin.my>
Carry architecture context for lidge-jun#3641 and lidge-jun#3733. Live BigModel discovery remains deferred; local suites are not run. Co-authored-by: jamespan <panjiabang@gmail.com> Co-authored-by: Chanhee Lee <hiddenest12@gmail.com>
Carry the remaining teardown fix from lidge-jun#3383 (51726d2) and verify cleanup ordering with a held asynchronous runner. Final combined CI will validate the stack; no local suite was run. Co-authored-by: x3M3x <amroeid1999@gmail.com>
Use the last event field and preserve significant whitespace while retaining independent JSON control-type filtering. Add discriminator, order, reset, and preservation regressions to the existing Responses test file. Tests were authored but not run; validation is delegated to final combined remote CI. Co-authored-by: Danh Thanh <danhthanh418@gmail.com>
Add one synthetic complete send_message_to_thread envelope after a real tool pair. Cover ordinary responses, stored-ID continuation, v2 compaction_trigger and v1 compact; assert upstream content, order and pairing plus compact output contracts. Coverage motivated by issue lidge-jun#3807 reports from @DaveW001 and @stephen-drew, using the narrowed envelope contract documented in lidge-jun#3735. These are synthetic fixtures, not captured reporter requests; no original source patch is copied. Validation: git diff --check passed. Tests, typecheck and build NOT RUN by explicit instruction. Production code and missing-call-id guards are unchanged.
…ip ci] Report declared wire length, observed lower bounds, and decoded sizes without reading rejected payloads further or changing admission and retry policy. Follow up on lidge-jun#3573; thanks to @nowhere1975 for the content-free incident measurements. The issue remains open for exact compact-attempt evidence. Independent source review passed; final remote CI pending.
…n#3641 Narrowed carry of jamespan’s PR lidge-jun#3641, source origin/axis2-source-3641 at b675d83. Reconstruct the separate Responses preset using only the two models in the official Codex example: https://docs.bigmodel.cn/cn/coding-plan/tool/codex.md (checked 2026-09-07). Keep liveModels false and preserve custom destinations and Responses reasoning replay. Map exact context windows, effort ladders, max defaults, summary support, and text modalities. Do not carry model-discovery.ts or envelopeKey/idKey; Flash Responses metadata and live discovery remain unverified. Add consumer metadata and custom-transport collision regressions; document the static roster and existing Codex export policy (compatibility ultra on GLM-5.3, omitted default field on Turbo’s empty ladder). Validation: git diff --check passed. Tests, typecheck, lint, and builds intentionally not run per worker scope; parent final CI owns execution. Co-authored-by: jamespan <panjiabang@gmail.com>
…t [skip ci] Carry PR lidge-jun#3627 from f699ec7, using merge base cf9f662. Keep the source runtime changes and existing Astra normalization intact. Qualify external-name restoration in all four provider docs and catalog SOT. Add Astra external-edit coverage and real retained/convergence writer coverage. Local tests, typecheck and builds NOT RUN by owner mandate. Static diff inspection and git diff --check passed; remote CI belongs to parent. Co-authored-by: Éverton Toffanetto <evertondgn@hotmail.com>
Carry the net diff of lidge-jun#3780 at 9b873e6. Strengthen multi-record JSON parity, escaping, and conflicting-flag coverage; synchronize all seven translated CLI pages and clarify consumer-side processing. Local tests, typecheck, and builds NOT RUN by owner mandate. Regenerated the capability surface and inspected the static diff. Lower-layer CI is owner-requested deferred evidence, not passing evidence; final combined CI belongs to the integration owner. Co-authored-by: 투린 <me@turin.my>
Exercise the source-build contract from lidge-jun#3421/lidge-jun#3604 and separate-home persistence from lidge-jun#3747 using disposable Docker resources. Preserve original token and both named volumes through container replacement; verify admission without upstream inference. Independent source/security review completed; actual Docker networking and runtime acceptance remain pending final CI. Co-authored-by: Buseong Kim <flight@skyline23.com> Co-authored-by: Ingwannu <ingwannu@users.noreply.github.com>
Carry the net diff from PR lidge-jun#2716 at 93ed440. Reconcile confirmed saved/reset receipts, including saved:true errors, with the editor draft, current label and reset availability. Preserve reset intent on retry and retry only the list read after a successful mutation and failed read. Reuse createBoundedFetch for a single 60-second write-and-refresh budget. Timeouts retain the draft, release the modal lock and leave persistence unknown; retry reads current state before another mutation. Keep global fetch unchanged. Add focused regression coverage, nine-locale recovery copy and workflow docs. Local tests, typecheck, build and browser smoke NOT RUN by owner mandate. Static diff inspection only; parent owns remote CI and browser verification. Co-authored-by: Zig Zag <shafishahin786@proton.me>
…lines [skip ci] Carry and refine lidge-jun#3809: observe each request-bound physical response, preserve probe clocks and model-specific windows, and retain valid multi-day upstream reset deadlines. Preserve credential ownership and skip unprovable observations. Runtime checks are deferred to the final cumulative hosted CI at owner request; no local suite was run. Co-authored-by: Éverton Toffanetto <evertondgn@hotmail.com>
Preserve empty signed and redacted-only replay items, keep signature updates within their source thinking block, and emit opaque blocks in order. Retain hidden-summary policy and document deferred Claude hidden-text replay and live/cache claims. Add exact-array synthetic round-trip coverage; local tests and typecheck intentionally not run, pending parent combined remote CI. Co-authored-by: SB Yoon <44089734+yansigit@users.noreply.github.com> Co-authored-by: Yumi <automation@sbyoon.com>
Keep an earlier confirmed save/reset receipt when retrying the same value and convergence fails with an ordinary HTTP error. Do not replace the saved snapshot from an unconfirmed response; retain the pending reset intent for another retry. Treat transport and response-body failures without a usable receipt as unknown outcomes, hide the stale current name, and make Retry/Enter read-only. Keep known unpersisted HTTP failures on the existing editable-draft path. Add regressions for reset -> saved:true -> HTTP failure -> success and persisted save/reset followed by rejected transport or response-body reads without abort. Local tests/typecheck/build NOT RUN by owner mandate; static diff check only. Co-authored-by: Zig Zag <shafishahin786@proton.me>
Skip undocumented HTTP model-list validation through the existing unknown key-validation policy. Add a zero-fetch regression. For explicitly empty model/provider effort ladders, omit only the Responses effort field and retain reasoning summaries. Preserve omitted requests, nonempty model override precedence, unknown/non-rankable ladders, and forward behavior. Keep the documented Turbo max metadata without adding a selectable tier or injecting a wire default. Existing __omit__ mappings and noReasoningModels policy are unchanged. Add outbound serialization cases for omitted, max and ultra effort, summary preservation, input immutability, and unchanged consumer paths. Regenerate model metadata; the generated delta is only the BigModel Responses to zai alias. Validation: bun run generate:model-metadata and git diff --check passed. No tests, typecheck, lint or builds run; commit hooks skipped to honor that restriction. Main final CI and separate independent review remain required. Co-authored-by: jamespan <panjiabang@gmail.com>
First CI run 34064726690 reports text,image rather than text for both BigModel models at provider-registry-parity.test.ts:471; the Turbo effort array remains empty. Source tracing confirms applyProviderConfigHints uses isModelVisionSidecarConsumer, also used by the runtime vision planner, to expose image attachment support for configured text-only models. Keep the official text-only registry declarations and assert them independently before checking the bridge-enriched model and final catalog modalities. Preserve exact Turbo empty effort expectations and all generic modality behavior. Clarify that image handling requires the existing available, enabled vision sidecar rather than native BigModel image support. Validation: supplied CI failure log and source contract reviewed; git diff --check passed. No local tests, typecheck, lint or builds run. Commit hooks skipped per execution restriction. Main final CI and independent review remain required. Co-authored-by: jamespan <panjiabang@gmail.com>
Browser review found an isolated Korean ending at 390px. Balance the short helper sentence without fixed line breaks or changing the existing layout. Co-authored-by: Zig Zag <shafishahin786@proton.me>
[WRONG BRANCH] release: promote 2.47.0 to main
[WRONG BRANCH] release: apply final roster correction to main
Merge upstream f7f890f with origin/dev 605728a in ancestry. Preserve fork configuration, TLS, OAuth, routing, providers, Claude semantics and cross-platform CI. Restore both sides of shared test and documentation changes; record all preservation decisions. Isolate reused-worker lifecycle hangs and use the existing loaded startup budget for certification descendant checks. Final exact-head prepush and remote CI remain required before landing.
Use the existing subprocess ceiling for the regression that performs three catalog syncs. Keep repair, idempotence and deletion assertions unchanged. The default 5s outer test limit expired at 5007ms under the full pool; isolated execution completes in 2485ms. All 26 focused catalog tests pass, and a scratch no-op sync ablation fails the original stale-effort assertion.
Contain the sampled macOS Bun 1.4 worker spin in a fresh-process lane. Preserve all endpoint assertions and deadlines; planner regression proves exactly one execution outside the general pool. Debug API and runner focused suites pass 62 tests with 3 platform-specific skips.
Memoize the feedback publisher used by display-name saves and include it in callback dependencies. Remove an unused stale-banner source read. React Doctor, 2015 GUI tests, lint, build and 155 root GUI-source/workflow oracles pass.
Use the existing CI batch ceiling of 60 seconds for unfiltered full-suite runs. Preserve focused defaults, explicit caller and per-test deadlines, assertions, worker concurrency and lane watchdogs. Multiple real catalog subprocess cases exceeded the local-only five-second default. Regression tests bind the CI ceiling and preserve explicit 250ms deadlines; focused runner and picker tests pass.
|
✅ Deterministic PR hygiene checks passed. |
Owner
Author
|
PR automation (bot-owned)
|
8 tasks
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
9 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
v2.47.0(f7f890ff72a5ccccadb5a935c1ea106922562cd2) intodev, retaining upstream history and fork behavior. This supersedes the stale v2.46 candidate; merge-commit only, never squash or rebase.docs/fork/ORCAROUTER.md; no authenticated OrcaRouter inference was performed for this sync.devmerge, including the existing automatic dev publication workflow. This PR does not promotemainor disable any release workflow.Verification
bun run prepushpassed on exact head3b280531c06d46e7af77cd562293abe6ad74d7ad(hygiene, workflow policy/lint, dependency audit, typecheck, GUI lint, full root tests, privacy scan and React Doctor). This successor repairs the two hosted CI failures found on sync: upstream v2.47.0 (preserve fork integrations) #321. No test assertions were skipped to obtain a green result.OPENCODEX_HOME, alternate port, and before/after production config hash/mtime and backup inventory checks. The production proxy at port 10100 is not a test target.docs/fork/PRESERVATION.json. Exact-head attestation and verification using the verifier and policy from trustedorigin/devboth passed; provenance is attached below.Imported upstream screenshot of the subagent fallback controls (reference image supplied with the upstream change, not a newly captured screenshot of this candidate):
Checklist
src/orgui/src/.v2.47.0/f7f890ff72a5ccccadb5a935c1ea106922562cd2— done locally.src/server/responses/core.ts,src/providers/quota.ts, adapter and configuration unions.605728a3963813f813c9e7a9734277abc55f6f41(merge history preserved).