release: 发布 1.2.76 并更新模型目录

Author: Open-Pixel-AI

backend/cmd/server/VERSION

@@ -1 +1 @@
-1.2.75
+1.2.76

backend/internal/handler/admin/account_handler_available_models_test.go

@@ -68,6 +68,7 @@ func TestAccountHandlerGetAvailableModels_OwnedAccountReturnsPricedIntersection(
 			Type:        service.AccountTypeOAuth,
 			Status:      service.StatusActive,
 			OwnerUserID: &ownerUserID,
+			ShareMode:   service.AccountShareModePublic,
 			Credentials: map[string]any{
 				"model_mapping": map[string]any{
 					"gpt-5": "gpt-5.1",
@@ -164,6 +165,7 @@ func TestAccountHandlerGetAvailableModels_OwnedAccountEmptyWhitelistReturnsWhite
 			Type:        service.AccountTypeOAuth,
 			Status:      service.StatusActive,
 			OwnerUserID: &ownerUserID,
+			ShareMode:   service.AccountShareModePublic,
 			Credentials: map[string]any{},
 		},
 	}
@@ -188,6 +190,7 @@ func TestAccountHandlerGetAvailableModels_OwnedAccountNoPricedIntersection(t *te
 			Type:        service.AccountTypeOAuth,
 			Status:      service.StatusActive,
 			OwnerUserID: &ownerUserID,
+			ShareMode:   service.AccountShareModePublic,
 			Credentials: map[string]any{
 				"model_mapping": map[string]any{"gpt-9": "gpt-9"},
 			},

backend/internal/handler/admin/account_handler_batch_test_model_options_test.go

@@ -45,6 +45,7 @@ func ownedGrokAccountForBatchTest(id int64, mapping map[string]any) *service.Acc
 		Type:        service.AccountTypeOAuth,
 		Status:      service.StatusActive,
 		OwnerUserID: &ownerID,
+		ShareMode:   service.AccountShareModePublic,
 		Credentials: credentials,
 	}
 }
@@ -107,6 +108,7 @@ func TestAccountHandlerGetBatchTestModelOptions_MixedPlatforms(t *testing.T) {
 				Type:        service.AccountTypeOAuth,
 				Status:      service.StatusActive,
 				OwnerUserID: &ownerID,
+				ShareMode:   service.AccountShareModePublic,
 				Credentials: map[string]any{"model_mapping": map[string]any{"gpt-5": "gpt-5"}},
 			},
 		},

backend/internal/handler/user_account_handler.go

@@ -2386,7 +2386,12 @@ func (h *UserAccountHandler) Test(c *gin.Context) {
 		response.BadRequest(c, "model_id is required")
 		return
 	}
