Repository navigation
merge: upstream 5f3240b (scrollback natif, erreurs terminal, volume Windows, cascade stop) - #96
Merged
Merged
Conversation
Co-authored-by: minimax <adhere@minimaxi.com>
Preserve public privacy defaults and distribution boundaries while porting compaction, Bash timeout, memory output and update-proxy improvements. Record selective provenance without advancing the full source baseline. Assisted-by: codex-cli reason:public-source-sync-0.5.5
…-AI#360) * docs: publish feedback and private security contact channels * docs: correct MiniMax Agent X contact link
…-AI#375) Include context window and effort controls in the first-run catalog while preserving existing managed snapshots. Docs-Impact: Existing model selection workflow is unchanged. Assisted-by: codex-cli reason:m31-flash-fallback-sync
* chore: bump version to 0.5.7 * test: drain stderr before nonzero Bash fixture exit
…x-AI#381) Port the reviewed shared runtime behavior while retaining standalone composition. Keep conversation leave separate from explicit stop, suppress canceled task delivery, and track append activations through teardown. Assisted-by: codex-cli reason:selective-runtime-port Docs-Impact: document stop and session-leave behavior in docs/tui-capabilities.md Co-authored-by: chenhao <chenhao@minimaxi.com>
…niMax-AI#385) * feat(examples): add reproducible Pocket Pet demo and refresh onboarding * feat(examples): polish Pocket Pet interaction and demo
…x-AI#389) * fix(tui): preserve native scrollback during projection updates * fix(tui): isolate transient overlays from native scrollback
…I#390) * fix(tui): prevent idle transcript replay and diff overlay frames * fix(tui): retain prompt identity and deferred main-buffer geometry
…budget (MiniMax-AI#397) * test(sandbox): pin the probe PATH instead of inheriting the ambient one The real sandbox-exec probes resolve their command through PATH, so inheriting the caller's let any wrapper ahead of /bin decide what `rm` means. On a machine that has run the agent, that is the recoverable-delete shim MCode installs into agent shells: `rm` resolves to the shim, the shim execs mavis-trash, the sandbox denies that trash move as a write outside the policy under test, and a correct allow-probe exits 1. The suite then reports a sandbox regression where the sandbox behaved correctly. Pin all three probe environments to the system binaries the probes actually use, matching the wrapper-argument test above them. This also drops the unguarded `process.env.PATH` in wrapProfile, which had no fallback and could hand a real sandbox spawn an undefined PATH. Fixes MiniMax-AI#394. * test(byok): scale the serial BYOK budget by platform The first case is 30+ serial CLI spawns, each booting the whole runtime, so its wall-clock cost tracks machine speed rather than the transport it asserts. The flat 90s budget only held with roughly 1.5x headroom on an idle machine, so a parallel build, a laptop under load, or a shared CI runner turned a passing transport into a `testTimeoutFailure` that named a product failure no assertion had actually observed. Budget it the way smoke.test.mjs already budgets runtime startup: a base allowance plus a Windows multiplier for slower process spawn. The test is not slowed down by a larger ceiling; it only stops failing for reasons unrelated to what it checks. Fixes MiniMax-AI#395.
…r dismissal, Windows volume props, session-stop cascade) Resolution notes: - README_ZH.md / docs/telemetry.md / update service+test: kept fork deletion (telemetry & update-proxy removal preserved). - docs/tui-capabilities.md: sections already present on main (stale-erasure, output speed) — no-op merge content accepted. - tui-provider-onboarding / tui-transcript-view tests: kept fork-adapted sequences (PR #79 fixes intact). - vitest-suites.json + public-source.json regenerated: union of fork+upstream entries, all registered files exist. - byok serial timeout: kept fork 180s/360s budget (upstream 180s flat was weaker).
- provider-application.test.ts and tui-transcript-view.test.ts: take fork-main versions (Kcode* exports + PR #79 onboarding sequences) — upstream 5f3240b versions referenced removed Mcode* symbols and the pre-fe24b27 key flow. - onboarding + scrollback suites pass with fork flow (111 + 56 tests green).
…ontract, byok timeouts, vitest registry, public-source) The merge had kept upstream@5f3240b versions of test/source-sync.test.mjs and test/windows-contract.test.mjs, which contradicted the fork's release tooling: releaseManifest emits bin.kcode + private npm manifests + kcode-only onboarding (tests expected bin.mcode / upstream update-proxy service) and the Windows contract no longer imports the removed update service. Fork-main versions are a strict superset. source-sync now 56/56 locally; full verify profile rerun next.
This was referenced Sep 30, 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
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.
Sync upstream
5f3240b(19 commits, dont 2 deja absorbes)Merge amont
5f3240bd96surorigin/main(5db6c1e). 19 commits amont au-dessus du merge-base8b55164;4198174et258addedeja absorbés ailleurs (contenu identique ailleurs — pas de re-merge direct de leurs fichiers).Commits cles integres
Conflits resolus (30 fichiers)
README_ZH.md,packages/tui/src/update/service.ts+ son test : suppression fork preservee (telemetry/update-proxy non re-introduits).docs/telemetry.mdabsent de l'arbre merge.package.json+packages/tui/package.json: identite fork preservee (kinetick-code0.6.8, binairekcode,check:egressgarde).tui-provider-onboarding.test.ts/tui-transcript-view.test.ts/provider-application.test.ts: versions fork-main gardees (sequences PR merge: upstream 0f6ad52 (0.5.5 runtime improvements) — en attente du fix upstream #79 + exportsKcode*), la version amont aurait casse 25+18+5 tests.tui-main-screen.ts/turn-execution.service.ts/session-lifecycle-bridge.ts: commentaires fork (session-leave ≠ user-stop, tab switching) fusionnes avec le texte amont.test/vitest-suites.json+release/public-source.json: regeneres (union complete verifiee ; 4340 chemins inventories ; 0 entree orpheline).test/byok.test.mjs: budget timeout fork 180/360 s conserve (superieur au 180 s a plat amont).Gates locaux (tous verts, travail worktree)
tsc -p tsconfig.standalone.json: 0 erreur ;eslint --quiet: 0 erreur.check:egressOK ;source-inventory --write+check:sourceOK ; build 0.6.8 OK.