## Upstream sync completed **PR**: https://github.com/arrrrny/kimi-code-sync/pull/54 **Branch**: sync/fork-sync-resolution-2026-09-04 **Resolution**: Manual conflict resolution on 7 files ### Conflicts resolved | File | Resolution | |------|-----------| | 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 | | packages/agent-core-v2/src/agent/fullCompaction/fullCompactionService.ts | Merged upstream imports with fork squeeze-model cascade | | packages/agent-core-v2/src/app/telemetry/events.ts | Merged telemetry event definitions | ### Additional fix Removed stale fullCompactionWireRangesKey import from test/state/builtinReplayableKeys.ts (state key deleted by upstream refactor) ### Fork-owned files verified All markers in .github/FORK_OWNED_FILES present after merge.
Activity