Skip to content

Merge upstream/main (73a2581, 14 commits) — en attente du fix upstream, NE PAS MERGER - #12

Merged
tournierjc merged 16 commits into
mainfrom
merge/upstream-73a2581
Sep 20, 2026
Merged

tournierjc merged 16 commits into
mainfrom
merge/upstream-73a2581

Conversation

@tournierjc

Copy link
Copy Markdown
Owner

Merge upstream/main → fork (73a2581, 14 commits)

Sync automatique vers upstream/main @ 73a2581c6c (« fix: restore complete TUI viewports… », MiniMax-AI/minimax-code).

⚠️ EN ATTENTE DU FIX UPSTREAM — NE PAS MERGER. PR de suivi tant que la divergence smoke/BYOK n'est pas corrigée côté upstream (decision JC 20/09).

Commits integrés (14, 8a0b439..73a2581)

Garde-fous du fork preservés

Conflits résolus

Gates

  • typecheck (tsc -p tsconfig.standalone.json): ✅ exit 0
  • vitest --config vitest.oss.config.mjs: copilot 10/10 ✅, provider-presets 37/37 ✅, provider-application 20/20 ✅, egress-guard 14/14 ✅
  • build (scripts/build.mjs): ✅ ; node --test test/smoke.test.mjs: 20 pass / 0 fail ✅ ; pnpm test:byok: 1/1 ✅

hetaoBackend and others added 16 commits September 20, 2026 15:57
…ax-AI#248)

* feat: publish npm installation archives from version tags

* feat: commit source versions before tagging CLI releases

* test: serialize BYOK proxy checks on Node 24.2
…-AI#250)

* fix: reduce repeated history processing and token estimation

* test: preserve native snapshot cloning boundaries

* fix: preserve shared references across semantic snapshot cloning
…Max-AI#252)

* feat: compare PR performance with pinned harness benchmark

* feat: run basic performance automatically and full suite on demand

* feat: trigger full performance checks with a PR label

* docs: clarify skipped performance label events
…niMax-AI#257)

Cover Tasks, Rewind, and other feature panels through scrolling, resizing, nested views, and chat restoration. Register viewport regressions in the public verification suite.

Assisted-by: codex-cli reason:tui-viewport-sync
Conflits resolus:
- test/vitest-suites.json: entrees fork preservees + entrees upstream (history-processing, viewport-contract, etc.); business-telemetry-privacy droppe (supprime cote fork); egress-guard preserve.
- test/byok.test.mjs: version sequentielle amont + adaptation fork (assertion .managed catalog supprimee, egress guard default-deny, cf PR #11).
- docs/telemetry.md: suppression preservee (UD=delete).
- release/public-source.json: regenere (source-inventory.mjs --write).
@tournierjc
tournierjc merged commit 1b6d845 into main Sep 20, 2026
4 checks passed
@tournierjc
tournierjc deleted the merge/upstream-73a2581 branch September 20, 2026 19:45
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.

4 participants