Repository navigation
merge: upstream 1e136bf (scrollback natif, erreurs terminal stale) - #94
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
…iniMax-AI#376) Co-authored-by: tournierjc <tournierjc@users.noreply.github.com>
…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>
Co-authored-by: tournierjc <tournierjc@users.noreply.github.com>
…niMax-AI#385) * feat(examples): add reproducible Pocket Pet demo and refresh onboarding * feat(examples): polish Pocket Pet interaction and demo Co-authored-by: tournierjc <tournierjc@users.noreply.github.com>
/clear aborts with session_leave so background work is not cascade-canceled. Switching Sessions still does not abort the previous turn. Document that fork behavior in the capabilities guide. Co-authored-by: tournierjc <tournierjc@users.noreply.github.com>
…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
Integre 3 commits amont (1e136bf MiniMax-AI#390, 9b9c07b MiniMax-AI#389, 67a5c2a MiniMax-AI#388) : stabilite frames historique natif/diff overlay, scrollback pendant les updates auto, dismissal des erreurs terminal stale en nouveau tour. Resolutions : - docs/examples.md, README.md, docs/demo.md, README_ZH.md : keep fork (delta amont = marketing MiniMax + lien install amont, deja rebroye fork). - pocket-pet/, provider/, onboarding, session-lifecycle-bridge, turn-execution.service, local-bash-output.test, source-sync.test.mjs : keep fork (contenu identique au main, deja verifie en #82). - update/service.ts + update-service.test.ts : keep fork deletion (78d2b5a release module = seul canal de update). - windows-contract.test.mjs : drop le test 'managed update' amont qui instancie McodeUpdateService (supprime sur le fork), imports netoyes. - tui-main-screen.ts, tui-engine-local-deltas.test.ts, LOCAL_CHANGES.* : take upstream (fork-side = identique a upstream avant le delta). - package.json / tui/package.json : keep fork name+version (kinetick-code 0.6.6). - release/public-source.json : keep fork, regenere ensuite.
…r in rollback test (fork rebrand fe24b27/8c3ed5e)
Resolutions reconcilees sur les fichiers de l'engine TUI: - docs/demo.md (add/add) = version main (rebroye fork #82). - docs/tui-capabilities.md = fusion section-level: sections amont (Regular-mode terminal history, Stopping cascade) + sections fork (Process sandbox #88, Session tabs family) + sections communes take main la ou rebroye. - LOCAL_CHANGES.md: delta amont (L044-L047 + notes supersession) + edits fork L015/L040. - LOCAL_CHANGES.json: entries union amont/main, currentSha256 recalculés sur l'arbre merge. - tui-main-screen.ts = amont (L045-L047) + hunk stop() main (retient le transcript a l'arret via hasPendingRender). - tui.ts = amont (contient deja le drain L044; surnumeraire main evite). - native-module-path.ts = main (resolu fork-layout; stale sha amont). Gates: typecheck OK; engine/scrollback/app/chat-controller/ background-panel/viewport/theme = 768/768.
Le symlink de setup worktree (node_modules -> clone principal) avait ete capture par un 'git add -A' du merge; il casse 'pnpm install' sur les runners CI (ERR_PNPM_ENOENT mkdir node_modules).
…erreur Memes symlinks de setup worktree (packages/*, third_party/pi-mono/*) captures par 'git add -A'; ils cassent pnpm install sur les runners.
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
6 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.
merge: upstream 1e136bf (scrollback natif, erreurs terminal stale)
Commits amont intégrés (3, delta 4fdf523..1e136bf)
1e136bffix(tui): stabilize native history and diff overlay frames (fix(tui): stabilize native history and diff overlay frames MiniMax-AI/minimax-code#390)9b9c07bfix(tui): preserve native scrollback during automatic updates (fix(tui): preserve native scrollback during automatic updates MiniMax-AI/minimax-code#389)67a5c2afix(tui): dismiss stale terminal errors when a new turn starts (fix(tui): dismiss stale terminal errors after retry MiniMax-AI/minimax-code#388)Aucun commit bloqué telemetry (aucune URL sortante dans les ajouts ; fixtures
example.invaliduniquement, déjà intégrées en #82).Skips
4198174(fix: remove forced branching from Bash guidance MiniMax-AI/minimax-code#358) : déjà absorbé dans main via PR merge: upstream 4198174 (bash guidance) #76 (merge=31d5346), diff contenu vide → skip-doublon.~/.kinetick) dans main via merge: upstream 4fdf523 (TUI, stop cascade, Pocket Pet) — en attente du fix upstream #82/merge: upstream 0b7403c (token speed + M3.1 Flash fallback) — en attente du fix upstream #80 — hunks amont (marketing MiniMax, lien d'install amont) écartés, identité fork préservée.Conflits résolus (29 + reconciliations du rebase)
update/service.ts+update-service.test.ts: suppression fork conservée (78d2b5a — le module release est le seul canal de update).test/windows-contract.test.mjs: test amont « managed update » (importMcodeUpdateService, service supprimé sur le fork) retiré ; imports netoyés ; les 2 tests restants (source location, WSL path) gardés.tui-main-screen.ts: version amont (L045–L047) + hunkstop()du main (retient le transcript à l'arrêt viahasPendingRender).tui.ts: version amont (contient déjà le drain L044 ; la copie main créait des déclarations dupliquées).native-module-path.ts: version main (résolution fork-layout ; stale sha amont non appliqué).docs/tui-capabilities.md: fusion section-level — sections amont (Regular-mode terminal history, Stopping cascade) + sections fork (Process sandbox docs: state that the sandbox is off and does not restrict the network #88, famille Session tabs) ; sections communes take main là où rebroyées.LOCAL_CHANGES.md/json: delta amont (L044–L047 + notes supersession) + edits fork L015/L040 ;currentSha256recalculés sur l'arbre mergé (26/26 cohérents).package.json/packages/tui/package.json: nom+version fork conservés (kinetick-code,@mavis/code).release/public-source.json: regénéré (node scripts/source-inventory.mjs --write, 4340 paths, check public-source passé).test/vitest-suites.json: entrée amonttui-scrollback-stability.test.tsajoutée, entrées fork conservées.Fix post-merge
37625f2:McodeInteractiveRenderer→KcodeInteractiveRendererdanstui-scrollback-stability.test.ts(le test amont fix(tui): preserve native scrollback during automatic updates MiniMax-AI/minimax-code#389 instancie le nom pré-rebrand ; 4 tests cassés → 56/56 après fix).10583f4: suppression des symlinksnode_modules(root + imbriqués) capturés par erreur par ungit add -Adu setup worktree — causaientERR_PNPM_ENOENTsur les runners CI.Gates locaux (branche merge, tous verts)
tsc -p tsconfig.standalone.json) : OK--quiet: 0 erreurInvariants fork vérifiés
docs/telemetry.mdabsent,requireTelemetryRunner/createConfiguredTuiBusinessTelemetry/businessEventTrackerabsents du tree merge.