@alilis/k-hat 0.2.4 → 0.2.5

package/dist/admin.js

@@ -4,6 +4,7 @@ import { join } from 'node:path';
 import { UiSessions, serveUi } from './web-ui.js';
 import { ACCESS_TOKEN_REF, generateAccessToken } from './vault.js';
 import { providerUrl } from './config.js';
+import { findRoute, routeUpstreamModel } from './router.js';
 // Admin API is the daemon's single-writer surface (ADR-0005). It is reachable
 // only from loopback and behind the proxy access token, so a local non-loopback
 // client or a process without the token cannot mutate config/state/vault.
@@ -76,7 +77,12 @@ function buildStatus(store) {
                 };
             })
         })),
-        routes: store.config.routes.map((route) => route.enabled === false ? { ...route, enabled: false } : { model: route.model, provider: route.provider })
+        routes: store.config.routes.map((route) => ({
+            model: route.model,
+            provider: route.provider,
+            ...(route.upstreamModel ? { upstreamModel: route.upstreamModel } : {}),
+            ...(route.enabled === false ? { enabled: false } : {})
+        }))
     };
 }
 async function route(req, res, store, sessionAuthorized = false) {
@@ -181,13 +187,18 @@ async function route(req, res, store, sessionAuthorized = false) {
             if (!provider || !key)
                 throw new Error('unknown provider or key');
             const secret = store.vault.get(key.vaultRef);
-            const model = store.config.routes.find((item) => item.provider === provider.id)?.model;
-            if (!secret || !model)
+            const requestedModel = url.searchParams.get('model');
+            const route = requestedModel
+                ? findRoute(store.config, requestedModel)
+                : store.config.routes.find((item) => item.provider === provider.id);
+            if (!secret || !route || route.provider !== provider.id)
                 throw new Error('a key and route model are required for probing');
+            const model = routeUpstreamModel(route);
             const path = provider.protocol === 'anthropic' ? '/v1/messages' : '/v1/chat/completions';
             const headers = upstreamHeaders(provider.protocol, secret, true);
             const body = provider.protocol === 'anthropic' ? { model, max_tokens: 1, messages: [{ role: 'user', content: 'ping' }] } : { model, max_tokens: 1, messages: [{ role: 'user', content: 'ping' }], stream: false };
             const response = await fetch(providerUrl(provider.baseUrl, path), { method: 'POST', headers: headers, body: JSON.stringify(body), signal: AbortSignal.timeout(30_000) });
+            await response.arrayBuffer();
             if (response.ok)
                 await store.mutate(() => enableKey(store, provider.id, key.id));
             return json(res, response.ok ? 200 : 502, { ok: response.ok, status: response.status });
@@ -198,15 +209,24 @@ async function route(req, res, store, sessionAuthorized = false) {
             const body = await readJsonBody(req);
             if (!body.model || !body.provider)
                 throw new Error('model and provider are required');
-            await store.mutate(() => addRoute(store, body.model, body.provider));
+            if (body.upstreamModel !== undefined && (typeof body.upstreamModel !== 'string' || !body.upstreamModel.trim()))
+                throw new Error('upstreamModel must be a non-empty string');
+            await store.mutate(() => addRoute(store, body.model, body.provider, body.upstreamModel));
             return json(res, 200, { ok: true });
         }
         if (sub.length === 2 && method === 'PUT') {
             const body = await readJsonBody(req);
-            if (body.provider !== undefined)
-                await store.mutate(() => updateRoute(store, decodeURIComponent(sub[1]), body.provider));
+            if (body.provider !== undefined && typeof body.provider !== 'string')
+                throw new Error('provider must be a string');
+            if (body.upstreamModel !== undefined && body.upstreamModel !== null && (typeof body.upstreamModel !== 'string' || !body.upstreamModel.trim()))
+                throw new Error('upstreamModel must be a non-empty string or null');
+            if (body.enabled !== undefined && typeof body.enabled !== 'boolean')
+                throw new Error('enabled must be a boolean');
+            const model = decodeURIComponent(sub[1]);
+            if (body.provider !== undefined || body.upstreamModel !== undefined)
+                await store.mutate(() => updateRoute(store, model, { provider: body.provider, upstreamModel: body.upstreamModel }));
             if (body.enabled !== undefined)
-                await store.mutate(() => setRouteEnabled(store, decodeURIComponent(sub[1]), body.enabled));
+                await store.mutate(() => setRouteEnabled(store, model, body.enabled));
             return json(res, 200, { ok: true });
         }
         if (sub.length === 2 && (sub[1] === 'enable' || sub[1] === 'disable') && method === 'POST') {

package/dist/cli.js

@@ -688,28 +688,38 @@ try {
         case 'route': {
             const action = positionals[0];
             if (action === 'add') {
-                const [model, providerId] = [positionals[1], positionals[2]];
+                const [model, providerId, upstreamModel] = [positionals[1], positionals[2], positionals[3]];
                 if (!model || !providerId) {
-                    console.error('usage: khat route add <model> <provider>');
+                    console.error('usage: khat route add <model> <provider> [upstream-model]');
                     process.exitCode = 1;
                     break;
                 }
-                await adminRequest('/_keys/routes', { method: 'POST', body: JSON.stringify({ model, provider: providerId }) });
-                console.log(`route added: ${model} -> ${providerId}`);
+                await adminRequest('/_keys/routes', { method: 'POST', body: JSON.stringify({ model, provider: providerId, ...(upstreamModel ? { upstreamModel } : {}) }) });
+                console.log(`route added: ${model}${upstreamModel ? ` -> ${upstreamModel}` : ''} -> ${providerId}`);
             }
             else if (action === 'list') {
                 const store = await openInitializedStore();
                 if (!store.config.routes.length)
                     console.log('(no routes)');
                 for (const route of store.config.routes)
-                    console.log(`${route.model} -> ${route.provider}`);
+                    console.log(`${route.model}${route.upstreamModel ? ` -> ${route.upstreamModel}` : ''} -> ${route.provider}`);
             }
             else if (action === 'update') {
-                const [model, providerId] = [positionals[1], positionals[2]];
-                if (!model || !providerId)
-                    throw new Error('usage: khat route update <model> <provider>');
-                await adminRequest(`/_keys/routes/${encodeURIComponent(model)}`, { method: 'PUT', body: JSON.stringify({ provider: providerId }) });
-                console.log(`route updated: ${model} -> ${providerId}`);
+                const [model, providerId, upstreamModel] = [positionals[1], positionals[2], positionals[3]];
+                const clearUpstream = flags['clear-upstream'] === true;
+                if (!model)
+                    throw new Error('usage: khat route update <model> [provider] [upstream-model] [--clear-upstream]');
+                if (!providerId && !clearUpstream)
+                    throw new Error('usage: khat route update <model> [provider] [upstream-model] [--clear-upstream]');
+                const body = {};
+                if (providerId)
+                    body.provider = providerId;
+                if (clearUpstream)
+                    body.upstreamModel = null;
+                else if (upstreamModel)
+                    body.upstreamModel = upstreamModel;
+                await adminRequest(`/_keys/routes/${encodeURIComponent(model)}`, { method: 'PUT', body: JSON.stringify(body) });
+                console.log(`route updated: ${model}${clearUpstream ? '' : (upstreamModel ? ` -> ${upstreamModel}` : '')} -> ${providerId ?? '(unchanged)'}`);
             }
             else if (action === 'remove') {
                 const model = positionals[1];

package/dist/config.js

@@ -78,6 +78,8 @@ export function validateConfig(config) {
     for (const route of config.routes) {
         if (!route.model || !route.provider)
             throw new Error('Invalid route: model and provider are required');
+        if (route.upstreamModel !== undefined && (typeof route.upstreamModel !== 'string' || !route.upstreamModel.trim()))
+            throw new Error(`Invalid route ${route.model}: upstreamModel must be a non-empty string`);
         if (route.enabled !== undefined && typeof route.enabled !== 'boolean')
             throw new Error(`Invalid route ${route.model}: enabled must be boolean`);
         if (!config.providers.some((item) => item.id === route.provider))

package/dist/router.js

@@ -1,11 +1,15 @@
 export function findRoute(config, model) {
+    // Exact model ids take precedence over provider/model shorthand.
+    const exact = config.routes.find((route) => route.model === model);
+    if (exact)
+        return exact;
     const slash = model.indexOf('/');
     if (slash > 0) {
         const providerId = model.slice(0, slash);
         const routeModel = model.slice(slash + 1);
         return config.routes.find((route) => route.provider === providerId && route.model === routeModel);
     }
-    return config.routes.find((route) => route.model === model);
+    return undefined;
 }
 export function resolveProvider(config, model) {
     const route = findRoute(config, model);
@@ -13,6 +17,9 @@ export function resolveProvider(config, model) {
         return undefined;
     return config.providers.find((item) => item.id === route.provider);
 }
+export function routeUpstreamModel(route) {
+    return route.upstreamModel ?? route.model;
+}
 export function isRouteDisabled(config, model) {
     return findRoute(config, model)?.enabled === false;
 }

package/dist/server.js

@@ -3,7 +3,7 @@ import { watch } from 'node:fs';
 import { readJsonFile, saveJsonAtomic, validateConfig, providerUrl, defaultTimeouts } from './config.js';
 import { LogWriter } from './logger.js';
 import { join, basename } from 'node:path';
-import { resolveProvider, isRouteDisabled } from './router.js';
+import { findRoute, routeUpstreamModel, resolveProvider, isRouteDisabled } from './router.js';
 import { WeightedSelector } from './selector.js';
 import { handleAdmin } from './admin.js';
 import { ACCESS_TOKEN_REF } from './vault.js';
@@ -101,6 +101,7 @@ export function createKhatServer(options) {
             }
             if (!parsed.model || typeof parsed.model !== 'string')
                 return json(res, 400, { error: { message: 'model is required' } });
+            const route = findRoute(options.config, parsed.model);
             const provider = resolveProvider(options.config, parsed.model);
             if (!provider) {
                 if (isRouteDisabled(options.config, parsed.model))
@@ -109,6 +110,7 @@ export function createKhatServer(options) {
             }
             if (provider.protocol !== protocol)
                 return json(res, 400, { error: { message: `Model ${parsed.model} resolves to a ${provider.protocol} provider, but ${req.url} speaks ${protocol}` } });
+            const upstreamBody = JSON.stringify({ ...parsed, model: routeUpstreamModel(route) });
             const tried = new Set();
             while (true) {
                 const key = selector.select(provider.id, provider.keys.filter((item) => !tried.has(item.id)), states);
@@ -124,7 +126,7 @@ export function createKhatServer(options) {
                 const headerTimer = setTimeout(() => upstreamAbort(abort, 'upstream response header timeout'), timeouts().headerMs);
                 let upstream;
                 try {
-                    upstream = await fetch(providerUrl(provider.baseUrl, req.url), { method: 'POST', headers: upstreamHeaders(protocol, secret, req.headers.accept), body: new Uint8Array(body), signal: abort.signal });
+                    upstream = await fetch(providerUrl(provider.baseUrl, req.url), { method: 'POST', headers: upstreamHeaders(protocol, secret, req.headers.accept), body: upstreamBody, signal: abort.signal });
                 }
                 catch (error) {
                     if (error?.upstreamTimeout)

package/dist/store.js

@@ -227,12 +227,17 @@ export async function enableKey(store, providerId, keyId) {
     delete store.states[`${providerId}/${keyId}`];
     await store.saveState();
 }
-export async function addRoute(store, model, providerId) {
+function normalizeUpstreamModel(upstreamModel) {
+    const normalized = upstreamModel?.trim();
+    return normalized || undefined;
+}
+export async function addRoute(store, model, providerId, upstreamModel) {
     findProvider(store, providerId);
     const existing = store.config.routes.find((route) => route.model === model);
     if (existing)
         throw new Error(`route already exists: ${model} -> ${existing.provider}`);
-    store.config.routes.push({ model, provider: providerId });
+    const normalizedUpstreamModel = normalizeUpstreamModel(upstreamModel);
+    store.config.routes.push({ model, provider: providerId, ...(normalizedUpstreamModel && normalizedUpstreamModel !== model ? { upstreamModel: normalizedUpstreamModel } : {}) });
     try {
         await persistConfig(store);
     }
@@ -241,18 +246,31 @@ export async function addRoute(store, model, providerId) {
         throw error;
     }
 }
-export async function updateRoute(store, model, providerId) {
-    findProvider(store, providerId);
+export async function updateRoute(store, model, input) {
+    if (input.provider !== undefined)
+        findProvider(store, input.provider);
     const route = store.config.routes.find((item) => item.model === model);
     if (!route)
         throw new Error(`unknown route: ${model}`);
-    const previous = route.provider;
-    route.provider = providerId;
+    const previous = { provider: route.provider, upstreamModel: route.upstreamModel };
+    if (input.provider !== undefined)
+        route.provider = input.provider;
+    if (input.upstreamModel !== undefined) {
+        const normalizedUpstreamModel = normalizeUpstreamModel(input.upstreamModel);
+        if (normalizedUpstreamModel && normalizedUpstreamModel !== route.model)
+            route.upstreamModel = normalizedUpstreamModel;
+        else
+            delete route.upstreamModel;
+    }
     try {
         await persistConfig(store);
     }
     catch (error) {
-        route.provider = previous;
+        route.provider = previous.provider;
+        if (previous.upstreamModel === undefined)
+            delete route.upstreamModel;
+        else
+            route.upstreamModel = previous.upstreamModel;
         throw error;
     }
 }

package/dist/tui-client.js

@@ -60,11 +60,11 @@ export class AdminClient {
     async probeKey(providerId, keyId) {
         return this.request(`/_keys/providers/${encodeURIComponent(providerId)}/keys/${encodeURIComponent(keyId)}/probe`, { method: 'POST' });
     }
-    async createRoute(model, provider) {
-        await this.request('/_keys/routes', { method: 'POST', body: { model, provider } });
+    async createRoute(model, provider, upstreamModel) {
+        await this.request('/_keys/routes', { method: 'POST', body: { model, provider, ...(upstreamModel ? { upstreamModel } : {}) } });
     }
-    async updateRoute(model, provider) {
-        await this.request(`/_keys/routes/${encodeURIComponent(model)}`, { method: 'PUT', body: { provider } });
+    async updateRoute(model, provider, upstreamModel) {
+        await this.request(`/_keys/routes/${encodeURIComponent(model)}`, { method: 'PUT', body: { ...(provider ? { provider } : {}), ...(upstreamModel !== undefined ? { upstreamModel } : {}) } });
     }
     async enableRoute(model) { await this.request(`/_keys/routes/enable?model=${encodeURIComponent(model)}`, { method: 'POST' }); }
     async disableRoute(model) { await this.request(`/_keys/routes/disable?model=${encodeURIComponent(model)}`, { method: 'POST' }); }

package/dist/tui.js

@@ -47,7 +47,7 @@ function RoutesBody({ status, cursor, height }) {
     return _jsx(Box, { flexDirection: "column", children: routes.length === 0 ? _jsx(Text, { dimColor: true, children: "\u6682\u65E0\u8DEF\u7531 \u00B7 \u7528 khat route add \u6DFB\u52A0" }) : _jsxs(_Fragment, { children: [view.above > 0 && _jsx(Edge, { text: `  ↑ ${view.above} more` }), view.items.map((index) => {
                     const route = routes[index];
                     const selected = index === cursor;
-                    return (_jsx(Text, { color: selected ? 'yellow' : undefined, children: `${selected ? '›' : ' '} ${cell(route.model, 32)}→ ${route.provider}` }, route.model));
+                    return (_jsx(Text, { color: selected ? 'yellow' : undefined, children: `${selected ? '›' : ' '} ${cell(route.model, 32)}${route.upstreamModel ? ` → ${route.upstreamModel}` : ''} → ${route.provider}` }, route.model));
                 }), view.below > 0 && _jsx(Edge, { text: `  ↓ ${view.below} more` })] }) });
 }
 function LogsBody({ logs, filter, cursor, detailOpen, height }) {

package/dist/web-ui.js

@@ -139,7 +139,7 @@ tbody tr:hover td{background:var(--surface-2)}
 <section class="card">
 <div class="card-head"><div><h2 class="card-title" data-i18n="cardRoutes">Routes</h2><p class="card-sub" data-i18n="cardRoutesSub">模型到 Provider 的转发映射规则。</p></div></div>
 <form id="routeForm" class="toolbar" autocomplete="off"><select name="provider" required></select><div class="ms" id="routeModelsMs"><button type="button" class="ms-toggle ms-empty" aria-haspopup="listbox" aria-expanded="false">请先获取模型</button><div class="ms-panel" hidden><input class="ms-search" type="search" placeholder="搜索 model…" data-i18n-ph="msPlaceholder" autocomplete="off"><label class="ms-all"><input type="checkbox" class="ms-all-cb"><span data-i18n="msSelectAll">全选</span></label><div class="ms-list" role="listbox"></div></div></div><button type="button" id="routeModels" class="btn btn-secondary" data-i18n="btnLoadModels">获取模型</button><button class="btn btn-primary" data-i18n="btnAddRoute">批量添加 Route</button></form>
-<div class="table-wrap"><table><thead><tr><th data-i18n="thModel">Model</th><th data-i18n="thProvider">Provider</th><th data-i18n="thStatus">Status</th><th></th></tr></thead><tbody id="routes"></tbody></table></div>
+<div class="table-wrap"><table><thead><tr><th data-i18n="thModel">Model</th><th>Upstream Model</th><th data-i18n="thProvider">Provider</th><th data-i18n="thStatus">Status</th><th></th></tr></thead><tbody id="routes"></tbody></table></div>
 </section>
 <section class="card">
 <div class="card-head"><div><h2 class="card-title" data-i18n="cardTraffic">请求成功 / 失败趋势</h2><p class="card-sub" data-i18n="cardTrafficSub">将最近拉取的日志按时间分桶聚合（最多 30 桶），悬停柱体可查看详情。</p></div><span class="legend"><span><i class="swatch ok"></i><span data-i18n="legendOk">成功</span></span><span><i class="swatch bad"></i><span data-i18n="legendFail">失败</span></span></span></div>
@@ -232,10 +232,10 @@ function renderProviders(){
 function renderRoutes(){
  const tb=$('#routes');tb.replaceChildren();
  const rs=state.status?state.status.routes:[];
- if(!rs.length){const er=document.createElement('tr');er.className='empty-row';const ed=document.createElement('td');ed.colSpan=4;ed.textContent=t('noRoutes');er.append(ed);tb.append(er);return}
- for(const rt of rs){
-  const tr=document.createElement('tr');
-  tr.append(cell(rt.model,'mono-cell'),cell(rt.provider),statusCell(rt.enabled!==false,rt.enabled!==false?t('avail'):t('unavail')));
+  if(!rs.length){const er=document.createElement('tr');er.className='empty-row';const ed=document.createElement('td');ed.colSpan=5;ed.textContent=t('noRoutes');er.append(ed);tb.append(er);return}
+  for(const rt of rs){
+   const tr=document.createElement('tr');
+   tr.append(cell(rt.model,'mono-cell'),cell(rt.upstreamModel||rt.model,'mono-cell'),cell(rt.provider),statusCell(rt.enabled!==false,rt.enabled!==false?t('avail'):t('unavail')));
   const d=document.createElement('td');
   const toggle=rt.enabled!==false?'disable':'enable';
   d.append(btn(rt.enabled!==false?t('btnDisable'):t('btnRecover'),'btn btn-secondary btn-sm',run(async()=>{await api('/_keys/routes/'+toggle+'?model='+encodeURIComponent(rt.model),{method:'POST'});toast(t('saved'),'ok');load()})));

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@alilis/k-hat",
-  "version": "0.2.4",
+  "version": "0.2.5",
   "publishConfig": {
     "access": "public"
   },