codexmate 0.0.38 → 0.0.40

package/web-ui/modules/app.computed.main-tabs.mjs

@@ -43,93 +43,99 @@ function readTaskOrchestrationDraftMetrics(taskOrchestration) {
     };
 }
 
-function createTaskDraftChecklist(metrics) {
+function translateTaskText(t, key, fallback, params = null) {
+    if (typeof t !== 'function') return fallback;
+    const translated = t(key, params);
+    return translated === key ? fallback : translated;
+}
+
+function createTaskDraftChecklist(metrics, t = null) {
     const workflowReady = metrics.engine !== 'workflow' || metrics.workflowCount > 0;
     const scopeReady = metrics.hasNotes || !metrics.allowWrite;
     const previewReady = metrics.hasPlan && metrics.planIssues.length === 0;
     return [
         {
             key: 'target',
-            label: '目标',
+            label: translateTaskText(t, 'orchestration.readiness.target.label', '目标'),
             done: metrics.hasTarget,
-            detail: metrics.hasTarget ? '已写目标' : '还没写目标'
+            detail: metrics.hasTarget ? translateTaskText(t, 'orchestration.readiness.target.done', '已写目标') : translateTaskText(t, 'orchestration.readiness.target.missing', '还没写目标')
         },
         {
             key: 'engine',
-            label: metrics.engine === 'workflow' ? 'Workflow' : '执行策略',
+            label: metrics.engine === 'workflow' ? 'Workflow' : translateTaskText(t, 'orchestration.readiness.engine.label', '执行策略'),
             done: workflowReady,
             detail: metrics.engine === 'workflow'
-                ? (metrics.workflowCount > 0 ? `已选 ${metrics.workflowCount} 个 Workflow` : '还没选 Workflow ID')
-                : '使用 Codex 规划节点'
+                ? (metrics.workflowCount > 0 ? translateTaskText(t, 'orchestration.readiness.workflow.done', `已选 ${metrics.workflowCount} 个 Workflow`, { count: metrics.workflowCount }) : translateTaskText(t, 'orchestration.readiness.workflow.missing', '还没选 Workflow ID'))
+                : translateTaskText(t, 'orchestration.readiness.engine.codex', '使用 Codex 规划节点')
         },
         {
             key: 'scope',
-            label: '边界',
+            label: translateTaskText(t, 'orchestration.readiness.scope.label', '边界'),
             done: scopeReady,
             detail: metrics.hasNotes
-                ? '已补充说明'
-                : (metrics.allowWrite ? '建议补说明后再写入' : '当前是只读，可直接试')
+                ? translateTaskText(t, 'orchestration.readiness.scope.done', '已补充说明')
+                : (metrics.allowWrite ? translateTaskText(t, 'orchestration.readiness.scope.writeHint', '建议补说明后再写入') : translateTaskText(t, 'orchestration.readiness.scope.readonlyHint', '当前是只读，可直接试'))
         },
         {
             key: 'preview',
-            label: '预览',
+            label: translateTaskText(t, 'orchestration.readiness.preview.label', '预览'),
             done: previewReady,
             detail: !metrics.hasPlan
-                ? '还没生成计划'
-                : (metrics.planIssues.length > 0 ? `有 ${metrics.planIssues.length} 个阻塞项` : `计划可用，${metrics.planNodeCount} 个节点`)
+                ? translateTaskText(t, 'orchestration.readiness.preview.missing', '还没生成计划')
+                : (metrics.planIssues.length > 0 ? translateTaskText(t, 'orchestration.readiness.preview.blocked', `有 ${metrics.planIssues.length} 个阻塞项`, { count: metrics.planIssues.length }) : translateTaskText(t, 'orchestration.readiness.preview.ready', `计划可用，${metrics.planNodeCount} 个节点`, { count: metrics.planNodeCount }))
         }
     ];
 }
 
-function createTaskDraftReadiness(metrics) {
+function createTaskDraftReadiness(metrics, t = null) {
     if (!metrics.hasTarget) {
         return {
             tone: 'neutral',
-            title: '先写目标',
-            summary: '先把想完成的结果写清楚，再让编排器拆节点。'
+            title: translateTaskText(t, 'orchestration.readiness.empty.title', '先写目标'),
+            summary: translateTaskText(t, 'orchestration.readiness.empty.summary', '先把想完成的结果写清楚，再让编排器拆节点。')
         };
     }
     if (metrics.engine === 'workflow' && metrics.workflowCount === 0) {
         return {
             tone: 'warn',
-            title: '缺少 Workflow',
-            summary: '你已经选了 Workflow 模式，但还没指定可复用流程。'
+            title: translateTaskText(t, 'orchestration.readiness.workflow.title', '缺少 Workflow'),
+            summary: translateTaskText(t, 'orchestration.readiness.workflow.summary', '你已经选了 Workflow 模式，但还没指定可复用流程。')
         };
     }
     if (!metrics.hasPlan) {
         return {
             tone: 'warn',
-            title: '建议先预览',
-            summary: '草稿已成形，先生成一次计划，确认节点和依赖再执行。'
+            title: translateTaskText(t, 'orchestration.readiness.preview.title', '建议先预览'),
+            summary: translateTaskText(t, 'orchestration.readiness.preview.summary', '草稿已成形，先生成一次计划，确认节点和依赖再执行。')
         };
     }
     if (metrics.planIssues.length > 0) {
         return {
             tone: 'error',
-            title: '预览有阻塞',
-            summary: `当前计划里还有 ${metrics.planIssues.length} 个阻塞项，先处理它们。`
+            title: translateTaskText(t, 'orchestration.readiness.blocked.title', '预览有阻塞'),
+            summary: translateTaskText(t, 'orchestration.readiness.blocked.summary', `当前计划里还有 ${metrics.planIssues.length} 个阻塞项，先处理它们。`, { count: metrics.planIssues.length })
         };
     }
     if (metrics.planWarnings.length > 0) {
         return {
             tone: 'warn',
-            title: '可以执行，但有提醒',
-            summary: `计划已生成，但还有 ${metrics.planWarnings.length} 条提醒值得先看一眼。`
+            title: translateTaskText(t, 'orchestration.readiness.warn.title', '可以执行，但有提醒'),
+            summary: translateTaskText(t, 'orchestration.readiness.warn.summary', `计划已生成，但还有 ${metrics.planWarnings.length} 条提醒值得先看一眼。`, { count: metrics.planWarnings.length })
         };
     }
     if (metrics.dryRun) {
         return {
             tone: 'success',
-            title: '适合先预演',
-            summary: '现在可以安全地跑一次仅预演，先看结果再决定是否真实执行。'
+            title: translateTaskText(t, 'orchestration.readiness.dryRun.title', '适合先预演'),
+            summary: translateTaskText(t, 'orchestration.readiness.dryRun.summary', '现在可以安全地跑一次仅预演，先看结果再决定是否真实执行。')
         };
     }
     return {
         tone: 'success',
-        title: '可以执行',
+        title: translateTaskText(t, 'orchestration.readiness.ready.title', '可以执行'),
         summary: metrics.followUpCount > 0
-            ? `主目标和收尾动作都已具备，可以直接执行或入队。`
-            : '主目标已经够清楚了，可以直接执行或入队。'
+            ? translateTaskText(t, 'orchestration.readiness.ready.withFollowUps', `主目标和收尾动作都已具备，可以直接执行或入队。`)
+            : translateTaskText(t, 'orchestration.readiness.ready.summary', '主目标已经够清楚了，可以直接执行或入队。')
     };
 }
 
@@ -144,6 +150,7 @@ export function createMainTabsComputed() {
             if (this.mainTab === 'market') return this.t('kicker.market');
             if (this.mainTab === 'plugins') return this.t('kicker.plugins');
             if (this.mainTab === 'docs') return this.t('kicker.docs');
+            if (this.mainTab === 'trash') return this.t('kicker.trash');
             return this.t('kicker.settings');
         },
         mainTabTitle() {
@@ -155,6 +162,7 @@ export function createMainTabsComputed() {
             if (this.mainTab === 'market') return this.t('title.market');
             if (this.mainTab === 'plugins') return this.t('title.plugins');
             if (this.mainTab === 'docs') return this.t('title.docs');
+            if (this.mainTab === 'trash') return this.t('settings.trash.title');
             return this.t('title.settings');
         },
         mainTabSubtitle() {
@@ -166,6 +174,7 @@ export function createMainTabsComputed() {
             if (this.mainTab === 'market') return this.t('subtitle.market');
             if (this.mainTab === 'plugins') return this.t('subtitle.plugins');
             if (this.mainTab === 'docs') return this.t('subtitle.docs');
+            if (this.mainTab === 'trash') return this.t('settings.trash.meta');
             return this.t('subtitle.settings');
         },
         taskOrchestrationSelectedRun() {
@@ -196,10 +205,10 @@ export function createMainTabsComputed() {
             return readTaskOrchestrationDraftMetrics(this.taskOrchestration);
         },
         taskOrchestrationDraftChecklist() {
-            return createTaskDraftChecklist(this.taskOrchestrationDraftMetrics);
+            return createTaskDraftChecklist(this.taskOrchestrationDraftMetrics, this.t && this.t.bind(this));
         },
         taskOrchestrationDraftReadiness() {
-            return createTaskDraftReadiness(this.taskOrchestrationDraftMetrics);
+            return createTaskDraftReadiness(this.taskOrchestrationDraftMetrics, this.t && this.t.bind(this));
         }
     };
 }

package/web-ui/modules/app.methods.claude-config.mjs

@@ -1,3 +1,67 @@
+function normalizeClaudeText(value) {
+    return typeof value === 'string' ? value.trim() : '';
+}
+
+function normalizeClaudeBaseUrl(value) {
+    return normalizeClaudeText(value).replace(/\/+$/g, '');
+}
+
+function isValidClaudeHttpUrl(value) {
+    if (!value) return false;
+    try {
+        const parsed = new URL(value);
+        return parsed.protocol === 'http:' || parsed.protocol === 'https:';
+    } catch (_) {
+        return false;
+    }
+}
+
+function getClaudeConfigValidationForContext(vm, mode = 'add') {
+    const draft = mode === 'edit' ? vm.editingConfig : vm.newClaudeConfig;
+    const name = normalizeClaudeText(draft && draft.name);
+    const apiKey = normalizeClaudeText(draft && draft.apiKey);
+    const externalCredentialType = normalizeClaudeText(draft && draft.externalCredentialType);
+    const baseUrl = normalizeClaudeBaseUrl(draft && draft.baseUrl);
+    const model = normalizeClaudeText(draft && draft.model);
+    const errors = {
+        name: '',
+        apiKey: '',
+        baseUrl: '',
+        model: ''
+    };
+
+    if (!name) {
+        errors.name = '配置名称不能为空';
+    } else if (mode === 'add' && vm.claudeConfigs && vm.claudeConfigs[name]) {
+        errors.name = '名称已存在';
+    }
+
+    if (!apiKey && !externalCredentialType) {
+        errors.apiKey = 'API Key 必填';
+    }
+
+    if (!baseUrl) {
+        errors.baseUrl = 'Base URL 必填';
+    } else if (!isValidClaudeHttpUrl(baseUrl)) {
+        errors.baseUrl = 'Base URL 仅支持 http/https';
+    }
+
+    if (!model) {
+        errors.model = '模型名称必填';
+    }
+
+    return {
+        mode,
+        name,
+        apiKey,
+        externalCredentialType,
+        baseUrl,
+        model,
+        errors,
+        ok: !errors.name && !errors.apiKey && !errors.baseUrl && !errors.model
+    };
+}
+
 export function createClaudeConfigMethods(options = {}) {
     const { api } = options;
 
@@ -54,14 +118,31 @@ export function createClaudeConfigMethods(options = {}) {
                 baseUrl: config.baseUrl || '',
                 model: config.model || ''
             };
+            this.showAddClaudeConfigKey = false;
             this.showClaudeConfigModal = true;
         },
 
+        getClaudeConfigValidation(mode = 'add') {
+            return getClaudeConfigValidationForContext(this, mode);
+        },
+
+        claudeConfigFieldError(mode, fieldName) {
+            const validation = getClaudeConfigValidationForContext(this, mode);
+            return validation && validation.errors && typeof validation.errors[fieldName] === 'string'
+                ? validation.errors[fieldName]
+                : '';
+        },
+
+        canSubmitClaudeConfig(mode = 'add') {
+            return getClaudeConfigValidationForContext(this, mode).ok;
+        },
+
         openEditConfigModal(name) {
             const config = this.claudeConfigs[name];
             this.editingConfig = {
                 name: name,
                 apiKey: config.apiKey || '',
+                externalCredentialType: config.externalCredentialType || '',
                 baseUrl: config.baseUrl || '',
                 model: config.model || ''
             };
@@ -70,7 +151,14 @@ export function createClaudeConfigMethods(options = {}) {
         },
 
         updateConfig() {
-            const name = this.editingConfig.name;
+            const validation = getClaudeConfigValidationForContext(this, 'edit');
+            if (!validation.ok) {
+                return this.showMessage(validation.errors.name || validation.errors.apiKey || validation.errors.baseUrl || validation.errors.model || '请检查 Claude 配置', 'error');
+            }
+            const name = validation.name;
+            this.editingConfig.apiKey = validation.apiKey;
+            this.editingConfig.baseUrl = validation.baseUrl;
+            this.editingConfig.model = validation.model;
             this.claudeConfigs[name] = this.mergeClaudeConfig(this.claudeConfigs[name], this.editingConfig);
             this.saveClaudeConfigs();
             this.showMessage('操作成功', 'success');
@@ -83,7 +171,7 @@ export function createClaudeConfigMethods(options = {}) {
         closeEditConfigModal() {
             this.showEditConfigModal = false;
             this.showEditClaudeConfigKey = false;
-            this.editingConfig = { name: '', apiKey: '', baseUrl: '', model: '' };
+            this.editingConfig = { name: '', apiKey: '', externalCredentialType: '', baseUrl: '', model: '' };
         },
 
         toggleEditClaudeConfigKey() {
@@ -91,7 +179,14 @@ export function createClaudeConfigMethods(options = {}) {
         },
 
         async saveAndApplyConfig() {
-            const name = this.editingConfig.name;
+            const validation = getClaudeConfigValidationForContext(this, 'edit');
+            if (!validation.ok) {
+                return this.showMessage(validation.errors.name || validation.errors.apiKey || validation.errors.baseUrl || validation.errors.model || '请检查 Claude 配置', 'error');
+            }
+            const name = validation.name;
+            this.editingConfig.apiKey = validation.apiKey;
+            this.editingConfig.baseUrl = validation.baseUrl;
+            this.editingConfig.model = validation.model;
             this.claudeConfigs[name] = this.mergeClaudeConfig(this.claudeConfigs[name], this.editingConfig);
             this.saveClaudeConfigs();
 
@@ -125,13 +220,15 @@ export function createClaudeConfigMethods(options = {}) {
         },
 
         addClaudeConfig() {
-            if (!this.newClaudeConfig.name || !this.newClaudeConfig.name.trim()) {
-                return this.showMessage('请输入名称', 'error');
-            }
-            const name = this.newClaudeConfig.name.trim();
-            if (this.claudeConfigs[name]) {
-                return this.showMessage('名称已存在', 'error');
+            const validation = getClaudeConfigValidationForContext(this, 'add');
+            if (!validation.ok) {
+                return this.showMessage(validation.errors.name || validation.errors.apiKey || validation.errors.baseUrl || validation.errors.model || '请检查 Claude 配置', 'error');
             }
+            this.newClaudeConfig.name = validation.name;
+            this.newClaudeConfig.apiKey = validation.apiKey;
+            this.newClaudeConfig.baseUrl = validation.baseUrl;
+            this.newClaudeConfig.model = validation.model;
+            const name = validation.name;
             const duplicateName = this.findDuplicateClaudeConfigName(this.newClaudeConfig);
             if (duplicateName) {
                 return this.showMessage('配置已存在', 'info');
@@ -199,6 +296,7 @@ export function createClaudeConfigMethods(options = {}) {
 
         closeClaudeConfigModal() {
             this.showClaudeConfigModal = false;
+            this.showAddClaudeConfigKey = false;
             this.newClaudeConfig = {
                 name: '',
                 apiKey: '',
@@ -207,6 +305,10 @@ export function createClaudeConfigMethods(options = {}) {
             };
         },
 
+        toggleAddClaudeConfigKey() {
+            this.showAddClaudeConfigKey = !this.showAddClaudeConfigKey;
+        },
+
         async loadClaudeLocalBridgeStatus() {
             try {
                 const res = await api('claude-local-bridge-status');

package/web-ui/modules/app.methods.index.mjs

@@ -20,6 +20,7 @@ import { createOpenclawEditingMethods } from './app.methods.openclaw-editing.mjs
 import { createOpenclawPersistMethods } from './app.methods.openclaw-persist.mjs';
 import { createProvidersMethods } from './app.methods.providers.mjs';
 import { createRuntimeMethods } from './app.methods.runtime.mjs';
+import { createToolConfigPermissionMethods } from './app.methods.tool-config-permissions.mjs';
 import { createTaskOrchestrationMethods } from './app.methods.task-orchestration.mjs';
 import { createSessionActionMethods } from './app.methods.session-actions.mjs';
 import { createSessionBrowserMethods } from './app.methods.session-browser.mjs';
@@ -81,6 +82,7 @@ export function createAppMethods() {
         ...createAgentsMethods({ api, apiWithMeta }),
         ...createProvidersMethods({ api }),
         ...createClaudeConfigMethods({ api }),
+        ...createToolConfigPermissionMethods({ api }),
         ...createOpenclawCoreMethods(),
         ...createOpenclawEditingMethods(),
         ...createOpenclawPersistMethods({

package/web-ui/modules/app.methods.openclaw-editing.mjs

@@ -367,6 +367,54 @@ export function createOpenclawEditingMethods() {
                 this.showMessage('保存本地 OpenClaw 配置失败', 'error');
                 return false;
             }
+        },
+
+        // Accordion stepper methods
+        toggleAccordionStep(step) {
+            if (this.openclawAccordionStep === step) {
+                // Don't allow collapsing the current step
+                return;
+            }
+            this.openclawAccordionStep = step;
+        },
+
+        nextAccordionStep() {
+            if (this.openclawAccordionStep < 3) {
+                this.openclawAccordionStep++;
+            }
+        },
+
+        prevAccordionStep() {
+            if (this.openclawAccordionStep > 1) {
+                this.openclawAccordionStep--;
+            }
+        },
+
+        finishAccordionStep() {
+            this.openclawAccordionStep = 4; // Mark as complete
+            this.applyOpenclawQuickToText();
+        },
+
+        validateProviderName() {
+            const name = (this.openclawQuick.providerName || '').trim();
+            if (!name) {
+                this.openclawValidation.providerName = { valid: false, message: '必填' };
+                return;
+            }
+            if (name.includes('/')) {
+                this.openclawValidation.providerName = { valid: false, message: '不能包含 "/"' };
+                return;
+            }
+            this.openclawValidation.providerName = { valid: true, message: '' };
+        },
+
+        validateModelId() {
+            const id = (this.openclawQuick.modelId || '').trim();
+            if (!id) {
+                this.openclawValidation.modelId = { valid: false, message: '必填' };
+                return;
+            }
+            this.openclawValidation.modelId = { valid: true, message: '' };
         }
     };
 }

package/web-ui/modules/app.methods.openclaw-persist.mjs

@@ -1,4 +1,4 @@
-const DEFAULT_OPENCLAW_CONFIG_NAME = '默认配置';
+export const DEFAULT_OPENCLAW_CONFIG_NAME = '默认配置';
 
 function buildNormalizedOpenclawConfigs(configs, defaultContent = '') {
     const source = configs && typeof configs === 'object' && !Array.isArray(configs)
@@ -11,7 +11,8 @@ function buildNormalizedOpenclawConfigs(configs, defaultContent = '') {
             : { content: defaultContent };
     const normalized = {
         [DEFAULT_OPENCLAW_CONFIG_NAME]: {
-            content: typeof defaultEntry.content === 'string' ? defaultEntry.content : defaultContent
+            content: typeof defaultEntry.content === 'string' ? defaultEntry.content : defaultContent,
+            isDefault: true
         }
     };
     for (const [name, value] of Object.entries(source)) {
@@ -25,7 +26,8 @@ function syncDefaultOpenclawConfigState(vm, content, options = {}) {
     const nextContent = typeof content === 'string' ? content : '';
     vm.openclawConfigs = buildNormalizedOpenclawConfigs(vm.openclawConfigs, nextContent);
     vm.openclawConfigs[DEFAULT_OPENCLAW_CONFIG_NAME] = {
-        content: nextContent
+        content: nextContent,
+        isDefault: true
     };
     if (typeof options.path === 'string') {
         vm.openclawConfigPath = options.path;
@@ -51,6 +53,10 @@ export function createOpenclawPersistMethods(options = {}) {
     } = options;
 
     return {
+        isDefaultOpenclawConfig(name, config = null) {
+            return !!(config && config.isDefault === true) || name === DEFAULT_OPENCLAW_CONFIG_NAME;
+        },
+
         syncDefaultOpenclawConfigEntry(options = {}) {
             const silent = !!options.silent;
             return api('get-openclaw-config')
@@ -104,7 +110,7 @@ export function createOpenclawPersistMethods(options = {}) {
 
         openOpenclawEditModal(name) {
             const existing = this.openclawConfigs[name];
-            const isDefaultConfig = name === DEFAULT_OPENCLAW_CONFIG_NAME;
+            const isDefaultConfig = this.isDefaultOpenclawConfig(name, existing);
             const modalToken = (Number(this.openclawModalLoadToken || 0) + 1);
             this.openclawModalLoadToken = modalToken;
             this.openclawEditorTitle = `编辑 OpenClaw 配置: ${name}`;
@@ -146,7 +152,7 @@ export function createOpenclawPersistMethods(options = {}) {
             const force = !!options.force;
             const fallbackToTemplate = options.fallbackToTemplate !== false;
             const syncDefaultEntry = options.syncDefaultEntry === true
-                || (this.openclawEditing && this.openclawEditing.lockName && this.openclawEditing.name === DEFAULT_OPENCLAW_CONFIG_NAME);
+                || (this.openclawEditing && this.openclawEditing.lockName && this.isDefaultOpenclawConfig(this.openclawEditing.name));
             const modalToken = Number(options.modalToken || this.openclawModalLoadToken || 0);
             const expectedEditorContent = typeof options.expectedEditorContent === 'string'
                 ? options.expectedEditorContent
@@ -260,7 +266,7 @@ export function createOpenclawPersistMethods(options = {}) {
             if (this.openclawSaving || this.openclawApplying) {
                 return;
             }
-            if (this.openclawEditing && this.openclawEditing.lockName && this.openclawEditing.name === DEFAULT_OPENCLAW_CONFIG_NAME) {
+            if (this.openclawEditing && this.openclawEditing.lockName && this.isDefaultOpenclawConfig(this.openclawEditing.name)) {
                 this.showMessage('默认配置代表当前系统配置，请使用“保存并应用”', 'info');
                 return;
             }
@@ -312,7 +318,7 @@ export function createOpenclawPersistMethods(options = {}) {
         },
 
         async deleteOpenclawConfig(name) {
-            if (name === DEFAULT_OPENCLAW_CONFIG_NAME) {
+            if (this.isDefaultOpenclawConfig(name, this.openclawConfigs && this.openclawConfigs[name])) {
                 return this.showMessage('默认配置始终映射当前系统配置，不可删除', 'info');
             }
             if (Object.keys(this.openclawConfigs).length <= 1) {

package/web-ui/modules/app.methods.providers.mjs

@@ -47,6 +47,12 @@ function normalizeProviderDraftState(target) {
     if (typeof target.url === 'string') {
         target.url = normalizeProviderUrl(target.url);
     }
+    if (typeof target.model === 'string') {
+        target.model = target.model.trim();
+    }
+    if (typeof target.key === 'string') {
+        target.key = target.key.trim();
+    }
 }
 
 function maskKeyLocal(key) {
@@ -66,9 +72,13 @@ function getProviderValidationForContext(vm, mode = 'add') {
     const editingName = mode === 'edit' ? normalizeText(draft && draft.name) : '';
     const name = normalizeText(draft && draft.name);
     const url = normalizeProviderUrl(draft && draft.url);
+    const model = normalizeText(draft && draft.model);
+    const key = normalizeText(draft && draft.key);
     const errors = {
         name: '',
-        url: ''
+        url: '',
+        key: '',
+        model: ''
     };
 
     if (mode === 'add') {
@@ -91,12 +101,22 @@ function getProviderValidationForContext(vm, mode = 'add') {
         errors.url = 'URL 仅支持 http/https';
     }
 
+    if (mode === 'add' && !key) {
+        errors.key = 'API Key 必填';
+    }
+
+    if (mode === 'add' && !model) {
+        errors.model = '模型名称必填';
+    }
+
     return {
         mode,
         name,
         url,
+        key,
+        model,
         errors,
-        ok: !errors.name && !errors.url
+        ok: !errors.name && !errors.url && !errors.key && !errors.model
     };
 }
 
@@ -150,21 +170,20 @@ export function createProvidersMethods(options = {}) {
             normalizeProviderDraftState(this.newProvider);
             const validation = getProviderValidationForContext(this, 'add');
             if (!validation.ok) {
-                return this.showMessage(validation.errors.name || validation.errors.url || '名称和URL必填', 'error');
+                return this.showMessage(validation.errors.name || validation.errors.url || validation.errors.key || validation.errors.model || '名称、URL、API Key 和模型名称必填', 'error');
             }
 
             try {
                 const payload = {
                     name: validation.name,
                     url: validation.url,
-                    key: this.newProvider.key || ''
+                    key: validation.key,
+                    model: validation.model
                 };
                 if (this.newProvider && this.newProvider.useTransform) {
                     payload.useTransform = true;
                 }
-                const suggestedModel = typeof this.newProvider._suggestedModel === 'string'
-                    ? this.newProvider._suggestedModel.trim()
-                    : '';
+                const suggestedModel = validation.model;
                 const res = await api('add-provider', payload);
                 if (res.error) {
                     this.showMessage(res.error, 'error');
@@ -179,7 +198,7 @@ export function createProvidersMethods(options = {}) {
                     codexmate_bridge: payload.useTransform ? 'openai' : '',
                     key: maskKeyLocal(payload.key),
                     hasKey: !!payload.key,
-                    models: [],
+                    models: suggestedModel ? [{ id: suggestedModel, name: suggestedModel, cost: null, contextWindow: undefined, maxTokens: undefined }] : [],
                     current: false,
                     readOnly: false,
                     nonDeletable: false,
@@ -208,7 +227,7 @@ export function createProvidersMethods(options = {}) {
             const configured = !!(provider && provider.hasKey);
             return {
                 configured,
-                text: configured ? '已配置' : '未配置'
+                text: configured ? this.t('common.configured') : this.t('common.notConfigured')
             };
         },
 
@@ -300,8 +319,10 @@ export function createProvidersMethods(options = {}) {
                 name: '',
                 url: cloneUrl,
                 key: '',
+                model: '',
                 useTransform: isTransform
             };
+            this.showAddProviderKey = false;
             this.showAddModal = true;
         },
 
@@ -513,7 +534,12 @@ export function createProvidersMethods(options = {}) {
 
         closeAddModal() {
             this.showAddModal = false;
-            this.newProvider = { name: '', url: '', key: '', useTransform: false, _suggestedModel: '' };
+            this.showAddProviderKey = false;
+            this.newProvider = { name: '', url: '', key: '', model: '', useTransform: false };
+        },
+
+        toggleAddProviderKey() {
+            this.showAddProviderKey = !this.showAddProviderKey;
         },
 
         closeModelModal() {