fix: align claude mcp schema with ollama mode

Author: awsl233777

cli.js

@@ -9357,24 +9357,33 @@ async function applyToClaudeSettings(config = {}) {
             return { success: false, mode: 'settings-file', error: '请先输入 API Key' };
         }
 
-        const baseUrl = (config.baseUrl || (targetApi === 'ollama' ? 'http://127.0.0.1:11434' : 'https://open.bigmodel.cn/api/anthropic')).trim();
+        const configuredBaseUrl = typeof config.baseUrl === 'string' ? config.baseUrl.trim() : '';
+        const baseUrl = (configuredBaseUrl || (targetApi === 'ollama' ? 'http://127.0.0.1:11434' : 'https://open.bigmodel.cn/api/anthropic')).trim();
         const model = (config.model || DEFAULT_CLAUDE_MODEL).trim();
         let settingsBaseUrl = baseUrl;
         let settingsApiKey = apiKey;
         let proxyResult = null;
 
         if (targetApi === 'chat_completions' || targetApi === 'ollama') {
+            const upstreamProviderName = typeof config.name === 'string' ? config.name.trim() : '';
+            if (targetApi === 'chat_completions' && !configuredBaseUrl && !upstreamProviderName) {
+                return {
+                    success: false,
+                    mode: 'claude-proxy',
+                    error: 'chat_completions 模式需要显式的上游 Base URL 或可解析的 provider 名称'
+                };
+            }
             await stopBuiltinClaudeProxyRuntime();
             const proxyToken = crypto.randomBytes(24).toString('hex');
             proxyResult = await startBuiltinClaudeProxyRuntime({
                 enabled: true,
                 host: DEFAULT_BUILTIN_CLAUDE_PROXY_SETTINGS.host,
-                provider: typeof config.name === 'string' ? config.name.trim() : '',
+                provider: upstreamProviderName,
                 authSource: 'provider',
                 targetApi,
                 timeoutMs: DEFAULT_BUILTIN_CLAUDE_PROXY_SETTINGS.timeoutMs,
-                upstreamProviderName: typeof config.name === 'string' ? config.name.trim() : '',
-                upstreamBaseUrl: baseUrl,
+                upstreamProviderName,
+                ...(configuredBaseUrl ? { upstreamBaseUrl: configuredBaseUrl } : {}),
                 upstreamApiKey: apiKey
             });
             if (!proxyResult || proxyResult.error || proxyResult.success === false || !proxyResult.listenUrl) {
@@ -15825,7 +15834,16 @@ function createMcpTools(options = {}) {
                 name: { type: 'string' },
                 targetApi: { type: 'string' }
             },
-            required: ['apiKey'],
+            allOf: [{
+                if: {
+                    not: {
+                        type: 'object',
+                        properties: { targetApi: { const: 'ollama' } },
+                        required: ['targetApi']
+                    }
+                },
+                then: { required: ['apiKey'] }
+            }],
             additionalProperties: false
         },
         handler: async (args = {}) => applyToClaudeSettings(args || {})

tests/unit/claude-settings-sync.test.mjs

@@ -3,6 +3,7 @@ import { readBundledWebUiScript, readProjectFile } from './helpers/web-ui-source
 
 const appSource = readBundledWebUiScript();
 const claudeConfigModuleSource = readProjectFile('web-ui/modules/app.methods.claude-config.mjs');
+const cliSource = readProjectFile('cli.js');
 
 function escapeRegExp(value) {
     return String(value || '').replace(/[.*+?^${}()|[\]\\]/g, '\\$&');
@@ -1116,3 +1117,27 @@ test('loadClaudeModels skips remote fetch for external-credential config without
     assert.strictEqual(context.claudeModelsHasCurrent, true);
     assert.deepStrictEqual(messages, []);
 });
+
+test('applyToClaudeSettings does not proxy chat completions through default Anthropic URL', () => {
+    const startIndex = cliSource.indexOf('async function applyToClaudeSettings');
+    assert.notStrictEqual(startIndex, -1);
+    const endIndex = cliSource.indexOf('async function cmdClaude', startIndex);
+    assert.notStrictEqual(endIndex, -1);
+    const source = cliSource.slice(startIndex, endIndex);
+    assert.match(source, /const configuredBaseUrl = typeof config\.baseUrl === 'string' \? config\.baseUrl\.trim\(\) : '';/);
+    assert.match(source, /targetApi === 'chat_completions' && !configuredBaseUrl && !upstreamProviderName/);
+    assert.match(source, /chat_completions 模式需要显式的上游 Base URL 或可解析的 provider 名称/);
+    assert.match(source, /\.\.\.\(configuredBaseUrl \? \{ upstreamBaseUrl: configuredBaseUrl \} : \{\}\)/);
+});
+
+test('MCP Claude config schema allows Ollama without API key only for ollama target', () => {
+    const toolIndex = cliSource.indexOf("name: 'codexmate.claude.config.apply'");
+    assert.notStrictEqual(toolIndex, -1);
+    const schemaEnd = cliSource.indexOf('handler: async (args = {}) => applyToClaudeSettings(args || {})', toolIndex);
+    assert.notStrictEqual(schemaEnd, -1);
+    const schemaSource = cliSource.slice(toolIndex, schemaEnd);
+    assert.match(schemaSource, /allOf:\s*\[\{/);
+    assert.match(schemaSource, /properties:\s*\{ targetApi:\s*\{ const: 'ollama' \} \}/);
+    assert.match(schemaSource, /then:\s*\{ required:\s*\['apiKey'\] \}/);
+    assert.doesNotMatch(schemaSource, /required:\s*\['apiKey'\],\s*additionalProperties/);
+});