fix(provider-add): 修复 chat mode 路径联动与模型数值校验一致性

xgopilot · phantom5099 · xgopilot · commit 5fe2d699b842 · 2026-04-20T16:28:47.000Z
Generated with [codeagent](https://github.com/qbox/codeagent) Co-authored-by: phantom5099 <245659304+phantom5099@users.noreply.github.com>
diff --git a/docs/guides/adding-providers.md b/docs/guides/adding-providers.md
@@ -103,7 +103,7 @@ discovery_endpoint_path: /models
 说明：
 
 - `chat_api_mode` 仅 `openaicompat` 生效，可选值：`chat_completions` / `responses`。
-- `chat_endpoint_path` 为空或 `/` 表示直连 `base_url`，不会自动补子路径。
+- `chat_endpoint_path` 为 `/` 表示直连 `base_url`；为空时会按 `chat_api_mode` 自动回填默认子路径（`/chat/completions` 或 `/responses`）。
 - `model_source: manual` 时必须提供 `models`，且会忽略 `discovery_endpoint_path`。
 
 ## 测试要求
diff --git a/internal/config/provider_custom_normalize.go b/internal/config/provider_custom_normalize.go
@@ -8,6 +8,9 @@ import (
 	providertypes "neo-code/internal/provider/types"
 )
 
+// ManualModelOptionalIntUnset 用于区分“未填写可选数值字段”和“显式输入 0”。
+const ManualModelOptionalIntUnset = -1
+
 // NormalizeCustomProviderInput 统一归一化 custom provider 的输入字段，并执行协议/模型来源的组合校验。
 func NormalizeCustomProviderInput(input SaveCustomProviderInput) (SaveCustomProviderInput, error) {
 	normalized := SaveCustomProviderInput{
@@ -40,7 +43,7 @@ func NormalizeCustomProviderInput(input SaveCustomProviderInput) (SaveCustomProv
 		normalized.ModelSource = ModelSourceDiscover
 	}
 
-	models, err := NormalizeCustomProviderModels(input.Models)
+	models, err := normalizeCustomProviderModels(input.Models, true)
 	if err != nil {
 		return SaveCustomProviderInput{}, err
 	}
@@ -109,6 +112,14 @@ func NormalizeCustomProviderInput(input SaveCustomProviderInput) (SaveCustomProv
 
 // NormalizeCustomProviderModels 统一归一化 custom provider 的模型描述并校验必填字段和边界条件。
 func NormalizeCustomProviderModels(models []providertypes.ModelDescriptor) ([]providertypes.ModelDescriptor, error) {
+	return normalizeCustomProviderModels(models, false)
+}
+
+// normalizeCustomProviderModels 统一归一化 custom provider 模型列表，并在需要时兼容历史的零值省略语义。
+func normalizeCustomProviderModels(
+	models []providertypes.ModelDescriptor,
+	allowZeroAsUnset bool,
+) ([]providertypes.ModelDescriptor, error) {
 	if len(models) == 0 {
 		return nil, nil
 	}
@@ -124,10 +135,16 @@ func NormalizeCustomProviderModels(models []providertypes.ModelDescriptor) ([]pr
 		if name == "" {
 			return nil, fmt.Errorf("config: models[%d].name is empty", index)
 		}
-		if model.ContextWindow < 0 {
+		contextWindow := model.ContextWindow
+		if contextWindow == ManualModelOptionalIntUnset || (allowZeroAsUnset && contextWindow == 0) {
+			contextWindow = 0
+		} else if contextWindow <= 0 {
 			return nil, fmt.Errorf("config: models[%d].context_window must be greater than 0", index)
 		}
-		if model.MaxOutputTokens < 0 {
+		maxOutputTokens := model.MaxOutputTokens
+		if maxOutputTokens == ManualModelOptionalIntUnset || (allowZeroAsUnset && maxOutputTokens == 0) {
+			maxOutputTokens = 0
+		} else if maxOutputTokens <= 0 {
 			return nil, fmt.Errorf("config: models[%d].max_output_tokens must be greater than 0", index)
 		}
 
@@ -141,8 +158,8 @@ func NormalizeCustomProviderModels(models []providertypes.ModelDescriptor) ([]pr
 			ID:              id,
 			Name:            name,
 			Description:     strings.TrimSpace(model.Description),
-			ContextWindow:   model.ContextWindow,
-			MaxOutputTokens: model.MaxOutputTokens,
+			ContextWindow:   contextWindow,
+			MaxOutputTokens: maxOutputTokens,
 			CapabilityHints: model.CapabilityHints,
 		})
 	}
diff --git a/internal/config/provider_loader.go b/internal/config/provider_loader.go
@@ -9,6 +9,7 @@ import (
 	"sort"
 	"strings"
 
+	"neo-code/internal/provider"
 	providertypes "neo-code/internal/provider/types"
 
 	"gopkg.in/yaml.v3"
@@ -146,6 +147,7 @@ func customProviderModels(models []customProviderModelFile) ([]providertypes.Mod
 	}
 
 	descriptors := make([]providertypes.ModelDescriptor, 0, len(models))
+	seen := make(map[string]struct{}, len(models))
 	for index, model := range models {
 		id := strings.TrimSpace(model.ID)
 		if id == "" {
@@ -157,9 +159,16 @@ func customProviderModels(models []customProviderModelFile) ([]providertypes.Mod
 		}
 
 		descriptor := providertypes.ModelDescriptor{
-			ID:   id,
-			Name: name,
+			ID:              id,
+			Name:            name,
+			ContextWindow:   ManualModelOptionalIntUnset,
+			MaxOutputTokens: ManualModelOptionalIntUnset,
 		}
+		key := provider.NormalizeKey(id)
+		if _, exists := seen[key]; exists {
+			return nil, fmt.Errorf("models[%d].id %q is duplicated", index, id)
+		}
+		seen[key] = struct{}{}
 		if model.ContextWindow != nil {
 			if *model.ContextWindow <= 0 {
 				return nil, fmt.Errorf("models[%d].context_window must be greater than 0", index)
@@ -174,7 +183,7 @@ func customProviderModels(models []customProviderModelFile) ([]providertypes.Mod
 		}
 		descriptors = append(descriptors, descriptor)
 	}
-	return NormalizeCustomProviderModels(descriptors)
+	return descriptors, nil
 }
 
 // SaveCustomProviderInput 定义自定义 Provider 的持久化字段。
diff --git a/internal/config/provider_test.go b/internal/config/provider_test.go
@@ -440,6 +440,33 @@ func TestCustomProviderModelsRejectsNonPositiveMaxOutputTokens(t *testing.T) {
 	}
 }
 
+func TestNormalizeCustomProviderModelsRejectsZeroLimits(t *testing.T) {
+	t.Parallel()
+
+	_, err := NormalizeCustomProviderModels([]providertypes.ModelDescriptor{
+		{
+			ID:            "deepseek-coder",
+			Name:          "DeepSeek Coder",
+			ContextWindow: 0,
+		},
+	})
+	if err == nil || !strings.Contains(err.Error(), "context_window") {
+		t.Fatalf("expected context_window validation error, got %v", err)
+	}
+
+	_, err = NormalizeCustomProviderModels([]providertypes.ModelDescriptor{
+		{
+			ID:              "deepseek-coder",
+			Name:            "DeepSeek Coder",
+			ContextWindow:   ManualModelOptionalIntUnset,
+			MaxOutputTokens: 0,
+		},
+	})
+	if err == nil || !strings.Contains(err.Error(), "max_output_tokens") {
+		t.Fatalf("expected max_output_tokens validation error, got %v", err)
+	}
+}
+
 func TestCustomProviderModelsRejectsDuplicateID(t *testing.T) {
 	t.Parallel()
 
diff --git a/internal/config/state/service_provider_create.go b/internal/config/state/service_provider_create.go
@@ -291,8 +291,10 @@ func parseManualModelsJSON(raw string) ([]providertypes.ModelDescriptor, error)
 		seen[key] = struct{}{}
 
 		descriptor := providertypes.ModelDescriptor{
-			ID:   id,
-			Name: name,
+			ID:              id,
+			Name:            name,
+			ContextWindow:   config.ManualModelOptionalIntUnset,
+			MaxOutputTokens: config.ManualModelOptionalIntUnset,
 		}
 		if model.ContextWindow != nil {
 			if *model.ContextWindow <= 0 {
diff --git a/internal/tui/core/app/update.go b/internal/tui/core/app/update.go
@@ -3066,6 +3066,7 @@ func (a *App) handleProviderAddFormInput(msg tea.KeyMsg) (tea.Model, tea.Cmd) {
 			a.providerAddForm.ModelSource = a.providerAddForm.ModelSources[currentIdx]
 			clampProviderAddStep(a.providerAddForm)
 		} else if currentProviderAddField(a.providerAddForm) == providerAddFieldChatAPIMode {
+			previousMode := a.providerAddForm.ChatAPIMode
 			currentIdx := 0
 			for i, mode := range a.providerAddForm.ChatAPIModes {
 				if mode == a.providerAddForm.ChatAPIMode {
@@ -3075,6 +3076,7 @@ func (a *App) handleProviderAddFormInput(msg tea.KeyMsg) (tea.Model, tea.Cmd) {
 			}
 			currentIdx = (currentIdx - 1 + len(a.providerAddForm.ChatAPIModes)) % len(a.providerAddForm.ChatAPIModes)
 			a.providerAddForm.ChatAPIMode = a.providerAddForm.ChatAPIModes[currentIdx]
+			syncProviderAddOpenAICompatModeDefaults(a.providerAddForm, previousMode)
 			clampProviderAddStep(a.providerAddForm)
 		}
 		return a, nil
@@ -3106,6 +3108,7 @@ func (a *App) handleProviderAddFormInput(msg tea.KeyMsg) (tea.Model, tea.Cmd) {
 			a.providerAddForm.ModelSource = a.providerAddForm.ModelSources[currentIdx]
 			clampProviderAddStep(a.providerAddForm)
 		} else if currentProviderAddField(a.providerAddForm) == providerAddFieldChatAPIMode {
+			previousMode := a.providerAddForm.ChatAPIMode
 			currentIdx := 0
 			for i, mode := range a.providerAddForm.ChatAPIModes {
 				if mode == a.providerAddForm.ChatAPIMode {
@@ -3115,6 +3118,7 @@ func (a *App) handleProviderAddFormInput(msg tea.KeyMsg) (tea.Model, tea.Cmd) {
 			}
 			currentIdx = (currentIdx + 1) % len(a.providerAddForm.ChatAPIModes)
 			a.providerAddForm.ChatAPIMode = a.providerAddForm.ChatAPIModes[currentIdx]
+			syncProviderAddOpenAICompatModeDefaults(a.providerAddForm, previousMode)
 			clampProviderAddStep(a.providerAddForm)
 		}
 		return a, nil
@@ -3231,6 +3235,20 @@ func providerAddDefaultOpenAICompatChatEndpointPath(chatAPIMode string) string {
 	return "/chat/completions"
 }
 
+// syncProviderAddOpenAICompatModeDefaults 在切换 chat_api_mode 时同步默认 chat endpoint，避免默认值错配。
+func syncProviderAddOpenAICompatModeDefaults(form *providerAddFormState, previousMode string) {
+	if form == nil || provider.NormalizeProviderDriver(form.Driver) != provider.DriverOpenAICompat {
+		return
+	}
+
+	currentPath := strings.TrimSpace(form.ChatEndpointPath)
+	previousDefaultPath := providerAddDefaultOpenAICompatChatEndpointPath(previousMode)
+	if currentPath != "" && currentPath != previousDefaultPath {
+		return
+	}
+	form.ChatEndpointPath = providerAddDefaultOpenAICompatChatEndpointPath(form.ChatAPIMode)
+}
+
 // providerAddDefaultBaseURL 返回 provider add 表单的驱动默认 base URL。
 func providerAddDefaultBaseURL(driver string) string {
 	switch provider.NormalizeProviderDriver(driver) {
@@ -3419,11 +3437,19 @@ func parseProviderAddManualModelsJSON(raw string) ([]providertypes.ModelDescript
 	}
 
 	descriptors := make([]providertypes.ModelDescriptor, 0, len(models))
+	seen := make(map[string]struct{}, len(models))
 	for _, model := range models {
 		descriptor := providertypes.ModelDescriptor{
-			ID:   strings.TrimSpace(model.ID),
-			Name: strings.TrimSpace(model.Name),
+			ID:              strings.TrimSpace(model.ID),
+			Name:            strings.TrimSpace(model.Name),
+			ContextWindow:   config.ManualModelOptionalIntUnset,
+			MaxOutputTokens: config.ManualModelOptionalIntUnset,
+		}
+		key := provider.NormalizeKey(descriptor.ID)
+		if _, exists := seen[key]; exists {
+			return nil, fmt.Errorf("parse manual model json: models.id %q is duplicated", descriptor.ID)
 		}
+		seen[key] = struct{}{}
 		if model.ContextWindow != nil {
 			if *model.ContextWindow <= 0 {
 				return nil, fmt.Errorf("parse manual model json: models.context_window must be greater than 0")
@@ -3438,7 +3464,7 @@ func parseProviderAddManualModelsJSON(raw string) ([]providertypes.ModelDescript
 		}
 		descriptors = append(descriptors, descriptor)
 	}
-	return config.NormalizeCustomProviderModels(descriptors)
+	return descriptors, nil
 }
 
 // sanitizeProviderAddInputRunes 过滤 provider 表单输入中的控制字符，避免不可见字符污染配置字段。
diff --git a/internal/tui/core/app/update_test.go b/internal/tui/core/app/update_test.go
@@ -3471,6 +3471,27 @@ func TestSlashSelectionAndProviderAddUtilityBranches(t *testing.T) {
 	app.handleProviderAddResultMsg(providerAddResultMsg{Name: "unused"})
 }
 
+func TestSyncProviderAddOpenAICompatModeDefaults(t *testing.T) {
+	t.Parallel()
+
+	form := &providerAddFormState{
+		Driver:           provider.DriverOpenAICompat,
+		ChatAPIMode:      provider.ChatAPIModeResponses,
+		ChatEndpointPath: "/chat/completions",
+	}
+	syncProviderAddOpenAICompatModeDefaults(form, provider.ChatAPIModeChatCompletions)
+	if form.ChatEndpointPath != "/responses" {
+		t.Fatalf("expected default endpoint to follow responses mode, got %q", form.ChatEndpointPath)
+	}
+
+	form.ChatAPIMode = provider.ChatAPIModeChatCompletions
+	form.ChatEndpointPath = "/custom/chat"
+	syncProviderAddOpenAICompatModeDefaults(form, provider.ChatAPIModeResponses)
+	if form.ChatEndpointPath != "/custom/chat" {
+		t.Fatalf("expected custom endpoint unchanged, got %q", form.ChatEndpointPath)
+	}
+}
+
 func TestRunProviderAddFlowDeadlineExceededBranch(t *testing.T) {
 	service := stubProviderService{
 		createErr: context.DeadlineExceeded,
