merge: upstream 8b55164 (en attente du fix upstream) - #59
Merged
Merged
Conversation
…Max-AI#351) * fix: run Windows managed updates through Node entry points * fix: preserve custom npm launchers during managed updates * fix: preserve npm wrapper behavior in managed updates --------- Co-authored-by: muyu <muyu@minimaxi.com>
…AI#350) * fix(tui): preserve detached scrolling across resize * test(tui): cover detached scrolling across content and footer shrink --------- Co-authored-by: muyu <muyu@minimaxi.com> Co-authored-by: hetaoBackend <hetao7@pku.edu.cn>
A provider can expose many models while users switch between only a few. Let users star those models so they can reach them without scrolling through every provider group. - Press Ctrl+S in /model to star or unstar the focused model. Starred models appear in a Favorites group at the top, in the order they were added, and keep a star marker in their provider group. - When the current model is a favorite, the picker opens with focus on its Favorites row. Search filters the Favorites group as well. - Favorites identify a model only (provider and model ID); effort, thinking and context still follow the normal selection flow. - Store favorites in the local runtime preferences table under `model-favorites`. Malformed values degrade to an empty or partial list. Favorites missing from the catalog are hidden, and are pruned on the next toggle only when the catalog was read successfully. - The picker updates immediately and rolls back with an inline notice if saving fails. Hosts without a favorites store hide the shortcut. Only the TUI uses this capability for now; Desktop and ACP are unchanged.
* perf: reuse verified history during incremental index scans * fix: validate index inputs from the same fresh read * perf: avoid transient copies and repeated replay size walks * perf: share immutable history messages across runtime boundaries * perf: defer unused browser and syntax grammar initialization * Revert "perf: defer unused browser and syntax grammar initialization" This reverts commit 058f59a. * perf: reuse bounded buffers for fresh history reads * Revert "perf: reuse bounded buffers for fresh history reads" This reverts commit 0d85c2b. * perf: fold native turn outcomes without retaining stream events * perf: reuse history subtree identities and index replay eviction * perf: continue canonical history digests from verified prefixes * fix: ignore superseded replay settlements
Upstream a914a30..8b55164 (12 commits): 0.5.4 bump, session titles, model favorites, perf, Bash execution contracts, Windows update fix. Fork identity (kinetick-code/@mavis/code, Kcode naming, telemetry removal, egress guard) preserved; copilotOAuth + listModelProviders kept alongside upstream model favorites. Upstream listUserModelProviders rename superseded by fork listModelProviders.
The kept chrome-flow title is the session name, or "Kinetick Code" when the session is untitled. Agent status does not rewrite it. Drop the upstream MCode status-title expectations and the leftover MCode app label. Co-authored-by: tournierjc <tournierjc@users.noreply.github.com>
This was referenced Sep 25, 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
8 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.
Sync upstream — en attente du fix upstream — NE PAS MERGER
Merge de l'amont
MiniMax-AI/minimax-codea914a30..8b551644dans le fork (12 commits, branchemerge/upstream-8b55164).Commits upstream intégrés (12, 0 bloqué, 0 skip-doublon)
Écran télémétrie : aucun commit sujet/chemin télémétrie ; URLs ajoutées =
updates.example.invalid(fixture),registry.npmjs.org,code.visualstudio.com(homepages). Aucun endpoint sortant.Conflits (15) et résolutions
kinetick-code/@mavis/code, version 0.5.3, naming Kcode (package.json ×2, install-source.ts, prefix-update.ts — le fix Windows upstream est déjà couvert par l'équivalent forkisManagedKcodeInstallRootinline).createTuiBusinessEventTracker(réintroduit par l'amont) NON intégré — suppression fork conservée ;docs/telemetry.mdabsent ; 0 réfrequireTelemetry.chrome-flow.syncTerminalTitle, tests fork), implémentation amont (feat(tui): improve session titles and terminal notifications MiniMax-AI/minimax-code#355) écartée en doublon fonctionnel.setModelFavorite/ModelFavoritesPreference(amont feat(tui): add model favorites to the /model picker MiniMax-AI/minimax-code#342) intégrés AUXcopilotOAuthetlistModelProvidersdu fork ; rename amontlistUserModelProvidersécarté (supersédé).update/service.ts: delete (fork), comme l'amont qui l'a aussi supprimé.Gates (APRES merge, worktree)
tsc typecheck: PASS--config vitest.oss.config.mjs: tabs/session-tabs/session-cost/provider-manager/provider-application/command-flow = 440/440 PASS ; themes (3) + engine-local-deltas + model-favorites = 158/158 PASSnode scripts/build.mjs: OK (Kinetick Code 0.5.3) ; smokenode --test: 20/0 (1 skip)test:byok: 4/0 ;check:egress: PASS ;source-inventory --check: 4273 files PASS