feat: agent swarm by kermanx · Pull Request #424 · MoonshotAI/kimi-code

kermanx · 2026-06-04T09:58:56Z

Related Issue

No linked issue. Problem explained below.

Problem

Kimi Code already had individual subagents, but there was no first-class workflow for splitting one task across many agents, coordinating the batch, or showing users what each subagent was doing. When many subagents hit provider limits at the same time, the parent session also had no dedicated way to suspend, retry, and surface that state without treating every throttled attempt as a final failure.

The CLI, TUI, SDK, and session replay layers all needed to understand the same swarm lifecycle so a user can start a swarm task, watch queued/running/suspended/completed/failed agents, resume unfinished work, and recover the display after reload.

What changed

Added core swarm mode and an AgentSwarm tool that fans out templated item prompts, resumes unfinished subagents by id, preserves swarm item metadata, and returns ordered results with resume hints.
Added queued subagent batch execution with staggered launch, readiness tracking, per-task timeout/cancellation behavior, rate-limit suspension events, same-agent retry, and adaptive retry capacity.
Added RPC and SDK support for swarm mode and swarm prompts, including swarm mode status and subagent suspension event typing.
Added provider rate-limit error normalization in @moonshot-ai/kosong so agent-core can distinguish throttled attempts from ordinary subagent failures.
Added /swarm, /swarm on, /swarm off, manual-permission prompting, and the kimi swarm-demo preview path for the CLI/TUI.
Added live TUI swarm progress rendering above the input area, including queued, running, suspended, completed, failed, and retry states, plus transcript replay and tool-call presentation updates.
Updated English and Chinese user docs for the slash command and tool surfaces.
Added and updated tests for the subagent batch scheduler, AgentSwarm tool behavior, rate-limit/error classification, SDK event/status typing, slash command parsing, TUI launch flow, progress rendering, replay, and related message/UI state handling.

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.
Ran gen-changesets skill, or this PR needs no changeset.
Ran gen-docs skill, or this PR needs no doc update.

…ess-ui

changeset-bot · 2026-06-04T09:59:02Z

🦋 Changeset detected

Latest commit: 31fa83d

The changes in this PR will be included in the next version bump.

This PR includes changesets to release 6 packages

Name	Type
@moonshot-ai/agent-core	Minor
@moonshot-ai/kosong	Minor
@moonshot-ai/kimi-code-sdk	Minor
@moonshot-ai/kimi-code	Minor
@moonshot-ai/acp-adapter	Patch
@moonshot-ai/migration-legacy	Patch

Not sure what this means? Click here to learn what changesets are.

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

…ess-ui # Conflicts: # apps/kimi-code/src/tui/controllers/session-event-handler.ts # apps/kimi-code/test/cli/options.test.ts # docs/en/reference/slash-commands.md # docs/zh/reference/slash-commands.md

…ess-ui

chatgpt-codex-connector

💡 Codex Review

Here are some automated review suggestions for this pull request.

Reviewed commit: dc029d586d

ℹ️ 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".

chatgpt-codex-connector

💡 Codex Review

Here are some automated review suggestions for this pull request.

Reviewed commit: b9dc203cae

ℹ️ 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".

kermanx · 2026-06-06T10:35:02Z

@codex

chatgpt-codex-connector

💡 Codex Review

Here are some automated review suggestions for this pull request.

Reviewed commit: 0d50b541a4

ℹ️ 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".

kermanx · 2026-06-06T13:37:44Z

@codex

chatgpt-codex-connector

💡 Codex Review

Here are some automated review suggestions for this pull request.

Reviewed commit: 1dc2a84a4c

ℹ️ 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".

kermanx · 2026-06-06T14:23:34Z

@codex

chatgpt-codex-connector

💡 Codex Review

Here are some automated review suggestions for this pull request.

Reviewed commit: 5c22fa98e8

ℹ️ 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".

kermanx · 2026-06-06T15:07:13Z

@codex

chatgpt-codex-connector

💡 Codex Review

Here are some automated review suggestions for this pull request.

Reviewed commit: 31fa83d549

ℹ️ 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".

kermanx added 18 commits June 3, 2026 20:58

feat: add agent swarm tui support

27dded5

fix: redraw agent swarm progress updates

d711cf0

fix: refine agent swarm progress rendering

45a74b1

upd

1cd720a

fix

6f89819

update

9e58f5c

fix

d3f92ef

update

8bc6b5f

upd

329238b

Merge remote-tracking branch 'origin/main' into xtr/agent-swarm-progr…

0c7d35f

…ess-ui

fix

9db2cd2

update

4d76bf0

Merge remote-tracking branch 'origin/main' into xtr/agent-swarm-progr…

c1b5ba7

