Repository navigation
merge: upstream c08148e (TPS timing, empty OpenAI tools, stable regular-mode history) - #108
Merged
Merged
Conversation
* fix: include hidden thinking in TPS timing * docs: note thinking_start in first token timing comment * test(windows): allow the NTFS source check to exceed the default timeout --------- Co-authored-by: hetaoBackend <hetao7@pku.edu.cn>
* fix: omit empty tools on OpenAI compaction requests * fix: negotiate missing tools with bounded compatibility recovery * fix: simplify empty tools handling to omit absent definitions
…AI#416) Regular mode wrote rows into native scrollback as soon as they scrolled off screen. When such a row later changed (a parallel tool finishing, a streamed table widening, a list turning loose, a turn growing past the projection fold, the welcome status badge flipping, or a stopped prompt gaining its cancelled marker), the renderer cleared scrollback and replayed the whole session from the welcome logo. Only final rows now reach native history: - The transcript reports how many leading rows later updates cannot change, including the committed blocks of a streaming Markdown reply. - The chat layout keeps rows that may still change within one screen above the footer, showing their latest rows under a one-line notice when they do not fit. - The regular-mode projection only appends; established turns are not re-folded or dropped. - The welcome banner above a conversation is static; account notices that need action appear above the Composer. - Stopping a run no longer marks its delivered prompt as cancelled; the marker stays reserved for prompts returned to the Composer. To keep long sessions responsive, the transcript drops final rows far above the screen and the engine rebases its retained state (takeDiscardedRows) instead of rewriting history. Co-authored-by: tournierjc <tournierjc@users.noreply.github.com>
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 amont
c08148e(MiniMax-AI/minimax-code)Port des commits amont postérieurs à
e77c763sur mainb9b9c61. La branchemerge/upstream-e77c763n'est pas rebasée : son arbre est identique au squash#105(3f17f32), et rejouer ses 32 commits déjà fusionnés serait un doublon. Cette PR part demainet ne contient que le delta nouveau.Commits amont intégrés (3)
8f114d9ffix: include hidden thinking in TPS timing (fix: include hidden thinking in TPS timing MiniMax-AI/minimax-code#413) — pris. Le début de génération inclutthinking_start, y compris quand le texte de réflexion est masqué, pour que le débit affiché suive l'usage de sortie. Le test NTFS Windows passe à 30 s (PowerShell/CIM) sans restaurer les tests de mise à jourMcodeUpdateServiceretirés du fork.bf3916f5fix: omit empty tools from OpenAI compaction requests (fix: omit empty tools from OpenAI compaction requests MiniMax-AI/minimax-code#199) — pris. Les requêtes de compaction OpenAI-compatibles n'envoient plustools: []quand aucune définition d'outil n'est fournie. Les définitions non vides restent inchangées. Couverture : fixture HTTP locale danscompaction-openai-transport.integration.test.ts(pas d'appel fournisseur réel).c08148e6fix(tui): keep regular-mode history stable during live runs (fix(tui): keep regular-mode history stable during live runs MiniMax-AI/minimax-code#416) — pris. En mode regular, seules les lignes finales entrent dans le scrollback natif (étapes terminées, blocs Markdown déjà commités, bannière d'accueil statique). Les lignes encore mutables restent à l'écran, avec l'avis↑ N more lines above · still updatingsi elles dépassent. Un arrêt de run ne marque plus le prompt déjà livré comme annulé. Les longues sessions tronquent les lignes finales loin au-dessus de l'écran (takeDiscardedRows) au lieu de réécrire l'historique.Déjà sur main (ne pas réappliquer)
Absorbés par
#105(e77c763) et les syncs précédents (#80,#94,#96,#98) :3ba81694hook system messages (fix(tui): display hook system messages without adding model context MiniMax-AI/minimax-code#376)c7935eb7restored sessions anchored above inherited history (fix(tui): keep the startup banner above restored session history MiniMax-AI/minimax-code#378)ec4a6117slow terminal output off the input loop (fix(tui): keep slow terminal output off the input loop MiniMax-AI/minimax-code#379)c593d3d5cascade explicit session stops (feat: cascade session stops to owned background work MiniMax-AI/minimax-code#381)68284bb1structured Windows source volume properties (fix: accept local NTFS source checkouts using structured volume data MiniMax-AI/minimax-code#383)4fdf5234Pocket Pet demo + README onboarding (feat(examples): add Pocket Pet demo and refresh README onboarding MiniMax-AI/minimax-code#385) — versions fork déjà retenues par#10567a5c2acdismiss stale terminal errors (fix(tui): dismiss stale terminal errors after retry MiniMax-AI/minimax-code#388)9b9c07bc/1e136bfdnative scrollback (fix(tui): preserve native scrollback during automatic updates MiniMax-AI/minimax-code#389 / fix(tui): stabilize native history and diff overlay frames MiniMax-AI/minimax-code#390) — revertés amont par#396, revert déjà sur main5f3240bdsrt-macos PATH + BYOK timeout (test: pin the srt-macos probe PATH and scale the BYOK serial timeout budget MiniMax-AI/minimax-code#397)d8a32b6bsync 0.5.9 runtime and TUI (feat: sync MiniMax Code 0.5.9 runtime and TUI changes MiniMax-AI/minimax-code#398) — branding/télémétrie déjà écartés3d369f51revert fix(tui): stabilize native history and diff overlay frames MiniMax-AI/minimax-code#390 and fix(tui): preserve native scrollback during automatic updates MiniMax-AI/minimax-code#389 (Revert #390 and #389 to restore TUI scrollback baseline MiniMax-AI/minimax-code#396)568346580.5.10 prompt and run recovery (fix(tui): sync 0.5.10 prompt rendering and stale-run recovery MiniMax-AI/minimax-code#410)Ignorés (version / release)
2aed5ca7chore: bump version to 0.5.7 (chore: bump version to 0.5.7 MiniMax-AI/minimax-code#377)e3d78551chore: bump version to 0.5.8 (chore: bump version to 0.5.8 MiniMax-AI/minimax-code#380)c8a39a5achore: release MiniMax Code 0.5.9 (chore: release MiniMax Code 0.5.9 MiniMax-AI/minimax-code#399)e77c7630chore: release MiniMax Code 0.5.10 (chore: release MiniMax Code 0.5.10 MiniMax-AI/minimax-code#411)Le fork reste
kinetick-code/@mavis/codeen 0.6.9. Aucun bump de version.Adaptations fork
KCodeetKCODE_WELCOME_DESIGNconservés. La bannière de conversation est statique (pas de statut live dans le scrollback) ; les avis de compte restent au-dessus du Composer.view.tsne revient pas au texte littéral amont).LOCAL_CHANGES: le comportement amont est enregistré en L048 (lignes Markdown commitées) et L049 (rejet des lignes finales déjà dans l'historique). L045–L047 restent les entrées fork existantes.docs/tui-capabilities.md: le nouveau paragraphe dit « Kinetick Code », pas MCode.docs/telemetry.md,requireTelemetryoucreateTuiBusinessEventTrackerréintroduit.release/public-source.jsonettest/vitest-suites.jsonincluent le nouveau test d'intégration compaction.pnpm check:source: 4355 fichiers.Change
Le débit de tokens compte la réflexion masquée, la compaction OpenAI n'envoie plus un tableau
toolsvide, et le mode regular du TUI n'écrit dans le scrollback natif que les lignes qui ne changeront plus.Validation
pnpm verify(profilfull) PASS — 15/15 gates sur7538db3, Linux, Node.js 24.21.0, pnpm 9.12.0.check:sourcePASS (4355 fichiers)check:tsconfigPASS (130 exports)test:release-toolsPASSlint:tuiPASStypecheckPASSbuildPASScheck:standalonePASScheck:egressPASStest:artifactPASStest:capabilitiesPASS (230 fichiers)test:status-contractPASStest:smokePASStest:byokPASStest:policyPASS (142)7538db3(run 36825163117) :verify (ubuntu-latest, 24)PASS etverify (macos-latest, 24)PASS. Le job agrégéverificationest vert.test:windows,test:sandbox(macOS) ettest:release-package(archive npm). Pas d'appel fournisseur réel. Les fixtures HTTP de compaction ne valident pas LiteLLM, vLLM, OpenAI ou un proxy Anthropic en production.Publication and contribution checks
release/public-source.json; new tests are declared intest/vitest-suites.jsonwhere applicable.Maintainer handoff
Publication scope or license changes (if any): none.
Shared-source port: this PR is the reviewed fork port of upstream
8f114d9f,bf3916f5andc08148e6. Version bumps2aed5ca7,e3d78551,c8a39a5aande77c7630are intentionally not ported. Earlier commits throughe77c763are already on main via #105.