@starlink-awaken/agentmesh 1.3.0 → 1.3.2

package/dist/src/cli.js

@@ -7,7 +7,7 @@ import { existsSync, readFileSync } from 'node:fs';
 import { resolve, dirname, join } from 'node:path';
 import { initLogger } from './core/logger.js';
 const PROJECT_ROOT = resolve(dirname(import.meta.dir), '..');
-const VERSION = '1.3.0';
+const VERSION = '1.3.2';
 const BANNER = `
    █████╗  ██████╗ ███████╗███╗   ██╗████████╗
   ██╔══██╗██╔════╝ ██╔════╝████╗  ██║╚══██╔══╝

package/dist/src/model-gateway/providers.d.ts

@@ -1,4 +1,3 @@
 import type { ChatCompletionRequest, ResolvedProvider } from './types.js';
 export declare function callChatCompletions(provider: ResolvedProvider, request: ChatCompletionRequest): Promise<Response>;
 export declare function callResponsesApi(provider: ResolvedProvider, body: Record<string, any>): Promise<Response>;
-export declare function buildStreamingResponse(upstreamResp: Response): Response;

package/dist/src/model-gateway/providers.js

@@ -1,6 +1,5 @@
 import { circuitBreakerRegistry } from './circuit-breaker.js';
 import { withRetry, isRetryable } from './retry.js';
-// 所有目标 Provider 都兼容 OpenAI API 格式，统一客户端即可
 export async function callChatCompletions(provider, request) {
     const { base_url, api_key, name: providerName } = provider;
     const { model, messages, stream, temperature, max_tokens, tools, tool_choice } = request;
@@ -19,22 +18,18 @@ export async function callChatCompletions(provider, request) {
         'Content-Type': 'application/json',
         Authorization: `Bearer ${api_key}`,
     };
-    // OpenRouter 需要额外的头部
     if (providerName === 'openrouter') {
         headers['HTTP-Referer'] = 'http://127.0.0.1:3000';
         headers['X-Title'] = 'Agent Mesh Gateway';
     }
     const url = `${base_url.replace(/\/$/, '')}/chat/completions`;
-    // 熔断器检查
     if (!circuitBreakerRegistry.canRequest(providerName)) {
         throw new Error(`Circuit breaker open for ${providerName}`);
     }
     try {
         const resp = await withRetry(providerName, async () => {
             const r = await fetch(url, {
-                method: 'POST',
-                headers,
-                body: JSON.stringify(body),
+                method: 'POST', headers, body: JSON.stringify(body),
                 signal: AbortSignal.timeout(120_000),
             });
             return r;
@@ -42,7 +37,6 @@ export async function callChatCompletions(provider, request) {
             console.warn(`[Retry] ${providerName} attempt ${attempt} after ${status} — retrying in ${delayMs}ms`);
         });
         if (!resp.ok && isRetryable(resp.status)) {
-            // Retry logic already handled in withRetry, but if we get here after max retries:
             circuitBreakerRegistry.recordFailure(providerName);
         }
         else if (resp.ok) {
@@ -58,38 +52,260 @@ export async function callChatCompletions(provider, request) {
         throw err;
     }
 }
+// ============================================================================
+// Responses API → Chat Completions 双向转换（含 tool_calls 往返）
+// ============================================================================
 export async function callResponsesApi(provider, body) {
-    // Responses API → Chat Completions 转换
-    const messages = convertResponsesInputToMessages(body.input || []);
+    const messages = convertInputToMessages(body.input || []);
     if (body.instructions) {
         messages.unshift({ role: 'system', content: body.instructions });
     }
-    return callChatCompletions(provider, {
+    // 转换 tools 定义（Codex 的 tool schema → OpenAI format）
+    const tools = convertToolSchemas(body.tools);
+    const chatResp = await callChatCompletions(provider, {
         model: body.model,
         messages,
         stream: body.stream,
-        tools: body.tools,
+        tools,
+        tool_choice: body.tool_choice,
+    });
+    // 非流式：直接转换响应
+    if (!body.stream) {
+        const ccData = (await chatResp.json());
+        return new Response(JSON.stringify(convertChatToResponses(ccData)), {
+            status: 200,
+            headers: { 'Content-Type': 'application/json' },
+        });
+    }
+    // 流式：解析 SSE → 转换 → 重新打包 SSE
+    const transformed = transformSSEStream(chatResp.body);
+    return new Response(transformed, {
+        status: 200,
+        headers: { 'Content-Type': 'text/event-stream', 'Cache-Control': 'no-cache' },
     });
 }
-function convertResponsesInputToMessages(input) {
+// ============================================================================
+// 输入转换: Responses input[] → Chat messages[]
+// ============================================================================
+function convertInputToMessages(input) {
     const messages = [];
     for (const item of input) {
-        if (item.role === 'system') {
-            messages.push({ role: 'system', content: extractTextContent(item.content) });
-        }
-        else if (item.role === 'user') {
-            messages.push({ role: 'user', content: extractTextContent(item.content) });
-        }
-        else if (item.role === 'assistant') {
-            messages.push({ role: 'assistant', content: extractTextContent(item.content) });
-        }
-        else if (item.type === 'message') {
-            const role = item.role || 'user';
-            messages.push({ role, content: extractTextContent(item.content) });
+        switch (item.type || item.role) {
+            // 标准消息类型
+            case 'message':
+                messages.push({ role: item.role || 'user', content: extractTextContent(item.content) });
+                break;
+            // Function call（Assistant 侧发起工具调用）
+            case 'function_call': {
+                messages.push({
+                    role: 'assistant',
+                    content: null,
+                    tool_calls: [{
+                            id: item.call_id,
+                            type: 'function',
+                            function: {
+                                name: item.name,
+                                arguments: typeof item.arguments === 'string' ? item.arguments : JSON.stringify(item.arguments),
+                            },
+                        }],
+                });
+                break;
+            }
+            // Function call output（Tool 返回结果）
+            case 'function_call_output':
+                messages.push({
+                    role: 'tool',
+                    tool_call_id: item.call_id,
+                    content: typeof item.output === 'string' ? item.output : JSON.stringify(item.output),
+                });
+                break;
+            // 简单角色
+            case 'system':
+                messages.push({ role: 'system', content: extractTextContent(item.content) });
+                break;
+            case 'user':
+                messages.push({ role: 'user', content: extractTextContent(item.content) });
+                break;
+            case 'assistant':
+                messages.push({ role: 'assistant', content: extractTextContent(item.content) });
+                break;
+            default:
+                // 回退: role 字段
+                if (item.role) {
+                    messages.push({ role: item.role, content: extractTextContent(item.content) });
+                }
         }
     }
     return messages;
 }
+// ============================================================================
+// 输出转换: Chat completions response → Responses API response
+// ============================================================================
+function convertChatToResponses(ccData) {
+    const choice = ccData.choices?.[0];
+    if (!choice) {
+        return { id: ccData.id, object: 'response', model: ccData.model, output: [], usage: ccData.usage };
+    }
+    const output = [];
+    // 文本回复
+    if (choice.message?.content) {
+        output.push({
+            type: 'message',
+            role: 'assistant',
+            content: [{ type: 'output_text', text: choice.message.content }],
+        });
+    }
+    // 工具调用
+    if (choice.message?.tool_calls) {
+        for (const tc of choice.message.tool_calls) {
+            output.push({
+                type: 'function_call',
+                call_id: tc.id,
+                name: tc.function?.name,
+                arguments: tc.function?.arguments,
+            });
+        }
+    }
+    // finish_reason = 'tool_calls' 表示等待 tool 结果（Codex 需要此信息）
+    const status = choice.finish_reason === 'tool_calls' ? 'requires_action' : 'completed';
+    return {
+        id: ccData.id,
+        object: 'response',
+        model: ccData.model,
+        status,
+        output,
+        usage: ccData.usage,
+    };
+}
+// ============================================================================
+// SSE 流式转换: Chat SSE → Responses SSE
+// ============================================================================
+function transformSSEStream(upstreamBody) {
+    const encoder = new TextEncoder();
+    let buffer = '';
+    let responseId = '';
+    let modelName = '';
+    let contentBuffer = '';
+    let toolCallAccum = {};
+    return new ReadableStream({
+        async start(controller) {
+            const reader = upstreamBody.getReader();
+            const decoder = new TextDecoder();
+            try {
+                while (true) {
+                    const { done, value } = await reader.read();
+                    if (done)
+                        break;
+                    buffer += decoder.decode(value, { stream: true });
+                    const lines = buffer.split('\n');
+                    buffer = lines.pop() || '';
+                    for (const line of lines) {
+                        if (!line.startsWith('data: '))
+                            continue;
+                        const data = line.slice(6).trim();
+                        if (data === '[DONE]') {
+                            // 发送最终事件
+                            const finalEvt = buildResponseEvent(responseId, modelName, contentBuffer, toolCallAccum, true);
+                            controller.enqueue(encoder.encode(finalEvt));
+                            controller.enqueue(encoder.encode('data: [DONE]\n\n'));
+                            continue;
+                        }
+                        try {
+                            const chunk = JSON.parse(data);
+                            responseId = chunk.id || responseId;
+                            modelName = chunk.model || modelName;
+                            const delta = chunk.choices?.[0]?.delta;
+                            if (!delta)
+                                continue;
+                            // 文本增量
+                            if (delta.content) {
+                                contentBuffer += delta.content;
+                                const evt = `data: ${JSON.stringify({
+                                    type: 'response.output_text.delta',
+                                    delta: delta.content,
+                                })}\n\n`;
+                                controller.enqueue(encoder.encode(evt));
+                            }
+                            // 工具调用增量
+                            if (delta.tool_calls) {
+                                for (const tc of delta.tool_calls) {
+                                    if (!toolCallAccum[tc.index]) {
+                                        toolCallAccum[tc.index] = {
+                                            id: tc.id || '',
+                                            type: 'function',
+                                            function: { name: tc.function?.name || '', arguments: '' },
+                                        };
+                                    }
+                                    if (tc.function?.arguments) {
+                                        toolCallAccum[tc.index].function.arguments += tc.function.arguments;
+                                    }
+                                    if (tc.id)
+                                        toolCallAccum[tc.index].id = tc.id;
+                                    if (tc.function?.name)
+                                        toolCallAccum[tc.index].function.name = tc.function.name;
+                                }
+                                // 发送 tool_call delta 事件
+                                const tcEvt = `data: ${JSON.stringify({
+                                    type: 'response.function_call_arguments.delta',
+                                    tool_calls: Object.values(toolCallAccum),
+                                })}\n\n`;
+                                controller.enqueue(encoder.encode(tcEvt));
+                            }
+                        }
+                        catch {
+                            // 非 JSON 行直接透传
+                            controller.enqueue(encoder.encode(line + '\n'));
+                        }
+                    }
+                }
+            }
+            catch (err) {
+                controller.error(err);
+            }
+            finally {
+                reader.releaseLock();
+                controller.close();
+            }
+        },
+    });
+}
+function buildResponseEvent(id, model, content, toolCalls, isFinal) {
+    const output = [];
+    if (content) {
+        output.push({ type: 'message', role: 'assistant', content: [{ type: 'output_text', text: content }] });
+    }
+    for (const tc of Object.values(toolCalls)) {
+        output.push({
+            type: 'function_call',
+            call_id: tc.id,
+            name: tc.function.name,
+            arguments: tc.function.arguments,
+        });
+    }
+    return `data: ${JSON.stringify({
+        type: isFinal ? 'response.completed' : 'response.output_text.delta',
+        response: isFinal ? { id, model, object: 'response', status: 'completed', output } : undefined,
+        delta: isFinal ? undefined : content,
+    })}\n\n`;
+}
+// ============================================================================
+// 工具定义转换
+// ============================================================================
+function convertToolSchemas(tools) {
+    if (!tools || !Array.isArray(tools))
+        return undefined;
+    return tools.map(t => ({
+        type: 'function',
+        function: {
+            name: t.name,
+            description: t.description,
+            parameters: t.parameters || t.input_schema,
+        },
+    }));
+}
+// ============================================================================
+// 辅助函数
+// ============================================================================
 function extractTextContent(content) {
     if (typeof content === 'string')
         return content;
@@ -101,13 +317,3 @@ function extractTextContent(content) {
     }
     return String(content || '');
 }
-export function buildStreamingResponse(upstreamResp) {
-    return new Response(upstreamResp.body, {
-        status: upstreamResp.status,
-        headers: {
-            'Content-Type': 'text/event-stream',
-            'Cache-Control': 'no-cache',
-            Connection: 'keep-alive',
-        },
-    });
-}

package/dist/src/model-gateway/router.js

@@ -1,7 +1,7 @@
 import { isProviderAvailable } from './quota.js';
 import { circuitBreakerRegistry } from './circuit-breaker.js';
-// 模型名重映射：对外模型名 → 实际 Provider 的模型名
-const MODEL_ALIASES = {
+// 模型名重映射：对外模型名 → 实际 Provider 的模型名（可从 config 覆盖）
+let modelAliases = {
     deepseek: {
         'gpt-5.3-codex': 'deepseek-v4-pro',
         'gpt-5.4': 'deepseek-v4-pro',
@@ -13,6 +13,13 @@ const MODEL_ALIASES = {
 let config;
 export function initModelRouter(cfg) {
     config = cfg;
+    // 从 config 加载模型别名（覆盖默认）
+    if (cfg.model_aliases) {
+        for (const [key, val] of Object.entries(cfg.model_aliases)) {
+            modelAliases.deepseek = modelAliases.deepseek || {};
+            modelAliases.deepseek[key] = val;
+        }
+    }
 }
 export function getConfig() {
     return config;
@@ -24,7 +31,7 @@ export function resolveProvider(model) {
     // 1. 按 model_routing 配置查找
     const routingEntries = Object.entries(config.model_routing);
     for (const [pattern, providers] of routingEntries) {
-        if (model.includes(pattern)) {
+        if (model.startsWith(pattern)) {
             for (const providerName of providers) {
                 const providerCfg = config.providers[providerName];
                 if (!providerCfg)
@@ -79,7 +86,7 @@ export function resolveProvider(model) {
     return null;
 }
 export function remapModel(model, providerName) {
-    return MODEL_ALIASES[providerName]?.[model] || model;
+    return modelAliases[providerName]?.[model] || model;
 }
 function resolveApiKey(_name, providerCfg) {
     if (providerCfg.api_key && providerCfg.api_key !== '') {

package/dist/src/model-gateway/routes.js

@@ -109,44 +109,28 @@ export async function modelGatewayRoutes(fastify) {
         const model = remapModel(originalModel, provider.name);
         body.model = model;
         console.log(`[ModelGW:Responses] ${originalModel} → ${provider.name}/${model}`);
+        const reqStart2 = Date.now();
         try {
             const upstreamResp = await callResponsesApi(provider, body);
             if (!upstreamResp.ok) {
                 const errText = await upstreamResp.text();
+                recordRequest({ timestamp: Date.now(), model: originalModel, provider: provider.name, actualModel: model, latencyMs: Date.now() - reqStart2, status: upstreamResp.status, error: errText.slice(0, 200), streaming: !!body.stream });
                 return reply.code(upstreamResp.status).send({
                     error: { message: `${provider.name}: ${errText.slice(0, 500)}` },
                 });
             }
+            recordRequest({ timestamp: Date.now(), model: originalModel, provider: provider.name, actualModel: model, latencyMs: Date.now() - reqStart2, status: 200, streaming: !!body.stream });
             if (body.stream) {
                 return reply.headers({
                     'Content-Type': 'text/event-stream',
                     'Cache-Control': 'no-cache',
                 }).send(upstreamResp.body);
             }
-            // 将 Chat Completions 响应转回 Responses API 格式
-            const ccData = (await upstreamResp.json());
-            const choice = ccData.choices?.[0];
-            const responsesData = {
-                id: ccData.id,
-                object: 'response',
-                model: ccData.model,
-                output: [
-                    {
-                        type: 'message',
-                        role: 'assistant',
-                        content: [
-                            {
-                                type: 'output_text',
-                                text: choice?.message?.content || '',
-                            },
-                        ],
-                    },
-                ],
-                usage: ccData.usage,
-            };
-            reply.send(responsesData);
+            const data = await upstreamResp.json();
+            reply.send(data);
         }
         catch (err) {
+            recordRequest({ timestamp: Date.now(), model: originalModel, provider: provider.name, actualModel: model, latencyMs: Date.now() - reqStart2, status: 502, error: err.message, streaming: !!body.stream });
             console.error(`[ModelGW:Responses] Error:`, err.message);
             reply.code(502).send({
                 error: { message: `Provider error: ${err.message}` },

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@starlink-awaken/agentmesh",
-  "version": "1.3.0",
+  "version": "1.3.2",
   "description": "Unified Agent Gateway - Multi-Agent Scheduler and Router",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",