feat(zgsm): enhance model handling and configuration (#431)

* feat(zgsm): enhance model handling and configuration

* fix(i18n): remove showCustomConfig text

Author: mini2s

src/api/providers/zgsm.ts

@@ -57,6 +57,7 @@ export class ZgsmAiHandler extends BaseProvider implements SingleCompletionHandl
 		const urlHost = this._getUrlHost(this.baseURL)
 		const isAzureOpenAi = urlHost === "azure.com" || urlHost.endsWith(".azure.com") || options.openAiUseAzure
 
+		this.fetchModel()
 		this.headers = {
 			...COSTRICT_DEFAULT_HEADERS,
 			...(this.options.openAiHeaders || {}),

src/shared/ExtensionMessage.ts

@@ -14,6 +14,7 @@ import type {
 	OrganizationAllowList,
 	ShareVisibility,
 	QueuedMessage,
+	IZgsmModelResponseData,
 } from "@roo-code/types"
 
 import { GitCommit } from "../utils/git"
@@ -172,7 +173,7 @@ export interface ExtensionMessage {
 	openAiModels?: string[]
 	ollamaModels?: ModelRecord
 	lmStudioModels?: ModelRecord
-	fullResponseData?: ModelInfo[]
+	fullResponseData?: IZgsmModelResponseData[]
 	vsCodeLmModels?: { vendor?: string; family?: string; version?: string; id?: string }[]
 	huggingFaceModels?: Array<{
 		id: string

webview-ui/src/components/settings/providers/ZgsmAI.tsx

@@ -124,8 +124,15 @@ export const ZgsmAI = ({
 
 		switch (message.type) {
 			case "zgsmModels": {
-				const updatedModels = message.openAiModels ?? []
-				setOpenAiModels(Object.fromEntries(updatedModels.map((item) => [item, zgsmModels.default])))
+				const { openAiModels: updatedModels = [], fullResponseData = [] } = message
+				setOpenAiModels(
+					Object.fromEntries(
+						updatedModels.map((modelId) => [
+							modelId,
+							fullResponseData?.find(({ id }) => id === modelId) ?? zgsmModels.default,
+						]),
+					),
+				)
 				break
 			}
 		}
@@ -175,7 +182,9 @@ export const ZgsmAI = ({
 							onChange={(e: any) => {
 								setCachedStateField("useZgsmCustomConfig", e.target.checked)
 							}}>
-							<label className="block font-medium mb-1">{t("settings:providers.showCustomConfig")}</label>
+							<label className="block font-medium mb-1">
+								{t("settings:providers.useZgsmCustomConfig")}
+							</label>
 						</VSCodeCheckbox>
 					</div>
 				</>

webview-ui/src/components/ui/hooks/useSelectedModel.ts

@@ -97,7 +97,7 @@ export const useSelectedModel = (apiConfiguration?: ProviderSettings) => {
 				})
 			: {
 					id: apiConfiguration?.zgsmModelId || apiConfiguration?.apiModelId || zgsmDefaultModelId,
-					info: zgsmModels.default,
+					info: getZgsmModelFeedback({ apiConfiguration }, zgsmModels.default),
 				}
 
 	return {
@@ -115,6 +115,24 @@ export const useSelectedModel = (apiConfiguration?: ProviderSettings) => {
 	}
 }
 
+function getZgsmModelFeedback(
+	config: {
+		provider?: ProviderName
+		apiConfiguration?: ProviderSettings
+	},
+	defaultModelInfo: ModelInfo,
+): ModelInfo {
+	const { apiConfiguration } = config
+	if (
+		apiConfiguration?.useZgsmCustomConfig &&
+		apiConfiguration?.openAiCustomModelInfo &&
+		JSON.stringify(apiConfiguration.openAiCustomModelInfo) !== "{}"
+	) {
+		return apiConfiguration.openAiCustomModelInfo
+	}
+	return defaultModelInfo
+}
+
 function getSelectedModel({
 	provider,
 	apiConfiguration,
@@ -136,7 +154,8 @@ function getSelectedModel({
 	switch (provider) {
 		case "zgsm": {
 			const id = apiConfiguration.zgsmModelId || apiConfiguration.apiModelId || zgsmDefaultModelId
-			const info = routerModels.zgsm[id]
+			const info = getZgsmModelFeedback({ apiConfiguration }, routerModels.zgsm[id] || zgsmModels.default)
+
 			return { id, info }
 		}
 		case "openrouter": {

webview-ui/src/i18n/costrict-i18n/locales/en/settings.json

@@ -42,7 +42,6 @@
 			"capabilities": "Configure the capabilities and pricing for your custom OpenAI-compatible model. Be careful when specifying the model capabilities, as they can affect how Costrict performs."
 		},
 		"useZgsmCustomConfig": "Use custom configuration",
-		"showCustomConfig": "Show Model Custom Configuration",
 		"geminiCli": {
 			"projectIdDescription": "Specify your Google Cloud Project ID for enterprise or non-free tier access. Leave empty for automatic project discovery with personal accounts. If you encounter an API Error, it is recommended to fill in the Project ID."
 		},

webview-ui/src/i18n/costrict-i18n/locales/zh-CN/settings.json

@@ -42,7 +42,6 @@
 			"capabilities": "配置您的自定义OpenAI兼容模型的功能和定价。在指定模型功能时要小心，因为它们会影响 Costrict 的表现。"
 		},
 		"useZgsmCustomConfig": "使用自定义配置",
-		"showCustomConfig": "显示模型自定义配置",
 		"geminiCli": {
 			"projectIdDescription": "为企业或非免费套餐访问指定您的 Google Cloud 项目 ID。如使用个人账号并希望自动发现项目，请留空。如果您遇到 API 错误，建议填写项目ID。"
 		},

webview-ui/src/i18n/costrict-i18n/locales/zh-TW/settings.json

@@ -41,8 +41,7 @@
 		"customModel": {
 			"capabilities": "配置您的自定義OpenAI兼容模型的功能和定價。在指定模型功能時要小心，因為它們會影響 Costrict 的表現。"
 		},
-		"useZgsmCustomConfig": "使用模型自定義配置",
-		"showCustomConfig": "顯示自定義配置",
+		"useZgsmCustomConfig": "使用自定義配置",
 		"geminiCli": {
 			"projectIdDescription": "若為企業或非免費方案存取，請指定您的 Google Cloud 專案 ID。如使用個人帳號並希望自動探索專案，請留空。如果您遇到 API 錯誤，建議填寫專案 ID。"
 		},

webview-ui/src/utils/validate.ts

@@ -312,7 +312,7 @@ export function validateModelId(apiConfiguration: ProviderSettings, routerModels
 
 	const models = routerModels?.[provider]
 
-	if (models && Object.keys(models).length > 1 && !Object.keys(models).includes(modelId)) {
+	if (provider !== "zgsm" && models && Object.keys(models).length > 1 && !Object.keys(models).includes(modelId)) {
 		return i18next.t("settings:validation.modelAvailability", { modelId })
 	}