feat(agent-core): custom agent files and secondary model on the v1 engine - #2232
Merged
Conversation
…gine
Migrate the custom agentfile and secondary-model capabilities from
agent-core-v2 to the v1 engine so they work in the TUI and plain
kimi -p sessions:
- discover Markdown agent files from user/project/extra/explicit
directories with the v2 precedence rules, a merged session profile
catalog replacing the hardcoded builtin profile lookups, SYSTEM.md
main prompt override, and ${base_prompt} backed by the effective
default
- --agent/--agent-file now work in print mode on the default engine;
CreateSessionOptions gains agentProfile/agentFiles
- [secondary_model] config + KIMI_SECONDARY_MODEL/EFFORT bind newly
spawned subagents to a cheaper model behind the secondary-model
experiment flag, with primary/secondary model params on Agent and
AgentSwarm and upfront session warnings
- full disallowedTools deny semantics (exact names + mcp__ globs)
evaluated by the tool manager and persisted in the agent wire
🦋 Changeset detectedLatest commit: e83cd85 The changes in this PR will be included in the next version bump. This PR includes changesets to release 1 package
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 |
commit: |
runPrompt is also driven programmatically (headless goal flow) with options that never pass through the CLI parser defaults, so agentFiles can be undefined; mirror the addDirs optional-chaining pattern. Also extend the SDK experimental-feature assertion with the secondary-model flag.
Signed-off-by: 7Sageer <sag77r@hotmail.com>
Signed-off-by: 7Sageer <sag77r@hotmail.com>
Signed-off-by: 7Sageer <sag77r@hotmail.com>
Signed-off-by: 7Sageer <sag77r@hotmail.com>
The resume path only forwards the agent file's name for the bound-profile assertion; the file's content is never re-applied (the session keeps its creation-time catalog snapshot). Previously the combination was silently accepted, so an edited file (or a same-named one) appeared to apply but did not. Reject it at option validation and document the constraint.
… agentfile headers The Windows notes, additional-dirs and skills prose blocks existed twice: inline in the builtin default template (system.md) and as constants in the agent-file renderer (from-file.ts). Extract them to profile/prompt-sections.ts as the single source: system.md renders them through injected KIMI_* template variables and from-file.ts imports the same constants. Rendered prompts are byte-identical for all four builtin profiles across macOS/Windows and skills/dirs on/off; a new test pins system.md to the shared constants. Also mark each profile/agentfile file with the path of its agent-core-v2 counterpart so format/semantics changes land in both engines.
Mirror /model: a picker with a thinking-effort step that persists [secondary_model] and live-applies to the current session via a new Session.setSecondaryModel RPC (node-sdk wrapper included), so newly spawned subagents bind the new model right away. The /model picker now hides the synthesized __secondary__ derived entry; docs and the update-config builtin skill mention the section.
Subagents report their model alias via agent.status.updated after spawn; resolve it to a display name and surface it in tool-call subagent stats and agent-group rows.
Show each subagent's model in the subagent card header and agent-group rows. Requires the secondary-model experiment (KIMI_CODE_EXPERIMENTAL_SECONDARY_MODEL=1); run /secondary_model to pick a model and thinking effort, applied to the current session immediately. Signed-off-by: 7Sageer <sag77r@hotmail.com>
Bind the selected agent profile to the startup session when launching the TUI with --agent/--agent-file, including the session created after an OAuth login at startup. Sessions created later in the process (/new) keep the default profile. Make both flags creation-only in every mode: combining them with --session/--continue is now rejected in print mode too, since resume restores the bound agent from the session automatically.
…rrides stripSecondaryModelConfig restored secondary_model.model/default_effort from raw whenever KIMI_SECONDARY_MODEL/KIMI_SECONDARY_EFFORT was set, so a /secondary_model pick made under the env vars was silently discarded on write. Restore from raw only when the value being written still equals the env value (an overlay round-trip), mirroring the pointer check in stripEnvModelConfig; a genuinely different selection now reaches config.toml.
… pick /secondary_model toasted the picked alias even when KIMI_SECONDARY_MODEL/KIMI_SECONDARY_EFFORT made the session bind a different model. Read the effective binding back from the reloaded config (as /model does from session status) and warn with the env-overridden values instead.
# Conflicts: # apps/kimi-code/src/cli/run-shell.ts
zicochaos
added a commit
to zicochaos/kimi-code
that referenced
this pull request
Jul 29, 2026
…odel/agentfile (MoonshotAI#2232) Syncs 30 upstream commits. Upstream MoonshotAI#2232 ported custom agent files + secondary-model binding to the v1 engine, covering the fork's exact-alias subagent model selection (fb6d57c) and subagent model surfacing (353a1c5) — so the fork's v1-side implementation is retired in favor of upstream's: - v1 collision files restored to upstream (agent/agent-swarm tools, subagent-host, tool registry, flags, docs); fork's v1 subagent-model-directory.ts dropped as dead code - TUI subagent model display deduplicated onto upstream's stats placement (agent-group, tool-call); fork's per-row model chip removed - config schema/toml unions keep the fork's disabledSkills alongside upstream's extraAgentDirs - footer quota readout ported onto upstream's slot-based footer (status_line); managed-usage rows adapted to upstream's structured ManagedUsageRow shape (window/name, no label) - node-sdk getSessionWarnings passes pathClass for the fork's AGENTS.md include expansion - state manifest regenerated Fork-unique deltas kept: disabled_skills denylist (PR MoonshotAI#1983 upstream), session-only default model, managed plan quota display, AGENTS.md include expansion, v2-side subagent model selection, misc fixes. Review follow-ups (PR #12): - v1 subagent-host + node-sdk getSessionWarnings: thread agentsMdExpandIncludes through spawned-subagent and warning prompt contexts (with a subagent-host test covering include expansion) - TUI: keep the status-derived subagent model when later events carry no model (subagent-event-handler, tool-call); AgentSwarm header shows a shared model only when all reported members agree (setMemberModel) - kap-server subagentRosterTracker learns the model from agent.status.updated; kimi-web agentEventProjector projects it onto the task - lint: drop useless spread in skillCatalogService; FORK.md + config docs note the v1 exact-alias retirement (v2-only)
zicochaos
added a commit
to zicochaos/kimi-code
that referenced
this pull request
Jul 29, 2026
chore: merge upstream main (f8ec3d1) and adopt upstream secondary-model/agentfile (MoonshotAI#2232)
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
1 participant
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Related Issue
No linked issue — the problem is explained in the next section.
Problem
Custom agents (Markdown agent files) and the secondary model for subagents were only available on the v2 engine (
kimi web/ experimentalkimi -p). Sessions on the default engine — the interactive TUI and plainkimi -p— could not discover or delegate to custom agents, override the main agent's system prompt viaSYSTEM.md, select the main agent with--agent/--agent-file, or bind subagents to a cheaper secondary model. This PR migrates both capabilities to the v1 engine with full v2 semantics.What changed
Custom agent files on v1
profile/agentfile/module: frontmatter parsing (shared with the skill parser; Claude Code comma-list and OpenCode file-name fallback compatible), user/extra/project/explicit discovery roots mirroring skill discovery, per-source priority merge,override: truegate before a file replaces a same-name builtin,SYSTEM.mdmain-prompt override, and dead-pattern warnings (bare*, incompletemcp__literals, unknown tool names).SessionAgentProfileCatalogmerges builtin and file profiles.${base_prompt}binds to an "effective default" slot (theSYSTEM.mdoverride when present, else the builtin default); the slot is structurally disjoint from the merge, so a file that overrides the default cannot recurse into itself. The delegation graph links file profiles'subagentsallowlists and extends the default profile's delegatable set with custom agents.--agent-filefails session creation); the three hardcodedDEFAULT_AGENT_PROFILESlookups (subagent host, persisted-profile restore, Agent tool description) now read the catalog.--agent/--agent-filework in print mode on either engine (the TUI still rejects them, matching v2);CreateSessionOptionsgainsagentProfile/agentFiles.Secondary model on v1 (experimental flag)
[secondary_model]config section (amodelpointer plus model patch fields) withKIMI_SECONDARY_MODEL/KIMI_SECONDARY_EFFORTenv overlays; a recipe with patch fields synthesizes an in-memory__secondary__derived entry that is stripped on write and never reachesconfig.toml.model> profilemodel_preference> configured secondary default), upfront validation via the provider manager with a wrapped error pointing at[secondary_model]; with the flag on, resume/retry keeps the subagent's bound model (v2 semantics), and with the flag off, inheritance behavior is unchanged.Agent/AgentSwarmtools gain aprimary|secondarymodelparameter (available models advertised in the tool description); startup validation surfacessecondary-model-invalid/secondary-model-effort-not-listedthrough the existing session warnings channel.disallowedToolsdeny semantics: exact names andmcp__glob patterns evaluated by the tool manager against resolved tool names (partial server denies likemcp__github__*work under a broadmcp__*allow). The deny list persists in the agent wire as an additive optional field (old records and older binaries are both compatible), so resumed agents keep the denylist./secondary_modelcommand (mirrors/model: a picker with a thinking-effort step) that persists[secondary_model]and live-applies to the current session viaSession.applyPersistedSecondaryModel(node-sdk wrapper included), so newly spawned subagents bind the new model right away. The/modelpicker hides the synthesized__secondary__derived entry, and theupdate-configbuiltin skill now lists the section.agent.status.updatedcarries its model alias, which the tool-call subagent stats and agent-group rows resolve to a display name.Verification: full agent-core suite green (4075 tests, ~60 new cases covering parser/discovery/catalog merge/
${base_prompt}chain/secondary config round-trip/spawn binding/tool deny/wire replay/session secondary-model override); kimi-code options, run-prompt, and TUI suites green (2401 tests, including the/secondary_modelcommand and the subagent model display); end-to-end smoke on the v1 engine (custom agent discovery,--agentselection, invalid--agent-filefailure). Docs updated in both English and Chinese.Checklist
gen-changesetsskill, or this PR needs no changeset.gen-docsskill, or this PR needs no doc update.