Skip to content

Self-hosted workflows for coding-agent delivery. Orchestrate CodeBuddy, Codex and Claude Code with scripts and human approval gates. Includes Local workflows for coding assistants.

feat: keep a personal model catalog for Codex, Claude Code, and agent CLIs (#177)

crispinhu27367b41d4279b
diff --git a/design.md b/design.md
index 1c453373..2105ec36 100644
--- a/design.md
+++ b/design.md
@@ -54,6 +54,7 @@
- 流程设计页 SOP 名称旁有一枚不占视觉重心的复制按钮(`#copyWorkflowName`,Harness `copy`,14px,默认弱化色)。它只把当前 SOP 名称写入剪贴板;点击不打开切换菜单。没有打开流程时按钮隐藏。悬停提示只用 `data-tip` 一处,不再同时写浏览器 `title`。切换列表里每个 SOP 名称右侧也有同样的复制按钮(`.fd-pop-copy`),只复制该行名称,不切换 SOP、不关闭菜单;这一处只用 `title`。
- 设置模式与工作台模式切换通过共享过渡控制器衔接;过渡副本不得接受点击、键盘焦点或提交操作。
- 凭据定位等跳转应在目标页面挂载后聚焦;用户已切换到其他页面时取消旧的焦点请求。
+- 个人配置里,Codex、Claude Code,以及带协议的 Agent CLI,可以维护模型目录:获取可用模型,勾选、排序、修改显示名。目录为空时,未填 Base URL 或协议是 Gemini 官方 API 则使用该 CLI 自带模型,填写了 Base URL 则跟随服务公布的模型。保存过的目录在官方服务和自定义地址上都生效。Cursor CLI 只使用官方模型。
- 主题入口在左下角头像卡片(`#userProfilePopover`)的「外观」行:「浅色 / 深色 / 跟随系统」三段开关(`.upp-theme-seg`,`role="radiogroup"`),访客与登录卡片都显示,选项文案与 chatbot 设置一致,偏好写入共享键 `agentflow.theme.v3`。三段前分别是 Harness `sun`、`moon`、`monitor` 图标,悬停、聚焦或点击时播放一次动效;选中滑块由 SlidingTabs 驱动,卡片展开时立即对准当前选项。切换时页面颜色约 280ms 渐变,减少动态效果时直接切换。
- 顶栏 `#themeToggle` 只在宽度 ≤1000px(图标栏隐藏)时显示,作为浅色、深色一键切换的兜底;宽屏下仅隐藏,DOM 节点保留给 AI 助手按钮定位。
diff --git a/internal/domain/user.go b/internal/domain/user.go
index 9d6d21a5..2ad22a72 100644
--- a/internal/domain/user.go
+++ b/internal/domain/user.go
@@ -14,8 +14,8 @@ type User struct {
ClaudeCodeAPIKeyConfigured bool `json:"claudeCodeApiKeyConfigured,omitempty"`
ClaudeCodeBaseURL string `json:"claudeCodeBaseUrl,omitempty"`
// CodexModels and ClaudeCodeModels are the model catalogs AI 对话 offers
- // for that CLI, in display order. Empty means the models the Base URL's
- // /models endpoint publishes.
+ // for that CLI, in display order. Empty follows the CLI's built-in models
+ // on the official endpoint, or the models the Base URL publishes.
CodexModels []CLIModel `json:"codexModels,omitempty"`
ClaudeCodeModels []CLIModel `json:"claudeCodeModels,omitempty"`
// AgentCLICredentials holds the credentials of the agent CLIs
diff --git a/internal/httpapi/assistant_engine_models_test.go b/internal/httpapi/assistant_engine_models_test.go
new file mode 100644
index 00000000..56c90122
--- /dev/null
+++ b/internal/httpapi/assistant_engine_models_test.go
@@ -0,0 +1,52 @@
+package httpapi
+
+import (
+ "context"
+ "slices"
+ "testing"
+
+ "agentflow/internal/domain"
+ "agentflow/internal/runtime"
+)
+
+func TestAssistantEngineModelsKeepPersonalCatalogOnOfficialKey(t *testing.T) {
+ previous := assistantEngineDiscover
+ t.Cleanup(func() { assistantEngineDiscover = previous })
+ var discovered []string
+ assistantEngineDiscover = func(_ context.Context, _ bool, _, baseURL string) ([]assistantDiscoveredModel, error) {
+ discovered = append(discovered, baseURL)
+ return []assistantDiscoveredModel{{ID: "remote-model", Name: "Remote"}}, nil
+ }
+ ids := func(user domain.User) []string {
+ var out []string
+ for _, model := range assistantEngineModels(context.Background(), user) {
+ out = append(out, model.ID)
+ }
+ return out
+ }
+
+ official := domain.User{CodexAPIKey: "codex-key", CodexModels: []domain.CLIModel{{ID: "gpt-5.5", Name: "GPT-5.5"}}}
+ if got := ids(official); !slices.Equal(got, []string{"codex:gpt-5.5"}) || len(discovered) != 0 {
+ t.Fatalf("official catalog: %v discovered %v", got, discovered)
+ }
+
+ builtin := ids(domain.User{CodexAPIKey: "codex-key", ClaudeCodeAPIKey: "claude-key"})
+ if !slices.Contains(builtin, "codex:gpt-6.1-terra") || !slices.Contains(builtin, "claude-code:claude-haiku-5-5") {
+ t.Fatalf("builtin catalog: %v", builtin)
+ }
+ if len(discovered) != 0 {
+ t.Fatalf("official endpoint discovered models: %v", discovered)
+ }
+
+ gemini := domain.User{AgentCLICredentials: map[string]domain.AgentCLICredential{
+ runtime.AgentCLIAntigravity: {APIKey: "gemini-key", BaseURL: "https://generativelanguage.googleapis.com", Protocol: domain.AgentCLIProtocolGemini, Models: []domain.CLIModel{{ID: "gemini-custom"}}},
+ }}
+ if got := ids(gemini); !slices.Equal(got, []string{"agy:gemini-custom"}) || len(discovered) != 0 {
+ t.Fatalf("gemini catalog: %v discovered %v", got, discovered)
+ }
+
+ remote := domain.User{CodexAPIKey: "codex-key", CodexBaseURL: "https://catalog-test.example/v1"}
+ if got := ids(remote); !slices.Equal(got, []string{"codex:remote-model"}) || len(discovered) != 1 {
+ t.Fatalf("base url catalog: %v discovered %v", got, discovered)
+ }
+}
diff --git a/internal/httpapi/assistant_engines.go b/internal/httpapi/assistant_engines.go
index c533f463..1201b04a 100644
--- a/internal/httpapi/assistant_engines.go
+++ b/internal/httpapi/assistant_engines.go
@@ -294,9 +294,11 @@ func assistantScheduledModel(id string, catalog assistantModelCatalog) string {
return assistantAllowedModel(id, catalog)
}
-// assistantEngineModels lists the Codex / Claude Code models the user can
-// chat with: the list from 个人配置 when set, otherwise the models the Base
-// URL publishes, otherwise the built-in executor catalog.
+// assistantEngineModels lists the models a configured CLI offers in chat.
+// A personal catalog wins on the official endpoint and behind a Base URL.
+// An empty catalog asks the Base URL for its published models, then falls
+// back to the built-in executor catalog. Gemini publishes no OpenAI-style
+// list, so an empty catalog there uses the built-in models directly.
func assistantEngineModels(ctx context.Context, user domain.User) []assistantModel {
var out []assistantModel
for _, engine := range assistantCLIEngines() {
@@ -306,22 +308,17 @@ func assistantEngineModels(ctx context.Context, user domain.User) []assistantMod
}
protocol := assistantEngineProtocol(user, engine)
if protocol == runtime.AgentCLIProtocolGemini {
- // A Gemini endpoint publishes no OpenAI-style model list.
baseURL = ""
}
- // The official endpoint serves the CLI's own models, so a catalog
- // only applies behind a Base URL.
var listed []assistantDiscoveredModel
- if baseURL != "" {
- for _, model := range assistantEngineCustomModels(user, engine) {
- if assistantValidEngineModel(model.ID) {
- listed = append(listed, assistantDiscoveredModel{ID: model.ID, Name: model.Name})
- }
- }
- if len(listed) == 0 {
- listed = cachedAssistantEngineDiscovery(ctx, assistantEngineAnthropicModels(engine, protocol), key, baseURL)
+ for _, model := range assistantEngineCustomModels(user, engine) {
+ if assistantValidEngineModel(model.ID) {
+ listed = append(listed, assistantDiscoveredModel{ID: model.ID, Name: model.Name})
}
}
+ if len(listed) == 0 && baseURL != "" {
+ listed = cachedAssistantEngineDiscovery(ctx, assistantEngineAnthropicModels(engine, protocol), key, baseURL)
+ }
if engine == runtime.AgentCLICursor {
listed = cachedCursorModels(key)
}
diff --git a/internal/httpapi/catalog_test.go b/internal/httpapi/catalog_test.go
index 379d6c48..539ecebd 100644
--- a/internal/httpapi/catalog_test.go
+++ b/internal/httpapi/catalog_test.go
@@ -55,7 +55,20 @@ func TestExecutorModelsCatalogListsPerCLI(t *testing.T) {
if cb.Models[0].Credits != "" {
t.Fatal("unconfigured public model must not claim a private price")
}
-
+ codex := catalogs["codex"]
+ if len(codex.Models) < 2 || codex.Models[0].ID != "gpt-6.1-sol" || codex.Models[1].ID != "gpt-6.1-terra" || codex.Models[1].Name != "GPT-6.1 Terra" {
+ t.Fatalf("codex catalog = %+v", codex.Models)
+ }
+ claude := catalogs["claude"]
+ haiku := -1
+ for i, model := range claude.Models {
+ if model.ID == "claude-haiku-5-5" {
+ haiku = i
+ }
+ }
+ if haiku < 0 || haiku+1 >= len(claude.Models) || claude.Models[haiku].Name != "Claude Haiku 5.5" || claude.Models[haiku+1].ID != "claude-haiku-4-5" {
+ t.Fatalf("claude catalog = %+v", claude.Models)
+ }
}
func TestEnvironmentAssetsAreFilteredByProjectAndSharedScope(t *testing.T) {
diff --git a/internal/httpapi/executor_models.go b/internal/httpapi/executor_models.go
index 5d7ddab5..373dde1c 100644
--- a/internal/httpapi/executor_models.go
+++ b/internal/httpapi/executor_models.go
@@ -74,6 +74,7 @@ func executorModelCatalogs() map[string]executorModelCatalog {
CustomModel: true,
Models: []executorModelInfo{
{ID: "gpt-6.1-sol", Name: "GPT-6.1 Sol"},
+ {ID: "gpt-6.1-terra", Name: "GPT-6.1 Terra"},
{ID: "gpt-6-astra", Name: "GPT-6 Astra"},
{ID: "gpt-6-sol", Name: "GPT-6 Sol"},
{ID: "gpt-6-luna", Name: "GPT-6 Luna"},
@@ -98,6 +99,7 @@ func executorModelCatalogs() map[string]executorModelCatalog {
{ID: "claude-sonnet-5", Name: "Claude Sonnet 5"},
{ID: "claude-sonnet-4-6", Name: "Claude Sonnet 4.6"},
{ID: "claude-sonnet-4-5", Name: "Claude Sonnet 4.5"},
+ {ID: "claude-haiku-5-5", Name: "Claude Haiku 5.5"},
{ID: "claude-haiku-4-5", Name: "Claude Haiku 4.5"},
},
Efforts: effortOptions(domain.ExecutorEffortLevels["claude-code"]),
diff --git a/internal/repo/models.go b/internal/repo/models.go
index 6a90c116..0e866cb2 100644
--- a/internal/repo/models.go
+++ b/internal/repo/models.go
@@ -41,8 +41,10 @@ type userConfigRow struct {
CodeBuddyInternetEnvironment string `gorm:"column:codebuddy_internet_environment;size:64"`
CodexAPIKey *string `gorm:"column:codex_api_key;type:text"`
CodexBaseURL *string `gorm:"column:codex_base_url;type:text"`
+ CodexModels *string `gorm:"column:codex_models;type:text"`
ClaudeCodeAPIKey *string `gorm:"column:claude_code_api_key;type:text"`
ClaudeCodeBaseURL *string `gorm:"column:claude_code_base_url;type:text"`
+ ClaudeCodeModels *string `gorm:"column:claude_code_models;type:text"`
AgentCLICredentials *string `gorm:"column:agent_cli_credentials;type:text"`
Created *time.Time `gorm:"column:created_at"`
Updated *time.Time `gorm:"column:updated_at"`
diff --git a/internal/repo/provider_credentials_test.go b/internal/repo/provider_credentials_test.go
index 244791d6..6f954e9f 100644
--- a/internal/repo/provider_credentials_test.go
+++ b/internal/repo/provider_credentials_test.go
@@ -94,7 +94,9 @@ func TestProviderUserCredentials(t *testing.T) {
}
u, _ := st.UserByLoginName(login)
codexURL, claudeURL := "https://codex.example/v1", "https://claude.example"
- _, err = st.UpdateUserCredentials(u.ID, UserCredentialUpdate{CodexAPIKey: "codex-secret", CodexBaseURL: &codexURL, ClaudeCodeAPIKey: "claude-secret", ClaudeCodeBaseURL: &claudeURL})
+ codexModels := []domain.CLIModel{{ID: "gpt-5.5", Name: "gpt-5.5"}}
+ claudeModels := []domain.CLIModel{{ID: "claude-sonnet", Name: "Sonnet"}}
+ _, err = st.UpdateUserCredentials(u.ID, UserCredentialUpdate{CodexAPIKey: "codex-secret", CodexBaseURL: &codexURL, CodexModels: &codexModels, ClaudeCodeAPIKey: "claude-secret", ClaudeCodeBaseURL: &claudeURL, ClaudeCodeModels: &claudeModels})
if err != nil {
t.Fatal(err)
}
@@ -107,8 +109,8 @@ func TestProviderUserCredentials(t *testing.T) {
t.Fatal(err)
}
got, ok := st.User(u.ID)
- if !ok || got.CodexAPIKey != "codex-secret" || got.ClaudeCodeAPIKey != "claude-secret" || got.CodexBaseURL != codexURL || got.ClaudeCodeBaseURL != claudeURL {
- t.Fatal("credentials did not survive refresh and partial update")
+ if !ok || got.CodexAPIKey != "codex-secret" || got.ClaudeCodeAPIKey != "claude-secret" || got.CodexBaseURL != codexURL || got.ClaudeCodeBaseURL != claudeURL || len(got.CodexModels) != 1 || got.CodexModels[0].ID != "gpt-5.5" || got.CodexModels[0].Name != "" || len(got.ClaudeCodeModels) != 1 || got.ClaudeCodeModels[0].Name != "Sonnet" {
+ t.Fatalf("credentials did not survive refresh and partial update: %+v %+v", got.CodexModels, got.ClaudeCodeModels)
}
{
var configRows int
@@ -134,12 +136,13 @@ func TestProviderUserCredentials(t *testing.T) {
t.Fatal("public user leaked credentials or lost configured state")
}
empty := ""
- _, err = st.UpdateUserCredentials(u.ID, UserCredentialUpdate{CodexAPIKeyClear: true, ClaudeCodeAPIKeyClear: true, CodexBaseURL: &empty, ClaudeCodeBaseURL: &empty})
+ noModels := []domain.CLIModel{}
+ _, err = st.UpdateUserCredentials(u.ID, UserCredentialUpdate{CodexAPIKeyClear: true, ClaudeCodeAPIKeyClear: true, CodexBaseURL: &empty, ClaudeCodeBaseURL: &empty, CodexModels: &noModels, ClaudeCodeModels: &noModels})
if err != nil {
t.Fatal(err)
}
cleared, _ := st.User(u.ID)
- if cleared.CodexAPIKey != "" || cleared.ClaudeCodeAPIKey != "" || cleared.CodexBaseURL != "" || cleared.ClaudeCodeBaseURL != "" || cleared.GitToken != "git-secret" {
+ if cleared.CodexAPIKey != "" || cleared.ClaudeCodeAPIKey != "" || cleared.CodexBaseURL != "" || cleared.ClaudeCodeBaseURL != "" || len(cleared.CodexModels) != 0 || len(cleared.ClaudeCodeModels) != 0 || cleared.GitToken != "git-secret" {
t.Fatal("clear operation did not isolate providers")
}
})
diff --git a/internal/repo/users.go b/internal/repo/users.go
index a475a975..6b7d98be 100644
--- a/internal/repo/users.go
+++ b/internal/repo/users.go
@@ -29,8 +29,10 @@ type userWithConfig struct {
CodeBuddyInternetEnvironment string `gorm:"column:codebuddy_internet_environment"`
CodexAPIKey *string `gorm:"column:codex_api_key"`
CodexBaseURL *string `gorm:"column:codex_base_url"`
+ CodexModels *string `gorm:"column:codex_models"`
ClaudeCodeAPIKey *string `gorm:"column:claude_code_api_key"`
ClaudeCodeBaseURL *string `gorm:"column:claude_code_base_url"`
+ ClaudeCodeModels *string `gorm:"column:claude_code_models"`
AgentCLICredentials *string `gorm:"column:agent_cli_credentials"`
Created *time.Time `gorm:"column:created_at"`
Updated *time.Time `gorm:"column:updated_at"`
@@ -39,7 +41,7 @@ type userWithConfig struct {
const userSelectColumns = `u.id, u.staff_id, u.login_name, u.chinese_name, u.dept_id, u.dept_name,
COALESCE(u.platform_role, '') AS platform_role,
c.git_token, c.gongfeng_refresh_token, c.gongfeng_token_expires_at, c.codebuddy_api_key, COALESCE(c.codebuddy_internet_environment, '') AS codebuddy_internet_environment,
- c.codex_api_key, c.codex_base_url, c.claude_code_api_key, c.claude_code_base_url,
+ c.codex_api_key, c.codex_base_url, c.codex_models, c.claude_code_api_key, c.claude_code_base_url, c.claude_code_models,
c.agent_cli_credentials,
u.created_at, u.updated_at`
@@ -67,12 +69,14 @@ func (r userWithConfig) toDomain() domain.User {
if r.CodexBaseURL != nil {
u.CodexBaseURL = *r.CodexBaseURL
}
+ u.CodexModels = decodeCLIModels(r.CodexModels)
if r.ClaudeCodeAPIKey != nil {
u.ClaudeCodeAPIKey = *r.ClaudeCodeAPIKey
}
if r.ClaudeCodeBaseURL != nil {
u.ClaudeCodeBaseURL = *r.ClaudeCodeBaseURL
}
+ u.ClaudeCodeModels = decodeCLIModels(r.ClaudeCodeModels)
if r.AgentCLICredentials != nil {
_ = json.Unmarshal([]byte(*r.AgentCLICredentials), &u.AgentCLICredentials)
}
@@ -148,8 +152,8 @@ func (r *UsersRepo) PutUser(v domain.User) error {
v.GitToken = old.GitToken
v.GongfengRefreshToken = old.GongfengRefreshToken
v.GongfengTokenExpiresAt = old.GongfengTokenExpiresAt
- v.CodexAPIKey, v.CodexBaseURL = old.CodexAPIKey, old.CodexBaseURL
- v.ClaudeCodeAPIKey, v.ClaudeCodeBaseURL = old.ClaudeCodeAPIKey, old.ClaudeCodeBaseURL
+ v.CodexAPIKey, v.CodexBaseURL, v.CodexModels = old.CodexAPIKey, old.CodexBaseURL, old.CodexModels
+ v.ClaudeCodeAPIKey, v.ClaudeCodeBaseURL, v.ClaudeCodeModels = old.ClaudeCodeAPIKey, old.ClaudeCodeBaseURL, old.ClaudeCodeModels
v.CodeBuddyAPIKey = old.CodeBuddyAPIKey
v.CodeBuddyInternetEnvironment = old.CodeBuddyInternetEnvironment
v.AgentCLICredentials = old.AgentCLICredentials
@@ -222,23 +226,27 @@ func userHasConfig(user domain.User) bool {
user.CodeBuddyInternetEnvironment != "" ||
user.CodexAPIKey != "" ||
user.CodexBaseURL != "" ||
+ len(user.CodexModels) > 0 ||
user.ClaudeCodeAPIKey != "" ||
user.ClaudeCodeBaseURL != "" ||
+ len(user.ClaudeCodeModels) > 0 ||
len(user.AgentCLICredentials) > 0
}
type UserCredentialUpdate struct {
- GitToken string `json:"gitToken"`
- GitTokenClear bool `json:"gitTokenClear"`
- CodeBuddyAPIKey string `json:"codeBuddyApiKey"`
- CodeBuddyAPIKeyClear bool `json:"codeBuddyApiKeyClear"`
- CodeBuddyInternetEnvironment *string `json:"codeBuddyInternetEnvironment"`
- CodexAPIKey string `json:"codexApiKey"`
- CodexAPIKeyClear bool `json:"codexApiKeyClear"`
- CodexBaseURL *string `json:"codexBaseUrl"`
- ClaudeCodeAPIKey string `json:"claudeCodeApiKey"`
- ClaudeCodeAPIKeyClear bool `json:"claudeCodeApiKeyClear"`
- ClaudeCodeBaseURL *string `json:"claudeCodeBaseUrl"`
+ GitToken string `json:"gitToken"`
+ GitTokenClear bool `json:"gitTokenClear"`
+ CodeBuddyAPIKey string `json:"codeBuddyApiKey"`
+ CodeBuddyAPIKeyClear bool `json:"codeBuddyApiKeyClear"`
+ CodeBuddyInternetEnvironment *string `json:"codeBuddyInternetEnvironment"`
+ CodexAPIKey string `json:"codexApiKey"`
+ CodexAPIKeyClear bool `json:"codexApiKeyClear"`
+ CodexBaseURL *string `json:"codexBaseUrl"`
+ CodexModels *[]domain.CLIModel `json:"codexModels"`
+ ClaudeCodeAPIKey string `json:"claudeCodeApiKey"`
+ ClaudeCodeAPIKeyClear bool `json:"claudeCodeApiKeyClear"`
+ ClaudeCodeBaseURL *string `json:"claudeCodeBaseUrl"`
+ ClaudeCodeModels *[]domain.CLIModel `json:"claudeCodeModels"`
// AgentCLICredentials updates the agent CLIs by kind; absent fields keep
// the stored value. CodeBuddy, Codex and Claude Code stay on their own columns.
AgentCLICredentials map[string]AgentCLICredentialUpdate `json:"agentCliCredentials"`
@@ -292,6 +300,20 @@ func (r *UsersRepo) UpdateUserCredentials(id int64, update UserCredentialUpdate)
if update.ClaudeCodeBaseURL != nil {
user.ClaudeCodeBaseURL = strings.TrimSpace(*update.ClaudeCodeBaseURL)
}
+ if update.CodexModels != nil {
+ models, err := normalizeCLIModels(*update.CodexModels)
+ if err != nil {
+ return domain.User{}, err
+ }
+ user.CodexModels = models
+ }
+ if update.ClaudeCodeModels != nil {
+ models, err := normalizeCLIModels(*update.ClaudeCodeModels)
+ if err != nil {
+ return domain.User{}, err
+ }
+ user.ClaudeCodeModels = models
+ }
if err := applyAgentCLICredentialUpdates(&user, update.AgentCLICredentials); err != nil {
return domain.User{}, err
}
@@ -326,8 +348,8 @@ func (r *UsersRepo) writeUserConfig(v domain.User) error {
"gongfeng_refresh_token": nullableString(v.GongfengRefreshToken), "gongfeng_token_expires_at": timePtr(v.GongfengTokenExpiresAt),
"codebuddy_api_key": nullableString(v.CodeBuddyAPIKey),
"codebuddy_internet_environment": v.CodeBuddyInternetEnvironment,
- "codex_api_key": nullableString(v.CodexAPIKey), "codex_base_url": nullableString(v.CodexBaseURL),
- "claude_code_api_key": nullableString(v.ClaudeCodeAPIKey), "claude_code_base_url": nullableString(v.ClaudeCodeBaseURL),
+ "codex_api_key": nullableString(v.CodexAPIKey), "codex_base_url": nullableString(v.CodexBaseURL), "codex_models": encodeCLIModels(v.CodexModels),
+ "claude_code_api_key": nullableString(v.ClaudeCodeAPIKey), "claude_code_base_url": nullableString(v.ClaudeCodeBaseURL), "claude_code_models": encodeCLIModels(v.ClaudeCodeModels),
"agent_cli_credentials": encodeAgentCLICredentials(v.AgentCLICredentials),
"created_at": timePtr(v.CreatedAt), "updated_at": timePtr(v.UpdatedAt),
})
@@ -406,6 +428,28 @@ const (
maxCLIModelNameRune = 64
)
+func decodeCLIModels(raw *string) []domain.CLIModel {
+ if raw == nil || strings.TrimSpace(*raw) == "" {
+ return nil
+ }
+ var models []domain.CLIModel
+ if json.Unmarshal([]byte(*raw), &models) != nil {
+ return nil
+ }
+ return models
+}
+
+func encodeCLIModels(models []domain.CLIModel) any {
+ if len(models) == 0 {
+ return nil
+ }
+ raw, err := json.Marshal(models)
+ if err != nil {
+ return nil
+ }
+ return string(raw)
+}
+
func normalizeCLIModels(models []domain.CLIModel) ([]domain.CLIModel, error) {
if len(models) > maxCLIModels {
return nil, fmt.Errorf("模型目录最多 %d 个", maxCLIModels)
diff --git a/migrations/027_cli_model_catalog.sql b/migrations/027_cli_model_catalog.sql
new file mode 100644
index 00000000..fc887975
--- /dev/null
+++ b/migrations/027_cli_model_catalog.sql
@@ -0,0 +1,7 @@
+-- Codex and Claude Code model catalogs. Agent CLI catalogs stay inside
+-- agent_cli_credentials. Apply manually; startup AutoMigrate also adds these
+-- columns. Empty follows the CLI's built-in models on the official endpoint,
+-- or the service's published models behind a Base URL.
+
+ALTER TABLE user_configs ADD COLUMN codex_models TEXT NULL;
+ALTER TABLE user_configs ADD COLUMN claude_code_models TEXT NULL;
diff --git a/web/app/workbench.js b/web/app/workbench.js
index b926c88c..0f8fc7f2 100644
--- a/web/app/workbench.js
+++ b/web/app/workbench.js
@@ -71,18 +71,20 @@ const CREDENTIAL_KINDS=[
impact:'AI 对话将只能使用默认模型,CodeBuddy 执行器节点会失败。'},
{key:'codexApiKey',group:'model',name:'Codex',short:'Codex API Key',logo:'codex',monochrome:true,
use:'AI 对话选择 Codex 执行器,以及以 Codex 运行的 SOP 节点',
- description:'用于调用 OpenAI Responses API 兼容服务:AI 对话可选择 Codex 执行器,SOP 中以 Codex 运行的节点也使用它;具体模型名称在角色定义中设置。',
- guide:[['在模型服务商控制台创建 API Key'],['如走代理或私有网关,记下服务地址'],['粘贴 Key,按需填写 Base URL;模型名在角色定义中设置']],
+ description:'AI 对话切换到 Codex 后可选用模型目录里的模型,SOP 在执行机器上以 Codex 运行的节点也使用它。目录为空时,未填 Base URL 使用 Codex 自带模型,填写后跟随服务发布的模型;也可以自己挑选、排序和命名。',
+ guide:[['在模型服务商控制台创建 API Key'],['如走代理或私有网关,记下服务地址'],['粘贴 Key,按需填写 Base URL;保存后可在模型目录里挑选 AI 对话的模型']],
placeholder:'请输入 Codex API Key',
extra:{name:'codexBaseUrl',label:'Base URL',placeholder:'https://api.openai.com/v1',url:true,clearWithKey:true},
- impact:'以 Codex 运行的 SOP 节点将无法执行,Base URL 一并清空。'},
+ models:{name:'codexModels',engine:'codex',endpoint:'/models'},
+ impact:'以 Codex 运行的 SOP 节点将无法执行,Base URL 与模型目录一并清空。'},
{key:'claudeCodeApiKey',group:'model',name:'Claude Code',short:'Claude Code API Key',logo:'claude',monochrome:true,
use:'AI 对话选择 Claude 执行器,以及以 Claude Code 运行的 SOP 节点',
- description:'用于调用 Anthropic Messages API 兼容服务:AI 对话可选择 Claude 执行器,SOP 中以 Claude Code 运行的节点也使用它;支持自定义服务地址。',
- guide:[['在模型服务商控制台创建 API Key'],['如走代理或私有网关,记下服务地址'],['粘贴 Key,按需填写 Base URL']],
+ description:'AI 对话切换到 Claude Code 后可选用模型目录里的模型,SOP 在执行机器上以 Claude Code 运行的节点也使用它。目录为空时,未填 Base URL 使用 Claude Code 自带模型,填写后跟随服务发布的模型;也可以自己挑选、排序和命名。',
+ guide:[['在模型服务商控制台创建 API Key'],['如走代理或私有网关,记下服务地址'],['粘贴 Key,按需填写 Base URL;保存后可在模型目录里挑选 AI 对话的模型']],
placeholder:'请输入 Claude Code API Key',
extra:{name:'claudeCodeBaseUrl',label:'Base URL',placeholder:'https://api.anthropic.com',url:true,clearWithKey:true},
- impact:'以 Claude Code 运行的 SOP 节点将无法执行,Base URL 一并清空。'},
+ models:{name:'claudeCodeModels',engine:'claude-code',endpoint:'/v1/models'},
+ impact:'以 Claude Code 运行的 SOP 节点将无法执行,Base URL 与模型目录一并清空。'},
agentCliCredentialKind('opencode',{name:'OpenCode',logo:'opencode',baseUrl:'https://api.example.com/v1',required:()=>true,
note:'OpenCode 没有自己的模型服务,需要填写 Base URL。',protocols:[['chat','Chat Completions'],['responses','Responses'],['messages','Messages(Anthropic)']]}),
agentCliCredentialKind('cursor',{name:'Cursor CLI',logo:'cursor',monochrome:true,
@@ -90,7 +92,7 @@ const CREDENTIAL_KINDS=[
guide:[['登录 Cursor 控制台,在「Integrations → User API Keys」新建 Key','https://cursor.com/dashboard?tab=integrations','前往 Cursor 创建 API Key'],['复制以 <code>crsr_</code> 开头的 Key'],['粘贴到下方保存']]}),
agentCliCredentialKind('agy',{name:'Antigravity',logo:'gemini',baseUrl:'https://gateway.example.com/v1',required:protocol=>protocol==='chat',
note:'默认连接 Gemini 官方服务;选择 OpenAI 兼容网关时需要填写 Base URL。',extraNote:'OpenAI 兼容网关必填',
- guide:[['在 Google AI Studio 创建 Gemini API Key,或准备 OpenAI 兼容网关的 Key','https://aistudio.google.com/apikey','前往 Google AI Studio'],['走网关时记下网关地址'],['粘贴 Key,选择协议']],
+ guide:[['在 Google AI Studio 创建 Gemini API Key,或准备 OpenAI 兼容网关的 Key','https://aistudio.google.com/apikey','前往 Google AI Studio'],['走网关时记下网关地址'],['粘贴 Key,选择协议;保存后可在模型目录里挑选 AI 对话的模型']],
protocols:[['gemini','Gemini 官方 API'],['chat','OpenAI 兼容网关(Chat Completions)']]}),
agentCliCredentialKind('kimi',{name:'Kimi Code',logo:'kimi',baseUrl:'https://api.moonshot.cn/v1',
note:'未填写 Base URL 时连接 Moonshot 官方服务。',protocols:[['chat','Chat Completions'],['responses','Responses'],['messages','Messages(Anthropic)']]}),
@@ -106,13 +108,14 @@ function agentCliCredentialKind(cli,o){
return {key:`agentCli.${cli}`,agentCli:cli,group:'model',name:o.name,short:`${o.name} API Key`,logo:o.logo,monochrome:!!o.monochrome,
use:`AI 对话的 ${o.name} 模型与以 ${o.name} 运行的 SOP 节点`,
description:`AI 对话切换到 ${o.name} 后可选用它的模型,SOP 在执行机器上以 ${o.name} 运行的节点也使用它。${o.note||''}`,
- guide:o.guide||[['在模型服务商控制台创建 API Key'],['记下服务地址和它提供的接口协议'],['粘贴 Key,按需填写 Base URL 并选择协议']],
+ guide:o.guide||[['在模型服务商控制台创建 API Key'],['记下服务地址和它提供的接口协议'],['粘贴 Key,按需填写 Base URL 并选择协议;保存后可在模型目录里挑选 AI 对话的模型']],
placeholder:`请输入 ${o.name} API Key`,
...(configurable?{
extra:{name:field+'baseUrl',label:'Base URL',placeholder:o.baseUrl,url:true,clearWithKey:true,required:o.required,note:o.extraNote||(o.required?'必填':'')},
protocol:{name:field+'protocol',options:o.protocols},
+ models:{name:field+'models',engine:cli},
}:{}),
- impact:`AI 对话将不能再切换到 ${o.name},以 ${o.name} 运行的 SOP 节点将无法执行${configurable?',Base URL 与协议一并清空':''}。`};
+ impact:`AI 对话将不能再切换到 ${o.name},以 ${o.name} 运行的 SOP 节点将无法执行${configurable?',Base URL、协议与模型目录一并清空':''}。`};
}
function credentialValue(user,name){
const [scope,cli,field]=String(name).split('.');
@@ -125,6 +128,251 @@ function credentialProtocol(kind,user){
function credentialProtocolHTML(kind,value){
return `<label class="credential-field"><span>接口协议<em>Base URL 提供的 API</em></span><div class="credential-input is-plain is-select"><select name="protocol" aria-label="接口协议">${kind.protocol.options.map(([id,label])=>`<option value="${id}"${id===value?' selected':''}>${escapeHTML(label)}</option>`).join('')}</select></div></label>`;
}
+// The model list behind an Anthropic-style Base URL sits under /v1.
+function credentialModelsEndpoint(kind,protocol){return kind.models.endpoint||(protocol==='messages'?'/v1/models':'/models')}
+// ---- 模型目录(Codex / Claude Code / 可配置 Agent CLI) ----
+// A saved catalog is the chat list on the official endpoint and behind a Base URL.
+// An empty catalog follows the CLI's built-in models when there is no Base URL
+// (or the protocol is Gemini), and the Base URL's published models otherwise.
+// Edits stay in the DOM until 保存.
+const CREDENTIAL_CATALOG_MAX=100;
+function credentialCatalogModels(value){
+ return (Array.isArray(value)?value:[]).map(model=>{const id=String(model?.id||'').trim(),name=String(model?.name||'').trim();return {id,name:name===id?'':name}}).filter(model=>model.id||model.name);
+}
+function credentialCatalogStored(models){return credentialCatalogModels(models).map(model=>model.name?model:{id:model.id})}
+function credentialCatalogKey(models){return JSON.stringify(credentialCatalogModels(models).map(model=>[model.id,model.name]))}
+function credentialCatalogError(models){
+ const seen=new Set();
+ if(models.length>CREDENTIAL_CATALOG_MAX)return {index:CREDENTIAL_CATALOG_MAX,error:`模型目录最多 ${CREDENTIAL_CATALOG_MAX} 个`};
+ for(const [index,{id='',name=''}] of models.entries()){
+ const model={id,name};
+ if(!model.id)return {index,field:'id',error:'模型 ID 不能为空'};
+ if(model.id.length>128)return {index,field:'id',error:'模型 ID 不能超过 128 个字符'};
+ if(/[\s"'`\\\u0000-\u001f\u007f]/.test(model.id))return {index,field:'id',error:`模型 ID「${model.id}」不能包含空格、引号或反斜杠`};
+ if(seen.has(model.id))return {index,field:'id',error:`模型 ID「${model.id}」重复`};
+ if([...model.name].length>64)return {index,field:'name',error:'显示名称不能超过 64 个字符'};
+ seen.add(model.id);
+ }
+ return null;
+}
+function credentialCatalogRowHTML(model={}){
+ return `<li class="credential-catalog-row" data-catalog-row><button type="button" class="credential-catalog-grip" data-catalog-grip aria-label="拖动排序,也可以按 ↑ ↓ 移动">${credentialGlyph('grip',14)}</button><span class="credential-input is-plain"><input class="credential-mono" data-catalog-field="id" value="${escapeHTML(model.id||'')}" placeholder="模型 ID,如 gpt-5.5" aria-label="模型 ID" autocomplete="off" spellcheck="false"></span><span class="credential-input is-plain"><input data-catalog-field="name" value="${escapeHTML(model.name||'')}" placeholder="显示名称(可选)" aria-label="显示名称" autocomplete="off"></span><button type="button" class="credential-btn ghost icon danger credential-ink" data-catalog-act="remove" aria-label="移除模型">${credentialGlyph('trash',14)}</button></li>`;
+}
+function credentialCatalogCopy(official,kind){
+ const name=kind?.name||'该 CLI';
+ return official
+ ?{title:`使用 ${name} 自带的模型`,detail:`目录为空时,AI 对话列出 ${name} 支持的模型。获取可用模型可以改成自己的目录,也可以手动添加。`,reset:'清空目录,改回使用自带的模型',restored:'已恢复默认,保存后使用自带的模型'}
+ :{title:'跟随服务发布的模型',reset:'清空目录,改回跟随服务发布的模型',restored:'已恢复默认,保存后跟随服务发布的模型'};
+}
+function credentialCatalogDetailHTML(official,kind,protocol){
+ const copy=credentialCatalogCopy(official,kind);
+ return official?escapeHTML(copy.detail):`目录为空时,AI 对话列出 Base URL 的 <code data-catalog-endpoint>${escapeHTML(credentialModelsEndpoint(kind,protocol))}</code> 返回的模型。`;
+}
+function credentialCatalogHTML(kind,user){
+ const baseUrl=credentialValue(user,kind.extra.name),protocol=credentialProtocol(kind,user);
+ const models=credentialCatalogModels(credentialValue(user,kind.models.name)),empty=!models.length,official=!String(baseUrl||'').trim()||protocol==='gemini';
+ const copy=credentialCatalogCopy(official,kind);
+ return `<section class="credential-catalog" data-credential-catalog data-catalog-mode="${official?'official':'remote'}" data-original-key="${escapeHTML(credentialCatalogKey(models))}" data-catalog-source="${escapeHTML(credentialCatalogSource(baseUrl))}" aria-label="模型目录">
+ <div class="credential-catalog-body" data-catalog-body>
+ <div class="credential-catalog-head"><div><b>模型目录</b><small data-catalog-count>${credentialCatalogCountText(models.length)}</small></div><div><button type="button" class="credential-btn secondary credential-ink" data-catalog-act="probe">${credentialGlyph('download',14)}<span>获取可用模型</span></button><button type="button" class="credential-btn secondary credential-ink" data-catalog-act="add"><span class="credential-turn">${credentialGlyph('plus',14)}</span><span>添加模型</span></button></div></div>
+ <div class="credential-catalog-probe" data-catalog-probe hidden></div>
+ <ol class="credential-catalog-list" data-catalog-list${empty?' hidden':''}>${models.map(credentialCatalogRowHTML).join('')}</ol>
+ <div class="credential-catalog-empty" data-catalog-empty${empty?'':' hidden'}>${credentialGlyph('layers',16)}<div><b data-catalog-empty-title>${escapeHTML(copy.title)}</b><small data-catalog-empty-detail>${credentialCatalogDetailHTML(official,kind,protocol)}</small></div></div>
+ <div class="credential-catalog-foot" data-catalog-foot${empty?' hidden':''}><button type="button" class="credential-btn link credential-ink" data-catalog-act="reset">${credentialGlyph('undo',13)}<span>恢复默认</span></button><small data-catalog-reset-note>${escapeHTML(copy.reset)}</small></div>
+ </div>
+ <span class="credential-sr" data-catalog-live role="status" aria-live="polite"></span>
+ </section>`;
+}
+function credentialCatalogSource(baseUrl){return String(baseUrl||'').trim().replace(/\/+$/,'')}
+function credentialCatalogCountText(count){return count?`${count} 个模型 · AI 对话按此顺序列出`:'未自定义'}
+function credentialCatalogRows(catalog){return [...catalog.querySelectorAll('[data-catalog-row]')]}
+function credentialCatalogRowModel(row){return {id:row.querySelector('[data-catalog-field="id"]').value,name:row.querySelector('[data-catalog-field="name"]').value}}
+function credentialCatalogFilledRows(catalog){return credentialCatalogRows(catalog).filter(row=>credentialCatalogModels([credentialCatalogRowModel(row)]).length)}
+function readCredentialCatalog(catalog){return credentialCatalogModels(credentialCatalogRows(catalog).map(credentialCatalogRowModel))}
+function credentialCatalogOfficial(catalog){
+ const form=catalog?.closest('.credential-editor-form'),extra=form?.querySelector('input[name="extra"]');
+ return (!!extra&&!extra.value.trim())||form?.querySelector('select[name="protocol"]')?.value==='gemini';
+}
+function credentialCatalogDirty(catalog){return !!catalog&&credentialCatalogKey(readCredentialCatalog(catalog))!==catalog.dataset.originalKey}
+function credentialCatalogPayload(catalog){
+ if(!catalog)return undefined;
+ return credentialCatalogDirty(catalog)?readCredentialCatalog(catalog):undefined;
+}
+function syncCredentialCatalog(catalog){
+ const official=credentialCatalogOfficial(catalog),kind=credentialKind(catalog.closest('[data-credential-row]')?.dataset.credentialRow),protocol=catalog.closest('.credential-editor-form')?.querySelector('select[name="protocol"]')?.value;
+ const copy=credentialCatalogCopy(official,kind),mode=official?'official':'remote';
+ const title=catalog.querySelector('[data-catalog-empty-title]'),detail=catalog.querySelector('[data-catalog-empty-detail]'),note=catalog.querySelector('[data-catalog-reset-note]');
+ if(title)title.textContent=copy.title;
+ if(detail)detail.innerHTML=credentialCatalogDetailHTML(official,kind,protocol);
+ if(note)note.textContent=copy.reset;
+ if(catalog.dataset.catalogMode&&catalog.dataset.catalogMode!==mode&&!catalog.querySelector('[data-catalog-probe]').hidden)closeCredentialCatalogProbe(catalog);
+ catalog.dataset.catalogMode=mode;
+ const rows=credentialCatalogRows(catalog).length,empty=!rows;
+ catalog.querySelector('[data-catalog-count]').textContent=credentialCatalogCountText(rows);
+ catalog.querySelector('[data-catalog-list]').hidden=empty;
+ catalog.querySelector('[data-catalog-empty]').hidden=!empty;
+ catalog.querySelector('[data-catalog-foot]').hidden=empty;
+ catalog.querySelector('[data-catalog-act="add"]').disabled=rows>=CREDENTIAL_CATALOG_MAX;
+}
+function announceCredentialCatalog(catalog,text){const live=catalog.querySelector('[data-catalog-live]');if(live)live.textContent=text}
+function credentialCatalogChanged(catalog){
+ syncCredentialCatalog(catalog);
+ const form=catalog.closest('.credential-editor-form');if(form)updateCredentialEditorDirty(form);
+}
+function resetCredentialCatalog(row){
+ const catalog=row.querySelector('[data-credential-catalog]'),kind=credentialKind(row.dataset.credentialRow);if(!catalog||!kind)return;
+ const holder=document.createElement('div');
+ holder.innerHTML=credentialCatalogHTML(kind,credentialUser());
+ catalog.replaceWith(holder.firstElementChild);
+ const fresh=row.querySelector('[data-credential-catalog]');
+ syncCredentialCatalog(fresh);
+ hydrateCredentialIcons(fresh);
+}
+function addCredentialCatalogRow(catalog,model={}){
+ const list=catalog.querySelector('[data-catalog-list]');
+ list.insertAdjacentHTML('beforeend',credentialCatalogRowHTML(model));
+ const row=list.lastElementChild;
+ hydrateCredentialIcons(row);
+ credentialCatalogChanged(catalog);
+ return row;
+}
+function removeCredentialCatalogRow(catalog,row){
+ const next=row.nextElementSibling||row.previousElementSibling;
+ row.remove();
+ credentialCatalogChanged(catalog);
+ announceCredentialCatalog(catalog,'已移除模型,保存后生效');
+ (next?.querySelector('[data-catalog-grip]')||catalog.querySelector('[data-catalog-act="add"]'))?.focus({preventScroll:true});
+}
+function moveCredentialCatalogRow(catalog,row,step){
+ const target=step<0?row.previousElementSibling:row.nextElementSibling;if(!target)return;
+ if(step<0)target.before(row);else target.after(row);
+ row.querySelector('[data-catalog-grip]')?.focus({preventScroll:true});
+ credentialCatalogChanged(catalog);
+ announceCredentialCatalog(catalog,`已移到第 ${credentialCatalogRows(catalog).indexOf(row)+1} 位`);
+}
+function startCredentialCatalogDrag(event,grip){
+ if(event.button!==0)return;
+ const row=grip.closest('[data-catalog-row]'),catalog=grip.closest('[data-credential-catalog]'),list=row?.parentElement;if(!row||!catalog)return;
+ event.preventDefault();
+ row.classList.add('is-dragging');list.classList.add('is-sorting');
+ const move=moveEvent=>{
+ if(moveEvent.pointerId!==event.pointerId)return;
+ const y=moveEvent.clientY;
+ let prev=row.previousElementSibling,next=row.nextElementSibling;
+ while(prev&&y<prev.getBoundingClientRect().top+prev.getBoundingClientRect().height/2){prev.before(row);prev=row.previousElementSibling}
+ while(next&&y>next.getBoundingClientRect().top+next.getBoundingClientRect().height/2){next.after(row);next=row.nextElementSibling}
+ };
+ const end=endEvent=>{
+ if(endEvent.pointerId!==event.pointerId)return;
+ window.removeEventListener('pointermove',move);window.removeEventListener('pointerup',end);window.removeEventListener('pointercancel',end);
+ row.classList.remove('is-dragging');list.classList.remove('is-sorting');
+ grip.focus({preventScroll:true});
+ credentialCatalogChanged(catalog);
+ };
+ window.addEventListener('pointermove',move);window.addEventListener('pointerup',end);window.addEventListener('pointercancel',end);
+}
+function credentialCatalogProbeHTML(catalog,kind){
+ const probe=catalog.probe,current=new Set(readCredentialCatalog(catalog).map(model=>model.id)),followAll=!current.size;
+ const items=probe.models.map(model=>{
+ const listed=current.has(model.id),checked=followAll||listed;
+ return `<label class="credential-catalog-pick" data-pick="${escapeHTML((model.id+' '+(model.name||'')).toLowerCase())}"><input type="checkbox" value="${escapeHTML(model.id)}"${checked?' checked':''}><code>${escapeHTML(model.id)}</code>${model.name&&model.name!==model.id?`<small>${escapeHTML(model.name)}</small>`:''}${listed?'<em>已在目录</em>':''}</label>`;
+ }).join('');
+ const protocol=catalog.closest('.credential-editor-form')?.querySelector('select[name="protocol"]')?.value;
+ const source=probe.source==='builtin'?'以下是内置模型':`来自 Base URL 的 ${escapeHTML(credentialModelsEndpoint(kind,protocol))}`;
+ return `<div class="credential-catalog-probe-top"><span class="credential-input is-plain is-search">${credentialGlyph('search',14)}<input data-catalog-search placeholder="搜索模型" aria-label="搜索模型" autocomplete="off" spellcheck="false"></span><span class="credential-catalog-picked" data-catalog-picked></span><button type="button" class="credential-btn link credential-ink" data-catalog-act="toggle-all">全选</button></div>
+ <div class="credential-catalog-probe-list" role="group" aria-label="可用模型">${items}</div>
+ <div class="credential-catalog-probe-foot"><small>${source} · 勾选的模型会加入目录,取消勾选会移出</small><div><button type="button" class="credential-btn ghost credential-ink" data-catalog-act="probe-close">取消</button><button type="button" class="credential-btn primary credential-ink" data-catalog-act="probe-apply">更新列表</button></div></div>`;
+}
+function syncCredentialCatalogProbe(catalog){
+ const panel=catalog.querySelector('[data-catalog-probe]'),query=String(panel.querySelector('[data-catalog-search]')?.value||'').trim().toLowerCase();
+ const picks=[...panel.querySelectorAll('.credential-catalog-pick')];
+ picks.forEach(pick=>{pick.hidden=!!query&&!pick.dataset.pick.includes(query)});
+ const visible=picks.filter(pick=>!pick.hidden),checked=picks.filter(pick=>pick.querySelector('input').checked).length;
+ const counter=panel.querySelector('[data-catalog-picked]');if(counter)counter.textContent=`已选 ${checked} / ${picks.length}`;
+ const toggle=panel.querySelector('[data-catalog-act="toggle-all"]');
+ if(toggle){toggle.textContent=visible.length&&visible.every(pick=>pick.querySelector('input').checked)?'全不选':'全选';toggle.disabled=!visible.length}
+}
+function closeCredentialCatalogProbe(catalog){
+ const panel=catalog.querySelector('[data-catalog-probe]');
+ catalog.probeToken=(catalog.probeToken||0)+1;catalog.probe=null;
+ panel.hidden=true;panel.innerHTML='';
+}
+async function probeCredentialCatalog(row,catalog,button){
+ const kind=credentialKind(row.dataset.credentialRow),form=row.querySelector('.credential-editor-form'),panel=catalog.querySelector('[data-catalog-probe]');
+ const extra=form.querySelector('input[name="extra"]'),secret=form.querySelector('input[name="secret"]')?.value.trim()||'',protocol=form.querySelector('select[name="protocol"]')?.value;
+ const extraError=extra?credentialExtraError(kind,extra.value,protocol):'';
+ if(extraError){toast(extraError,'err');extra.focus();return}
+ const token=(catalog.probeToken||0)+1;catalog.probeToken=token;catalog.probe=null;
+ panel.hidden=false;
+ panel.innerHTML=`<p class="credential-vline is-info" role="status">${credentialSpinner(13)}正在获取可用模型…</p>`;
+ hydrateCredentialIcons(panel);
+ setCredentialButtonBusy(button,'获取中');
+ let result;
+ try{result=await api(`/api/users/${state.currentUser.id}/cli-models/probe`,{method:'POST',body:JSON.stringify({engine:kind.models.engine,apiKey:secret,...(extra?{baseUrl:extra.value.trim()}:{}),...(protocol?{protocol}:{})}),silent:true})}
+ catch(err){result={error:err.message}}
+ finally{setCredentialButtonBusy(button,'')}
+ if(catalog.probeToken!==token||!catalog.isConnected)return;
+ if(result?.error||!result?.models?.length){
+ panel.innerHTML=`<div class="credential-catalog-probe-fail"><p class="credential-vline is-err" role="alert">${credentialGlyph('alert',13)}${escapeHTML(result?.error||'服务没有返回可用模型')}</p><div><button type="button" class="credential-btn ghost credential-ink" data-catalog-act="probe-close">关闭</button><button type="button" class="credential-btn secondary credential-ink" data-catalog-act="probe">${credentialGlyph('refresh',13)}<span>重试</span></button></div></div>`;
+ hydrateCredentialIcons(panel);
+ return;
+ }
+ const source=credentialCatalogSource(extra?.value);
+ if(source!==catalog.dataset.catalogSource){
+ const cleared=credentialCatalogRows(catalog);
+ cleared.forEach(item=>item.remove());
+ catalog.dataset.catalogSource=source;
+ credentialCatalogChanged(catalog);
+ if(cleared.length)announceCredentialCatalog(catalog,'Base URL 已更换,原模型目录已清空,保存后生效');
+ }
+ catalog.probe=result;
+ panel.innerHTML=credentialCatalogProbeHTML(catalog,kind);
+ hydrateCredentialIcons(panel);
+ syncCredentialCatalogProbe(catalog);
+ panel.querySelector('[data-catalog-search]')?.focus({preventScroll:true});
+}
+function toggleCredentialCatalogProbe(catalog){
+ const panel=catalog.querySelector('[data-catalog-probe]'),visible=[...panel.querySelectorAll('.credential-catalog-pick:not([hidden]) input')];
+ const on=!visible.every(input=>input.checked);
+ visible.forEach(input=>{input.checked=on});
+ syncCredentialCatalogProbe(catalog);
+}
+function applyCredentialCatalogProbe(catalog){
+ const probe=catalog.probe;if(!probe)return;
+ const picked=new Set([...catalog.querySelectorAll('[data-catalog-probe] input[type="checkbox"]:checked')].map(input=>input.value));
+ const offered=new Set(probe.models.map(model=>model.id)),kept=new Set();
+ let removed=0;
+ credentialCatalogRows(catalog).forEach(row=>{
+ const id=row.querySelector('[data-catalog-field="id"]').value.trim();
+ if(offered.has(id)&&!picked.has(id)){row.remove();removed++}else kept.add(id);
+ });
+ const added=probe.models.filter(model=>picked.has(model.id)&&!kept.has(model.id));
+ const room=Math.max(0,CREDENTIAL_CATALOG_MAX-kept.size),list=catalog.querySelector('[data-catalog-list]');
+ list.insertAdjacentHTML('beforeend',added.slice(0,room).map(model=>credentialCatalogRowHTML({id:model.id,name:model.name&&model.name!==model.id?model.name:''})).join(''));
+ hydrateCredentialIcons(list);
+ closeCredentialCatalogProbe(catalog);
+ credentialCatalogChanged(catalog);
+ const skipped=added.length-Math.min(added.length,room);
+ const message=`模型目录已更新:新增 ${Math.min(added.length,room)} 个,移除 ${removed} 个${skipped?`,超出上限未加入 ${skipped} 个`:''},保存后生效`;
+ announceCredentialCatalog(catalog,message);
+ toast(message,skipped?'err':'ok');
+ catalog.querySelector('[data-catalog-act="probe"]')?.focus({preventScroll:true});
+}
+function credentialCatalogAction(action,row,catalog,button){
+ if(action==='add'){addCredentialCatalogRow(catalog).querySelector('[data-catalog-field="id"]').focus({preventScroll:true});return}
+ if(action==='remove')return removeCredentialCatalogRow(catalog,button.closest('[data-catalog-row]'));
+ if(action==='reset'){
+ credentialCatalogRows(catalog).forEach(item=>item.remove());
+ credentialCatalogChanged(catalog);
+ announceCredentialCatalog(catalog,credentialCatalogCopy(credentialCatalogOfficial(catalog),credentialKind(row?.dataset.credentialRow)).restored);
+ catalog.querySelector('[data-catalog-act="add"]')?.focus({preventScroll:true});
+ return;
+ }
+ if(action==='probe')return probeCredentialCatalog(row,catalog,catalog.querySelector('[data-catalog-act="probe"]'));
+ if(action==='probe-close'){closeCredentialCatalogProbe(catalog);catalog.querySelector('[data-catalog-act="probe"]')?.focus({preventScroll:true});return}
+ if(action==='toggle-all')return toggleCredentialCatalogProbe(catalog);
+ if(action==='probe-apply')return applyCredentialCatalogProbe(catalog);
+}
// Platform features depend on these, in the order people should configure them.
const CREDENTIAL_RECOMMENDED=['gitToken','codeBuddyApiKey'];
const CREDENTIAL_PAT_WARNING='请填写 GitHub <b>个人访问令牌(PAT)</b>,为目标仓库授予 <b>Contents</b> 和 <b>Pull requests</b> 的读写权限;少勾权限会导致克隆 / 推送仓库失败。';
@@ -186,16 +434,23 @@ function credentialSavePayload(kind,values={}){
if(secret)entry.apiKey=secret;
if(kind.extra&&values.extra!==undefined)entry.baseUrl=String(values.extra||'').trim();
if(kind.protocol&&values.protocol!==undefined)entry.protocol=values.protocol;
+ if(kind.models&&values.models!==undefined)entry.models=credentialCatalogStored(values.models);
return {agentCliCredentials:{[kind.agentCli]:entry}};
}
const payload={[kind.key]:String(values.secret||'').trim()};
if(kind.extra&&values.extra!==undefined)payload[kind.extra.name]=String(values.extra||'').trim()||(kind.extra.fallback||'');
+ if(kind.models&&values.models!==undefined)payload[kind.models.name]=credentialCatalogStored(values.models);
return payload;
}
function credentialClearPayload(kind){
- if(kind.agentCli)return {agentCliCredentials:{[kind.agentCli]:{apiKeyClear:true,baseUrl:'',protocol:''}}};
+ if(kind.agentCli){
+ const entry={apiKeyClear:true,baseUrl:'',protocol:''};
+ if(kind.models)entry.models=[];
+ return {agentCliCredentials:{[kind.agentCli]:entry}};
+ }
const payload={[kind.key+'Clear']:true};
if(kind.extra?.clearWithKey)payload[kind.extra.name]='';
+ if(kind.models)payload[kind.models.name]=[];
return payload;
}
function gitTokenVerifyFor(user){return state.gitTokenVerify&&Number(state.gitTokenVerify.userId)===Number(user?.id)?state.gitTokenVerify:null}
@@ -233,7 +488,11 @@ function credentialSubline(kind,user){
const raw=String(user.codeBuddyInternetEnvironment||'').trim(),env=codeBuddyEnvironment(raw);
return `<span>网络环境</span>${env?`<span class="credential-mono">${escapeHTML(env.label)}</span>`:`<span class="is-err">「${escapeHTML(raw)}」无法识别,按国际站连接</span>`}${dot}${use}`;
}
- if(kind.extra){const extra=credentialValue(user,kind.extra.name);return (extra?`<span class="credential-mono">${escapeHTML(extra)}</span>`:'<span>官方地址</span>')+dot+use;}
+ if(kind.extra){
+ const models=kind.models&&credentialCatalogModels(credentialValue(user,kind.models.name)).length,baseUrl=credentialValue(user,kind.extra.name);
+ const protocol=kind.protocol?kind.protocol.options.find(([id])=>id===credentialProtocol(kind,user))?.[1]:'';
+ return (baseUrl?`<span class="credential-mono">${escapeHTML(baseUrl)}</span>`:'<span>官方地址</span>')+(protocol?dot+`<span>${escapeHTML(protocol)}</span>`:'')+(models?dot+`<span>${models} 个自定义模型</span>`:'')+dot+use;
+ }
return use;
}
function credentialFieldHTML({label,note='',name,type='password',value='',placeholder='',hint='',hintTone='',id=''}){
@@ -288,12 +547,14 @@ function credentialEditorHTML(kind,user){
const extraField=!kind.extra?''
:kind.extra.options?credentialSelectFieldHTML(kind,extraStored,'与 Key 所在站点一致')
:credentialFieldHTML({label:kind.extra.label,note:kind.extra.note||(kind.extra.url?'留空使用官方地址':''),name:'extra',type:kind.extra.url?'url':'text',value:extraValue,placeholder:kind.extra.placeholder,hint:null});
- const protocolField=kind.protocol?credentialProtocolHTML(kind,credentialProtocol(kind,user)):'';
+ const protocolValue=kind.protocol?credentialProtocol(kind,user):'';
+ const protocolField=kind.protocol?credentialProtocolHTML(kind,protocolValue):'';
const legacy=!!(kind.extra?.options&&codeBuddyEnvironmentLegacy(user[kind.extra.name]));
- return `<div class="credential-editor-form"${kind.extra?` data-original="${escapeHTML(extraValue)}"`:''}${legacy?' data-legacy="true"':''}>
+ return `<div class="credential-editor-form${kind.models?' has-catalog':''}"${kind.extra?` data-original="${escapeHTML(extraValue)}"`:''}${kind.protocol?` data-original-protocol="${escapeHTML(protocolValue)}"`:''}${legacy?' data-legacy="true"':''}>
${credentialFieldHTML({label:kind.short,note:'已配置 · 留空则不改',name:'secret',placeholder:'输入新值以替换',hint:kind.hint||''})}
${extraField}
${protocolField}
+ ${kind.models?credentialCatalogHTML(kind,user):''}
<div class="credential-swap">
<div class="credential-editor-foot" data-credential-pane="foot"><button type="button" class="credential-btn ghost danger credential-ink" data-credential-act="delete">${credentialGlyph('trash',14)}<span>删除</span></button><div><button type="button" class="credential-btn ghost credential-ink" data-credential-act="cancel">取消</button><button type="button" class="credential-btn primary credential-ink" data-credential-act="save"${legacy?'':' disabled'}>保存</button></div></div>
<div class="credential-confirm is-off" data-credential-pane="confirm" role="alert"><div>删除 <b>${escapeHTML(kind.short)}</b>?${escapeHTML(kind.impact)}</div><button type="button" class="credential-btn ghost credential-ink" data-credential-act="undelete">取消</button><button type="button" class="credential-btn danger-solid credential-ink" data-credential-act="confirm-delete">删除</button></div>
@@ -384,6 +645,8 @@ function resetCredentialEditor(row){
const form=row.querySelector('.credential-editor-form');if(!form)return;
const extra=form.querySelector('[name="extra"]');if(extra)extra.value=form.dataset.original||'';
if(extra?.tagName==='SELECT')refreshCredentialEnvironmentLinks(form,extra.value);
+ const protocol=form.querySelector('select[name="protocol"]');if(protocol)protocol.value=form.dataset.originalProtocol||'';
+ resetCredentialCatalog(row);
if(row.dataset.credentialRow==='gitToken'){
const line=form.querySelector('[data-git-verify-line]');if(line){line.classList.remove('is-err');line.innerHTML=''}
setCredentialHint(form,'secret',GIT_TOKEN_REPLACE_HINT);
@@ -407,8 +670,8 @@ function showCredentialPane(row,name,focus=CREDENTIAL_PANE_FOCUS[name]){
if(focus)setTimeout(()=>target.querySelector(focus)?.focus({preventScroll:true}),60);
}
function updateCredentialEditorDirty(form){
- const secret=form.querySelector('input[name="secret"]')?.value.trim()||'',extra=form.querySelector('[name="extra"]'),save=form.querySelector('[data-credential-act="save"]');
- if(save&&!save.dataset.busy)save.disabled=!secret&&!form.dataset.legacy&&!(extra&&extra.value.trim()!==(form.dataset.original||''));
+ const secret=form.querySelector('input[name="secret"]')?.value.trim()||'',extra=form.querySelector('[name="extra"]'),protocol=form.querySelector('select[name="protocol"]'),save=form.querySelector('[data-credential-act="save"]');
+ if(save&&!save.dataset.busy)save.disabled=!secret&&!form.dataset.legacy&&!(extra&&extra.value.trim()!==(form.dataset.original||''))&&!(protocol&&protocol.value!==(form.dataset.originalProtocol||''))&&!credentialCatalogDirty(form.querySelector('[data-credential-catalog]'));
}
function setCredentialHint(scope,name,text,tone=''){
const hint=scope.querySelector(`[data-credential-hint="${name}"]`),box=scope.querySelector(`input[name="${name}"]`)?.closest('.credential-input');
@@ -479,6 +742,14 @@ async function submitCredentialEditor(row,button){
const secretError=credentialSecretError(kind,secret),extraError=extra?credentialExtraError(kind,extra.value,protocol?.value):'';
if(secretError){setCredentialHint(form,'secret',secretError,'err');return}
if(extraError){toast(extraError,'err');extra.focus();return}
+ const catalog=form.querySelector('[data-credential-catalog]'),models=credentialCatalogPayload(catalog);
+ const catalogError=models&&credentialCatalogError(models);
+ if(catalogError){
+ toast(catalogError.error,'err');
+ const input=credentialCatalogFilledRows(catalog)[catalogError.index]?.querySelector(`[data-catalog-field="${catalogError.field||'id'}"]`);
+ if(input){const box=input.closest('.credential-input');box.classList.add('is-bad');box.classList.remove('is-shake');void box.offsetWidth;box.classList.add('is-shake');input.focus()}
+ return;
+ }
setCredentialButtonBusy(button,key==='gitToken'?'校验中':'保存中');
try{
if(key==='gitToken'){
@@ -493,7 +764,7 @@ async function submitCredentialEditor(row,button){
credentialSaved(key,'Git Token 校验通过,已保存');
return;
}
- await saveCredential(key,{secret,...(extra?{extra:extra.value}:{}),...(protocol?{protocol:protocol.value}:{})});
+ await saveCredential(key,{secret,...(extra?{extra:extra.value}:{}),...(protocol?{protocol:protocol.value}:{}),...(models?{models}:{})});
credentialSaved(key,`${kind.short} 已保存`);
}catch(err){toast(err.message,'err');setCredentialButtonBusy(button,'')}
}
@@ -550,6 +821,8 @@ function bindCredentialPanel(panel){
const head=target.closest('.credential-group-head');if(head)return toggleCredentialGroup(head);
const eye=target.closest('[data-credential-eye]');if(eye)return toggleCredentialSecret(eye);
const row=target.closest('[data-credential-row]');if(!row)return;
+ const catalogAction=target.closest('[data-catalog-act]');
+ if(catalogAction){event.stopPropagation();if(!catalogAction.disabled)credentialCatalogAction(catalogAction.dataset.catalogAct,row,catalogAction.closest('[data-credential-catalog]'),catalogAction);return}
const action=target.closest('[data-credential-act]');
if(action){event.stopPropagation();if(!action.disabled)credentialRowAction(action.dataset.credentialAct,row,action);return}
if(target.closest('.credential-editor'))return;
@@ -558,11 +831,24 @@ function bindCredentialPanel(panel){
panel.onkeydown=event=>{
const main=event.target.closest?.('.credential-row-main[role="button"]');
if(main&&event.target===main&&(event.key==='Enter'||event.key===' ')){event.preventDefault();activateCredentialRow(main.closest('[data-credential-row]'))}
- const input=event.target.closest?.('.credential-editor-form input');
- if(input&&event.key==='Enter'){event.preventDefault();const save=input.closest('.credential-editor-form').querySelector('[data-credential-act="save"]');if(!save.disabled)save.click()}
+ const grip=event.target.closest?.('[data-catalog-grip]');
+ if(grip&&(event.key==='ArrowUp'||event.key==='ArrowDown')){event.preventDefault();moveCredentialCatalogRow(grip.closest('[data-credential-catalog]'),grip.closest('[data-catalog-row]'),event.key==='ArrowUp'?-1:1);return}
+ const probe=event.target.closest?.('[data-catalog-probe]');
+ if(probe&&event.key==='Escape'){event.preventDefault();event.stopPropagation();credentialCatalogAction('probe-close',null,probe.closest('[data-credential-catalog]'));return}
+ const input=event.target.closest?.('.credential-editor-form input, .credential-editor-form select');
+ if(input&&event.key==='Enter'&&!probe){event.preventDefault();const save=input.closest('.credential-editor-form').querySelector('[data-credential-act="save"]');if(!save.disabled)save.click()}
+ };
+ panel.onpointerdown=event=>{
+ const grip=event.target.closest?.('[data-catalog-grip]');if(grip)startCredentialCatalogDrag(event,grip);
};
panel.oninput=event=>{
const form=event.target.closest?.('.credential-editor-form');if(!form)return;
+ const catalog=event.target.closest('[data-credential-catalog]');
+ if(catalog){
+ if(event.target.closest('[data-catalog-probe]'))return syncCredentialCatalogProbe(catalog);
+ event.target.closest('.credential-input')?.classList.remove('is-bad');
+ }
+ if(event.target.name==='extra'||event.target.name==='protocol'){const catalogBox=form.querySelector('[data-credential-catalog]');if(catalogBox)syncCredentialCatalog(catalogBox)}
if(event.target.name==='secret'){
const kind=credentialKind(form.closest('[data-credential-row]').dataset.credentialRow),error=credentialSecretError(kind,event.target.value),warning=credentialSecretWarning(kind,event.target.value);
setCredentialHint(form,'secret',error||warning||(kind.key==='gitToken'?GIT_TOKEN_REPLACE_HINT:kind.hint||''),error?'err':warning?'warn':'');
diff --git a/web/platform.css b/web/platform.css
index 7bb875cd..4dd1fdf7 100644
--- a/web/platform.css
+++ b/web/platform.css
@@ -2370,6 +2370,7 @@ html[data-theme="dark"] .credential-logo.monochrome img{filter:invert(1)}
.credential-row.is-open .credential-editor-inner{opacity:1;transform:none;transition-delay:.06s}
.credential-row:not(.is-open) .credential-editor-inner{visibility:hidden;transition:opacity .22s,transform .34s var(--cr-fold),visibility 0s .34s}
.credential-editor-form{display:grid;gap:14px;max-width:560px;padding-left:14px;border-left:1px solid color-mix(in srgb,var(--cr-line-strong) 80%,transparent)}
+.credential-editor-form.has-catalog{max-width:680px}
.credential-field{display:grid;gap:6px;margin:0}
.credential-field>span{display:flex;align-items:baseline;justify-content:space-between;gap:8px;color:var(--cr-text-2);font-size:12px;font-weight:500}
.credential-field>span em{color:var(--cr-tertiary);font-size:11.5px;font-style:normal;font-weight:400}
@@ -2424,6 +2425,57 @@ html[data-theme="dark"] .credential-logo.monochrome img{filter:invert(1)}
.credential-confirm{display:flex;align-items:center;gap:10px;padding:8px 8px 8px 12px;border:1px solid color-mix(in srgb,var(--cr-err) 20%,transparent);border-radius:10px;background:var(--cr-err-fill);color:var(--cr-text-2);font-size:12.5px}
.credential-confirm>div{flex:1;min-width:0}
.credential-confirm b{color:var(--cr-err);font-weight:500}
+/* 模型目录:可排序目录 + 「获取可用模型」勾选面板 */
+.credential-sr{position:absolute;width:1px;height:1px;overflow:hidden;clip:rect(0 0 0 0);white-space:nowrap}
+.credential-catalog{position:relative;display:grid;gap:10px;padding:12px;border:1px solid var(--cr-line);border-radius:10px;background:var(--cr-canvas)}
+.credential-catalog [hidden]{display:none!important}
+.credential-catalog-body{display:grid;gap:10px;min-width:0}
+.credential-catalog-head{display:flex;align-items:center;justify-content:space-between;flex-wrap:wrap;gap:8px 12px}
+.credential-catalog-head>div:first-child{display:grid;gap:2px}
+.credential-catalog-head b{color:var(--cr-text-2);font-size:12.5px;font-weight:500}
+.credential-catalog-head small{color:var(--cr-tertiary);font-size:11.5px;font-variant-numeric:tabular-nums}
+.credential-catalog-head>div:last-child{display:flex;gap:6px}
+.credential-catalog-head .credential-btn{min-height:30px;padding:0 10px}
+.credential-catalog-list{display:grid;gap:6px;max-height:360px;margin:0;padding:0;overflow:auto;list-style:none;overscroll-behavior:contain}
+.credential-catalog-row{display:grid;grid-template-columns:24px minmax(0,1.15fr) minmax(0,1fr) 30px;align-items:center;gap:6px;padding:4px;border:1px solid transparent;border-radius:9px;background:var(--cr-surface);animation:credentialRise .32s var(--cr-spring) both;transition:border-color .16s,box-shadow .2s var(--cr-flow),opacity .16s}
+.credential-catalog-row:hover{border-color:var(--cr-line)}
+.credential-catalog-row .credential-input input{height:32px;font-size:12.5px}
+.credential-catalog-row .credential-input input.credential-mono{font-size:12px}
+.credential-catalog-grip{display:grid;place-items:center;width:24px;height:30px;margin:0;padding:0;border:0;border-radius:6px;background:transparent;color:var(--cr-tertiary);cursor:grab;touch-action:none}
+.credential-catalog-grip:hover{background:var(--cr-hover);color:var(--cr-text)}
+.credential-catalog-grip:focus-visible{outline:2px solid color-mix(in srgb,var(--cr-accent) 65%,transparent);outline-offset:1px;color:var(--cr-text)}
+.credential-catalog-list.is-sorting{cursor:grabbing;user-select:none}
+.credential-catalog-list.is-sorting .credential-catalog-grip{cursor:grabbing}
+.credential-catalog-row.is-dragging{position:relative;z-index:1;border-color:color-mix(in srgb,var(--cr-accent) 45%,transparent);box-shadow:var(--hui-popover-shadow)}
+.credential-catalog-empty{display:flex;gap:10px;padding:12px;border:1px dashed var(--cr-line-strong);border-radius:9px;color:var(--cr-muted)}
+.credential-catalog-empty>svg{flex:none;margin-top:2px;color:var(--cr-tertiary)}
+.credential-catalog-empty b{display:block;color:var(--cr-text-2);font-size:12.5px;font-weight:500}
+.credential-catalog-empty small{display:block;margin-top:2px;font-size:11.5px;line-height:1.6}
+.credential-catalog code,.credential-catalog-pick code{font-family:var(--cr-mono);font-size:11.5px}
+.credential-catalog-foot{display:flex;align-items:center;gap:6px}
+.credential-catalog-foot .credential-btn.link{padding:0 4px;color:var(--cr-muted)}
+.credential-catalog-foot .credential-btn.link:hover:not(:disabled){color:var(--cr-text)}
+.credential-catalog-foot small{color:var(--cr-tertiary);font-size:11.5px}
+.credential-catalog-probe{display:grid;gap:8px;padding:10px;border:1px solid var(--cr-line);border-radius:9px;background:var(--cr-surface);box-shadow:var(--hui-popover-shadow);animation:credentialRise .28s var(--cr-spring) both}
+.credential-catalog-probe-top{display:flex;align-items:center;gap:10px}
+.credential-catalog-probe-top .is-search{flex:1;min-width:0}
+.credential-catalog-probe-top .is-search>svg{position:absolute;left:10px;color:var(--cr-tertiary);pointer-events:none}
+.credential-catalog-probe-top .is-search input{height:32px;padding-left:31px;font-size:12.5px}
+.credential-catalog-picked{flex:none;color:var(--cr-muted);font-size:12px;font-variant-numeric:tabular-nums}
+.credential-catalog-probe-list{display:grid;max-height:260px;overflow:auto;overscroll-behavior:contain;margin:0 -4px;padding:0 4px}
+.credential-catalog-pick{display:flex;align-items:center;gap:9px;min-height:34px;padding:0 8px;border-radius:7px;color:var(--cr-text);cursor:pointer;transition:background-color .14s}
+.credential-catalog-pick:hover{background:var(--cr-hover)}
+.credential-catalog-pick input{flex:none;margin:0}
+.credential-catalog-pick code{min-width:0;overflow:hidden;text-overflow:ellipsis;white-space:nowrap}
+.credential-catalog-pick small{min-width:0;overflow:hidden;color:var(--cr-muted);font-size:12px;text-overflow:ellipsis;white-space:nowrap}
+.credential-catalog-pick em{flex:none;margin-left:auto;padding:1px 7px;border-radius:99px;background:color-mix(in srgb,var(--cr-accent) 10%,transparent);color:var(--cr-accent);font-size:11px;font-style:normal}
+.credential-catalog-probe-foot,.credential-catalog-probe-fail{display:flex;align-items:center;justify-content:space-between;flex-wrap:wrap;gap:8px;padding-top:8px;border-top:1px solid var(--cr-line)}
+.credential-catalog-probe-fail{padding-top:0;border-top:0}
+.credential-catalog-probe-foot small{color:var(--cr-tertiary);font-size:11.5px}
+.credential-catalog-probe-foot>div,.credential-catalog-probe-fail>div{display:flex;gap:6px;margin-left:auto}
+.credential-catalog-probe-fail .credential-vline{flex:1;min-width:0;align-items:flex-start;line-height:1.6;overflow-wrap:anywhere}
+.credential-catalog-probe-fail .credential-vline>svg{margin-top:3px}
+@media (prefers-reduced-motion:reduce){.credential-catalog-row,.credential-catalog-probe{animation:none}}
/* 代码仓库: read-only detail with bar / replace form / confirm panes */
.credential-editor-form.is-detail{max-width:none;padding-left:0;border-left:0}
.credential-editor-form.is-detail .credential-kv{display:grid;grid-template-columns:72px minmax(0,1fr);gap:9px 16px;margin:0;font-size:12.5px;line-height:1.6}
diff --git a/web/syntax_test.go b/web/syntax_test.go
index ff173395..854b518e 100644
--- a/web/syntax_test.go
+++ b/web/syntax_test.go
@@ -823,8 +823,40 @@ assert.deepEqual(credentialSavePayload(cred.kind('gitToken'), {secret: ' ghp_1 '
assert.deepEqual(credentialSavePayload(cred.kind('codeBuddyApiKey'), {secret: '', extra: 'ioa'}), {codeBuddyApiKey: '', codeBuddyInternetEnvironment: 'ioa'});
assert.deepEqual(credentialSavePayload(cred.kind('codeBuddyApiKey'), {secret: '', extra: ''}), {codeBuddyApiKey: '', codeBuddyInternetEnvironment: ''});
assert.deepEqual(credentialSavePayload(cred.kind('codexApiKey'), {secret: 'sk-1'}), {codexApiKey: 'sk-1'});
-assert.deepEqual(credentialClearPayload(cred.kind('codexApiKey')), {codexApiKeyClear: true, codexBaseUrl: ''});
-assert.deepEqual(credentialClearPayload(cred.kind('claudeCodeApiKey')), {claudeCodeApiKeyClear: true, claudeCodeBaseUrl: ''});
+assert.deepEqual(credentialSavePayload(cred.kind('claudeCodeApiKey'), {secret: '', extra: '', models: [{id: ' hy4 ', name: '混元 4'}, {id: 'glm-5', name: 'glm-5'}]}), {claudeCodeApiKey: '', claudeCodeBaseUrl: '', claudeCodeModels: [{id: 'hy4', name: '混元 4'}, {id: 'glm-5'}]});
+assert.deepEqual(credentialSavePayload(cred.kind('codexApiKey'), {secret: '', extra: '', models: []}), {codexApiKey: '', codexBaseUrl: '', codexModels: []}, '恢复默认 sends an empty catalog');
+assert.deepEqual(credentialSavePayload(cred.kind('agentCli.opencode'), {secret: 'k', extra: 'https://gw.example/v1', protocol: 'messages', models: [{id: 'a', name: 'A'}]}), {agentCliCredentials: {opencode: {apiKey: 'k', baseUrl: 'https://gw.example/v1', protocol: 'messages', models: [{id: 'a', name: 'A'}]}}});
+assert.equal(cred.kind('agentCli.cursor').models, undefined, 'Cursor stays on its official models');
+assert.equal(cred.kind('agentCli.zcode').models.engine, 'zcode');
+assert.ok(credentialSubline(cred.kind('codexApiKey'), {codexApiKeyConfigured: true, codexModels: [{id: 'hy4'}, {id: 'gpt-5.5'}]}).includes('2 个自定义模型'));
+assert.deepEqual(credentialClearPayload(cred.kind('codexApiKey')), {codexApiKeyClear: true, codexBaseUrl: '', codexModels: []});
+assert.deepEqual(credentialClearPayload(cred.kind('claudeCodeApiKey')), {claudeCodeApiKeyClear: true, claudeCodeBaseUrl: '', claudeCodeModels: []});
+assert.deepEqual(credentialClearPayload(cred.kind('agentCli.opencode')), {agentCliCredentials: {opencode: {apiKeyClear: true, baseUrl: '', protocol: '', models: []}}});
+assert.deepEqual(credentialClearPayload(cred.kind('agentCli.cursor')), {agentCliCredentials: {cursor: {apiKeyClear: true, baseUrl: '', protocol: ''}}});
+const catalogUser = {codexApiKeyConfigured: true, codexBaseUrl: 'https://gw.example/v1', codexModels: [{id: 'hy4', name: '混元 4'}, {id: 'gpt-5.5'}]};
+const catalogHTML = credentialCatalogHTML(cred.kind('codexApiKey'), catalogUser);
+assert.equal(count(catalogHTML, 'data-catalog-row'), 2);
+assert.ok(catalogHTML.indexOf('value="hy4"') < catalogHTML.indexOf('value="gpt-5.5"') && catalogHTML.includes('value="混元 4"'));
+assert.ok(catalogHTML.includes('data-catalog-act="probe"') && catalogHTML.includes('data-catalog-act="add"') && catalogHTML.includes('data-catalog-grip'));
+assert.ok(catalogHTML.includes('data-catalog-source="https://gw.example/v1"'));
+assert.equal(credentialCatalogSource(' https://gw.example/v1/ '), credentialCatalogSource('https://gw.example/v1'));
+assert.ok(catalogHTML.includes('data-catalog-empty hidden') && catalogHTML.includes('2 个模型') && catalogHTML.includes('data-catalog-body>') && !catalogHTML.includes('data-catalog-body hidden'));
+const emptyCatalog = credentialCatalogHTML(cred.kind('claudeCodeApiKey'), {claudeCodeBaseUrl: 'https://gw.example'});
+assert.ok(emptyCatalog.includes('跟随服务发布的模型') && emptyCatalog.includes('/v1/models') && emptyCatalog.includes('data-catalog-foot hidden') && emptyCatalog.includes('未自定义'));
+const officialCatalog = credentialCatalogHTML(cred.kind('codexApiKey'), {codexModels: [{id: 'hy4'}]});
+assert.ok(officialCatalog.includes('value="hy4"') && officialCatalog.includes('data-catalog-act="probe"') && officialCatalog.includes('改回使用自带的模型') && !officialCatalog.includes('data-catalog-body hidden'), 'an official key keeps its custom catalog editable');
+const officialEmpty = credentialCatalogHTML(cred.kind('codexApiKey'), {});
+assert.ok(officialEmpty.includes('使用 Codex 自带的模型') && officialEmpty.includes('data-catalog-act="add"') && !officialEmpty.includes('data-catalog-body hidden'));
+const geminiCatalog = credentialCatalogHTML(cred.kind('agentCli.agy'), {agentCliCredentials: {agy: {baseUrl: 'https://gw.example/v1', protocol: 'gemini'}}});
+assert.ok(geminiCatalog.includes('使用 Antigravity 自带的模型') && geminiCatalog.includes('data-catalog-act="probe"') && !geminiCatalog.includes('data-catalog-body hidden'), 'Gemini official API can still keep a custom catalog');
+assert.ok(credentialEditorHTML(cred.kind('codexApiKey'), catalogUser).includes('data-credential-catalog') && credentialEditorHTML(cred.kind('codexApiKey'), catalogUser).includes('has-catalog'));
+assert.ok(!credentialEditorHTML(cred.kind('agentCli.cursor'), {agentCliCredentials: {cursor: {apiKeyConfigured: true}}}).includes('data-credential-catalog'));
+assert.equal(credentialCatalogKey([{id: 'a', name: 'a'}, {id: '', name: ''}]), credentialCatalogKey([{id: 'a'}]));
+assert.equal(credentialCatalogError([{id: 'a'}, {id: 'b', name: 'B'}]), null);
+assert.deepEqual(credentialCatalogError([{id: 'a'}, {id: '', name: 'x'}]), {index: 1, field: 'id', error: '模型 ID 不能为空'});
+assert.ok(credentialCatalogError([{id: 'a b'}]).error.includes('空格'));
+assert.ok(credentialCatalogError([{id: 'a'}, {id: 'a'}]).error.includes('重复'));
+assert.equal(credentialCatalogError([{id: 'a', name: 'n'.repeat(65)}]).field, 'name');
assert.deepEqual(credentialClearPayload(cred.kind('codeBuddyApiKey')), {codeBuddyApiKeyClear: true});
assert.deepEqual(credentialClearPayload(cred.kind('gitToken')), {gitTokenClear: true});
assert.equal(credentialSecretError(cred.kind('gitToken'), 'github_pat_1'), '');
@@ -881,7 +913,7 @@ assert.equal(calls.length, 0);
(async () => {
await deleteCredential('codexApiKey');
- assert.deepEqual(calls.at(-1).body, {codexApiKeyClear: true, codexBaseUrl: ''});
+ assert.deepEqual(calls.at(-1).body, {codexApiKeyClear: true, codexBaseUrl: '', codexModels: []});
// 添加凭证 starts at step 1 with configured kinds disabled.
cred.wizard = {step: 1, kind: null, direct: false, secret: '', extra: '', guide: {}, error: ''};