fix(native): honor requested model in bridge gates

Author: dwgx

README.md

@@ -276,8 +276,8 @@ curl http://localhost:3003/v1/messages \
 | `LS_PREWARM_DEFAULT` | `1` | 设为 `0` 可跳过启动时 default LS 预热，低内存/全 proxy 池改为首个真实请求再懒启动 |
 | `LS_PREWARM_PROXIES` | `0` | 设为 `1` 才在启动时预热所有 proxy LS；默认按需启动。后台 scheduled probe / 预测 prewarm 只复用空闲常驻 LS，不会为了探测新开/等待/驱逐 LS |
 | `LS_PREWARM_ON_ACCOUNT_ADD` | `0` | 设为 `1` 才在 Dashboard/批量导入/OAuth 添加账号后立即预热对应 LS；默认避免批量录入打爆内存 |
-| `WINDSURFAPI_NATIVE_TOOL_BRIDGE` | 空 | `all_mapped` 仅在 Read/Bash/Grep/Glob 及其别名全部可映射时走 native bridge；`1` 为混合工具 partition 模式。WebSearch/WebFetch 默认仍走 prompt emulation，需显式加入工具 allowlist |
-| `WINDSURFAPI_NATIVE_TOOL_BRIDGE_TOOLS` | `Read,Bash,Grep,Glob` 语义族 | native bridge 工具 allowlist。默认包含 `Read/read_file/view_file`、`Bash/shell_command/run_command`、`Grep/grep_search_v2`、`Glob/find`，不含 WebSearch/WebFetch |
+| `WINDSURFAPI_NATIVE_TOOL_BRIDGE` | 空 | `all_mapped` 仅在已 allowlist 的工具全部可映射时走 native bridge；`1` 为混合工具 partition 模式。WebSearch/WebFetch 默认仍走 prompt emulation，需显式加入工具 allowlist |
+| `WINDSURFAPI_NATIVE_TOOL_BRIDGE_TOOLS` | `Bash/shell_command/run_command` 语义族 | native bridge 工具 allowlist。默认只包含成熟的 Bash/run_command 路径；Read/Grep/Glob 和 WebSearch/WebFetch 需显式加入 allowlist 后再用灰度账号/API key 实测 |
 | `WINDSURFAPI_NATIVE_TOOL_BRIDGE_MODELS` / `PROVIDERS` / `ROUTES` / `CALLERS` / `ACCOUNTS` / `API_KEYS` | 空 | native bridge 灰度门。为空表示不限；设置后必须匹配才启用。`ACCOUNTS` 可填账号 id/email，`API_KEYS` 匹配调用方 API key 但不会把明文 key 传进 chat 逻辑 |
 | `WINDSURFAPI_NATIVE_TOOL_BRIDGE_OFF` | 空 | 设为 `1` 强制关闭 native tool bridge，优先级高于上面的开关 |
 | `WINDSURFAPI_SPECIAL_AGENT_BACKEND` | 空 | 可选 special-agent 后端。设为 `devin-cli` 后，`swe-1.6` / `swe-1.6-fast` / `adaptive` / `arena-*` 不再走 direct Cascade，而是走 Devin CLI PoC |

docs/releases/RELEASE_NOTES_2.0.129.md

@@ -0,0 +1,21 @@
+## v2.0.129 - Native bridge gray-gate model alias fix
+
+- Fixed the native bridge model gray gate so it checks both the internal routing
+  model key and the caller's requested model alias. A real v2.0.128 canary with
+  `WINDSURFAPI_NATIVE_TOOL_BRIDGE_MODELS=claude-haiku-4.5` was incorrectly
+  rejected after chat routing normalized the request to `claude-4.5-haiku`.
+- Native bridge decision telemetry now includes `requestedModel` alongside
+  `modelKey`, making dashboard/health output explain whether a gray gate matched
+  the request alias or the internal routing key.
+- README native-bridge defaults now match the code: production default allowlist
+  is still the mature Bash/run_command path only. Read/Grep/Glob and
+  WebSearch/WebFetch remain explicit gray-canary tools until their live protocol
+  matrix is proven.
+
+Verification:
+
+- `node --check src\cascade-native-bridge.js`
+- `node --check src\native-bridge-stats.js`
+- `node --check src\handlers\chat.js`
+- `node --test test\native-tool-routing.test.js test\native-bridge-stats.test.js test\cascade-native-bridge.test.js test\dashboard-api.test.js`
+- `node --test --test-timeout=120000 --test-force-exit test\*.test.js`

package.json

