Consider it done. The open-source AI agent that works out of the box · 想到,就能做到。开源、开箱即用的 AI Agent。
TypeScript agentai-agentai-assistantandroidclaude-codecodexelectroniosllmmacosreact-nativetypescriptwindows
fix(providers): 按官方 host 族识别 Vertex / Azure 端点 (#4540)
Chris Zhang3bd46f3bd478
diff --git a/apps/desktop/src/main/maker-host/__tests__/piProviderTransport.test.ts b/apps/desktop/src/main/maker-host/__tests__/piProviderTransport.test.tsindex b27c5fd426..4b2ebfefb9 100644--- a/apps/desktop/src/main/maker-host/__tests__/piProviderTransport.test.ts+++ b/apps/desktop/src/main/maker-host/__tests__/piProviderTransport.test.ts@@ -1,6 +1,6 @@import { describe, expect, it, vi } from 'vitest';import { PROVIDER_MODEL_CATALOG, BUNDLED_CATALOG, buildUserProvider } from '@cindy/model-providers';-import { createPiProviderFetch, invocationModelRecord, nativeBridgeApiKey, NATIVE_ADAPTER_ERROR_BODY_LIMIT, readBoundedResponseText } from '../pi-provider-transport.js';+import { createPiProviderFetch, hostCredentialEndpointAllowed, invocationModelRecord, nativeBridgeApiKey, NATIVE_ADAPTER_ERROR_BODY_LIMIT, readBoundedResponseText } from '../pi-provider-transport.js';const reply = [{ id: 'fixture-reply', object: 'chat.completion.chunk', choices: [{ index: 0, delta: { role: 'assistant', content: 'Hello' } }] },@@ -94,6 +94,14 @@ it('does not invent a fake API key for header-only native bridges', () => {expect(nativeBridgeApiKey({ authorization: 'Bearer real-key' })).toBe('real-key');});+it('allows official Vertex hosts for Desktop ADC and rejects unofficial ones', () => {+ expect(hostCredentialEndpointAllowed('google-vertex', 'https://aiplatform.googleapis.com')).toBe(true);+ expect(hostCredentialEndpointAllowed('google-vertex', 'https://aiplatform.us.rep.googleapis.com')).toBe(true);+ expect(hostCredentialEndpointAllowed('google-vertex', 'https://europe-west1-aiplatform.googleapis.com')).toBe(true);+ expect(hostCredentialEndpointAllowed('google-vertex', 'https://attacker.example')).toBe(false);+ expect(hostCredentialEndpointAllowed('google-vertex', 'https://evil-aiplatform.googleapis.com')).toBe(false);+});+it('does not let Bedrock execution inherit Desktop IAM against an unrelated host', async () => {const row = PROVIDER_MODEL_CATALOG.providers['amazon-bedrock'][0];const send = createPiProviderFetch({diff --git a/apps/desktop/src/renderer/__tests__/addProviderWizardPresetEntry.test.tsx b/apps/desktop/src/renderer/__tests__/addProviderWizardPresetEntry.test.tsxindex fea927f40b..da63c2f2ee 100644--- a/apps/desktop/src/renderer/__tests__/addProviderWizardPresetEntry.test.tsx+++ b/apps/desktop/src/renderer/__tests__/addProviderWizardPresetEntry.test.tsx@@ -634,6 +634,40 @@ describe('AddProviderWizard — preset 直达', () => {expect(screen.getAllByDisplayValue('https://myres.openai.azure.com/openai/v1')).toHaveLength(2);});+ it('accepts the official Vertex global host and rejects an unrelated host on the Vertex template', async () => {+ const preset = {+ id: 'google-vertex',+ name: 'Google Vertex AI',+ runtimes: {+ pi: {+ baseUrl: 'https://{location}-aiplatform.googleapis.com',+ baseUrlEditable: true,+ wireProtocol: 'google-generative-ai' as const,+ models: [{ id: 'gemini-3.8-flash', name: 'Gemini 3.8 Flash' }],+ },+ codex: {+ baseUrl: 'https://{location}-aiplatform.googleapis.com',+ baseUrlEditable: true,+ wireProtocol: 'google-generative-ai' as const,+ models: [{ id: 'gemini-3.8-flash', name: 'Gemini 3.8 Flash' }],+ },+ },+ };+ vi.mocked(window.electronAPI.maker.listProviderPresets).mockResolvedValueOnce({ presets: [preset] });+ renderWizard('google-vertex');+ const inputs = await screen.findAllByDisplayValue('https://{location}-aiplatform.googleapis.com');+ const next = screen.getByText('settings.providers.wizard.next').closest('button') as HTMLButtonElement;+ fireEvent.change(screen.getByPlaceholderText('sk-…'), { target: { value: 'vertex-key' } });+ expect(next.disabled).toBe(true);++ fireEvent.change(inputs[0], { target: { value: 'https://attacker.example' } });+ expect(next.disabled).toBe(true);++ fireEvent.change(inputs[0], { target: { value: 'https://aiplatform.googleapis.com' } });+ expect(screen.getAllByDisplayValue('https://aiplatform.googleapis.com')).toHaveLength(2);+ expect(next.disabled).toBe(false);+ });+it('LiteLLM:模型发现失败时可手填模型 ID,并以 none 鉴权保存', async () => {renderWizard('litellm');diff --git a/apps/desktop/src/renderer/components/settings/AddProviderWizard.tsx b/apps/desktop/src/renderer/components/settings/AddProviderWizard.tsxindex d3da4fabae..feabde8bb2 100644--- a/apps/desktop/src/renderer/components/settings/AddProviderWizard.tsx+++ b/apps/desktop/src/renderer/components/settings/AddProviderWizard.tsx@@ -111,13 +111,17 @@ function presetRuntimeBaseUrl(const source = preset.runtimes[sourceAgent as AgentKind];if (!source || !endpoint) continue;const bindings = providerEndpointBindings(source.baseUrl, endpoint.trim());- if (bindings && source.baseUrl.includes('{')) return bindProviderEndpoint(runtime.baseUrl, bindings);+ if (bindings && source.baseUrl.includes('{')) {+ return bindProviderEndpoint(runtime.baseUrl, bindings, endpoint.trim());+ }}return runtime.baseUrl;}-function isValidEditablePresetBaseUrl(value: string): boolean {- return !/[{}]/.test(value) && parseSafePresetHttpUrl(value) !== null;+function isValidEditablePresetBaseUrl(value: string, template?: string): boolean {+ if (/[{}]/.test(value) || parseSafePresetHttpUrl(value) === null) return false;+ if (!template?.includes('{')) return true;+ return providerEndpointBindings(template, value) !== null;}function parseSafePresetHttpUrl(value: string): URL | null {@@ -924,7 +928,7 @@ export function AddProviderWizard({const rt = preset.runtimes[agent];return (!rt?.baseUrlEditable ||- isValidEditablePresetBaseUrl(presetRuntimeBaseUrl(preset, agent, presetBaseUrls))+ isValidEditablePresetBaseUrl(presetRuntimeBaseUrl(preset, agent, presetBaseUrls), rt.baseUrl));});if (!editableBaseUrlsValid) return;@@ -1320,12 +1324,10 @@ export function AddProviderWizard({};});if (agentModels.length === 0) continue;- runtimes[agent] = presetConnectionRuntime(- preset,- agent,- agentModels,- presetRuntimeBaseUrl(preset, agent, presetBaseUrls),- );+ runtimes[agent] = {+ ...presetConnectionRuntime(preset, agent, agentModels, rt.baseUrl),+ ...(rt.modelsUrl ? { modelsUrl: rt.modelsUrl } : {}),+ };if (preset.authMethod !== 'none') {const k = apiKey.trim();if (k) keys[agent] = k;@@ -1407,7 +1409,7 @@ export function AddProviderWizard({(!runtime.modelsUrl?.trim() || isLoopbackProviderUrl(runtime.modelsUrl.trim())));}- return !runtime.baseUrlEditable || isValidEditablePresetBaseUrl(value);+ return !runtime.baseUrlEditable || isValidEditablePresetBaseUrl(value, runtime.baseUrl);});const presetCanContinue =sel?.kind === 'preset' &&@@ -1937,7 +1939,7 @@ export function AddProviderWizard({const rt = sel.preset.runtimes[agent];if (rt?.baseUrlEditable) {const value = presetRuntimeBaseUrl(sel.preset, agent, presetBaseUrls);- const valid = isValidEditablePresetBaseUrl(value.trim());+ const valid = isValidEditablePresetBaseUrl(value.trim(), rt.baseUrl);return (<label key={agent} className="flex flex-col gap-1.5"><spandiff --git a/apps/desktop/src/renderer/components/settings/ProviderConnectionDialog.tsx b/apps/desktop/src/renderer/components/settings/ProviderConnectionDialog.tsxindex 96830e9daa..d016e99bbb 100644--- a/apps/desktop/src/renderer/components/settings/ProviderConnectionDialog.tsx+++ b/apps/desktop/src/renderer/components/settings/ProviderConnectionDialog.tsx@@ -1,4 +1,4 @@-import { providerEndpointBindings, BUNDLED_CATALOG, classifyModel, isChatEligible, isAgentSelectableModel, mergeModelMetadata } from '@cindy/model-providers';+import { providerEndpointBindings, canonicalProviderEndpoint, BUNDLED_CATALOG, classifyModel, isChatEligible, isAgentSelectableModel, mergeModelMetadata } from '@cindy/model-providers';/*** Connection credentials and advanced routing only. Model capabilities are imported into the* shared catalog and edited through standard model settings. Stored per-runtime credentials,@@ -1690,8 +1690,13 @@ export function ProviderConnectionDialog({rf.wireProtocol,defaultProtocol,);+ const endpointTemplate = presets.find(preset => preset.id === rf.catalogPresetId)?.runtimes[a]?.baseUrl;+ const typedBaseUrl = rf.baseUrl.trim();+ const baseUrl = endpointTemplate?.includes('{')+ ? canonicalProviderEndpoint(endpointTemplate, typedBaseUrl) ?? typedBaseUrl+ : typedBaseUrl;runtimes[a] = {- baseUrl: rf.baseUrl.trim(),+ baseUrl,...(rf.catalogPresetId ? { catalogPresetId: rf.catalogPresetId } : {}),...(requestPath ? { requestPath } : {}),...(savedWireProtocol ? { wireProtocol: savedWireProtocol } : {}),diff --git a/docs/dev-rules/provider-catalog-generation.md b/docs/dev-rules/provider-catalog-generation.mdindex 2461096718..55b3a4ed83 100644--- a/docs/dev-rules/provider-catalog-generation.md+++ b/docs/dev-rules/provider-catalog-generation.md@@ -98,6 +98,11 @@ OpenAI / Anthropic / xAI API 与订阅入口分开,另加 Nous Research(Herm- Azure 资源名、Vertex location、Cloudflare account/gateway 使用可编辑的声明模板;绑定后同一连接的三个 runtime、发现地址与模型独立地址同步替换,不按模型名猜地址。+ Vertex 的官方 host 不是一条 `{location}-` 正则:`global` 用无前缀+ `aiplatform.googleapis.com`,`us`/`eu` 用 `aiplatform.{us|eu}.rep.googleapis.com`,+ 区域才用 `{region}-aiplatform.googleapis.com`。匹配只认这一族官方形态并规范化别名,+ 不把占位符放宽成任意 host。Azure OpenAI 同样认 `openai.azure.com` 与+ `cognitiveservices.azure.com` 的 `/openai[/v1]`,保存时保留用户用的那个官方 host。- Bedrock 不同区域分开预设,避免把别区模型错误地借给当前 endpoint。- 账号模板绑定后仍按 preset ID + 精确模型 ID/API 查标准资料;普通改写地址不继承原渠道承诺。- 模型详情可逐引擎选八种原生 API;同处调整默认思考档位和工作上下文,上游窗口与最大输出另行展示。diff --git a/packages/model-providers/src/__tests__/providerBranding.test.ts b/packages/model-providers/src/__tests__/providerBranding.test.tsindex 67342ebe21..a453d62db7 100644--- a/packages/model-providers/src/__tests__/providerBranding.test.ts+++ b/packages/model-providers/src/__tests__/providerBranding.test.ts@@ -88,6 +88,30 @@ describe('provider branding', () => {}});+ it.each([+ 'https://aiplatform.googleapis.com',+ 'https://us-central1-aiplatform.googleapis.com',+ 'https://aiplatform.us.rep.googleapis.com',+ 'https://aiplatform.eu.rep.googleapis.com',+ ])('brands official Vertex hosts as Google: %s', upstream => {+ expect(resolveProviderLogoKind('renamed-vertex', { pi: { upstream } })).toBe('google');+ });++ it('does not brand a lookalike Vertex host as Google', () => {+ expect(resolveProviderLogoKind('lookalike', {+ pi: { upstream: 'https://aiplatform.googleapis.com.evil.test' },+ })).toBeNull();+ });++ it('brands the official Azure Cognitive Services host as Azure', () => {+ expect(resolveProviderLogoKind('renamed-azure', {+ pi: { upstream: 'https://my-resource.cognitiveservices.azure.com/openai/v1' },+ })).toBe('azure');+ expect(resolveProviderLogoKind('lookalike', {+ pi: { upstream: 'https://my-resource.cognitiveservices.azure.com.evil.test/openai/v1' },+ })).toBeNull();+ });+it('rejects spoofed hosts, malformed URLs, and mixed-brand routing deterministically', () => {expect(hasProviderLogo('lookalike', {diff --git a/packages/model-providers/src/__tests__/providerEndpointTemplate.test.ts b/packages/model-providers/src/__tests__/providerEndpointTemplate.test.tsindex a7aebec246..9318d8e7bb 100644--- a/packages/model-providers/src/__tests__/providerEndpointTemplate.test.ts+++ b/packages/model-providers/src/__tests__/providerEndpointTemplate.test.ts@@ -1,8 +1,15 @@import { describe, expect, it } from 'vitest';-import { bindProviderPresetRuntime, providerEndpointBindings } from '../providerEndpointTemplate.js';+import {+ bindProviderEndpoint,+ bindProviderPresetRuntime,+ canonicalProviderEndpoint,+ providerEndpointBindings,+} from '../providerEndpointTemplate.js';import { BUNDLED_CATALOG } from '../builtin.js';import { buildUserProvider } from '../user-provider.js';+const VERTEX_TEMPLATE = 'https://{location}-aiplatform.googleapis.com';+describe('cloud account endpoint setup', () => {it('binds Cloudflare account and gateway to every model route', () => {const preset = BUNDLED_CATALOG.presets!.find(preset => preset.id === 'cloudflare-ai-gateway')!;@@ -56,4 +63,74 @@ describe('cloud account endpoint setup', () => {expect(providerEndpointBindings(template, endpoint)).toBeNull();}});++ it('accepts the official Azure Cognitive Services host without rewriting it to openai.azure.com', () => {+ const preset = BUNDLED_CATALOG.presets!.find(preset => preset.id === 'azure-openai-responses')!;+ const endpoint = 'https://my-resource.cognitiveservices.azure.com/openai/v1';+ expect(providerEndpointBindings(preset.runtimes.pi!.baseUrl, endpoint)).toEqual({ resource: 'my-resource' });+ expect(bindProviderPresetRuntime(preset.runtimes.pi!, endpoint).baseUrl).toBe(endpoint);+ expect(canonicalProviderEndpoint(preset.runtimes.pi!.baseUrl, 'https://my-resource.openai.azure.com/openai/v1'))+ .toBe('https://my-resource.openai.azure.com/openai/v1');+ });+});++describe('Vertex official endpoint family', () => {+ it('binds the unprefixed global host and us/eu multi-region hosts', () => {+ expect(providerEndpointBindings(VERTEX_TEMPLATE, 'https://aiplatform.googleapis.com')).toEqual({ location: 'global' });+ expect(providerEndpointBindings(VERTEX_TEMPLATE, 'https://aiplatform.googleapis.com/v1')).toEqual({ location: 'global' });+ expect(providerEndpointBindings(VERTEX_TEMPLATE, 'https://aiplatform.us.rep.googleapis.com')).toEqual({ location: 'us' });+ expect(providerEndpointBindings(VERTEX_TEMPLATE, 'https://aiplatform.eu.rep.googleapis.com/')).toEqual({ location: 'eu' });+ expect(providerEndpointBindings(VERTEX_TEMPLATE, 'https://us-central1-aiplatform.googleapis.com')).toEqual({ location: 'us-central1' });+ });++ it('normalizes template-induced aliases to the official hosts', () => {+ expect(canonicalProviderEndpoint(VERTEX_TEMPLATE, 'https://global-aiplatform.googleapis.com'))+ .toBe('https://aiplatform.googleapis.com');+ expect(canonicalProviderEndpoint(VERTEX_TEMPLATE, 'https://us-aiplatform.googleapis.com'))+ .toBe('https://aiplatform.us.rep.googleapis.com');+ expect(bindProviderEndpoint(VERTEX_TEMPLATE, { location: 'global' })).toBe('https://aiplatform.googleapis.com');+ expect(bindProviderEndpoint(VERTEX_TEMPLATE, { location: 'us' })).toBe('https://aiplatform.us.rep.googleapis.com');+ expect(bindProviderEndpoint(VERTEX_TEMPLATE, { location: 'europe-west1' }))+ .toBe('https://europe-west1-aiplatform.googleapis.com');+ });++ it('rewrites a stored Vertex alias onto the official host in live routing', () => {+ const preset = BUNDLED_CATALOG.presets!.find(preset => preset.id === 'google-vertex')!;+ const runtimes = Object.fromEntries(Object.entries(preset.runtimes).map(([agent, runtime]) => [agent, {+ ...bindProviderPresetRuntime(runtime!, 'https://global-aiplatform.googleapis.com'),+ catalogPresetId: preset.id,+ baseUrl: 'https://global-aiplatform.googleapis.com',+ }]));+ const provider = buildUserProvider({ id: 'legacy-vertex', name: 'Vertex', runtimes }, { presets: BUNDLED_CATALOG.presets });+ expect(provider.routing.pi?.upstream).toBe('https://aiplatform.googleapis.com');+ expect(provider.routing.codex?.upstream).toBe('https://aiplatform.googleapis.com');+ expect(provider.models.pi?.find(row => row.id === 'gemini-3.8-flash')?.api+ ?? provider.models.pi?.find(row => row.id === 'gemini-3.8-flash')?.piApi).toBe('google-vertex');+ });++ it('keeps Vertex catalog metadata when the user saved a global official host', () => {+ const preset = BUNDLED_CATALOG.presets!.find(preset => preset.id === 'google-vertex')!;+ const runtimes = Object.fromEntries(Object.entries(preset.runtimes).map(([agent, runtime]) => [agent, {+ ...bindProviderPresetRuntime(runtime!, 'https://aiplatform.googleapis.com'), catalogPresetId: preset.id,+ }]));+ const provider = buildUserProvider({ id: 'my-vertex', name: 'Vertex', runtimes }, { presets: BUNDLED_CATALOG.presets });+ const model = provider.models.pi?.find(row => row.id === 'gemini-3.8-flash');+ expect(model?.api ?? model?.piApi).toBe('google-vertex');+ expect(model?.contextWindow).toBeGreaterThan(0);+ expect(provider.routing.pi?.upstream).toBe('https://aiplatform.googleapis.com');+ });++ it('rejects unofficial hosts instead of widening the placeholder regex', () => {+ for (const endpoint of [+ 'https://attacker.example',+ 'https://aiplatform.googleapis.com.evil.test',+ 'https://evil-aiplatform.googleapis.com',+ 'https://aiplatform.us.rep.googleapis.com.evil.test',+ 'https://aiplatform.asia.rep.googleapis.com',+ 'https://us-central1-aiplatform.googleapis.com/projects/p',+ VERTEX_TEMPLATE,+ ]) {+ expect(providerEndpointBindings(VERTEX_TEMPLATE, endpoint), endpoint).toBeNull();+ }+ });});diff --git a/packages/model-providers/src/index.ts b/packages/model-providers/src/index.tsindex 59e545aeb7..3142a41412 100644--- a/packages/model-providers/src/index.ts+++ b/packages/model-providers/src/index.ts@@ -301,7 +301,7 @@ export { parseModelsListResponse, isOpenRouterModelsUrl } from "./modelDiscoveryexport type { ProviderModelRecord } from "./providerModelCatalog.js";-export { providerEndpointBindings, bindProviderEndpoint, bindProviderPresetRuntime } from "./providerEndpointTemplate.js";+export { providerEndpointBindings, bindProviderEndpoint, bindProviderPresetRuntime, canonicalProviderEndpoint } from "./providerEndpointTemplate.js";export { providerSetupLink } from './providerSetupLinks.js';export { providerPresetOAuth, providerPresetOAuthRuntimes, providerOAuthContract } from './providerPresetOAuth.js';diff --git a/packages/model-providers/src/providerBranding.ts b/packages/model-providers/src/providerBranding.tsindex f491d2e59a..e06d1fd0b9 100644--- a/packages/model-providers/src/providerBranding.ts+++ b/packages/model-providers/src/providerBranding.ts@@ -198,7 +198,16 @@ const PROVIDER_LOGO_KIND_BY_HOST: readonly (readonly [string, ProviderLogoKind])];function hostMatches(hostname: string, brandHost: string): boolean {- if (brandHost === 'aiplatform.googleapis.com' && hostname.endsWith('-aiplatform.googleapis.com')) return true;+ if (brandHost === 'aiplatform.googleapis.com') {+ return hostname === brandHost+ || hostname.endsWith('-aiplatform.googleapis.com')+ || /^aiplatform\.(us|eu)\.rep\.googleapis\.com$/.test(hostname);+ }+ if (brandHost === 'openai.azure.com') {+ return hostname === brandHost+ || hostname.endsWith('.openai.azure.com')+ || hostname.endsWith('.cognitiveservices.azure.com');+ }if (brandHost === 'ai-gateway.vercel.sh') return hostname === brandHost;return hostname === brandHost || hostname.endsWith(`.${brandHost}`);}diff --git a/packages/model-providers/src/providerEndpointTemplate.ts b/packages/model-providers/src/providerEndpointTemplate.tsindex b5d1cacc8d..beffd1beab 100644--- a/packages/model-providers/src/providerEndpointTemplate.ts+++ b/packages/model-providers/src/providerEndpointTemplate.ts@@ -1,8 +1,79 @@import type { ProviderPresetRuntime } from './types.js';const token = /\{([A-Za-z][A-Za-z0-9_]*)\}/g;-export function providerEndpointBindings(template: string, endpoint: string): Record<string, string> | null {- if (!template.includes('{')) return template.replace(/\/+$/, '') === endpoint.replace(/\/+$/, '') ? {} : null;+const GCP_REGION = /^[a-z]+(?:-[a-z]+)+[0-9]+$/;+const VERTEX_MULTIREGION = /^(us|eu)$/;+const AZURE_RESOURCE = /^[a-z0-9](?:[a-z0-9-]{0,62}[a-z0-9])$/;+const VERTEX_REGIONAL_TEMPLATE = 'https://{location}-aiplatform.googleapis.com';+const VERTEX_MULTIREGION_TEMPLATE = 'https://aiplatform.{location}.rep.googleapis.com';+const VERTEX_GLOBAL_HOST = 'https://aiplatform.googleapis.com';++function stripTrailingSlash(value: string): string {+ return value.replace(/\/+$/, '');+}++function parseHttpUrl(value: string): URL | null {+ try {+ const url = new URL(value);+ if ((url.protocol !== 'http:' && url.protocol !== 'https:') || url.username || url.password) return null;+ return url;+ } catch {+ return null;+ }+}++function isVertexFamilyTemplate(template: string): boolean {+ const trimmed = stripTrailingSlash(template);+ return trimmed === VERTEX_REGIONAL_TEMPLATE || trimmed === VERTEX_MULTIREGION_TEMPLATE;+}++function isAzureOpenAIFamilyTemplate(template: string): boolean {+ return /^https:\/\/\{resource\}\.(openai|cognitiveservices)\.azure\.com\/openai(?:\/v1)?$/.test(stripTrailingSlash(template));+}++function vertexPathAllowed(pathname: string): boolean {+ const path = stripTrailingSlash(pathname);+ return path === '' || path === '/v1' || path === '/v1beta';+}++function recognizeVertexLocation(endpoint: string): string | null {+ const url = parseHttpUrl(endpoint);+ if (!url || url.protocol !== 'https:' || url.search || url.hash || !vertexPathAllowed(url.pathname)) return null;+ const host = url.hostname.toLowerCase();+ if (host === 'aiplatform.googleapis.com') return 'global';+ const multi = /^aiplatform\.(us|eu)\.rep\.googleapis\.com$/.exec(host);+ if (multi) return multi[1];+ const prefixed = /^([a-z0-9-]+)-aiplatform\.googleapis\.com$/.exec(host);+ if (!prefixed) return null;+ const location = prefixed[1];+ if (location === 'global' || VERTEX_MULTIREGION.test(location) || GCP_REGION.test(location)) return location;+ return null;+}++function officialVertexEndpoint(location: string): string {+ if (location === 'global') return VERTEX_GLOBAL_HOST;+ if (VERTEX_MULTIREGION.test(location)) return `https://aiplatform.${location}.rep.googleapis.com`;+ return `https://${location}-aiplatform.googleapis.com`;+}++function recognizeAzureBinding(endpoint: string): { resource: string; host: string; path: string } | null {+ const url = parseHttpUrl(endpoint);+ if (!url || url.protocol !== 'https:' || url.search || url.hash) return null;+ const host = url.hostname.toLowerCase();+ const matched = /^([a-z0-9](?:[a-z0-9-]{0,62}[a-z0-9])?)\.(openai\.azure\.com|cognitiveservices\.azure\.com)$/.exec(host);+ if (!matched || !AZURE_RESOURCE.test(matched[1])) return null;+ const path = stripTrailingSlash(url.pathname);+ if (path !== '/openai' && path !== '/openai/v1') return null;+ return { resource: matched[1], host: matched[2], path };+}++function azureShapeFromTemplate(template: string): { host: string; path: string } {+ const url = new URL(stripTrailingSlash(template).replace('{resource}', 'resource'));+ return { host: url.hostname.slice('resource.'.length), path: url.pathname };+}++function genericBindings(template: string, endpoint: string): Record<string, string> | null {+ if (!template.includes('{')) return stripTrailingSlash(template) === stripTrailingSlash(endpoint) ? {} : null;const names: string[] = [];const escaped = template.split(token).map((part, index) => {if (index % 2) { names.push(part); return '([A-Za-z0-9_-]+)'; }@@ -14,20 +85,52 @@ export function providerEndpointBindings(template: string, endpoint: string): Renames.forEach((name, index) => { bindings[name] = matches[index + 1]; });return names.every((name, index) => bindings[name] === matches[index + 1]) ? bindings : null;}-export function bindProviderEndpoint(template: string, bindings: Record<string, string>): string {++/** Only declared account/location placeholders bind. Official host aliases stay explicit; no cross-origin guessing. */+export function providerEndpointBindings(template: string, endpoint: string): Record<string, string> | null {+ if (isVertexFamilyTemplate(template)) {+ const location = recognizeVertexLocation(endpoint);+ return location ? { location } : null;+ }+ if (isAzureOpenAIFamilyTemplate(template)) {+ const recognized = recognizeAzureBinding(endpoint);+ return recognized ? { resource: recognized.resource } : null;+ }+ return genericBindings(template, endpoint);+}++export function bindProviderEndpoint(+ template: string,+ bindings: Record<string, string>,+ sourceEndpoint?: string,+): string {+ if (isVertexFamilyTemplate(template) && bindings.location) return officialVertexEndpoint(bindings.location);+ if (isAzureOpenAIFamilyTemplate(template) && bindings.resource) {+ const fromSource = sourceEndpoint ? recognizeAzureBinding(sourceEndpoint) : null;+ const fallback = azureShapeFromTemplate(template);+ return `https://${bindings.resource}.${fromSource?.host ?? fallback.host}${fromSource?.path ?? fallback.path}`;+ }return template.replace(token, (source, name) => bindings[name] ?? source);}++export function canonicalProviderEndpoint(template: string, endpoint: string): string | null {+ const bindings = providerEndpointBindings(template, endpoint);+ return bindings ? bindProviderEndpoint(template, bindings, endpoint) : null;+}+/** Only declared account/location placeholders are substituted. No cross-origin URL guessing. */export function bindProviderPresetRuntime(runtime: ProviderPresetRuntime, endpoint: string): ProviderPresetRuntime {- const bindings = providerEndpointBindings(runtime.baseUrl, endpoint) ?? {};- return { ...runtime, baseUrl: endpoint,- ...(runtime.modelsUrl ? { modelsUrl: bindProviderEndpoint(runtime.modelsUrl, bindings) } : {}),+ const bindings = providerEndpointBindings(runtime.baseUrl, endpoint);+ const resolved = bindings ? bindProviderEndpoint(runtime.baseUrl, bindings, endpoint) : endpoint;+ const names = bindings ?? {};+ return { ...runtime, baseUrl: resolved,+ ...(runtime.modelsUrl ? { modelsUrl: bindProviderEndpoint(runtime.modelsUrl, names, endpoint) } : {}),models: runtime.models.map(model => ({ ...model, ...(model.route ? { route: {- ...model.route, baseUrl: bindProviderEndpoint(model.route.baseUrl, bindings),+ ...model.route, baseUrl: bindProviderEndpoint(model.route.baseUrl, names, endpoint),} } : {}) })),...(runtime.modelDiscovery ? { modelDiscovery: runtime.modelDiscovery.map(source => ({ ...source,- baseUrl: bindProviderEndpoint(source.baseUrl, bindings),- ...(source.modelsUrl ? { modelsUrl: bindProviderEndpoint(source.modelsUrl, bindings) } : {}),+ baseUrl: bindProviderEndpoint(source.baseUrl, names, endpoint),+ ...(source.modelsUrl ? { modelsUrl: bindProviderEndpoint(source.modelsUrl, names, endpoint) } : {}),})) } : {}),};}diff --git a/packages/model-providers/src/user-provider.ts b/packages/model-providers/src/user-provider.tsindex 218aaca067..961b1c2d2d 100644--- a/packages/model-providers/src/user-provider.ts+++ b/packages/model-providers/src/user-provider.ts@@ -1,7 +1,7 @@import { alignModelApiRoute, providerInterfaceModelRoute, hasDeclaredProviderInterface, providerWireProtocolForApi, providerBaseUrlForApi } from './providerInterfaceRoutes.js';import { nativeModelAgents } from './modelProtocol.js';import { resolveCatalogModelNativeApi, resolveModelNativeApi } from './modelRegistry.js';-import { providerEndpointBindings, bindProviderPresetRuntime } from './providerEndpointTemplate.js';+import { providerEndpointBindings, bindProviderEndpoint, bindProviderPresetRuntime, canonicalProviderEndpoint } from './providerEndpointTemplate.js';import { PI_MODEL_APIS } from "./types.js";import { providerModelRecord, providerPresetModelRecord, providerModelMetadata } from "./providerModelCatalog.js";import { BUNDLED_CATALOG, BUILTIN_PROVIDERS } from './builtin.js';@@ -455,27 +455,32 @@ export function buildUserProvider(const rt = config.runtimes[agent];if (!rt) continue;agents.push(agent);+ const preset = options.presets?.find(+ (preset) => preset.id === rt.catalogPresetId,+ );+ const presetRuntimeSource = preset?.runtimes[agent];+ const presetBindings = presetRuntimeSource+ ? providerEndpointBindings(presetRuntimeSource.baseUrl, rt.baseUrl) : null;+ const presetRuntime = presetRuntimeSource && presetBindings+ ? bindProviderPresetRuntime(presetRuntimeSource, rt.baseUrl) : presetRuntimeSource;+ const resolvedBaseUrl = presetBindings && presetRuntimeSource+ ? bindProviderEndpoint(presetRuntimeSource.baseUrl, presetBindings, rt.baseUrl)+ : rt.baseUrl;routing[agent] = toRouting(agent,- rt.baseUrl,+ resolvedBaseUrl,rt.requestPath,rt.headers,rt.headersState,strategy,- rt.modelsUrl,+ presetRuntime?.modelsUrl ?? rt.modelsUrl,rt.wireProtocol,rt.piCatalogProviderId,rt.supportsImageGeneration,);- const preset = options.presets?.find(- (preset) => preset.id === rt.catalogPresetId,- );- const presetRuntimeSource = preset?.runtimes[agent];- const presetRuntime = presetRuntimeSource && providerEndpointBindings(presetRuntimeSource.baseUrl, rt.baseUrl)- ? bindProviderPresetRuntime(presetRuntimeSource, rt.baseUrl) : presetRuntimeSource;const followsPreset =presetRuntime &&- withoutTrailingSlashes(rt.baseUrl) ===+ withoutTrailingSlashes(resolvedBaseUrl) ===withoutTrailingSlashes(presetRuntime.baseUrl) &&(rt.wireProtocol ?? defaultWireProtocol(agent)) ===(presetRuntime.wireProtocol ?? defaultWireProtocol(agent)) &&@@ -494,9 +499,16 @@ export function buildUserProvider(...(agent === 'pi' && interfaceDefault.piApi ? { piApi: interfaceDefault.piApi } : {}),...(interfaceDefault.route ? { route: { ...interfaceDefault.route } } : {}),} : storedModel;- const m = rt.requestPath ? configuredModel : alignModelApiRoute(- providerInterfaceModelRoute(configuredModel, agent, rt.catalogPresetId, rt.baseUrl),- rt.baseUrl, rt.wireProtocol ?? defaultWireProtocol(agent),+ const boundConfiguredModel = configuredModel.route+ ? { ...configuredModel, route: {+ ...configuredModel.route,+ baseUrl: canonicalProviderEndpoint(presetRuntimeSource?.baseUrl ?? '', configuredModel.route.baseUrl)+ ?? configuredModel.route.baseUrl,+ } }+ : configuredModel;+ const m = rt.requestPath ? boundConfiguredModel : alignModelApiRoute(+ providerInterfaceModelRoute(boundConfiguredModel, agent, rt.catalogPresetId, resolvedBaseUrl),+ resolvedBaseUrl, rt.wireProtocol ?? defaultWireProtocol(agent),);const presetModel = followsPreset? presetRuntime.models.find((model) => model.id === m.id)@@ -523,7 +535,7 @@ export function buildUserProvider(// 目录(预设只声明 context/image 时 reasoning 仍由目录补),用户显式配置仍优先。const catalogDefaults =agent === "pi" && rt.piCatalogProviderId && !m.route &&- piNativeCatalogRouteMatches(rt.piCatalogProviderId, rt.baseUrl, rt.wireProtocol)+ piNativeCatalogRouteMatches(rt.piCatalogProviderId, resolvedBaseUrl, rt.wireProtocol)? piNativeCatalogModelDefaults(rt.piCatalogProviderId, m.id): undefined;const wire = m.route?.wireProtocol ?? rt.wireProtocol ?? defaultWireProtocol(agent);@@ -531,10 +543,10 @@ export function buildUserProvider(// discarding all metadata when a Responses/Gemini model shares a Chat connection.// With no explicit model route/API, an exact endpoint + unique ID supplies Pi's API.const imported = !(m.route?.requestPath ?? rt.requestPath)- ? providerModelRecord(m.id, m.route?.baseUrl ?? rt.baseUrl,+ ? providerModelRecord(m.id, m.route?.baseUrl ?? resolvedBaseUrl,m.api ?? (agent === 'pi' ? m.piApi ?? wire : wire),!m.api && !m.piApi && !m.route)- ?? (hasDeclaredProviderInterface(m, agent, rt.catalogPresetId, rt.baseUrl)+ ?? (hasDeclaredProviderInterface(m, agent, rt.catalogPresetId, resolvedBaseUrl)? providerPresetModelRecord(rt.catalogPresetId, m.id) : undefined)?? (followsPreset && sameRoute && m.api && presetModel?.api === m.api? providerPresetModelRecord(preset?.id, m.id, m.api) : undefined)@@ -583,7 +595,7 @@ export function buildUserProvider(...(importedApi && !m.piApi && !m.api ? {api: importedApi, ...(agent === 'pi' ? { piApi: importedApi } : {}),...(!m.route && providerWireProtocolForApi(importedApi) && providerWireProtocolForApi(importedApi) !== wire ? { route: {- baseUrl: providerBaseUrlForApi(rt.baseUrl, importedApi),+ baseUrl: providerBaseUrlForApi(resolvedBaseUrl, importedApi),wireProtocol: providerWireProtocolForApi(importedApi)!,} } : {}),} : {}),