Synced from monorepo
Synced from monorepo Changes: - Refresh tool search when the managed MCP catalog is re-fetched - Prevent duplicate leader process spawn and startup hang from stale leaders - Document marketplaces, plugins, and organization controls - Stamp session ID on image generation direct-to-API requests - Fix auto mode blocked documentation - Auto mode considers recent user intent - Expose deploy archive, taken-down, limit, and in-progress reasons on the chat API - Fail-closed auth refresh contract for shell clients - Emit a chat-supplied per-session turn index in turn hooks - Show bash mode chrome in minimal mode - Add metrics for true-noop and stationarity stops - Include voice interim text on prompt submit - Silently end turn on true-noop thrash - Quiet copy toast when clipboard delivery is confirmed - Fix session fork truncating at the wrong prompt in rewound sessions - Make the idle "still running" watcher cue clickable to open the tasks pane - Default web search model to grok-4.5 - Let plugin subagents inherit parent MCP servers - Gate no-op end-turn reminder on system reminders - Add gateway bridge lifecycle telemetry - Allow editing finalized text while voice is open - Relocate token carrier to turn-commit events and plumb per-turn origin context - Raise workflow scratch quotas and make failed runs resumable - Workflows overlay: auto-progress phases, live agent status, and drop budget meter Source-Revision: 9b8d35b46d959c042ea9aa31cbbebbd1f0c5c527
This commit is contained in:
parent
69f0ba880a
commit
6e38642082
103 changed files with 4964 additions and 1261 deletions
|
|
@ -183,6 +183,40 @@ The `resume_from` parameter lets a new subagent continue where a completed subag
|
|||
|
||||
The new subagent inherits the source's transcript, tool state, and model; its system prompt and tools are re-rendered from the current agent definition. The source must be completed (not running), belong to the current session, and use the same agent type.
|
||||
|
||||
### MCP inheritance
|
||||
|
||||
Subagents inherit the parent session’s **already-connected** MCP servers by default. That includes local stdio/HTTP servers and plugin-sourced agents (for example `my-plugin:reviewer`). The child discovers and calls those tools with `search_tool` / `use_tool` the same way the parent does.
|
||||
|
||||
Control inheritance with agent frontmatter `mcpInheritance`:
|
||||
|
||||
| Value | Effect |
|
||||
| ----- | ------ |
|
||||
| `all` (default if omitted) | Inherit every parent-connected MCP server |
|
||||
| `none` | Inherit no parent MCP servers |
|
||||
| `named: [server, …]` | Inherit only the listed server names |
|
||||
| `except: [server, …]` | Inherit all parent servers except the listed names |
|
||||
|
||||
Example:
|
||||
|
||||
```yaml
|
||||
---
|
||||
name: research-only
|
||||
description: Read MCP tools but not internal connectors
|
||||
tools: search_tool, use_tool, Read
|
||||
mcpInheritance:
|
||||
except:
|
||||
- internal-tools
|
||||
---
|
||||
```
|
||||
|
||||
**Plugin agents** inherit parent MCP the same way. For security they still cannot:
|
||||
|
||||
- Declare their own `mcpServers` in agent frontmatter (ignored with a warning)
|
||||
- Declare hooks in agent frontmatter
|
||||
- Set `permissionMode: bypassPermissions`
|
||||
|
||||
Plugin-bundled MCP servers (plugin `.mcp.json`) still attach to the **parent/session** after the plugin is trusted — they are not a child-only frontmatter declaration. See [Plugins](09-plugins.md) and [MCP Servers](07-mcp-servers.md).
|
||||
|
||||
---
|
||||
|
||||
## Isolation: Worktree Mode
|
||||
|
|
|
|||
Loading…
Reference in a new issue