From 4d72233e5fc0565a5108dc2683584246da0c456f Mon Sep 17 00:00:00 2001
From: "shijinyu.7" <shijinyu.7@bytedance.com>
Date: Mon, 5 Jan 2026 18:46:48 +0800
Subject: [PATCH] fix: fix the run_code and mcp_router configs

---
 configs/configs.go               |  6 +++++-
 configs/tool.go                  | 37 +++++++++++++++++++++++++++++++-
 tool/builtin_tools/mcp_router.go |  5 +++--
 tool/builtin_tools/run_code.go   |  8 +++----
 4 files changed, 48 insertions(+), 8 deletions(-)

diff --git a/configs/configs.go b/configs/configs.go
index 03c96f5..8836ee9 100644
--- a/configs/configs.go
+++ b/configs/configs.go
@@ -66,7 +66,10 @@ func SetupVeADKConfig() error {
 			Image: &CommonModelConfig{},
 			Video: &CommonModelConfig{},
 		},
-		Tool:        &BuiltinToolConfigs{},
+		Tool: &BuiltinToolConfigs{
+			MCPRouter: &MCPRouter{},
+			RunCode:   &RunCode{},
+		},
 		PromptPilot: &PromptPilotConfig{},
 		TlsConfig:   &TLSConfig{},
 		Veidentity:  &VeIdentityConfig{},
@@ -78,6 +81,7 @@ func SetupVeADKConfig() error {
 		},
 	}
 	globalConfig.Model.MapEnvToConfig()
+	globalConfig.Tool.MapEnvToConfig()
 	globalConfig.LOGGING.MapEnvToConfig()
 	globalConfig.Database.MapEnvToConfig()
 	globalConfig.Volcengine.MapEnvToConfig()
diff --git a/configs/tool.go b/configs/tool.go
index bb2c38e..91271cd 100644
--- a/configs/tool.go
+++ b/configs/tool.go
@@ -14,6 +14,41 @@
 
 package configs
 
+import (
+	"github.com/volcengine/veadk-go/common"
+	"github.com/volcengine/veadk-go/utils"
+)
+
 type BuiltinToolConfigs struct {
-	// 根据实际字段补充
+	MCPRouter *MCPRouter `yaml:"mcp_router"`
+	RunCode   *RunCode   `yaml:"run_code"`
+}
+
+func (b *BuiltinToolConfigs) MapEnvToConfig() {
+	b.MCPRouter.MapEnvToConfig()
+	b.RunCode.MapEnvToConfig()
+}
+
+type MCPRouter struct {
+	Url    string `yaml:"url"`
+	ApiKey string `yaml:"api_key"`
+}
+
+func (m *MCPRouter) MapEnvToConfig() {
+	m.Url = utils.GetEnvWithDefault(common.TOOL_MCP_ROUTER_URL)
+	m.ApiKey = utils.GetEnvWithDefault(common.TOOL_MCP_ROUTER_API_KEY)
+}
+
+type RunCode struct {
+	ToolID      string `yaml:"tool_id"`
+	Host        string `yaml:"host"`
+	ServiceCode string `yaml:"service_code"`
+	Region      string `yaml:"region"`
+}
+
+func (r *RunCode) MapEnvToConfig() {
+	r.ToolID = utils.GetEnvWithDefault(common.AGENTKIT_TOOL_ID)
+	r.Host = utils.GetEnvWithDefault(common.AGENTKIT_TOOL_HOST)
+	r.ServiceCode = utils.GetEnvWithDefault(common.AGENTKIT_TOOL_SERVICE_CODE)
+	r.Region = utils.GetEnvWithDefault(common.AGENTKIT_TOOL_REGION)
 }
diff --git a/tool/builtin_tools/mcp_router.go b/tool/builtin_tools/mcp_router.go
index a9fa1ed..293aa26 100644
--- a/tool/builtin_tools/mcp_router.go
+++ b/tool/builtin_tools/mcp_router.go
@@ -19,6 +19,7 @@ import (
 
 	"github.com/modelcontextprotocol/go-sdk/mcp"
 	"github.com/volcengine/veadk-go/common"
+	"github.com/volcengine/veadk-go/configs"
 	"github.com/volcengine/veadk-go/utils"
 	"golang.org/x/oauth2"
 	"google.golang.org/adk/tool"
@@ -27,10 +28,10 @@ import (
 
 func agentkitMCPTransport(ctx context.Context) mcp.Transport {
 	ts := oauth2.StaticTokenSource(
-		&oauth2.Token{AccessToken: utils.GetEnvWithDefault(common.TOOL_MCP_ROUTER_API_KEY)},
+		&oauth2.Token{AccessToken: utils.GetEnvWithDefault(common.TOOL_MCP_ROUTER_API_KEY, configs.GetGlobalConfig().Tool.MCPRouter.ApiKey)},
 	)
 	return &mcp.StreamableClientTransport{
-		Endpoint:   utils.GetEnvWithDefault(common.TOOL_MCP_ROUTER_URL),
+		Endpoint:   utils.GetEnvWithDefault(common.TOOL_MCP_ROUTER_URL, configs.GetGlobalConfig().Tool.MCPRouter.Url),
 		HTTPClient: oauth2.NewClient(ctx, ts),
 	}
 }
diff --git a/tool/builtin_tools/run_code.go b/tool/builtin_tools/run_code.go
index 25afc9e..867f1f8 100644
--- a/tool/builtin_tools/run_code.go
+++ b/tool/builtin_tools/run_code.go
@@ -61,13 +61,13 @@ type RunCodeArgs struct {
 func runCodeHandler(ctx tool.Context, args RunCodeArgs) (map[string]any, error) {
 	var result = make(map[string]any)
 
-	toolID := utils.GetEnvWithDefault(common.AGENTKIT_TOOL_ID)
+	toolID := utils.GetEnvWithDefault(common.AGENTKIT_TOOL_ID, configs.GetGlobalConfig().Tool.RunCode.ToolID)
 	if toolID == "" {
 		return result, ErrInvalidToolID
 	}
-	service := utils.GetEnvWithDefault(common.AGENTKIT_TOOL_SERVICE_CODE, common.DEFAULT_AGENTKIT_TOOL_SERVICE_CODE)
-	region := utils.GetEnvWithDefault(common.AGENTKIT_TOOL_REGION, common.DEFAULT_AGENTKIT_TOOL_REGION)
-	host := utils.GetEnvWithDefault(common.AGENTKIT_TOOL_HOST, fmt.Sprintf("%s.%s.volces.com", service, region))
+	service := utils.GetEnvWithDefault(common.AGENTKIT_TOOL_SERVICE_CODE, configs.GetGlobalConfig().Tool.RunCode.ServiceCode, common.DEFAULT_AGENTKIT_TOOL_SERVICE_CODE)
+	region := utils.GetEnvWithDefault(common.AGENTKIT_TOOL_REGION, configs.GetGlobalConfig().Tool.RunCode.Region, common.DEFAULT_AGENTKIT_TOOL_REGION)
+	host := utils.GetEnvWithDefault(common.AGENTKIT_TOOL_HOST, configs.GetGlobalConfig().Tool.RunCode.Host, fmt.Sprintf("%s.%s.volces.com", service, region))
 
 	var ak string
 	var sk string