mirror of
https://github.com/MoonshotAI/kimi-code.git
synced 2026-08-26 17:14:33 +00:00
Conflict resolution notes: - Follow main's architecture (model-as-container, agent runtime, featurized todo/cron/interaction/goal) and re-apply spine features onto it. - Port agent-scope token counting additions (rawSize/latestMeasurement/ projected estimates, AgentStatusUpdated rawContextTokens) onto the new session-scope ISessionTokenCountingService; adapt spine/kap-server/TUI facade call sites to AgentContext-keyed APIs. - Move branch-added cron tests into the renamed test/features/cron and rewrite them on the agent-runtime harness (ctx.resolve(AgentCron)). - Port the spine-flag todo reminder gate into features/todo; silence the reminder lazily so DI-light test hosts keep working. - Register contextProjector in test hosts that construct context memory directly; make the trailing-open-tool-exchange trim compose with main's closeTrailingOpenToolExchange in fork. - Restore mimeType passthrough for staged media uploads (facade uploadFile -> IFileService.save) so main's video/image paste pipeline works on the v2 facade. - compactionFutile now latches only when the post-compaction shape still exceeds the effective window itself (not the 85% trigger ratio), so main's provider-observed-window pre-compaction can still fire. |
||
|---|---|---|
| .. | ||
| kimi-code | ||
| kimi-desktop/out | ||
| kimi-inspect | ||
| vis | ||
| vscode | ||