Upstream kimi-code — Sync status (2026-07-30): 12 commits, 5 conflicts

[zicochaos]

Current upstream delta

Fresh refs checked on 2026-07-30:

• Fork main: a6a96a0dbd4e
• Upstream main: f1a3475ad5d6
• Fork-only commits: 36
• Upstream-only commits: 12

The earlier secondary-model/custom-agentfile collision is no longer a strategic blocker: #12 adopted upstream's implementation, and #20 synchronized the fork through upstream commit 1896d1a13.

Upstream-only work

The remaining 12 commits are:

• fa2c5ce18b — plugin-contributed custom agents (feat: support plugin-contributed custom agents MoonshotAI/kimi-code#2365)
• 691ec4679e — non-blocking TaskOutput (fix: remove the blocking wait from the TaskOutput tool MoonshotAI/kimi-code#2379)
• 40172c7ca9 — unified host identity (feat: unify the host identity across OAuth, telemetry, and kap-server MoonshotAI/kimi-code#2382)
• d10b1c1308 — rebuild incomplete cache entries as cold misses (fix(agent-core-v2): treat cache entries missing required fields as cold misses MoonshotAI/kimi-code#2395)
• d36f4c58f6 — remove the fault-injection experimental feature (refactor(agent-core-v2): remove the fault-injection experimental feature MoonshotAI/kimi-code#2399)
• 6d0a046488, 0f3b106c42, 479403e701 — VS Code sign-in fixes and 0.6.6 release
• bc28e9d802 — package release CI
• ea81c9a3c5 — managed-account profile at GET /oauth/userinfo (feat(kap-server): expose the managed-account profile at GET /oauth/userinfo MoonshotAI/kimi-code#2363)
• d8f455d694 — sync the 0.31.0 changelog
• f1a3475ad5 — atomic agent-core-v2 config refresh transition (fix(agent-core-v2): write refresh results in one atomic config transition MoonshotAI/kimi-code#2410)

Fresh merge simulation

A clean Jujutsu merge simulation of main@fork and main@origin reports 5 two-sided conflicts:

File	Relevant upstream change	Resolution direction
packages/agent-core/test/harness/runtime.test.ts	plugin-contributed custom agents (fa2c5ce18b)	Port the fork's runtime/subagent assertions onto upstream's plugin-agent catalog setup.
packages/agent-core-v2/docs/state-manifest.d.ts	plugin agents + fault-injection removal (fa2c5ce18b, d36f4c58f6)	Regenerate from the resolved state manifest; do not hand-maintain the generated declaration.
packages/agent-core-v2/test/agent/loop/loop.test.ts	non-blocking TaskOutput (691ec4679e)	Keep fork-specific loop coverage while adopting the no-block/no-timeout contract.
packages/agent-core-v2/test/app/config/config.test.ts	atomic refresh transition (f1a3475ad5)	Reconcile fork config cases with the new single-transition refresh behavior.
packages/agent-core-v2/test/tool/tool.test.ts	non-blocking TaskOutput (691ec4679e)	Update assertions to the success / not_ready retrieval contract.

All other paths merge automatically in the fresh simulation.

Recommended follow-up

• Create a dedicated upstream-sync branch from fork main.
• Merge upstream main at f1a3475ad5d6 in one operation.
• Resolve the five conflicts above, regenerating state-manifest.d.ts from its source.
• Verify plugin-agent refresh behavior and the non-blocking TaskOutput contract.
• Run the affected agent-core and agent-core-v2 suites, followed by the repository's normal build/typecheck verification.
• Open a PR documenting the chosen resolutions and test evidence.

---

Supersedes #10 and #22. Generated from freshly fetched refs and a disposable Jujutsu merge workspace; no merge was applied to the working checkout.