feat: v0.4.0 四阶段迭代 — 安全加固 + 工程基线 + 架构重构 + 双 Provider 扩展
P0 安全修复: - API Key 加密存储(safeStorage 密钥链,版本化前缀,历史明文平滑兼容) - 间接提示注入防护(SecurityScanHook 工具结果深扫描,网络工具脱敏/本地工具警示分级) - error:report IPC 断链修复(渲染进程错误上报落 electron-log + 审计) - abort 信号贯通工具层(run_command/dev-tools 子进程随会话中断终止) - run_command 沙箱加固(cd 系统目录/敏感文件读取拦截 + chcp 前缀剥离防解析退化) - .env 真实生效(dotenv 回退加载,应用内配置优先) P1 工程基础: - ESLint 9 flat config + 全部 34 条存量 warnings 清零(零容忍基线) - 测试基线 118 用例 11 文件(token/文件防护/权限/沙箱/注入/命令/引擎/注册表/审计链/摘要分层) - test:electron 双模式(ELECTRON_RUN_AS_NODE 跑 Electron ABI,SQLite 套件全执行) - SessionRecorder 多会话隔离 + 9 种 TRACE 事件补全(含最终轮 iteration_end) - Provider 故障转移(重试耗尽/不可重试一次性切换 fallback + 前端通知) - MCP 真就绪(等待全部连接完成再广播 tools:ready) - SLO/HealthChecker 真实接入(60s 巡检 + 托盘状态) - CONFIG_DEFAULTS 单一来源(消除 SEED 双源漂移) P2 架构升级: - handlers.ts 1940 行拆分为 13 个 IPC 域模块(防重入注册 + 多窗口广播) - AgentEngineManager 每会话独立引擎(LRU 30 + adapter 工厂隔离 abort 信号) - TaskOrchestrator EngineProvider 改造 + abortByParent 联动中断 SubAgent - 会话摘要分层上下文(session_summaries 滚动摘要 + 截断游标清理防因果污染) - 消息编辑重发/重新生成(truncateAfter IPC + store 动作 + UI) - Markdown 导出 / WebSearch 并行抓取(并发 3)/ 记忆 TF 缓存 / 版本构建期注入 P3 能力扩展: - OpenAI Adapter(o 系列推理模型 reasoning_effort/max_completion_tokens) - Anthropic Adapter(原生 Messages API:tool_use 块/角色合并/thinking budget/图片 base64/SSE 事件机) - 设置页/Onboarding 六 Provider 全链路接入
This commit is contained in:
@@ -0,0 +1,117 @@
|
||||
/**
|
||||
* AuditService 单元测试(P1-14 测试基线)
|
||||
* 覆盖:链式哈希生成与验证、篡改检测
|
||||
*
|
||||
* 注意:better-sqlite3 为原生模块——若本机安装的构建与系统 Node ABI 不匹配,
|
||||
* 测试自动跳过(skipIf),避免误报失败。
|
||||
*/
|
||||
|
||||
import { describe, it, expect, beforeAll, afterAll } from 'vitest';
|
||||
import { mkdtempSync, rmSync } from 'fs';
|
||||
import { tmpdir } from 'os';
|
||||
import { join } from 'path';
|
||||
import log from 'electron-log';
|
||||
|
||||
// better-sqlite3 加载失败时(ABI 不匹配)自动跳过整个套件
|
||||
// 注意:require 成功不代表原生绑定可用(Electron ABI vs 系统 Node ABI),
|
||||
// 需实际构造一次内存库验证
|
||||
let dbAvailable = true;
|
||||
let Database: typeof import('better-sqlite3');
|
||||
try {
|
||||
// eslint-disable-next-line @typescript-eslint/no-require-imports
|
||||
Database = require('better-sqlite3');
|
||||
const probe = new Database(':memory:');
|
||||
probe.close();
|
||||
} catch {
|
||||
dbAvailable = false;
|
||||
}
|
||||
|
||||
// electron-log 在纯 Node 环境静默(false = 禁用该 transport)
|
||||
log.transports.console.level = false;
|
||||
log.transports.file.level = false;
|
||||
|
||||
describe.skipIf(!dbAvailable)('AuditService 链式哈希', () => {
|
||||
let dir: string;
|
||||
// eslint-disable 是失效指令(测试文件 overrides 已关闭 no-explicit-any),已移除
|
||||
let db: any;
|
||||
let service: any;
|
||||
|
||||
beforeAll(async () => {
|
||||
const { AuditService } = await import('../../services/audit.service');
|
||||
dir = mkdtempSync(join(tmpdir(), 'metona-audit-'));
|
||||
// 手动建库(绕过 DatabaseService 的 electron 依赖)
|
||||
db = new Database(join(dir, 'test.db'));
|
||||
db.exec(`
|
||||
CREATE TABLE IF NOT EXISTS audit_logs (
|
||||
id INTEGER PRIMARY KEY AUTOINCREMENT,
|
||||
session_id TEXT,
|
||||
iteration INTEGER,
|
||||
event_type TEXT NOT NULL,
|
||||
actor TEXT NOT NULL DEFAULT 'system',
|
||||
target TEXT NOT NULL,
|
||||
details TEXT,
|
||||
outcome TEXT,
|
||||
duration_ms INTEGER,
|
||||
created_at INTEGER NOT NULL DEFAULT (unixepoch() * 1000),
|
||||
prev_hash TEXT,
|
||||
current_hash TEXT
|
||||
);
|
||||
CREATE TRIGGER IF NOT EXISTS audit_no_delete BEFORE DELETE ON audit_logs
|
||||
BEGIN
|
||||
SELECT RAISE(ABORT, 'Audit logs are INSERT-ONLY.');
|
||||
END;
|
||||
`);
|
||||
service = new AuditService(() => db);
|
||||
});
|
||||
|
||||
afterAll(() => {
|
||||
try { db?.close(); } catch { /* ignore */ }
|
||||
rmSync(dir, { recursive: true, force: true });
|
||||
});
|
||||
|
||||
it('写入审计日志并生成链式哈希', () => {
|
||||
service.log({
|
||||
sessionId: 's1',
|
||||
eventType: 'tool_call',
|
||||
actor: 'agent',
|
||||
target: 'read_file',
|
||||
details: { file: 'a.ts' },
|
||||
outcome: 'success',
|
||||
});
|
||||
const rows = db.prepare('SELECT * FROM audit_logs').all();
|
||||
expect(rows.length).toBe(1);
|
||||
expect(rows[0].current_hash).toBeTruthy();
|
||||
// 首条 prev_hash 为 64 个 0 的创世哨兵(getLastHash 空表回退值)
|
||||
expect(rows[0].prev_hash).toBe('0'.repeat(64));
|
||||
});
|
||||
|
||||
it('第二条记录的 prev_hash 链接前一条', () => {
|
||||
service.log({
|
||||
sessionId: 's1',
|
||||
eventType: 'tool_call',
|
||||
actor: 'agent',
|
||||
target: 'write_file',
|
||||
details: { file: 'b.ts' },
|
||||
outcome: 'success',
|
||||
});
|
||||
const rows = db.prepare('SELECT * FROM audit_logs ORDER BY id').all();
|
||||
expect(rows.length).toBe(2);
|
||||
expect(rows[1].prev_hash).toBe(rows[0].current_hash);
|
||||
});
|
||||
|
||||
it('verifyChain 对完整链返回 valid', () => {
|
||||
const result = service.verifyChain();
|
||||
expect(result.valid).toBe(true);
|
||||
expect(result.totalRecords).toBe(2);
|
||||
});
|
||||
|
||||
it('篡改记录后 verifyChain 检测到 tampered', () => {
|
||||
// 需要先 drop 触发器才能 UPDATE(INSERT-ONLY 约束)
|
||||
db.exec('DROP TRIGGER audit_no_delete');
|
||||
db.prepare('UPDATE audit_logs SET details = ? WHERE id = 1').run('{"tampered": true}');
|
||||
db.exec(`CREATE TRIGGER audit_no_delete BEFORE DELETE ON audit_logs
|
||||
BEGIN SELECT RAISE(ABORT, 'Audit logs are INSERT-ONLY.'); END`);
|
||||
const result = service.verifyChain();
|
||||
expect(result.valid).toBe(false);
|
||||
});
|
||||
});
|
||||
@@ -0,0 +1,162 @@
|
||||
/**
|
||||
* SessionSummaryService + truncateMessagesAfter 交互回归测试
|
||||
*
|
||||
* 覆盖全量复检 #1 修复:消息截断必须同步清理 session_summaries 摘要游标,
|
||||
* 否则 (1) afterRowid 过滤返回空 tail 导致截断点前原文永不加载;
|
||||
* (2) 摘要包含被撤销的"未来"内容(因果污染)。
|
||||
*
|
||||
* 运行要求:better-sqlite3 为 Electron ABI 构建,需 test:electron 模式
|
||||
* (cross-env ELECTRON_RUN_AS_NODE=1 electron ...)执行;系统 Node 下自动跳过。
|
||||
*/
|
||||
|
||||
import { describe, it, expect, beforeAll, afterAll, vi } from 'vitest';
|
||||
|
||||
vi.mock('electron-log', () => ({
|
||||
default: { info: vi.fn(), warn: vi.fn(), error: vi.fn(), debug: vi.fn() },
|
||||
}));
|
||||
|
||||
import { mkdtempSync, rmSync } from 'fs';
|
||||
import { tmpdir } from 'os';
|
||||
import { join } from 'path';
|
||||
|
||||
let dbAvailable = true;
|
||||
let Database: typeof import('better-sqlite3');
|
||||
try {
|
||||
// eslint-disable-next-line @typescript-eslint/no-require-imports
|
||||
Database = require('better-sqlite3');
|
||||
const probe = new Database(':memory:');
|
||||
probe.close();
|
||||
} catch {
|
||||
dbAvailable = false;
|
||||
}
|
||||
|
||||
describe.skipIf(!dbAvailable)('SessionSummary 分层上下文 × 截断交互', () => {
|
||||
let db: any;
|
||||
let dir: string;
|
||||
let sessionService: any;
|
||||
let summaryService: any;
|
||||
|
||||
const insertMessage = (sessionId: string, id: string, role: string, content: string): void => {
|
||||
db.prepare(
|
||||
`INSERT INTO messages (id, session_id, role, content, created_at) VALUES (?, ?, ?, ?, ?)`,
|
||||
).run(id, sessionId, role, content, Date.now());
|
||||
};
|
||||
|
||||
beforeAll(async () => {
|
||||
const { SessionService } = await import('../session.service');
|
||||
const { SessionSummaryService } = await import('../session-summary.service');
|
||||
dir = mkdtempSync(join(tmpdir(), 'metona-summary-'));
|
||||
db = new Database(':memory:');
|
||||
db.exec(`
|
||||
CREATE TABLE sessions (
|
||||
id TEXT PRIMARY KEY,
|
||||
title TEXT DEFAULT '新会话',
|
||||
created_at INTEGER NOT NULL,
|
||||
updated_at INTEGER NOT NULL,
|
||||
message_count INTEGER DEFAULT 0,
|
||||
pinned INTEGER DEFAULT 0,
|
||||
archived INTEGER DEFAULT 0,
|
||||
metadata TEXT DEFAULT '{}'
|
||||
);
|
||||
CREATE TABLE messages (
|
||||
id TEXT PRIMARY KEY,
|
||||
session_id TEXT NOT NULL,
|
||||
role TEXT NOT NULL,
|
||||
content TEXT,
|
||||
reasoning_content TEXT,
|
||||
tool_calls TEXT,
|
||||
tool_result TEXT,
|
||||
attachments TEXT,
|
||||
iteration INTEGER,
|
||||
created_at INTEGER NOT NULL
|
||||
);
|
||||
CREATE TABLE session_summaries (
|
||||
session_id TEXT PRIMARY KEY,
|
||||
summary TEXT NOT NULL,
|
||||
summarized_until_rowid INTEGER NOT NULL,
|
||||
updated_at INTEGER NOT NULL DEFAULT (unixepoch() * 1000)
|
||||
);
|
||||
`);
|
||||
db.prepare(
|
||||
'INSERT INTO sessions (id, created_at, updated_at, message_count) VALUES (?, ?, ?, ?)',
|
||||
).run('s_test', Date.now(), Date.now(), 0);
|
||||
|
||||
sessionService = new SessionService(() => db);
|
||||
summaryService = new SessionSummaryService(
|
||||
() => db,
|
||||
sessionService,
|
||||
// buildHistoryMessages 不触 adapter(仅 maybeSummarize 用),占位即可
|
||||
() => null as unknown as Parameters<typeof Object>[0],
|
||||
);
|
||||
});
|
||||
|
||||
afterAll(() => {
|
||||
try { db?.close(); } catch { /* ignore */ }
|
||||
rmSync(dir, { recursive: true, force: true });
|
||||
});
|
||||
|
||||
it('分层加载:摘要存在时返回 [摘要消息, 游标之后的原文]', () => {
|
||||
// 5 条消息,摘要覆盖到第 3 条(rowid 3)
|
||||
for (let i = 1; i <= 5; i++) {
|
||||
insertMessage('s_test', `m${i}`, i % 2 === 1 ? 'user' : 'assistant', `消息 ${i}`);
|
||||
}
|
||||
summaryService.saveSummary('s_test', '早期对话的滚动摘要', 3);
|
||||
|
||||
const history = summaryService.buildHistoryMessages('s_test');
|
||||
// 1 条摘要 + rowid 4、5 两条原文
|
||||
expect(history.length).toBe(3);
|
||||
expect((history[0].content as string).startsWith('[Context Summary]')).toBe(true);
|
||||
expect(history[1].content).toBe('消息 4');
|
||||
expect(history[2].content).toBe('消息 5');
|
||||
});
|
||||
|
||||
it('其他会话的摘要不影响本会话(游标按 session_id 隔离)', () => {
|
||||
// s_other 的摘要不应影响 s_test 的分层加载结果
|
||||
summaryService.saveSummary('s_other', 'x', 0);
|
||||
const history = summaryService.buildHistoryMessages('s_test');
|
||||
// s_test 摘要(游标 3)仍生效:摘要 + rowid 4、5
|
||||
expect(history.length).toBe(3);
|
||||
});
|
||||
|
||||
it('截断清理摘要(缺陷 #1 回归):游标落在删除范围内时摘要被删', () => {
|
||||
// 编辑重发第 2 条消息(rowid 2,inclusive)→ 删除 rowid>=2 的 4 条
|
||||
// 摘要游标为 3,落在 [2, ∞) 内 → 摘要必须被清理
|
||||
const truncated = sessionService.truncateMessagesAfter('s_test', 'm2', true);
|
||||
expect(truncated).toBe(true);
|
||||
|
||||
// 摘要已删除
|
||||
expect(summaryService.getSummary('s_test')).toBeNull();
|
||||
// 只剩 rowid 1 的消息
|
||||
const remaining = sessionService.getMessages('s_test');
|
||||
expect(remaining.length).toBe(1);
|
||||
expect(remaining[0].content).toBe('消息 1');
|
||||
// 分层加载退化为全量原文(无摘要注入)
|
||||
const history = summaryService.buildHistoryMessages('s_test');
|
||||
expect(history.length).toBe(1);
|
||||
expect(history[0].content).toBe('消息 1');
|
||||
});
|
||||
|
||||
it('inclusive=false:游标等于锚点时摘要保留(语义仍一致)', () => {
|
||||
// 重建场景:rowid 1(消息1)+ 新插入 3 条 → rowid 2-4;摘要游标 = 2
|
||||
insertMessage('s_test', 'm2b', 'user', '消息 2b');
|
||||
insertMessage('s_test', 'm3b', 'assistant', '消息 3b');
|
||||
insertMessage('s_test', 'm4b', 'user', '消息 4b');
|
||||
summaryService.saveSummary('s_test', '摘要到 rowid2', 2);
|
||||
|
||||
// 截断 rowid > 3(保留锚点 3):游标 2 < 3+1 → 摘要保留
|
||||
const truncated = sessionService.truncateMessagesAfter('s_test', 'm3b', false);
|
||||
expect(truncated).toBe(true);
|
||||
expect(summaryService.getSummary('s_test')).not.toBeNull();
|
||||
|
||||
// 分层加载:摘要 + rowid 3 原文(rowid 4 已删)
|
||||
const history = summaryService.buildHistoryMessages('s_test');
|
||||
expect(history.length).toBe(2);
|
||||
expect(history[1].content).toBe('消息 3b');
|
||||
});
|
||||
|
||||
it('锚点消息不存在时返回 false 且不产生副作用', () => {
|
||||
const before = sessionService.getMessages('s_test').length;
|
||||
expect(sessionService.truncateMessagesAfter('s_test', 'not_exist', true)).toBe(false);
|
||||
expect(sessionService.getMessages('s_test').length).toBe(before);
|
||||
});
|
||||
});
|
||||
Reference in New Issue
Block a user