@relayplane/proxy 1.8.13 → 1.8.16

package/dist/standalone-proxy.js

@@ -62,6 +62,7 @@ exports.extractResponseText = extractResponseText;
 exports.parseModelSuffix = parseModelSuffix;
 exports.classifyComplexity = classifyComplexity;
 exports.shouldEscalate = shouldEscalate;
+exports.resolveExplicitModel = resolveExplicitModel;
 exports.startProxy = startProxy;
 const http = __importStar(require("node:http"));
 const fs = __importStar(require("node:fs"));
@@ -1891,10 +1892,48 @@ function parsePreferredModel(preferredModel) {
     return { provider: provider, model };
 }
 /**
- * Resolve explicit model name to provider and model
- * Handles direct model names like "claude-3-5-sonnet-latest" or "gpt-4o"
+ * Resolve explicit model name to provider and model.
+/**
+ * Add provider prefix to bare model names for aggregator routing (e.g., OpenRouter).
+ * Complexity routing produces bare names like 'claude-sonnet-4-6' — aggregators need
+ * the full 'anthropic/claude-sonnet-4-6' format to identify the upstream provider.
+ * If the model already has a prefix (contains '/'), it's returned unchanged.
  */
-function resolveExplicitModel(modelName) {
+function addProviderPrefix(model, detectedProvider) {
+    // Already has a prefix (e.g., 'anthropic/claude-sonnet-4-6')
+    if (model.includes('/'))
+        return model;
+    // Map detected provider to OpenRouter-style prefix
+    const prefixMap = {
+        anthropic: 'anthropic',
+        openai: 'openai',
+        google: 'google',
+        deepseek: 'deepseek',
+        mistral: 'mistralai',
+        together: 'together',
+        groq: 'groq',
+    };
+    const prefix = prefixMap[detectedProvider];
+    if (prefix)
+        return `${prefix}/${model}`;
+    // Fallback: infer from model name patterns
+    if (model.startsWith('claude') || model.startsWith('claude-'))
+        return `anthropic/${model}`;
+    if (model.startsWith('gpt') || model.startsWith('o1') || model.startsWith('o3'))
+        return `openai/${model}`;
+    if (model.startsWith('gemini'))
+        return `google/${model}`;
+    return model;
+}
+/**
+ * When `defaultProvider` is set, ALL models are routed to that provider
+ * regardless of model name prefix — the model name is preserved as-is
+ * so OpenRouter receives the full `anthropic/claude-sonnet-4-6` format.
+ */
+function resolveExplicitModel(modelName, defaultProvider) {
+    if (defaultProvider) {
+        return { provider: defaultProvider, model: modelName };
+    }
     // Resolve aliases first (e.g., relayplane:auto → rp:balanced)
     const resolvedAlias = resolveModelAlias(modelName);
     // Check SMART_ALIASES (rp:best, rp:fast, etc.)
@@ -1954,7 +1993,10 @@ function resolveExplicitModel(modelName) {
     }
     return null;
 }
-function resolveConfigModel(modelName) {
+function resolveConfigModel(modelName, defaultProvider) {
+    if (defaultProvider) {
+        return { provider: defaultProvider, model: modelName };
+    }
     return resolveExplicitModel(modelName) ?? parsePreferredModel(modelName);
 }
 function extractResponseTextAuto(responseData) {
@@ -2147,18 +2189,27 @@ function resolveProviderApiKey(provider, ctx, envApiKey) {
     }
     const apiKeyEnv = exports.DEFAULT_ENDPOINTS[provider]?.apiKeyEnv ?? `${provider.toUpperCase()}_API_KEY`;
     const apiKey = process.env[apiKeyEnv];
-    if (!apiKey) {
-        return {
-            error: {
-                status: 500,
-                payload: {
-                    error: `Missing ${apiKeyEnv} environment variable`,
-                    hint: `Cross-provider routing requires API keys for each provider. Set ${apiKeyEnv} to enable ${provider} models.`,
-                },
-            },
-        };
+    if (apiKey) {
+        return { apiKey };
     }
-    return { apiKey };
+    // Auth passthrough: use incoming Authorization: Bearer token when no env key is configured.
+    // This supports defaultProvider scenarios where the caller passes the API key in the request
+    // (e.g., OpenRouter users who pass their key via Authorization header).
+    if (ctx.authHeader) {
+        const bearerMatch = ctx.authHeader.match(/^Bearer\s+(.+)$/i);
+        if (bearerMatch) {
+            return { apiKey: bearerMatch[1] };
+        }
+    }
+    return {
+        error: {
+            status: 500,
+            payload: {
+                error: `Missing ${apiKeyEnv} environment variable`,
+                hint: `Cross-provider routing requires API keys for each provider. Set ${apiKeyEnv} to enable ${provider} models.`,
+            },
+        },
+    };
 }
 function getCascadeModels(config) {
     return config.routing?.cascade?.models ?? [];
@@ -4279,6 +4330,25 @@ async function startProxy(config = {}) {
                 }
             }
         }
+        // ── defaultProvider: override provider for all non-cascade cloud routing ──
+        // When set, ALL models route to this provider regardless of model prefix.
+        // Ollama is excluded — local routing takes priority over defaultProvider.
+        if (proxyConfig.defaultProvider && !useCascade && targetProvider !== 'ollama') {
+            const originalProvider = targetProvider;
+            targetProvider = proxyConfig.defaultProvider;
+            // When routing to OpenRouter (or any aggregator), model names need provider prefixes.
+            // Complexity routing produces bare names like 'claude-sonnet-4-6' — OpenRouter needs
+            // 'anthropic/claude-sonnet-4-6'. Passthrough mode preserves the original request model.
+            if (routingMode === 'passthrough') {
+                targetModel = requestedModel;
+            }
+            else {
+                // Add provider prefix for bare model names when routing to an aggregator
+                targetModel = addProviderPrefix(targetModel, originalProvider);
+            }
+            log(`defaultProvider override: ${originalProvider} → ${targetProvider} (model: ${targetModel})`);
+        }
+        // ── End defaultProvider override ──
         if (!useCascade) {
             log(`Routing to: ${targetProvider}/${targetModel}`);
         }
@@ -4529,6 +4599,10 @@ async function startProxy(config = {}) {
             console.log(`    POST /v1/messages/count_tokens - Token counting`);
             console.log(`    GET  /v1/models            - Model list`);
             console.log(`  Models: relayplane:auto, relayplane:cost, relayplane:fast, relayplane:quality`);
+            if (proxyConfig.defaultProvider) {
+                console.log(`  Providers:`);
+                console.log(`    ✓ ${proxyConfig.defaultProvider.charAt(0).toUpperCase() + proxyConfig.defaultProvider.slice(1)} (default provider — all models route here)`);
+            }
             console.log(`  Auth: Passthrough for Anthropic, env vars for other providers`);
             console.log(`  Streaming: ✅ Enabled`);
             startWatchdog();