Skip to content

chore: sync upstream/main 17 commits (2026-09-04) — merged #55

Closed

Description

@arrrrny

Upstream sync completed

PR: #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.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Metadata

Metadata

Assignees

No one assigned

    Labels

    Projects

    No projects

      Milestone

      No milestone

      Relationships

      None yet

      Development

      No branches or pull requests

      Issue actions