From fa140b0375a709ad26648b10aa8238cad726978f Mon Sep 17 00:00:00 2001 From: YeonGyu-Kim Date: Wed, 8 Apr 2026 13:10:41 +0900 Subject: [PATCH] fix(skill-loader): propagate scope to MCP connections Ultraworked with [Sisyphus](https://github.com/code-yeongyu/oh-my-openagent) Co-authored-by: Sisyphus --- src/features/skill-mcp-manager/connection.ts | 3 ++- src/tools/skill-mcp/tools.ts | 1 + 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/src/features/skill-mcp-manager/connection.ts b/src/features/skill-mcp-manager/connection.ts index 79754e712..2826492b0 100644 --- a/src/features/skill-mcp-manager/connection.ts +++ b/src/features/skill-mcp-manager/connection.ts @@ -38,7 +38,8 @@ export async function getOrCreateClient(params: { return pending } - const expandedConfig = expandEnvVarsInObject(config, { trusted: true }) + const isTrusted = info.scope !== "project" + const expandedConfig = expandEnvVarsInObject(config, { trusted: isTrusted }) let currentConnectionPromise!: Promise state.inFlightConnections.set(info.sessionID, (state.inFlightConnections.get(info.sessionID) ?? 0) + 1) currentConnectionPromise = (async () => { diff --git a/src/tools/skill-mcp/tools.ts b/src/tools/skill-mcp/tools.ts index 197ee62dc..2e1876575 100644 --- a/src/tools/skill-mcp/tools.ts +++ b/src/tools/skill-mcp/tools.ts @@ -166,6 +166,7 @@ export function createSkillMcpTool(options: SkillMcpToolOptions): ToolDefinition serverName: args.mcp_name, skillName: found.skill.name, sessionID, + scope: found.skill.scope, } const context: SkillMcpServerContext = {