Skip to content

chore: sync release/2026-10-28 (2.4.0) back to main - #4497

Merged
Grapedge merged 2 commits into
MoonshotAI:mainfrom
kimi-agent-bot:chore/sync-release-2026-10-28-back-to-main
Oct 28, 2026
Merged

Grapedge merged 2 commits into
MoonshotAI:mainfrom
kimi-agent-bot:chore/sync-release-2026-10-28-back-to-main

Conversation

@kimi-agent-bot

Copy link
Copy Markdown
Collaborator

Requirement or Bug

将本期 release/2026-10-28 的 2.4.0 版本元数据、CHANGELOG、已消费 changesets 和 release-only 修复同步回 main,避免下一期发版基准漂移。本 PR 提前以 Draft 开出,必须在全部发布与验收步骤完成后才能转为 Ready / 合并。

Bug Reproduction Steps

N/A

Root Cause

N/A

Code Changes

Behavior Changes and Affected Users

Behavior Before After Who relies on the old behavior Escape hatch
MCP 自动重试状态 每次自动重试可能重复显示失败状态 自动重试中间状态去重,初始失败与恢复仍保留 CLI/TUI 用户及 SDK 消费方 与本期 2.4.0 一致
main 版本与 CHANGELOG 2.3.3 / 0.8.3 / 0.21.1 / 0.85.0 2.4.0 / 0.8.4 / 0.22.0 / 0.86.0 下一期发版与文档读者 不需要
main 后续功能与 dist-web main #4488 的独立产物 保持不变,不用 release 旧线产物覆盖 main 上 multi-source-folder 等后续能力的用户 保留 main 版本,无需迁移
发布行为 main 的普通 PR CI 本同步 PR 不触发 npm、GitHub Release、VS Code 市场或 CDN 发布 所有用户 不需要

验证:

  • apps/kimi-code/dist-web 相对 origin/main 零 diff。
  • 版本号、CHANGELOG 和 fix(agent-core-v2): suppress automatic MCP retry status repeats #4492 源文件与本期 release 一致;main 独有的后续测试断言和未消费 changesets 保留。
  • packages/agent-core-v2 的 test/mcpCore/connection-manager.test.ts:46/46 通过。
  • pnpm run build 全量通过;Web assets 检查通过。
  • 本 PR 只提前准备同步内容,门禁⑥前不合并。

Checklist

  • I have read the CONTRIBUTING document.
  • I have linked a related issue, or explained the problem above.
  • I have added tests that prove my feature works. (N/A — cherry-pick of already reviewed release changes; focused MCP tests and full build completed, full PR CI also required)
  • The behavior-change table above is complete, and every removed behavior or flipped default is named in the changeset and either has an escape hatch or was explicitly approved by a maintainer in this PR. (Changes were approved and released through ci: release packages #4463)
  • Ran gen-changesets skill, or this PR needs no changeset. (Release sync only; consumed changesets are removed, no new changeset)
  • Ran gen-docs skill, or this PR needs no doc update. (Docs changelog is handled separately in docs(changelog): sync 2.4.0 from apps/kimi-code/CHANGELOG.md #4496)

sailist and others added 2 commits October 28, 2026 19:44
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
@changeset-bot

changeset-bot Bot commented Oct 28, 2026

Copy link
Copy Markdown

⚠️ No Changeset found

Latest commit: c111bc8

Merging this PR will not cause a version bump for any packages. If these changes should not result in a new version, you're good to go. If these changes should result in a version bump, you need to add a changeset.

This PR includes no changesets

When changesets are added to this PR, you'll see the packages that this PR includes changesets for and the associated semver types

Click here to learn what changesets are, and how to add one.

Click here if you're a maintainer who wants to add a changeset to this PR

@kimi-agent-bot
kimi-agent-bot marked this pull request as ready for review October 28, 2026 13:09
@chatgpt-codex-connector

chatgpt-codex-connector Bot commented Oct 28, 2026 •

Copy link
Copy Markdown

Codex Review Summary

This comment shows the latest Codex review activity on this pull request.

Review Status Commit Review trigger
📝 Code Review ✅ Completed 2026-10-28T13:16:27.286586Z c111bc8 Draft marked ready
ℹ️ About Codex in GitHub

Your team has set up Codex to review pull requests in this repo. Reviews are triggered when you

  • Open a pull request for review
  • Mark a draft as ready
  • Comment "@codex review" or "@codex security review".

Codex reacts with 👀 while any review is running, comments if it has suggestions, and reacts with 👍 once all reviews finish with no findings.

@pkg-pr-new

pkg-pr-new Bot commented Oct 28, 2026

Copy link
Copy Markdown
pnpm dlx https://pkg.pr.new/@moonshot-ai/kimi-code@c111bc8
npx https://pkg.pr.new/@moonshot-ai/kimi-code@c111bc8

commit: c111bc8

@Grapedge
Grapedge merged commit 0c63065 into MoonshotAI:main Oct 28, 2026
18 checks passed

@chatgpt-codex-connector chatgpt-codex-connector Bot left a comment

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

💡 Codex Review

Here are some automated review suggestions for this pull request.

Reviewed commit: c111bc88b3

ℹ️ About Codex in GitHub

Codex has been enabled to automatically review pull requests in this repo. Reviews are triggered when you

  • Open a pull request for review
  • Mark a draft as ready
  • Comment "@codex review".

If Codex has suggestions, it will comment; otherwise it will react with 👍.

When you sign up for Codex through ChatGPT, Codex can also answer questions or update the PR, like "@codex address that feedback".

}
const after = toPublicEntry(entry);
if (plan.forceEmit === true || !publicEntriesEqual(before, after)) {
const suppressRetryStatus = event.type === 'retryDue' || (automaticRetry && plan.target === 'retryWaiting');

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

P2 Badge Notify OAuth waiters when automatic retries settle

When a credential event such as tokens-saved arrives while an automatic retry is connecting, WorkspaceMcpService.handleMcpOAuthEvent sees pending and waits for a non-pending onStatusChange notification before invoking reconnectAfterCurrent (packages/agent-core-v2/src/workspace/workspaceMcp/workspaceMcpService.ts:214-231). If that handshake fails transiently, this condition suppresses the resulting retryWaiting/failed notification, so the credential change is not redriven until a later automatic attempt emits; with the default backoff this can delay OAuth completion by several minutes. Preserve a settle signal for internal waiters even if duplicate user-facing statuses are hidden.

Useful? React with 👍 / 👎.

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

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants