chore: sync upstream/main 17 commits (2026-09-04) into fork - #54
Merged
Conversation
Conflicts resolved: - apps/kimi-code/src/tui/commands/config.ts — preserved fork-owned fallback-model and squeeze-model commands - apps/kimi-code/src/tui/config.ts — kept fork-owned config additions - apps/kimi-code/test/tui/commands/update-preferences.test.ts — merged fork test expectations with upstream - apps/kimi-code/test/tui/config.test.ts — merged fork test expectations with upstream - packages/agent-core-v2/src/agent/fullCompaction/compactionOps.ts — kept fork-owned fullCompactionKey model fields, removed upstream-deleted fullCompactionWireRangesKey - packages/agent-core-v2/src/agent/fullCompaction/fullCompactionService.ts — merged upstream's new imports with fork's squeeze-model cascade - packages/agent-core-v2/src/app/telemetry/events.ts — merged telemetry event definitions Removed upstream-deleted files: - packages/agent-core-v2/src/features/staleGuard/* (upstream refactored this out) - packages/agent-core-v2/test/features/staleGuard/staleGuard.test.ts Fixed: - packages/agent-core-v2/test/state/builtinReplayableKeys.ts — removed stale fullCompactionWireRangesKey import (state key deleted by upstream)
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
1 participant
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.
Summary
Merge the 17 upstream commits from MoonshotAI/kimi-code#main that did not auto-sync, with manual conflict resolution for all 7 conflicted files.
Upstream commits included
Conflict resolution
All 7 conflicted files resolved with fork-owned features preserved:
Additional fix during merge
Fork-owned files guard
All fork-owned markers in verified present after merge (fallbackModel, squeeze-model-secondary, fork-and-switch, model-favorites).
Test status
4 pre-existing test failures in fullCompaction (identical to fork master baseline). No new test failures introduced by this merge.