…ess-ui

fix

4797e90

fix

0a93675

fix: emit suspended subagent events

c0bfa73

fix: show suspended swarm progress

5729fbc

fix: normalize suspended swarm status

42ff90b

kermanx changed the title ~~feat: add AgentSwarm TUI support~~ feat: agent swarm Jun 4, 2026

kermanx added 10 commits June 4, 2026 18:20

fix

a116227

fix

68ec665

fix

f5841ae

Merge remote-tracking branch 'origin/main' into xtr/agent-swarm-progr…

ce6a471

…ess-ui # Conflicts: # apps/kimi-code/src/tui/controllers/session-event-handler.ts # apps/kimi-code/test/cli/options.test.ts # docs/en/reference/slash-commands.md # docs/zh/reference/slash-commands.md

fix

99adec6

fix

b418a04

fix

765f108

update

75e00b8

Merge remote-tracking branch 'origin/main' into xtr/agent-swarm-progr…

b922dbe

…ess-ui

fix

108f635

chatgpt-codex-connector Bot reviewed Jun 6, 2026

View reviewed changes

kermanx added 6 commits June 6, 2026 16:22

update

6e87a7b

fix

536d27c

fix

f52f253

fix exit

29de45b

fix

06d452f

fix

b9dc203

chatgpt-codex-connector Bot reviewed Jun 6, 2026

View reviewed changes

Comment thread packages/agent-core/src/agent/turn/index.ts Outdated

Comment thread packages/node-sdk/src/rpc.ts

kermanx added 4 commits June 6, 2026 18:19

timeout

4a2eede

fix

42b1fb9

fix

548ada8

refactor merge panels

0d50b54

chatgpt-codex-connector Bot reviewed Jun 6, 2026

View reviewed changes

Comment thread apps/kimi-code/src/tui/commands/swarm.ts Outdated

Comment thread packages/agent-core/src/tools/builtin/collaboration/agent-swarm.ts

kermanx added 2 commits June 6, 2026 18:54

fix

7c9e5dd

fix

1dc2a84

chore: update agent swarm changeset

c5b416c

chatgpt-codex-connector Bot reviewed Jun 6, 2026

View reviewed changes

Comment thread packages/agent-core/src/tools/builtin/collaboration/agent-swarm.ts

Comment thread apps/kimi-code/src/tui/commands/swarm.ts

Comment thread apps/kimi-code/src/tui/commands/undo.ts

kermanx added 4 commits June 6, 2026 21:52

update

67b8d35

update

4a64533

fix

0da717c

fix

5c22fa9

fix

a42e6a7

chatgpt-codex-connector Bot reviewed Jun 6, 2026

View reviewed changes

Comment thread packages/agent-core/src/session/subagent-batch.ts

Comment thread packages/agent-core/src/tools/builtin/collaboration/agent-swarm.ts

Comment thread packages/node-sdk/src/rpc.ts

ok

b380ceb

gated under flag

31fa83d

chatgpt-codex-connector Bot reviewed Jun 6, 2026

View reviewed changes

Comment thread packages/node-sdk/src/rpc.ts

Comment thread packages/agent-core/src/rpc/events.ts

Comment thread packages/agent-core/src/tools/builtin/collaboration/agent-swarm.ts

Conversation

kermanx commented Jun 4, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Related Issue

Problem

What changed

Checklist

Uh oh!

changeset-bot Bot commented Jun 4, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

🦋 Changeset detected

Uh oh!

chatgpt-codex-connector Bot left a comment

Choose a reason for hiding this comment

💡 Codex Review

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

chatgpt-codex-connector Bot left a comment

Choose a reason for hiding this comment

💡 Codex Review

Uh oh!

Uh oh!

Uh oh!

kermanx commented Jun 6, 2026

Uh oh!

chatgpt-codex-connector Bot left a comment

Choose a reason for hiding this comment

💡 Codex Review

Uh oh!

Uh oh!

Uh oh!

kermanx commented Jun 6, 2026

Uh oh!

chatgpt-codex-connector Bot left a comment

Choose a reason for hiding this comment

💡 Codex Review

Uh oh!

Uh oh!

Uh oh!

Uh oh!

kermanx commented Jun 6, 2026

Uh oh!

chatgpt-codex-connector Bot left a comment

Choose a reason for hiding this comment

💡 Codex Review

Uh oh!

Uh oh!

Uh oh!

Uh oh!

kermanx commented Jun 6, 2026

Uh oh!

chatgpt-codex-connector Bot left a comment

Choose a reason for hiding this comment

💡 Codex Review

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

1 participant

kermanx commented Jun 4, 2026 •

edited

Loading

changeset-bot Bot commented Jun 4, 2026 •

edited

Loading