@@ -1,6 +1,6 @@
 {
   "name": "windsurf-api",
-  "version": "2.0.128",
+  "version": "2.0.129",
   "description": "Windsurf to OpenAI + Anthropic compatible API proxy. Turns Windsurf's 107 AI models (Claude, GPT, Gemini, DeepSeek, Grok, Qwen, Kimi, GLM, SWE) into dual-protocol API endpoints. Zero npm deps.",
   "type": "module",
   "main": "src/index.js",

src/cascade-native-bridge.js

@@ -1350,6 +1350,7 @@ function nativeBridgeDecision({
   explicitOn,
   allMappedOnly,
   modelKey,
+  model,
   provider,
   route,
 } = {}) {
@@ -1363,6 +1364,7 @@ function nativeBridgeDecision({
     allMappedOnly: !!allMappedOnly,
     useCascade: !!useCascade,
     modelKey: String(modelKey || ''),
+    requestedModel: String(model || ''),
     provider: String(provider || ''),
     route: String(route || ''),
     hasTools: Array.isArray(tools) && tools.length > 0,
@@ -1394,6 +1396,7 @@ export function getNativeBridgeDecision(tools, {
     explicitOn,
     allMappedOnly,
     modelKey,
+    model,
     provider,
     route,
   };
@@ -1423,9 +1426,10 @@ export function getNativeBridgeDecision(tools, {
   return nativeBridgeDecision({ ...base, enabled: true, reason: 'native_bridge_enabled' });
 }
 
-export function shouldUseNativeBridge(tools, { modelKey = '', provider = '', route = '', callerKey = '' } = {}) {
+export function shouldUseNativeBridge(tools, { modelKey = '', model = '', provider = '', route = '', callerKey = '' } = {}) {
   return getNativeBridgeDecision(tools, {
     modelKey,
+    model,
     provider,
     route,
     callerKey,

src/handlers/chat.js

@@ -120,11 +120,12 @@ function upstreamTransientErrorMessage(model, triedCount, reason = 'internal_err
   return `${model} 上游 Windsurf Cascade 服务瞬态故障：已在 ${triedCount} 个账号上重试都收到 ${detail}。这是上游或本地语言服务器会话的瞬时问题，建议 30-60 秒后重试；若连续出现，请重启语言服务器。`;
 }
 
-export function buildToolRoutingPlan(tools, { useCascade = false, modelKey = '', provider = null, route = 'chat', callerKey = '' } = {}) {
+export function buildToolRoutingPlan(tools, { useCascade = false, modelKey = '', model = '', provider = null, route = 'chat', callerKey = '' } = {}) {
   const hasTools = Array.isArray(tools) && tools.length > 0;
   const nativeDecision = getNativeBridgeDecision(tools || [], {
     useCascade,
     modelKey,
+    model,
     provider,
     route,
     callerKey,
@@ -1582,6 +1583,7 @@ async function _handleChatCompletionsInner(body, context = {}) {
   const toolRouting = buildToolRoutingPlan(effectiveTools, {
     useCascade,
     modelKey: routingModelKey,
+    model: reqModel || body.model || modelKey,
     provider: modelInfo?.provider || null,
     route: body.__route || 'chat',
     callerKey: nativeBridgeCallerKey,

src/native-bridge-stats.js

@@ -65,6 +65,7 @@ function sanitizeDecision(decision = {}) {
     mode: safeString(decision.mode, 40),
     useCascade: decision.useCascade !== false,
     modelKey: safeString(decision.modelKey || decision.model, 120),
+    requestedModel: safeString(decision.requestedModel || decision.model, 120),
     provider: safeString(decision.provider, 80),
     route: safeString(decision.route, 80),
     toolChoiceFiltered: !!decision.toolChoiceFiltered,

src/runtime-config.js

@@ -129,6 +129,11 @@ export function getRuntimeConfig() {
   return structuredClone(_state);
 }
 
+export function _resetRuntimeConfigForTests(patch = {}) {
+  _state = deepMerge(structuredClone(DEFAULTS), patch);
+  return getRuntimeConfig();
+}
+
 export function getExperimental() {
   return { ...(_state.experimental || {}) };
 }

test/dashboard-api.test.js

@@ -1,19 +1,22 @@
 import { afterEach, describe, it } from 'node:test';
 import assert from 'node:assert/strict';
 import { config } from '../src/config.js';
-import { configureBindHost } from '../src/auth.js';
+import { configureBindHost, _resetLockoutForTests } from '../src/auth.js';
 import { buildBatchProxyBinding, handleDashboardApi } from '../src/dashboard/api.js';
 import {
   recordNativeBridgeDecision,
   resetNativeBridgeStats,
 } from '../src/native-bridge-stats.js';
+import { _resetRuntimeConfigForTests } from '../src/runtime-config.js';
 
 const originalDashboardPassword = config.dashboardPassword;
 const originalApiKey = config.apiKey;
 const originalNativeBridgeApiKeys = process.env.WINDSURFAPI_NATIVE_TOOL_BRIDGE_API_KEYS;
 const originalNativeBridgeAccounts = process.env.WINDSURFAPI_NATIVE_TOOL_BRIDGE_ACCOUNTS;
 
 afterEach(() => {
+  _resetRuntimeConfigForTests();
+  _resetLockoutForTests();
   config.dashboardPassword = originalDashboardPassword;
   config.apiKey = originalApiKey;
   if (originalNativeBridgeApiKeys === undefined) delete process.env.WINDSURFAPI_NATIVE_TOOL_BRIDGE_API_KEYS;
@@ -51,6 +54,7 @@ describe('dashboard batch import proxy binding', () => {
   });
 
   it('fails closed for dashboard write APIs without auth on non-localhost binds', async () => {
+    _resetRuntimeConfigForTests();
     config.dashboardPassword = '';
     config.apiKey = '';
     configureBindHost('0.0.0.0');
@@ -63,6 +67,7 @@ describe('dashboard batch import proxy binding', () => {
   });
 
   it('allows unauthenticated dashboard writes only on localhost binds', async () => {
+    _resetRuntimeConfigForTests();
     config.dashboardPassword = '';
     config.apiKey = '';
     configureBindHost('127.0.0.1');
@@ -74,6 +79,7 @@ describe('dashboard batch import proxy binding', () => {
   });
 
   it('accepts dashboard auth headers with timing-safe configured secrets', async () => {
+    _resetRuntimeConfigForTests();
     config.dashboardPassword = 'dash-secret';
     config.apiKey = '';
     configureBindHost('0.0.0.0');
@@ -85,6 +91,7 @@ describe('dashboard batch import proxy binding', () => {
   });
 
   it('includes sanitized native bridge telemetry in authenticated overview', async () => {
+    _resetRuntimeConfigForTests();
     config.dashboardPassword = 'dash-secret';
     config.apiKey = '';
     configureBindHost('0.0.0.0');

test/native-bridge-stats.test.js

@@ -60,6 +60,7 @@ describe('native bridge runtime stats', () => {
       mode: 'all_mapped',
       useCascade: true,
       modelKey: 'gpt-5.5-medium',
+      requestedModel: 'gpt-5.5',
       provider: 'openai',
       route: 'chat',
       callerKey: 'api:secret-hash',
@@ -76,6 +77,7 @@ describe('native bridge runtime stats', () => {
       mode: '1',
       useCascade: true,
       modelKey: 'claude-sonnet-4.6',
+      requestedModel: 'claude-sonnet-4.6',
       provider: 'anthropic',
       route: 'chat',
       hasTools: true,
@@ -91,6 +93,8 @@ describe('native bridge runtime stats', () => {
     assert.equal(stats.decisionReasons.native_bridge_model_not_allowed, 1);
     assert.equal(stats.decisionReasons.native_bridge_enabled, 1);
     assert.equal(stats.lastDecision.reason, 'native_bridge_enabled');
+    assert.equal(stats.recentDecisions[0].modelKey, 'gpt-5.5-medium');
+    assert.equal(stats.recentDecisions[0].requestedModel, 'gpt-5.5');
     assert.equal(stats.recentDecisions.length, 2);
     assert.equal(JSON.stringify(stats).includes('secret-hash'), false);
   });

test/native-tool-routing.test.js

@@ -436,6 +436,26 @@ describe('native mapped-tool routing', () => {
     assert.equal(allowed.nativeDecision.reason, 'native_bridge_enabled');
   });
 
+  it('honors requested model aliases in native bridge model gray gates', () => {
+    process.env.WINDSURFAPI_NATIVE_TOOL_BRIDGE = 'all_mapped';
+    process.env.WINDSURFAPI_NATIVE_TOOL_BRIDGE_TOOLS = 'Read';
+    process.env.WINDSURFAPI_NATIVE_TOOL_BRIDGE_MODELS = 'claude-haiku-4.5';
+    delete process.env.WINDSURFAPI_NATIVE_TOOL_BRIDGE_OFF;
+
+    const plan = buildToolRoutingPlan([fnTool('Read')], {
+      useCascade: true,
+      modelKey: 'claude-4.5-haiku',
+      model: 'claude-haiku-4.5',
+      provider: 'anthropic',
+      route: 'chat',
+    });
+
+    assert.equal(plan.nativeBridgeOn, true);
+    assert.equal(plan.nativeDecision.reason, 'native_bridge_enabled');
+    assert.equal(plan.nativeDecision.modelKey, 'claude-4.5-haiku');
+    assert.equal(plan.nativeDecision.requestedModel, 'claude-haiku-4.5');
+  });
+
   it('explains native bridge disabled decisions for operators', () => {
     delete process.env.WINDSURFAPI_NATIVE_TOOL_BRIDGE;
     delete process.env.WINDSURFAPI_NATIVE_TOOL_BRIDGE_TOOLS;