-	if !account.IsModelSupported(req.ModelID) {
+	if account.UsesPlatformModelInheritance() {
+		if err := h.accountTestService.ValidateExplicitTestModel(c.Request.Context(), account, req.ModelID); err != nil {
+			response.ErrorFrom(c, err)
+			return
+		}
+	} else if !account.IsModelSupported(req.ModelID) {
 		response.ErrorFrom(c, service.ErrOwnedAccountModelNotSelectable.WithMetadata(map[string]string{
 			"platform": account.Platform,
 			"model":    req.ModelID,
@@ -2407,7 +2412,7 @@ func (h *UserAccountHandler) Test(c *gin.Context) {
 
 // GetAvailableModels handles getting available models for a user-owned account.
 // GET /api/v1/accounts/:id/models
-// 复用 service.AvailableTestModels，用户端严格遵守个人账号模型白名单。
+// 私有账号继承平台定价目录，公有账号按模型白名单与定价目录取交集。
 func (h *UserAccountHandler) GetAvailableModels(c *gin.Context) {
 	subject, ok := middleware2.GetAuthSubjectFromContext(c)
 	if !ok {

backend/internal/handler/user_account_public_share_test.go

@@ -15,6 +15,7 @@ import (
 	"strings"
 	"testing"
 
+	"github.com/Wei-Shaw/sub2api/internal/config"
 	infraerrors "github.com/Wei-Shaw/sub2api/internal/pkg/errors"
 	"github.com/Wei-Shaw/sub2api/internal/pkg/pagination"
 	"github.com/Wei-Shaw/sub2api/internal/pkg/tlsfingerprint"
@@ -29,6 +30,20 @@ const (
 	userAgentIdentityPublicGroupID  int64 = 8202
 )
 
+type userAccountTestModelCatalog struct{}
+
+func (userAccountTestModelCatalog) ListPricedModelIDs(context.Context, []string) ([]string, error) {
+	return nil, nil
+}
+
+func (userAccountTestModelCatalog) ListSelectablePricedModelIDs(context.Context, service.PricedModelQuery) ([]string, error) {
+	return []string{"selected-model", "gpt-new"}, nil
+}
+
+func (userAccountTestModelCatalog) IsModelPriced(context.Context, service.PricedModelQuery, string) (bool, error) {
+	return false, nil
+}
+
 type userAgentIdentityShareRepo struct {
 	service.AccountRepository
 	accounts map[int64]*service.Account
@@ -259,6 +274,7 @@ type userAgentIdentityValidationUpstream struct {
 	body              string
 	calls             int
 	lastAuthorization string
+	lastModel         string
 }
 
 func (u *userAgentIdentityValidationUpstream) Do(req *http.Request, _ string, _ int64, _ int) (*http.Response, error) {
@@ -272,6 +288,13 @@ func (u *userAgentIdentityValidationUpstream) DoWithTLS(req *http.Request, _ str
 func (u *userAgentIdentityValidationUpstream) response(req *http.Request) *http.Response {
 	u.calls++
 	u.lastAuthorization = req.Header.Get("Authorization")
+	if req.Body != nil {
+		var payload struct {
+			Model string `json:"model"`
+		}
+		_ = json.NewDecoder(req.Body).Decode(&payload)
+		u.lastModel = payload.Model
+	}
 	statusCode := u.statusCode
 	if statusCode == 0 {
 		statusCode = http.StatusOK
@@ -368,7 +391,8 @@ func newUserAgentIdentityShareHandler(
 	accountService.SetAccountShareModeRepository(placementRepo)
 	accountService.SetAgentIdentityWSInvalidator(invalidatorProxy)
 	upstream := &userAgentIdentityValidationUpstream{statusCode: upstreamStatus, body: upstreamBody}
-	accountTestService := service.NewAccountTestService(repo, nil, nil, nil, upstream, nil, nil, nil, invalidatorProxy)
+	accountTestService := service.NewAccountTestService(repo, nil, nil, nil, upstream, &config.Config{}, nil, nil, invalidatorProxy)
+	accountTestService.SetModelResolver(service.NewAccountTestModelResolver(userAccountTestModelCatalog{}))
 	handler := NewUserAccountHandler(accountService, nil, accountTestService, nil, nil, nil, nil, nil, nil, nil)
 	return handler, repo, upstream, invalidator, placementRepo
 }
@@ -389,10 +413,10 @@ func runUserAgentIdentityUpdateRequest(t *testing.T, handler *UserAccountHandler
 	return recorder
 }
 
-func TestUserAccountHandlerTestRejectsModelOutsideOwnerWhitelist(t *testing.T) {
+func TestUserAccountHandlerTestRejectsModelOutsideOwnerWhitelistForPublicAccount(t *testing.T) {
 	gin.SetMode(gin.TestMode)
 	ownerUserID := int64(101)
-	account := newUserAgentIdentityShareAccount(t, ownerUserID, service.AccountShareModePrivate, service.AccountShareStatusApproved)
+	account := newUserAgentIdentityShareAccount(t, ownerUserID, service.AccountShareModePublic, service.AccountShareStatusApproved)
 	account.Credentials["model_mapping"] = map[string]any{"selected-model": "selected-model"}
 	handler, _, upstream, _, _ := newUserAgentIdentityShareHandler(t, account, http.StatusOK, "")
 
@@ -412,6 +436,53 @@ func TestUserAccountHandlerTestRejectsModelOutsideOwnerWhitelist(t *testing.T) {
 	require.Zero(t, upstream.calls)
 }
 
+func TestUserAccountHandlerTestPrivateInheritanceAllowsPricedModelOutsideLegacyMapping(t *testing.T) {
+	gin.SetMode(gin.TestMode)
+	ownerUserID := int64(101)
+	account := newUserAgentIdentityShareAccount(t, ownerUserID, service.AccountShareModePrivate, service.AccountShareStatusApproved)
+	account.Type = service.AccountTypeAPIKey
+	account.Credentials = map[string]any{"api_key": "test-key", "model_mapping": map[string]any{"old-model": "old-model"}}
+	handler, _, upstream, _, _ := newUserAgentIdentityShareHandler(t, account, http.StatusOK, "")
+
+	router := gin.New()
+	router.POST("/accounts/:id/test", func(c *gin.Context) {
+		c.Set(string(middleware2.ContextKeyUser), middleware2.AuthSubject{UserID: ownerUserID})
+		handler.Test(c)
+	})
+	recorder := httptest.NewRecorder()
+	request := httptest.NewRequest(http.MethodPost, "/accounts/1/test", strings.NewReader(`{"model_id":"gpt-new"}`))
+	request.Header.Set("Content-Type", "application/json")
+	router.ServeHTTP(recorder, request)
+
+	require.Equal(t, http.StatusOK, recorder.Code, recorder.Body.String())
+	require.Contains(t, recorder.Body.String(), `"success":true`)
+	require.Equal(t, 1, upstream.calls)
+	require.Equal(t, "gpt-new", upstream.lastModel)
+}
+
+func TestUserAccountHandlerTestPrivateInheritanceRejectsUnpricedModel(t *testing.T) {
+	gin.SetMode(gin.TestMode)
+	ownerUserID := int64(101)
+	account := newUserAgentIdentityShareAccount(t, ownerUserID, service.AccountShareModePrivate, service.AccountShareStatusApproved)
+	account.Type = service.AccountTypeAPIKey
+	account.Credentials = map[string]any{"api_key": "test-key"}
+	handler, _, upstream, _, _ := newUserAgentIdentityShareHandler(t, account, http.StatusOK, "")
+
+	router := gin.New()
+	router.POST("/accounts/:id/test", func(c *gin.Context) {
+		c.Set(string(middleware2.ContextKeyUser), middleware2.AuthSubject{UserID: ownerUserID})
+		handler.Test(c)
+	})
+	recorder := httptest.NewRecorder()
+	request := httptest.NewRequest(http.MethodPost, "/accounts/1/test", strings.NewReader(`{"model_id":"unpriced-model"}`))
+	request.Header.Set("Content-Type", "application/json")
+	router.ServeHTTP(recorder, request)
+
+	require.Equal(t, http.StatusBadRequest, recorder.Code, recorder.Body.String())
+	require.Contains(t, recorder.Body.String(), "ACCOUNT_TEST_MODEL_NOT_AVAILABLE")
+	require.Zero(t, upstream.calls)
+}
+
 func TestIsOpenAIUsageLimitReachedValidationError(t *testing.T) {
 	require.True(t, isOpenAIUsageLimitReachedValidationError(`API returned 429: {"error":{"type":"usage_limit_reached","message":"The usage limit has been reached"}}`))
 	require.True(t, isOpenAIUsageLimitReachedValidationError(`API returned 429: {"error": {"type": "usage_limit_reached"}}`))

backend/internal/repository/account_share_mode_repo.go

@@ -2825,7 +2825,7 @@ func validateAccountShareRoomAllowedModelsInTx(
 			Extra:        candidate.Extra,
 		}
 		for _, model := range allowedModels {
-			if account.IsModelSupported(model) {
+			if account.IsModelSupportedByMapping(model) {
 				continue
 			}
 			return service.ErrAccountShareModeUnsupportedModel.WithMetadata(map[string]string{

backend/internal/repository/account_share_room_repo.go

@@ -654,7 +654,7 @@ func (r *accountShareModeRepository) AttachRoomAccountsAtomic(
 			Extra:        candidate.Extra,
 		}
 		for _, model := range room.AllowedModels {
-			if account.IsModelSupported(model) {
+			if account.IsModelSupportedByMapping(model) {
 				continue
 			}
 			recordFailure(accountID, service.ErrAccountShareModeUnsupportedModel, map[string]string{"model": model})

backend/internal/service/account.go

@@ -659,6 +659,16 @@ func NormalizeAccountShareStatus(status string) string {
 	}
 }
 
+// UsesPlatformModelInheritance reports whether an owned account inherits the
+// active model catalog of its platform instead of using its group bindings as
+// the model-list scope. Explicit mappings are still honored as upstream
+// aliases when a request matches one.
+func (a *Account) UsesPlatformModelInheritance() bool {
+	return a != nil &&
+		a.OwnerUserID != nil &&
+		NormalizeAccountShareMode(a.ShareMode) == AccountShareModePrivate
+}
+
 func (a *Account) IsPublicShareApproved() bool {
 	return a != nil &&
 		a.OwnerUserID != nil &&
@@ -1336,9 +1346,18 @@ func resolveRequestedModelInMapping(mapping map[string]string, requestedModel st
 	return matchWildcardMappingResult(mapping, requestedModel)
 }
 
-// IsModelSupported 检查模型是否在 model_mapping 中（支持通配符）。
-// 平台账号未配置 mapping 时保持历史兼容（允许所有）；个人账号的空白名单拒绝全部。
+// IsModelSupported 检查账号模型能力。私有个人账号不以 mapping 限制能力，
+// 可选模型由调用方的渠道定价目录确定；其他账号按 mapping 判断。
 func (a *Account) IsModelSupported(requestedModel string) bool {
+	if a.UsesPlatformModelInheritance() {
+		return strings.TrimSpace(requestedModel) != ""
+	}
+	return a.IsModelSupportedByMapping(requestedModel)
+}
+
+// IsModelSupportedByMapping 保留共享场景的账号模型能力边界（支持通配符）。
+// 个人账号空 mapping 拒绝全部，平台账号未配置 mapping 时保持历史兼容。
+func (a *Account) IsModelSupportedByMapping(requestedModel string) bool {
 	mapping := a.GetModelMapping()
 	if len(mapping) == 0 {
 		return a.OwnerUserID == nil

backend/internal/service/account_opencode_test.go

@@ -78,6 +78,8 @@ func TestResolveOpencodeGoModelSpec(t *testing.T) {
 		found      bool
 	}{
 		{name: "chat", model: "deepseek-v4-flash", protocol: OpencodeGoProtocolChat, found: true},
+		{name: "deepseek flash alias", model: "deepseek-flash", protocol: OpencodeGoProtocolChat, found: true},
+		{name: "deepseek v4.1 flash", model: "deepseek-v4.1-flash", protocol: OpencodeGoProtocolChat, found: true},
 		{name: "messages", model: "opencode-go/minimax-m3[1m]", protocol: OpencodeGoProtocolMessages, found: true},
 		{name: "documented qwen messages", model: "opencode-go/qwen3.7-plus", protocol: OpencodeGoProtocolMessages, found: true},
 		{name: "responses", model: "opencode/grok-4.6", protocol: OpencodeGoProtocolResponses, found: true},
@@ -154,11 +156,11 @@ func TestOpencodeDefaultModelSlugs(t *testing.T) {
 		"minimax-m3", "minimax-m2.7", "minimax-m2.5",
 		"kimi-k3", "kimi-k2.7-code", "kimi-k2.6", "longcat-2.0", "kimi-k2.5",
 		"glm-5.2", "glm-5.3-flash", "glm-5.3", "glm-5.1", "glm-5",
-		"deepseek-v4-pro", "deepseek-v4-flash", "deepseek-v4-flash-vision-exp",
+		"deepseek-v4-pro", "deepseek-v4-flash", "deepseek-flash", "deepseek-v4.1-flash", "deepseek-v4-flash-vision-exp",
 		"qwen3.7-max", "qwen3.8-max", "qwen3.8-flash", "qwen3.7-plus", "qwen3.6-plus", "qwen3.5-plus",
 		"mimo-v2-pro", "mimo-v2-omni", "mimo-v2.5-pro", "mimo-v2.5",
 		"hy4-preview", "hy3", "hy3-preview",
-		"gpt-5.6-luna", "grok-4.5", "grok-4.6", "muse-spark-1.2-contributor", "muse-spark-1.3-contributor", "omen-alpha",
+		"gpt-5.6-luna", "grok-4.5", "grok-4.6", "muse-spark-1.3-contributor", "muse-spark-1.2-contributor", "omen-alpha",
 	}
 	if !slices.Equal(models, wantModels) {
 		t.Fatalf("model snapshot mismatch\n got: %v\nwant: %v", models, wantModels)
@@ -225,7 +227,7 @@ func TestOpencodeDefaultModelSlugs(t *testing.T) {
 	}
 
 	models[0] = "mutated"
-	if fresh := OpencodeDefaultModelSlugs(); len(fresh) != 35 || fresh[0] == "mutated" {
+	if fresh := OpencodeDefaultModelSlugs(); len(fresh) != 37 || fresh[0] == "mutated" {
 		t.Fatalf("OpencodeDefaultModelSlugs did not return an independent copy: %v", fresh)
 	}
 }

backend/internal/service/account_share_lifecycle.go

@@ -1147,7 +1147,7 @@ func (s *AccountShareModeService) validateRoomActivation(
 			return ErrAccountShareAccountUnavailable
 		}
 		for _, model := range allowedModels {
-			if account.IsModelSupported(model) {
+			if account.IsModelSupportedByMapping(model) {
 				continue
 			}
 			return ErrAccountShareModeUnsupportedModel.WithMetadata(map[string]string{
@@ -1167,7 +1167,7 @@ func (s *AccountShareModeService) validateRoomActivation(
 	// OpenCode 房间的恢复校验只需要确认账号凭证和上游连通性，不应使用房间
 	// 白名单中的任意模型作为探针。白名单首项可能是区域、套餐或上游状态
 	// 不稳定的模型（例如 grok-4.5），会把模型级失败误判成账号不可用。
-	// OpenCode 账号测试服务的默认探针是 deepseek-v4-flash，这里显式固定
+	// OpenCode 账号测试服务的默认探针是 deepseek-v4.1-flash，这里显式固定
 	// 使用同一个模型，避免房间恢复流程传入首个白名单模型覆盖该默认值。
 	validationCtx, validationCancel := context.WithTimeout(
 		ctx,