惯性聚合 高效追踪和阅读你感兴趣的博客、新闻、科技资讯
阅读原文 在惯性聚合中打开

推荐订阅源

奇客Solidot–传递最新科技情报
奇客Solidot–传递最新科技情报
Jina AI
Jina AI
博客园 - Franky
Apple Machine Learning Research
Apple Machine Learning Research
酷 壳 – CoolShell
酷 壳 – CoolShell
阮一峰的网络日志
阮一峰的网络日志
量子位
雷峰网
雷峰网
宝玉的分享
宝玉的分享
V
Visual Studio Blog
博客园_首页
小众软件
小众软件
The Cloudflare Blog
让小产品的独立变现更简单 - ezindie.com
让小产品的独立变现更简单 - ezindie.com
大猫的无限游戏
大猫的无限游戏
博客园 - 聂微东
S
SegmentFault 最新的问题
博客园 - 【当耐特】
OSCHINA 社区最新新闻
OSCHINA 社区最新新闻
博客园 - 叶小钗
月光博客
月光博客
博客园 - 三生石上(FineUI控件)
人人都是产品经理
人人都是产品经理
WordPress大学
WordPress大学

Recent Commits to openclaw:main

test: merge chat side-result checks · openclaw/openclaw@ddd2c2a test: merge cron history checks · openclaw/openclaw@f7eb746 test: merge responsive navigation shell checks · openclaw/openclaw@c2e4b47 docs(changelog): add codex oauth fixes · openclaw/openclaw@628e6cd test: merge navigation routing cases · openclaw/openclaw@5d8cecb Tests: mock channel registry bundled fallback · openclaw/openclaw@2b08233 Secrets: avoid broad web search discovery for single plugin config · openclaw/openclaw@a464f59 test: merge config view browser checks · openclaw/openclaw@20cf511 fix(status): align oauth health with runtime · openclaw/openclaw@eed7116 feat: add macOS screen snapshots for monitor preview (#67954) thanks … · openclaw/openclaw@f377db1 fix: report shared auth scopes in hello-ok (#67810) thanks @BunsDev · openclaw/openclaw@0b6c39b Auto-reply: avoid eager bundled route fallback · openclaw/openclaw@3ea1bf4 Tests: narrow session binding contract setup · openclaw/openclaw@54e4e16 fix(macOS): enable undo/redo in webchat composer text input (#34962) · openclaw/openclaw@00951dc Tests: speed up channel setup promotion · openclaw/openclaw@82b529a Docs: refresh agent instructions · openclaw/openclaw@5775fe2 fix(auth): serialize OAuth refresh across agents to fix #26322 (#67876) · openclaw/openclaw@8e79080 test: allow ollama public surface boundary test · openclaw/openclaw@7d4f1a6 Docs: add test performance guardrails · openclaw/openclaw@89706d3 Tests: restore context-engine usage proof · openclaw/openclaw@e4c4f95 Tests: slim context engine runtime coverage · openclaw/openclaw@74c198f ci: retry failed custom checkouts · openclaw/openclaw@0ee5baf test: trim duplicate provider auth onboarding cases · openclaw/openclaw@1ffc02e matrix: fix sessions_spawn --thread subagent session spawning (#67643) · openclaw/openclaw@1ce2596 test: reduce auth choice fixture churn · openclaw/openclaw@857b9cd test: mock health status config boundaries · openclaw/openclaw@9d5ab4a test: mock onboard config io boundary · openclaw/openclaw@299694d test: mock legacy state plugin boundaries · openclaw/openclaw@2713089 test: mock channel install boundaries · openclaw/openclaw@b945248 test: mock doctor preview channel boundaries · openclaw/openclaw@b1a3ad4
refactor(agents): split bundle MCP CLI adapters · opencla...
steipete · 2026-04-26 · via Recent Commits to openclaw:main

@@ -0,0 +1,99 @@

1+

import fs from "node:fs/promises";

2+

import os from "node:os";

3+

import path from "node:path";

4+

import { applyMergePatch } from "../../config/merge-patch.js";

5+

import type { BundleMcpConfig, BundleMcpServerConfig } from "../../plugins/bundle-mcp.js";

6+

import {

7+

applyCommonServerConfig,

8+

decodeHeaderEnvPlaceholder,

9+

isRecord,

10+

normalizeStringRecord,

11+

} from "./bundle-mcp-adapter-shared.js";

12+13+

async function readJsonObject(filePath: string): Promise<Record<string, unknown>> {

14+

try {

15+

const raw = JSON.parse(await fs.readFile(filePath, "utf-8")) as unknown;

16+

return raw && typeof raw === "object" && !Array.isArray(raw)

17+

? ({ ...raw } as Record<string, unknown>)

18+

: {};

19+

} catch {

20+

return {};

21+

}

22+

}

23+24+

function resolveEnvPlaceholder(

25+

value: string,

26+

inheritedEnv: Record<string, string> | undefined,

27+

): string {

28+

const decoded = decodeHeaderEnvPlaceholder(value);

29+

if (!decoded) {

30+

return value;

31+

}

32+

const resolved = inheritedEnv?.[decoded.envVar] ?? process.env[decoded.envVar] ?? "";

33+

return decoded.bearer ? `Bearer ${resolved}` : resolved;

34+

}

35+36+

function normalizeGeminiServerConfig(

37+

server: BundleMcpServerConfig,

38+

inheritedEnv: Record<string, string> | undefined,

39+

): Record<string, unknown> {

40+

const next: Record<string, unknown> = {};

41+

applyCommonServerConfig(next, server);

42+

if (typeof server.type === "string") {

43+

next.type = server.type;

44+

}

45+

const headers = normalizeStringRecord(server.headers);

46+

if (headers) {

47+

next.headers = Object.fromEntries(

48+

Object.entries(headers).map(([name, value]) => [

49+

name,

50+

resolveEnvPlaceholder(value, inheritedEnv),

51+

]),

52+

);

53+

}

54+

if (typeof server.trust === "boolean") {

55+

next.trust = server.trust;

56+

}

57+

return next;

58+

}

59+60+

export async function writeGeminiSystemSettings(

61+

mergedConfig: BundleMcpConfig,

62+

inheritedEnv: Record<string, string> | undefined,

63+

): Promise<{ env: Record<string, string>; cleanup: () => Promise<void> }> {

64+

const tempDir = await fs.mkdtemp(path.join(os.tmpdir(), "openclaw-gemini-mcp-"));

65+

const settingsPath = path.join(tempDir, "settings.json");

66+

const existingSettingsPath =

67+

inheritedEnv?.GEMINI_CLI_SYSTEM_SETTINGS_PATH ?? process.env.GEMINI_CLI_SYSTEM_SETTINGS_PATH;

68+

const base =

69+

typeof existingSettingsPath === "string" && existingSettingsPath.trim()

70+

? await readJsonObject(existingSettingsPath)

71+

: {};

72+

const normalizedConfig: BundleMcpConfig = {

73+

mcpServers: Object.fromEntries(

74+

Object.entries(mergedConfig.mcpServers).map(([name, server]) => [

75+

name,

76+

normalizeGeminiServerConfig(server, inheritedEnv),

77+

]),

78+

) as BundleMcpConfig["mcpServers"],

79+

};

80+

const settings = applyMergePatch(base, {

81+

mcp: {

82+

allowed: Object.keys(normalizedConfig.mcpServers),

83+

},

84+

mcpServers: normalizedConfig.mcpServers,

85+

}) as Record<string, unknown>;

86+

if (!isRecord(settings.mcp) || !isRecord(settings.mcpServers)) {

87+

throw new Error("Gemini MCP settings merge produced an invalid object");

88+

}

89+

await fs.writeFile(settingsPath, `${JSON.stringify(settings, null, 2)}\n`, "utf-8");

90+

return {

91+

env: {

92+

...inheritedEnv,

93+

GEMINI_CLI_SYSTEM_SETTINGS_PATH: settingsPath,

94+

},

95+

cleanup: async () => {

96+

await fs.rm(tempDir, { recursive: true, force: true });

97+

},

98+

};

99+

}