Added support for Kimi in https://github.com/raine/claude-code-proxy and it does appear to work surprisingly well with Claude Code, although the usage limit for the entry tier doesn't seem as generous as I'd have expected.
Conflicts are not a problem at all in my experience.
My setup is that I run `/merge`[1] , which will first have the agent rebase changes on base, and on conflicts, it's instructed to understand both sides before resolving, which helps it merge them cleanly. I haven't resolved conflicts manually in months and also haven't had any issues with agents resolving them incorrectly. A solved problem as far as I'm concerned.
> it's instructed to understand both sides before resolving.
This is the crux of the issue. You are delegating the resolution of conflicts to an agent, which is fine, but doesnt solve the core issue that there's no scalable way to actually do this. It is far from a solved problem lol, just because your agents havent had issues resolving them.
In some specific work contexts, such as writing pull request descriptions, not sounding like AI is something I've given up on trying to optimize. It's simply not worth the effort for me being non-native and writing detailed PR descriptions being so arduous, and the agent already has full context anyway. Obviously any fluff or inaccuracies are aggressively weeded out but I don't care anymore about the AI voice.
> any fluff or inaccuracies are aggressively weeded out
this work is paramount. Without clear evidence of human filtering, a long, well formatted message/PR/doc is likely to reduce my estimate of the value/veracity/relevance of its content.
Hardware improvements are easier to quantify and progress naturally comes in incremental steps.
Software however especially from UX point of view, is more likely to be more or less ready at some point. Any improvements are marginal and subjective. What are the large UX teams at Apple going to do if not redesigns for the sake of redesigning? I wish it would happen, but it’s hard to imagine Apple shipping an annual OS release without noticeable visual changes.
reply