本次升级基于完整代码审查,修复 Critical/High/Medium/Low 四级共 96 项问题, 并通过返工审计修复 10 项遗留问题,tsc 双端类型检查零错误。 Critical (10/10 完成): - C-4: command.ts 接入 shell-quote 进行 token-level 注入检测,替代原有正则匹配 可防御 r"m" -rf /、$'rm'、$(echo rm) 等字符串拼接绕过 High (11/11 完成): - 竞态保护、Promise.allSettled、AbortController 资源泄漏、IPC 参数校验等 Medium (55/55 完成): - 事务保护、敏感数据脱敏、枚举校验、MUI v9 Stack prop 迁移、 React 组件 cancelled 标志、类型收窄等 Low (20/20 完成): - 辅助方法提取(flushToolCallBuffer/scoreAndPushMemory/tryAddColumn 等) - nanoid 统一替代 Date.now()+Math.random() - confirm() 替换为 MUI Dialog、useMemo 缓存、魔法数字命名化等 返工审计修复 (10/10 完成): - L-11: LogsSettings 残留的原生 confirm()/alert() 全部替换为 MUI Dialog/Alert - M-53: MemoryViewer handleSearch 独立 ref,修复 searching 状态卡死 - M-42: 脱敏短值(length <= 4)泄露修复 - M-47: tasks:update 补全 title/description 类型校验 - L-9: ollama.adapter 非流式路径 nanoid 统一 - M-45: audit:query limit 策略与 memory:listAll 一致化 - SettingsModal handleConfirmRemove 补全 try/catch + loadServers cleanup - L-15: CommandPalette useMemo 补全 sessions 响应式依赖 - useAgentStream 事件类型补全 seq/timestamp 字段 新增依赖: shell-quote + @types/shell-quote 版本号: 0.3.0 -> 0.3.1
203 lines
7.1 KiB
TypeScript
203 lines
7.1 KiB
TypeScript
/**
|
||
* Agnes AI Provider Adapter
|
||
*
|
||
* OpenAI 兼容 API。支持 Tool Calling、Thinking 模式、多模态(图片)。
|
||
*
|
||
* 独立继承 BaseAdapter,通过 shared/openai-format 和 shared/sse-stream 复用
|
||
* OpenAI 兼容格式构建和 SSE 流式解析逻辑。不与其他 Provider Adapter 耦合。
|
||
*
|
||
* 与 DeepSeek 的差异:
|
||
* - Thinking 模式使用 chat_template_kwargs(非 thinking 字段)
|
||
* - 默认 max_tokens 更大(65536 vs 8192)
|
||
*
|
||
* @see apis/agnes-ai-api-docs-20260625.html
|
||
*/
|
||
|
||
import { BaseAdapter } from './base-adapter';
|
||
import type { MetonaRequest, MetonaResponse, MetonaStreamEvent } from '../types';
|
||
import { MetonaFinishReason } from '../types';
|
||
import type { MetonaModelInfo } from '../types/metona-adapter';
|
||
import { buildOpenAICompatibleMessages, buildOpenAICompatibleTools } from './shared/openai-format';
|
||
import { parseSSEStream, parseOpenAICompatibleResponse } from './shared/sse-stream';
|
||
import log from 'electron-log';
|
||
|
||
export class AgnesAdapter extends BaseAdapter {
|
||
// H-2 修复: provider → providerId(规范要求)
|
||
override readonly providerId: string = 'agnes';
|
||
readonly supportedModels = ['agnes-2.0-flash'];
|
||
readonly supportsToolCalling = true;
|
||
readonly supportsThinking = true;
|
||
|
||
// H-2 修复: Agnes 模型元信息(1M 上下文,65.5K 最大输出)
|
||
private static readonly MODEL_INFO: Record<string, MetonaModelInfo> = {
|
||
'agnes-2.0-flash': {
|
||
id: 'agnes-2.0-flash',
|
||
name: 'Agnes 2.0 Flash',
|
||
contextWindow: 1_000_000,
|
||
maxOutputTokens: 65_536,
|
||
supportsToolCalling: true,
|
||
supportsThinking: true,
|
||
description: 'Agnes AI 快速版,1M 上下文,支持多模态图片与思考模式',
|
||
},
|
||
};
|
||
|
||
// ===== POST /chat/completions (非流式) =====
|
||
|
||
// H-2 修复: chat → send(规范要求)
|
||
async send(request: MetonaRequest): Promise<MetonaResponse> {
|
||
const body = this.toNativeRequest(request, false);
|
||
|
||
const response = await fetch(`${this.config.baseURL}/chat/completions`, {
|
||
method: 'POST',
|
||
headers: {
|
||
'Content-Type': 'application/json',
|
||
Authorization: `Bearer ${this.config.apiKey}`,
|
||
...this.config.headers,
|
||
},
|
||
body: JSON.stringify(body),
|
||
// C-2 修复: 使用合并后的 signal(外部 abort + timeout)
|
||
signal: this.getFetchSignal(this.config.timeoutMs ?? 300_000),
|
||
});
|
||
|
||
if (!response.ok) {
|
||
const errorBody = await response.text().catch(() => '');
|
||
throw new Error(`Agnes AI API error: ${response.status} ${response.statusText} - ${errorBody}`);
|
||
}
|
||
|
||
const data = await response.json() as Record<string, unknown>;
|
||
const parsed = parseOpenAICompatibleResponse(data, request.meta.requestId, this.providerId, this.config.defaultModel);
|
||
|
||
return {
|
||
meta: {
|
||
requestId: request.meta.requestId,
|
||
provider: this.providerId,
|
||
model: (data.model as string) ?? this.config.defaultModel,
|
||
latencyMs: 0,
|
||
timestamp: Date.now(),
|
||
},
|
||
content: parsed.content,
|
||
reasoningContent: parsed.reasoningContent,
|
||
toolCalls: parsed.toolCalls,
|
||
usage: parsed.usage,
|
||
finishReason: parsed.finishReason as MetonaFinishReason,
|
||
};
|
||
}
|
||
|
||
// ===== POST /chat/completions (流式) =====
|
||
|
||
// H-2 修复: chatStream → sendStream(规范要求)
|
||
async *sendStream(request: MetonaRequest): AsyncIterable<MetonaStreamEvent> {
|
||
const body = this.toNativeRequest(request, true);
|
||
|
||
const response = await fetch(`${this.config.baseURL}/chat/completions`, {
|
||
method: 'POST',
|
||
headers: {
|
||
'Content-Type': 'application/json',
|
||
Authorization: `Bearer ${this.config.apiKey}`,
|
||
...this.config.headers,
|
||
},
|
||
body: JSON.stringify(body),
|
||
// C-2 修复: 使用合并后的 signal(外部 abort + timeout)
|
||
signal: this.getFetchSignal(this.config.timeoutMs ?? 300_000),
|
||
});
|
||
|
||
if (!response.ok || !response.body) {
|
||
throw new Error(`Agnes AI stream error: ${response.status}`);
|
||
}
|
||
|
||
yield* parseSSEStream(
|
||
response.body,
|
||
request.meta.requestId,
|
||
request.meta.sessionId,
|
||
request.meta.iteration,
|
||
);
|
||
}
|
||
|
||
/**
|
||
* H-2 修复: 获取上下文窗口大小(规范要求)
|
||
*
|
||
* Agnes 模型统一 1M 上下文窗口。
|
||
* 注意:Agnes API 未提供 /models 端点,listModels 使用基类默认实现。
|
||
*/
|
||
override getContextWindow(): number {
|
||
const modelInfo = AgnesAdapter.MODEL_INFO[this.config.defaultModel];
|
||
return modelInfo?.contextWindow ?? 1_000_000;
|
||
}
|
||
|
||
// ========== 私有方法 ==========
|
||
|
||
/**
|
||
* 构建 Agnes AI 原生请求体
|
||
*
|
||
* Agnes AI 特有参数:
|
||
* - 多模态图片:user 消息的 images[] → OpenAI content 数组 [{type:"text"}, {type:"image_url"}]
|
||
* - chat_template_kwargs: { enable_thinking: true } — 启用思考模式(非 thinking 字段)
|
||
* - 默认 max_tokens: 65536(1M 上下文,65.5K 最大输出)
|
||
*/
|
||
private toNativeRequest(request: MetonaRequest, stream: boolean): Record<string, unknown> {
|
||
const messages = buildOpenAICompatibleMessages(request);
|
||
const tools = buildOpenAICompatibleTools(request.tools);
|
||
|
||
// === Agnes 多模态:将 images 转为 OpenAI content 数组 ===
|
||
// buildOpenAICompatibleMessages 不处理图片(各 Provider 自行处理)
|
||
const nonSystemMsgs = request.messages.filter((m) => m.role !== 'system');
|
||
let imageCount = 0;
|
||
for (let i = 0; i < messages.length; i++) {
|
||
// messages[0] 是 system,非 system 消息从 messages[1] 开始
|
||
if (i === 0) continue;
|
||
const origMsg = nonSystemMsgs[i - 1];
|
||
if (!origMsg?.images?.length) continue;
|
||
|
||
imageCount += origMsg.images.length;
|
||
|
||
const contentParts: Array<Record<string, unknown>> = [];
|
||
if (origMsg.content) {
|
||
contentParts.push({ type: 'text', text: origMsg.content });
|
||
}
|
||
for (const img of origMsg.images) {
|
||
contentParts.push({
|
||
type: 'image_url',
|
||
image_url: { url: img.url },
|
||
});
|
||
}
|
||
messages[i].content = contentParts;
|
||
}
|
||
|
||
if (imageCount > 0) {
|
||
const firstUrl = request.messages.find(m => m.images?.length)?.images?.[0]?.url ?? '';
|
||
log.info(`[Agnes] Processing ${imageCount} image(s), first URL prefix: ${firstUrl.slice(0, 50)}`);
|
||
}
|
||
|
||
const body: Record<string, unknown> = {
|
||
model: this.config.defaultModel,
|
||
messages,
|
||
temperature: request.params.temperature,
|
||
max_tokens: request.params.maxTokens ?? 65536,
|
||
stream,
|
||
};
|
||
|
||
if (stream) {
|
||
body.stream_options = { include_usage: true };
|
||
}
|
||
|
||
if (tools) {
|
||
body.tools = tools;
|
||
}
|
||
|
||
// C-3 修复: Thinking 模式 — Agnes 使用 chat_template_kwargs 而非 thinking
|
||
// Agnes API 仅支持 enable_thinking: true/false,不支持 effort 级别
|
||
// thinkingEffort === 'low' 时映射为 false(不启用深度思考),其他级别映射为 true
|
||
if (request.params.thinkingEnabled) {
|
||
const effort = request.params.thinkingEffort ?? 'high';
|
||
body.chat_template_kwargs = { enable_thinking: effort !== 'low' };
|
||
}
|
||
|
||
// 停止序列
|
||
if (request.params.stopSequences?.length) {
|
||
body.stop = request.params.stopSequences;
|
||
}
|
||
|
||
return body;
|
||
}
|
||
}
|