fix(cli-runtime): merge user mcp.servers into claude-cli bundle config · openclaw/openclaw@61250e2
keishingu
·
2026-04-25
·
via Recent Commits to openclaw:main
| Original file line number | Diff line number | Diff line change |
|---|
@@ -3,6 +3,7 @@ import fs from "node:fs/promises";
|
3 | 3 | import os from "node:os"; |
4 | 4 | import path from "node:path"; |
5 | 5 | import { applyMergePatch } from "../../config/merge-patch.js"; |
| 6 | +import { normalizeConfiguredMcpServers } from "../../config/mcp-config.js"; |
6 | 7 | import type { CliBackendConfig } from "../../config/types.js"; |
7 | 8 | import type { OpenClawConfig } from "../../config/types.openclaw.js"; |
8 | 9 | import { |
@@ -415,6 +416,10 @@ export async function prepareCliBundleMcpConfig(params: {
|
415 | 416 | params.warn?.(`bundle MCP skipped for ${diagnostic.pluginId}: ${diagnostic.message}`); |
416 | 417 | } |
417 | 418 | mergedConfig = applyMergePatch(mergedConfig, bundleConfig.config) as BundleMcpConfig; |
| 419 | +const configuredMcp = normalizeConfiguredMcpServers(params.config?.mcp?.servers); |
| 420 | +if (Object.keys(configuredMcp).length > 0) { |
| 421 | +mergedConfig = applyMergePatch(mergedConfig, { mcpServers: configuredMcp }) as BundleMcpConfig; |
| 422 | +} |
418 | 423 | if (params.additionalConfig) { |
419 | 424 | mergedConfig = applyMergePatch(mergedConfig, params.additionalConfig) as BundleMcpConfig; |
420 | 425 | } |
|
此内容由惯性聚合(RSS阅读器)自动聚合整理，仅供阅读参考。 原文来自 — 版权归原作者所有。
