Skip to content

sync: upstream v2.47.0 (decision-handoff resolved) - #320

Closed
cursor[bot] wants to merge 327 commits into
devfrom
sync/upstream-v2.47.0-f7f890ff72a5-605728a39638
Closed

sync: upstream v2.47.0 (decision-handoff resolved)#320
cursor[bot] wants to merge 327 commits into
devfrom
sync/upstream-v2.47.0-f7f890ff72a5-605728a39638

Conversation

@cursor

@cursor cursor Bot commented Sep 7, 2026

Copy link
Copy Markdown

Summary

Merge upstream release v2.47.0 (f7f890ff72a5ccccadb5a935c1ea106922562cd2) into fork integration branch dev (base 605728a3963813f813c9e7a9734277abc55f6f41).

The automated sync workflow stopped at decision-handoff with 63 textual conflicts. This coordinator pass took upstream for upstream-owned paths, applied the package.json recipe, and re-fit fork Antigravity hotspots on upstream v2.47 control flow.

Blocker: bun run test reports 331 failing tests despite green bun run typecheck. Human review required before merge; do not squash/rebase.

Verification

Item SHA
Upstream tag v2.47.0
Tag / vendor/main SHA f7f890f
Integration base 605728a
Sync head 3ec056e

Commands: bun run typecheck (pass), bun run lint:workflows (pass), bun run audit:high (pass), bun run test (331 fail).

Checklist

  • Scope stays focused.
  • Tests — blocked by 331 full-suite failures.
  • Docs — upstream docs taken via conflict resolution.
  • Security review — no new secrets.
Open in Web View Automation 

lidge-jun and others added 30 commits September 7, 2026 05:19
…skip ci]

Authorized maintainer integration of Track 3 layer 1.

Cumulative source: 9ea8967. Cross-platform CI34055675846 (Windows2 retry retained), service34055677193 and exact-source docs34055679992 passed. Lower tests deferred by explicit final-head-first policy; no local suites. Independent code/security reviews recorded in PR. Original commits and contributor trailers retained.
Authorized maintainer integration of Track 3 layer 2.

Cumulative source: 9ea8967. Cross-platform CI34055675846 (Windows2 retry retained), service34055677193 and exact-source docs34055679992 passed. Lower tests deferred by explicit final-head-first policy; no local suites. Independent code/security reviews recorded in PR. Original commits and contributor trailers retained.
… [skip ci]

Authorized maintainer integration of Track 3 layer 3.

Cumulative source: 9ea8967. Cross-platform CI34055675846 (Windows2 retry retained), service34055677193 and exact-source docs34055679992 passed. Lower tests deferred by explicit final-head-first policy; no local suites. Independent code/security reviews recorded in PR. Original commits and contributor trailers retained.
…) [skip ci]

Authorized maintainer integration of Track 3 layer 4.

Cumulative source: 9ea8967. Cross-platform CI34055675846 (Windows2 retry retained), service34055677193 and exact-source docs34055679992 passed. Lower tests deferred by explicit final-head-first policy; no local suites. Independent code/security reviews recorded in PR. Original commits and contributor trailers retained.
…un#3796) [skip ci]

Authorized maintainer integration of Track 3 layer 5.

Cumulative source: 9ea8967. Cross-platform CI34055675846 (Windows2 retry retained), service34055677193 and exact-source docs34055679992 passed. Lower tests deferred by explicit final-head-first policy; no local suites. Independent code/security reviews recorded in PR. Original commits and contributor trailers retained.
…p ci]

Authorized maintainer integration of Track 3 layer 6.

Cumulative source: 9ea8967. Cross-platform CI34055675846 (Windows2 retry retained), service34055677193 and exact-source docs34055679992 passed. Lower tests deferred by explicit final-head-first policy; no local suites. Independent code/security reviews recorded in PR. Original commits and contributor trailers retained.
…tics [skip ci]

