feat: v0.7.2 安全收口 · 断链接线 · 观测补洞 — 230 用例扩充与全量回归
P1 修复面收口: /clear 全链路根治(前端清空联动 DB messages+摘要游标+TRACE 快照, IPC 语义改"操作完成"; 流式中拒绝); web_browser open 补 SSRF 校验(Chromium 旁路关闭, 与 web_fetch/http_request 同源 validateSSRF); MCP 工具结果纳入注入扫描(mcp_* 前缀 按网络来源同级 full 模式, 收敛 resolveScanMode 单点); Trace 落库/入 store 双重瘦身 (tool_result base64/超长字段剥离, metadata 防 MB 级膨胀); 文本附件 512KB 闸门 (file.slice 首段读取+truncated 标志随消息持久化+主进程附件提示感知截断); 单实例锁(requestSingleInstanceLock + second-instance 聚焦已有窗口) P2 安全纵深: ConfirmationHook 多窗口化(确认请求/超时提示改全窗口广播, getAllWindows 空时回退 mainWindow, fail-closed 判定升级双通道); mcp_servers.headers 全链路接线(safeParseHeaders 容错解析+SSE/StreamableHTTP requestInit 注入+IPC 逐项 校验+设置页 JSON 输入, 远程 MCP 鉴权头可用) P3 断链接线: llm:listModels IPC(六家 adapter 动态模型发现首次接线, 配置完整性 前置校验); Ollama pullModel IPC+设置页下载卡片(进度/取消/能力徽标, v0.7.0 死代码 激活); 后台会话运行指示(sessionRunStates 图+Sidebar 状态点, 多会话并发可见); IR 卫生(移除 THINKING_START/END 死枚举, constraints 标注预留) P4 质量与文档: i18n 第二阶段(确认弹框/侧栏/状态栏/AgentMonitor/终止原因出层, 外观设置 zh-CN/en-US 切换, ui.locale 持久化, 渲染时求值规避异步注册); README/D1 文档对齐(http_request 风险等级/用例数/实现状态注记); 版本号 0.7.2 测试: 507 → 737 用例(+230, 11 个新文件)。覆盖补齐: context-builder/consolidator/ orchestrator/workspace.service/session-recorder/config-layering/secure-config/ network-proxy + IPC mcp/tasks/memory/app/data 域 + 渲染层 store 与流事件管线纯函数。 测试驱动修复: workspace.appendMemory 中文分区 \b 词边界失效(JS \b 不含 CJK), 固化条目恒追加文件末尾产生重复分区头 → (?=\n|$) 前瞻断言根治 回归: typecheck 双端 0 错误; ESLint 0/0; 系统 Node 687 通过 50 跳过; Electron ABI 全量 737/737 零跳过
This commit is contained in:
+95
-1
@@ -18,6 +18,7 @@ import type { MetonaMessage, MetonaStreamEvent, MetonaError } from '../harness/t
|
||||
import { MetonaErrorCode, MetonaStreamEventType } from '../harness/types';
|
||||
import { estimateMessagesTokens } from '../harness/utils/token-estimator';
|
||||
import { DeepSeekAdapter } from '../harness/adapters/deepseek.adapter';
|
||||
import { OllamaAdapter } from '../harness/adapters/ollama.adapter';
|
||||
import log from 'electron-log';
|
||||
|
||||
/** 单会话的 text_delta 节流状态 */
|
||||
@@ -439,11 +440,17 @@ export function registerAgentHandlers(ctx: IPCContext): void {
|
||||
.map((att, i) => {
|
||||
const typeLabel =
|
||||
att.type === 'image' ? 'image' : att.type === 'text' ? 'text file' : 'file';
|
||||
// v0.7.2 A5: 文本附件被上传入口截断(512KB 上限)时,明确告知 LLM 内容不完整,
|
||||
// 防止模型把残缺内容当作完整文件事实
|
||||
const truncatedNote =
|
||||
(att as { truncated?: boolean }).truncated === true
|
||||
? ' (TRUNCATED — only the first 512KB is included; the full content is NOT available)'
|
||||
: '';
|
||||
const note =
|
||||
att.type === 'image'
|
||||
? 'already provided to you via vision capability — you can SEE it directly, do NOT call view_image or any tool to read it again'
|
||||
: att.type === 'text'
|
||||
? 'content already inlined in the user message, do NOT search in workspace or read it again'
|
||||
? `content${truncatedNote} already inlined in the user message, do NOT search in workspace or read it again`
|
||||
: 'uploaded directly by user, do NOT search in workspace';
|
||||
return `${i + 1}. [${typeLabel}] ${att.name} — ${note}`;
|
||||
})
|
||||
@@ -723,6 +730,93 @@ export function registerAgentHandlers(ctx: IPCContext): void {
|
||||
}
|
||||
});
|
||||
|
||||
// ===== v0.7.2 P3-9: 动态模型列表(六家 adapter 的 listModels 首次获得 IPC 消费者)=====
|
||||
// 此前 DeepSeek/OpenAI/Ollama 均实现了实时模型发现(/models、/api/tags),
|
||||
// 但 preload/IPC 层无任何通道 —— 设置页模型输入只能靠用户手填。
|
||||
// 契约:列表基于"已保存"的 LLM 配置(与引擎实际使用的 adapter 同源);
|
||||
// 配置不完整时显式失败,绝不返回兜底 adapter 的误导性静态列表。
|
||||
ipcMain.handle('llm:listModels', async () => {
|
||||
try {
|
||||
const provider = configService.get<string>('llm.provider') ?? '';
|
||||
const model = configService.get<string>('llm.model') ?? '';
|
||||
const apiKey = configService.get<string>('llm.apiKey') || '';
|
||||
if (!provider || !model) {
|
||||
return { success: false, error: 'LLM 未配置(Provider/Model 为空),无法获取模型列表' };
|
||||
}
|
||||
if (!apiKey && provider !== 'ollama') {
|
||||
return { success: false, error: 'API Key 未配置,无法获取模型列表' };
|
||||
}
|
||||
// 列表基于当前已保存配置 —— 先幂等重载 adapter(配置签名未变时为 no-op)
|
||||
if (!ctx.reloadAdapter()) {
|
||||
return { success: false, error: 'LLM 配置校验失败,请先在设置中修正配置' };
|
||||
}
|
||||
const adapter = agentEngineManager.getAdapter();
|
||||
if (!adapter.listModels) {
|
||||
return { success: false, error: '当前 Provider 不支持模型列表查询' };
|
||||
}
|
||||
const models = await adapter.listModels();
|
||||
return { success: true, data: models };
|
||||
} catch (error) {
|
||||
log.warn('[AGENT] listModels failed:', (error as Error).message);
|
||||
return { success: false, error: (error as Error).message };
|
||||
}
|
||||
});
|
||||
|
||||
// ===== v0.7.2 P3-10: Ollama 模型下载(adapter.pullModel 首次接线 IPC/UI)=====
|
||||
// v0.6.4 P4-1 已实现 pull 的进度回调与外部取消信号,但主进程侧零消费者。
|
||||
// 契约:同一时刻仅允许一个下载任务(全局 AbortController);
|
||||
// 进度经 llm:ollamaPullProgress 广播({ model, status, completed?, total? }),
|
||||
// 结束(成功/失败/取消)统一广播 llm:ollamaPullEnded 供前端复位 UI。
|
||||
let ollamaPullController: AbortController | null = null;
|
||||
|
||||
ipcMain.handle('llm:ollamaPull', async (_event, modelName: unknown) => {
|
||||
if (typeof modelName !== 'string' || !modelName.trim()) {
|
||||
return { success: false, error: 'Invalid model name' };
|
||||
}
|
||||
// 模型名仅进入 JSON body(不经 shell),仍做字符白名单防转义边界
|
||||
// 合法形态如 qwen3:8b / llama3.1:70b-instruct-q4_K_M / user/model
|
||||
if (!/^[A-Za-z0-9._:/-]+$/.test(modelName.trim())) {
|
||||
return { success: false, error: `Invalid model name: ${modelName.slice(0, 60)}` };
|
||||
}
|
||||
const adapter = agentEngineManager.getAdapter();
|
||||
if (!(adapter instanceof OllamaAdapter)) {
|
||||
return { success: false, error: '仅 Ollama Provider 支持模型下载' };
|
||||
}
|
||||
if (ollamaPullController) {
|
||||
return { success: false, error: '已有模型下载任务进行中,请先取消' };
|
||||
}
|
||||
const controller = new AbortController();
|
||||
ollamaPullController = controller;
|
||||
const trimmed = modelName.trim();
|
||||
try {
|
||||
await adapter.pullModel(
|
||||
trimmed,
|
||||
(progress) => {
|
||||
broadcast('llm:ollamaPullProgress', { model: trimmed, ...progress });
|
||||
},
|
||||
controller.signal,
|
||||
);
|
||||
return { success: true };
|
||||
} catch (error) {
|
||||
return {
|
||||
success: false,
|
||||
error: (error as Error).message,
|
||||
aborted: controller.signal.aborted,
|
||||
};
|
||||
} finally {
|
||||
ollamaPullController = null;
|
||||
broadcast('llm:ollamaPullEnded', { model: trimmed });
|
||||
}
|
||||
});
|
||||
|
||||
ipcMain.handle('llm:ollamaPullCancel', async () => {
|
||||
if (!ollamaPullController) {
|
||||
return { success: false, error: '没有进行中的下载任务' };
|
||||
}
|
||||
ollamaPullController.abort();
|
||||
return { success: true };
|
||||
});
|
||||
|
||||
// ===== 中断会话 =====
|
||||
|
||||
ipcMain.handle('agent:abortSession', async (_event, sessionId) => {
|
||||
|
||||
Reference in New Issue
Block a user