refactor(agentic-models): align Gemini API and tool config (#852)

Author: mrh997

components/model/agenticark/README.md

@@ -158,14 +158,6 @@ type Config struct {
     // Optional.
     ParallelToolCalls *bool
 
-    // ServerTools specifies server-side tools available to the model.
-    // Optional.
-    ServerTools []*ServerToolConfig
-    
-    // MCPTools specifies Model Context Protocol tools available to the model.
-    // Optional.
-    MCPTools []*responses.ToolMcp
-    
     // EnableAutoCache controls whether auto-caching for multi-turn conversations is active for the model.
     // When enabled, conversation turns are stored, and the model automatically maintains context
     // by locating the most recent cached message in the input (via Response ID in ResponseMeta).

components/model/agenticark/README.zh_CN.md

@@ -159,14 +159,6 @@ type Config struct {
     // 可选。
     ParallelToolCalls *bool
 
-    // ServerTools 指定模型可用的服务器端工具。
-    // 可选。
-    ServerTools []*ServerToolConfig
-
-    // MCPTools 指定模型可用的 MCP（模型上下文协议）工具。
-    // 可选。
-    MCPTools []*responses.ToolMcp
-
     // EnableAutoCache 控制是否开启多轮对话自动缓存。
     // 启用后，对话轮次将被存储，模型通过定位输入中最近的缓存消息（通过 ResponseMeta 中的 Response ID）
     // 自动维护上下文。该缓存消息及其之前的所有输入将从请求中排除。

components/model/agenticark/model.go

@@ -127,14 +127,6 @@ type Config struct {
 	// Optional.
 	ParallelToolCalls *bool
 
-	// ServerTools specifies server-side tools available to the model.
-	// Optional.
-	ServerTools []*ServerToolConfig
-
-	// MCPTools specifies Model Context Protocol tools available to the model.
-	// Optional.
-	MCPTools []*responses.ToolMcp
-
 	// EnableAutoCache controls whether auto-caching for multi-turn conversations is active for the model.
 	// When enabled, conversation turns are stored, and the model automatically maintains context
 	// by locating the most recent cached message in the input (via Response ID in ResponseMeta).
@@ -219,8 +211,6 @@ func buildClient(config *Config) (*Model, error) {
 		enablePassBackReasoning: config.EnablePassBackReasoning,
 		maxToolCalls:            config.MaxToolCalls,
 		parallelToolCalls:       config.ParallelToolCalls,
-		serverTools:             config.ServerTools,
-		mcpTools:                config.MCPTools,
 		enableAutoCache:         config.EnableAutoCache,
 		expireAtSec:             config.ExpireAtSec,
 		contextManagement:       config.ContextManagement,
@@ -246,8 +236,6 @@ type Model struct {
 	reasoning         *responses.ResponsesReasoning
 	maxToolCalls      *int64
 	parallelToolCalls *bool
-	serverTools       []*ServerToolConfig
-	mcpTools          []*responses.ToolMcp
 
 	enableAutoCache         bool
 	expireAtSec             *int64
@@ -611,8 +599,6 @@ func (m *Model) getOptions(opts []model.Option) (*model.Options, *arkOptions, er
 		text:              m.text,
 		maxToolCalls:      m.maxToolCalls,
 		parallelToolCalls: m.parallelToolCalls,
-		serverTools:       m.serverTools,
-		mcpTools:          m.mcpTools,
 		contextManagement: m.contextManagement,
 		customHeaders:     m.customHeaders,
 	}, opts...)

components/model/agenticclaude/README.md

@@ -142,10 +142,6 @@ type Config struct {
     // Optional.
     Thinking *anthropic.ThinkingConfigParamUnion
 
-    // ServerTools specifies server-side tools available to the model.
-    // Optional.
-    ServerTools []*ServerToolConfig
-
     // CustomHeaders specifies custom HTTP headers to include in API requests.
     // CustomHeaders allows passing additional metadata or authentication information.
     // Optional.

components/model/agenticclaude/README_zh.md

@@ -142,10 +142,6 @@ type Config struct {
     // 可选。
     Thinking *anthropic.ThinkingConfigParamUnion
 
-    // ServerTools 指定模型可用的服务器端工具。
-    // 可选。
-    ServerTools []*ServerToolConfig
-
     // CustomHeaders 指定 API 请求中包含的自定义 HTTP 标头。
     // 可用于传递额外的元数据或认证信息。
     // 可选。

components/model/agenticclaude/model.go

@@ -88,10 +88,6 @@ type Config struct {
 	// Optional.
 	Thinking *anthropic.ThinkingConfigParamUnion
 
-	// ServerTools specifies server-side tools available to the model.
-	// Optional.
-	ServerTools []*ServerToolConfig
-
 	// CustomHeaders specifies custom HTTP headers to include in API requests.
 	// CustomHeaders allows passing additional metadata or authentication information.
 	// Optional.
@@ -158,7 +154,6 @@ type Model struct {
 	maxTokens              int
 	stopSequences          []string
 	disableParallelToolUse *bool
-	serverTools            []*ServerToolConfig
 	customHeaders          map[string]string
 	extraFields            map[string]any
 	thinking               *anthropic.ThinkingConfigParamUnion
@@ -211,7 +206,6 @@ func New(ctx context.Context, cfg *Config) (*Model, error) {
 		maxTokens:              cfg.MaxTokens,
 		stopSequences:          cfg.StopSequences,
 		disableParallelToolUse: cfg.DisableParallelToolUse,
-		serverTools:            cfg.ServerTools,
 		customHeaders:          cfg.CustomHeaders,
 		extraFields:            cfg.ExtraFields,
 		thinking:               cfg.Thinking,
@@ -514,7 +508,6 @@ func (m *Model) getOptions(opts []model.Option) (*model.Options, *claudeOptions,
 		Stop:      m.stopSequences,
 	}, opts...)
 	specOptions := model.GetImplSpecificOptions(&claudeOptions{
-		serverTools:   m.serverTools,
 		customHeaders: m.customHeaders,
 		extraFields:   m.extraFields,
 	}, opts...)

components/model/agenticclaude/model_test.go

@@ -420,15 +420,15 @@ func TestGetOptions(t *testing.T) {
 		model:         "claude-sonnet-4",
 		maxTokens:     4096,
 		stopSequences: []string{"done"},
-		serverTools: []*ServerToolConfig{
-			{WebSearch20260209: &anthropic.WebSearchTool20260209Param{}},
-		},
 		customHeaders: map[string]string{"x-default": "1"},
 		extraFields:   map[string]any{"foo": "bar"},
 	}
 
 	options, specOptions, err := m.getOptions([]model.Option{
 		model.WithTemperature(0.2),
+		WithServerTools([]*ServerToolConfig{
+			{WebSearch20260209: &anthropic.WebSearchTool20260209Param{}},
+		}),
 		WithCustomHeaders(map[string]string{"x-call": "2"}),
 	})
 	if err != nil {

components/model/agenticgemini/README.md

@@ -50,7 +50,7 @@ func main() {
 		log.Fatalf("NewClient of gemini failed, err=%v", err)
 	}
 
-	cm, err := agenticgemini.NewAgenticModel(ctx, &agenticgemini.Config{
+	cm, err := agenticgemini.New(ctx, &agenticgemini.Config{
 		Client: client,
 		Model:  modelName,
 		ThinkingConfig: &genai.ThinkingConfig{
@@ -135,17 +135,13 @@ type Config struct {
 
     // ResponseModalities specifies the modalities the model can return.
     // Optional.
-    ResponseModalities []ResponseModality
+    ResponseModalities []genai.Modality
 
     MediaResolution genai.MediaResolution
 
-    // CacheTTL specifies how long prefix cache resources remain valid (now + TTL).
+    // CacheExpiration configures the expiration policy for prefix cache resources.
     // Optional.
-    CacheTTL time.Duration
-
-    // CacheExpireTime sets the absolute expiration timestamp for prefix cache resources.
-    // Optional.
-    CacheExpireTime time.Time
+    CacheExpiration *CacheExpiration
 }
 ```
 

components/model/agenticgemini/README.zh_CN.md

@@ -50,7 +50,7 @@ func main() {
 		log.Fatalf("NewClient of gemini failed, err=%v", err)
 	}
 
-	cm, err := agenticgemini.NewAgenticModel(ctx, &agenticgemini.Config{
+	cm, err := agenticgemini.New(ctx, &agenticgemini.Config{
 		Client: client,
 		Model:  modelName,
 		ThinkingConfig: &genai.ThinkingConfig{
@@ -135,17 +135,13 @@ type Config struct {
 
     // ResponseModalities 指定模型可以返回的模态类型
     // 可选。
-    ResponseModalities []ResponseModality
+    ResponseModalities []genai.Modality
 
     MediaResolution genai.MediaResolution
 
-    // CacheTTL 指定前缀缓存资源的有效时长（now + TTL）。
+    // CacheExpiration 配置前缀缓存资源的过期策略。
     // 可选。
-    CacheTTL time.Duration
-
-    // CacheExpireTime 设置前缀缓存资源的绝对过期时间戳。
-    // 可选。
-    CacheExpireTime time.Time
+    CacheExpiration *CacheExpiration
 }
 ```
 

components/model/agenticgemini/consts.go

@@ -0,0 +1,44 @@
+/*
+ * Copyright 2026 CloudWeGo Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package agenticgemini
+
+type ServerToolName string
+
+const (
+	ServerToolNameCodeExecution ServerToolName = "CodeExecution"
+)
+
+type Language string
+
+const (
+	LanguageUnspecified Language = "LANGUAGE_UNSPECIFIED"
+	LanguagePython      Language = "PYTHON"
+)
+
+type Outcome string
+
+const (
+	// OutcomeUnspecified specifies that unspecified status. This value should not be used.
+	OutcomeUnspecified Outcome = "OUTCOME_UNSPECIFIED"
+	// OutcomeOK specifies that code execution completed successfully.
+	OutcomeOK Outcome = "OUTCOME_OK"
+	// OutcomeFailed specifies that code execution finished but with a failure. `stderr` should contain the reason.
+	OutcomeFailed Outcome = "OUTCOME_FAILED"
+	// OutcomeDeadlineExceeded specifies that code execution ran for too long, and was cancelled. There may or may not be a partial
+	// output present.
+	OutcomeDeadlineExceeded Outcome = "OUTCOME_DEADLINE_EXCEEDED"
+)