opensource/mateclaw
2
0
Fork 0
mirror of https://gitee.com/mateos/mateclaw.git synced 2026-11-02 14:11:49 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

chore(mcp): revert McpClientManager polish to enable PR #60 merge

Browse Source 
Temporarily restore McpClientManager.java to its pre-#60 state so the
contributor's PR can squash-merge cleanly with their authorship preserved.
The args-expansion follow-up will land as a separate commit right after.
This commit is contained in:
matevip 2026-05-05 14:53:58 +08:00
parent 609da7029f
commit 10fe511d48
1 changed files with 4 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
mateclaw-server/src/main/java/vip/mate/tool/mcp/runtime/McpClientManager.java
View File

@ -269,7 +269,6 @@ public class McpClientManager {
// Args
if (server.getArgsJson() != null && !server.getArgsJson().isBlank()) {
List<String> args = JSONUtil.toList(server.getArgsJson(), String.class);
args = args.stream().map(McpClientManager::expandEnvVars).toList();
builder.args(args);
}
@ -377,22 +376,17 @@ public class McpClientManager {
}
/**
* 展开系统属性和环境变量引用，如 ${user.home}、${ENV_VAR} 或 $ENV_VAR
* 展开环境变量引用，如 ${ENV_VAR} 或 $ENV_VAR
* <p>
* 先处理 ${VAR}（精确匹配，JVM 系统属性优先于环境变量，
* 这样 ${user.home} 等跨平台占位符在 Windows 上也能解析），
* 再用正则处理 $VAR（word boundary），避免 $PATH 误替换 $PATH_HOME 的问题。
* 先处理 ${VAR}（精确匹配），再用正则处理 $VAR（word boundary），
* 避免 $PATH 误替换 $PATH_HOME 的问题。
*/
private static String expandEnvVars(String value) {
if (value == null || !value.contains("$")) {
return value;
}
String result = value;
// Phase 1a: ${VAR} 优先匹配 JVM system property（如 ${user.home}、${java.io.tmpdir}）
for (String key : System.getProperties().stringPropertyNames()) {
result = result.replace("${" + key + "}", System.getProperty(key));
}
// Phase 1b: ${VAR} 回退匹配 OS 环境变量
// Phase 1: 精确匹配 ${VAR} 模式（不会误替换）
for (Map.Entry<String, String> env : System.getenv().entrySet()) {
result = result.replace("${" + env.getKey() + "}", env.getValue());
}