Maintainer integration authorized by @lidge-jun under MAINTAINERS.md. Integrates PR lidge-jun#3803 at exact head 723e59e.

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.
…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>
t and others added 24 commits September 8, 2026 01:16
[WRONG BRANCH] release: promote 2.47.0 to main
[WRONG BRANCH] release: apply final roster correction to main
Take upstream for upstream-owned conflict paths per OWNED.md.
Apply package.json recipe (@yansigit/opencodex, version 2.47.0).
Re-fit antigravity quota probes and 429 carousel on upstream v2.47
control flow using the v2.46 resolved fork overlay.

Tag SHA: f7f890f
Base SHA: 605728a

Co-authored-by: SB Yoon <yansigit@users.noreply.github.com>
@github-actions github-actions Bot added the intake: hygiene-blocked Deterministic PR hygiene checks failed label Sep 7, 2026
@github-actions

github-actions Bot commented Sep 7, 2026

Copy link
Copy Markdown

⚠️ Deterministic hygiene checks failed.

  • new_suppression — A new TypeScript, lint, formatter, or similar suppression was added. Fix the underlying issue or obtain suppression-approved. Paths: gui/src/pages/Models.tsx.
  • unsponsored_surface — This changes an authentication, workflow, release-automation, or dependency surface. MAINTAINERS.md requires security review for these; ask a maintainer to apply maintainer-sponsored once they have reviewed it. Paths: .github/workflows/ci.yml, .github/workflows/release.yml, package.json, src/codex/auth-api.ts, src/lib/windows-secret-acl.ts, src/oauth/health.ts, src/oauth/orcarouter.ts, src/server/auth-cors.ts.

@github-actions

github-actions Bot commented Sep 7, 2026

Copy link
Copy Markdown

PR automation (bot-owned)

  • Class: draft (draft)
  • Base: 24c66effcd68404dd9e10d9b4782a4f350825fbc
  • Head: 3ec056e5fa91202b69ffdc1b9483b437085c19a2
  • Action: behind
  • Exact-head gate: BLOCKED (not-mergeable, base-not-ancestor, base-mismatch, check-not-success)
  • Sensitive paths: .github/workflows/ci.yml, .github/workflows/release.yml, package.json, src/adapters/anthropic.ts, src/adapters/cursor/protobuf-request.ts, src/adapters/cursor/tool-guidance.ts, src/adapters/cursor/tool-result-normalize.ts, src/adapters/exec
  • Maintainer auto-merge approval: NO
  • Bot merge evidence: NO
  • Next action: human review required

@github-actions

github-actions Bot commented Sep 7, 2026

Copy link
Copy Markdown

⏳ DRAFT

  • hygiene: new_suppression. hygiene: unsponsored_surface. sync_baseline

What to do

  • Wait for successful exact-head ci, enforce-target, and hygiene checks.
  • Fix new_suppression — A new TypeScript, lint, formatter, or similar suppression was added. Fix the underlying issue or obtain suppression-approved. Paths: gui/src/pages/Models.tsx.
  • Fix unsponsored_surface — This changes an authentication, workflow, release-automation, or dependency surface. MAINTAINERS.md requires security review for these; ask a maintainer to apply maintainer-sponsored once they have reviewed it. Paths: .github/workflows/ci.yml, .github/workflows/release.yml, package.json, src/codex/auth-api.ts, src/lib/windows-secret-acl.ts, src/oauth/health.ts, src/oauth/orcarouter.ts, src/server/auth-cors.ts.

This pull request was already a draft. Its draft status will be preserved after every issue above is resolved.

@yansigit

yansigit commented Sep 7, 2026

Copy link
Copy Markdown
Owner

Superseded by #323, now merged into dev as 24c66ef. The landed v2.47.0 integration passed full local verification, exact-head trusted preservation verification, and all required hosted CI checks. This draft branch is retained for history.

@yansigit yansigit closed this Sep 7, 2026
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

intake: hygiene-blocked Deterministic PR hygiene checks failed

Projects

None yet

Development

Successfully merging this pull request may close these issues.

10 participants