Skip to content

Merge upstream a5639bc (20 commits) - #7

Merged
tournierjc merged 21 commits into
mainfrom
merge/upstream-a5639bc
Sep 19, 2026
Merged

tournierjc merged 21 commits into
mainfrom
merge/upstream-a5639bc

Conversation

@tournierjc

Copy link
Copy Markdown
Collaborator

Merge upstream MiniMax-AI/minimax-code@main (a5639bc, 20 commits).

Commits mergés : 20 (fe9a0db…a5639bc). Aucun blocage telemetry : refs externes ajoutées = fixtures example.invalid/example.test + presets API Moonshot (api.moonshot.ai/.cn).

Skips doublon : aucun — les correctifs upstream (MiniMax-AI#163-MiniMax-AI#203) ne recouvrent pas les PR fork #1-#6 (egress guard, copilot connector, docs harness, deepseek, openrouter).

Conflits résolus :

  • README.md : doc « Uninstall » upstream + section « Network egress » fork conservées.
  • SECURITY.md : côté fork conservé (egress guard default-deny, ~/.minimax-code).
  • docs/telemetry.md : supprimé (UD = delete, télémétrie retirée par PR security: default-deny egress guard + remove the telemetry subsystem #1).
  • packages/tui/src/cli/program.ts : requireTelemetryRunner non réintroduit ; parsePositiveSafeInteger (upstream) conservé.
  • release/public-source.json : régénéré (node scripts/source-inventory.mjs --write).
  • test/vitest-suites.json : entrées fork conservées (egress-guard) + nouveaux tests upstream non-telemetry ; incident-reporter-privacy et business-telemetry-privacy non réinscrits (supprimés par PR security: default-deny egress guard + remove the telemetry subsystem #1).

Gates (typecheck + copilot-connector + provider-presets + provider-application + egress-guard, vitest.oss.config) : AVANT fork main 5/5 verts, APRÈS merge 5/5 verts. check:source : passed (4184 files).

hetaoBackend and others added 21 commits September 19, 2026 07:01
* docs: add public contributor development skills

* docs: remove frontend design from contributor skills
Port the reviewed README-only patch from rishabhiskawai/minimax-code commit 8d4f263, offered for maintainer adoption in MiniMax-AI#143. Preserve the artwork and existing text links.
Document the integrity-verified npm 0.4.12 default separately from the source default and installer prefix. Explain overrides and safe path identification without changing runtime behavior. Related to MiniMax-AI#158.
…x-AI#170)

* fix: restrict credential-bearing config files to owner access

Repair existing POSIX config and migration backup permissions, and keep all config writers and temporary files private. Fixes MiniMax-AI#159.

* test: bound Windows filesystem concurrency and runtime startup

* Revert "test: bound Windows filesystem concurrency and runtime startup"

This reverts commit 79a69b8.

* fix: preserve private read-only config during permission repair

* fix: validate config before starting auth watchers
…iMax-AI#191)

* fix: protect terminal rendering and private runtime data reads

* fix: check search scope when directory tools omit a path

* fix: preserve status text layout when neutralizing carriage returns
…I#201)

* fix: import declared reasoning effort from provider presets

Import explicit models.dev effort options without deriving effort support from the reasoning flag. Cover preset normalization, saved metadata, roster selection, TUI controls and offline headless request bodies.

Adapted from hezhongtang/minimax-code@098fcf9 with additional integration and transport regression coverage.

Co-authored-by: hezhongtang <he_alexander91@126.com>

* test: check effort on conversation requests

---------

Co-authored-by: hezhongtang <he_alexander91@126.com>
# Conflicts:
#	README.md
#	SECURITY.md
#	docs/telemetry.md
#	packages/tui/src/cli/program.ts
#	release/public-source.json
#	test/vitest-suites.json
@tournierjc
tournierjc merged commit b90cfe9 into main Sep 19, 2026
3 of 6 checks passed
@tournierjc
tournierjc deleted the merge/upstream-a5639bc 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