Skip to content

docs(mcp): document mcp.json options and custom-droid mcpServers#1175

Merged
factory-davidgu merged 3 commits into
mainfrom
dgu/mcp-options
Jun 2, 2026
Merged

docs(mcp): document mcp.json options and custom-droid mcpServers#1175
factory-davidgu merged 3 commits into
mainfrom
dgu/mcp-options

Conversation

@factory-davidgu
Copy link
Copy Markdown
Contributor

Summary

Adds documentation for newly available MCP configuration surfaces:

  • Variable expansion in mcp.json values — ${VAR} / ${VAR:-default} resolved from the environment at load time (CLI-161).
  • Per-tool filtering via enabledTools / disabledTools arrays in mcp.json, with precedence and context-cost notes (CLI-510).
  • Configurable MCP call timeout — per-server timeoutMs plus global mcp.callTimeoutMs in settings.json, with resolution order (CLI-707).
  • Custom-droid mcpServers — new frontmatter field that scopes a subagent to a subset of configured MCP servers (PR Factory-AI/factory-mono#14134 / CLI-728).

Files changed

  • docs/cli/configuration/mcp.mdx — new schema fields plus three subsections (Variable expansion, Per-tool filtering, MCP call timeout).
  • docs/cli/configuration/custom-droids.mdxmcpServers row in the metadata table and a new Scoping MCP servers to a droid subsection with an example.

Linear / upstream

Naming used in drafts (timeoutMs, mcp.callTimeoutMs, expansion fallback behavior) follows what's described in the Linear issues — please flag if the shipping implementation uses different identifiers and I'll align.

Add documentation for newly available MCP configuration surfaces:
variable expansion in mcp.json values, enabledTools/disabledTools
per-tool filtering, configurable per-server and global call timeouts,
and the mcpServers field for scoping MCP servers to a custom droid.

Co-authored-by: factory-droid[bot] <138933559+factory-droid[bot]@users.noreply.github.com>
@mintlify
Copy link
Copy Markdown
Contributor

mintlify Bot commented May 30, 2026

Preview deployment for your docs. Learn more about Mintlify Previews.

Project Status Preview Updated (UTC)
factory 🟢 Ready View Preview May 30, 2026, 3:40 AM

💡 Tip: Enable Workflows to automatically generate PRs for you.

@factory-droid
Copy link
Copy Markdown
Contributor

factory-droid Bot commented May 30, 2026

Droid finished @factory-davidgu's task —— View job


The new MCP docs are clear and cover the added configuration surfaces well. Follow-ups: keep the JP localized pages in sync, document mcp.callTimeoutMs in the settings reference, and consider pinning npx example versions (or explicitly documenting the supply-chain tradeoff).

Comment thread docs/cli/configuration/mcp.mdx
Comment thread docs/cli/configuration/mcp.mdx
Comment thread docs/cli/configuration/custom-droids.mdx Outdated
Comment thread docs/cli/configuration/mcp.mdx
factory-ain3sh
factory-ain3sh previously approved these changes May 30, 2026
Copy link
Copy Markdown
Contributor

@factory-ain3sh factory-ain3sh left a comment

Choose a reason for hiding this comment

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

lgtm besides comments documented by review droid, pls address before merging

…n tip

- Add mcp.callTimeoutMs row to the settings reference table
- Add a supply-chain Tip near the popular stdio examples (EN + JP)
  recommending pinned npx versions for security-sensitive setups
- Sync docs/jp/cli/configuration/mcp.mdx with the new schema fields
  (enabledTools, disabledTools, timeoutMs) and the three new sections:
  variable expansion, per-tool filtering, MCP call timeout
- Sync docs/jp/cli/configuration/custom-droids.mdx with the mcpServers
  frontmatter field row and scoping subsection

Co-authored-by: factory-droid[bot] <138933559+factory-droid[bot]@users.noreply.github.com>
Co-authored-by: factory-droid[bot] <138933559+factory-droid[bot]@users.noreply.github.com>
Copy link
Copy Markdown
Contributor

@factory-ain3sh factory-ain3sh left a comment

Choose a reason for hiding this comment

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

lgtm, thx!

@factory-davidgu factory-davidgu merged commit ce83e77 into main Jun 2, 2026
4 checks passed
@factory-davidgu factory-davidgu deleted the dgu/mcp-options branch June 2, 2026 00:45
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.

2 participants