feat: v0.8.0 流语义补全 · 会话可靠 · 恢复力 — finish_reason 全链路贯通根治"思考中停止" · 2445 用例全量回归
P0 会话可靠性收口(根治"模型思考着会话就停止"): - P0-1 finish_reason 全链路贯通:DONE 事件与 IterationStep 新增 finishReason,OpenAI 共享 SSE / Anthropic message_delta.stop_reason / Ollama done_reason 三路采集,TRACE 层弃用硬编码 'stop' 记录真值 - P0-2 空响应守卫 + 降级重试:零产出流→可重试错误走退避;思考耗尽输出预算(reasoning-only + length)→自动关闭思考降级重试一次;仍失败→OUTPUT_LENGTH_EXCEEDED 结构化错误 + 故障转移;附带根治 abort 恰逢零工具调用轮被 COMPLETED 抢占的真实缺陷 - P0-3 思考×能力×预算三对齐:DeepSeek/MiMo/Agnes/Ollama 四家 supportsThinking=false 强制不发思考参数;小输出预算告警;设置页联动提示 - P0-4 渲染层可见性:截断/空完成/友好错误三类提示,i18n 全部出层 - P0-5 回归四件套:reasoning-only 终止判定、集成级空闲超时、504 引擎重试归类、思考中 abort→USER_INTERRUPT、P4-2 强制收尾路径 FEAT-1:LLM 设置新增「最大输出上限」——Provider 支持矩阵显隐 + 模型上限钳制提示 + 超限保存警告 + llm.maxTokens 热生效 P1 修复面收口: - 渲染层三缺陷根治:后台会话回放缓冲(2000 条/4MB 有界 + agent:getReplayState + 事件总线)+ abort 双层自愈 + sendMessage 收尾兜底 + 中断卡片清扫 - 工具 abort 信号全覆盖:web_search/web_fetch/http_request/code_search/git 系列/delegate_task 全部接入引擎中断;web_search 时间预算收敛(720s→≤240s);移除伪造 ToolExecutionContext 与死代码 - 安全:本地 Pinned CONNECT 代理根治浏览器通道 DNS rebinding(校验期 IP pinning,可注入 resolver 表测);配置 URL 域名解析深校验(DeepCheckSoftFailure 软失败);SSE 空 error 帧防御修复;Ollama generate/embed AbortSignal.any 合并 - 缺陷清单:UTF-16 BOM 读取、tmp 同毫秒碰撞(nanoid 后缀)、code_search JS 回退参数对称(case_sensitive/前后文独立)、list_directory include_node_modules、崩溃自愈退避(60s 窗 ≥3 次停 reload)、MemoryViewer/Sidebar i18n 收口 P2 能力演进: - 会话回收站:SCHEMA_VERSION 3 + 迁移 10(deleted_at,存在性守卫),软删除/恢复/彻底删除/30 天自动清理(启动+24h),searchMessages 聚合剔除,Sidebar 回收站面板 - 会话回放播放器:sessions:listRecordings/readRecording(白名单+目录边界+20MB 上限),SessionReplayPlayer 时间轴/步进/变速,Trace 面板入口 - electron-updater 自动更新:双轨(手动 feed 比对保留),生产环境启动静默检查 + update:status 广播 + app:updateInstall + LogsSettings UpdatePanel + builder publish 配置 - @ 文件提及:workspace.listFiles/readFileClip(边界/512KB/NUL 拒绝/MEMORY.md 保护),ChatInput Fuse 联想+键盘导航+附件管线注入 - MCP Resources/Prompts 发现:可选能力 try/catch 降级,mcp:listServerContents,MCPSettings 展开视图 - 文档对齐:内部 API 标准 HTML(Adapter 清单补 MiMo/已实现注记/STREAM_RESET/DONE.finishReason/ repetition_truncation 映射);README v0.8.0 亮点表 P3 测试基建: - 新增 4 个测试文件:engine-stream-contract(6)、engine-stream-reliability(4:集成空闲超时/504 重试/思考中 abort/P4-2 强制收尾)、thinking-capability-gate(7)、pinned-proxy(9,含深校验 5)、session-trash(5,DB 域)、use-agent-stream hook 级(5)、agent.test 回放缓冲(2) - 契约更新:orchestrator 被中断 SubAgent success=false(abort 优先级修复语义)、SSE 空 error 帧、UTF-16 正常读取、DeepSeek 未配置思考显式 disabled、迁移矩阵 v2→3 - 弱断言根治:registry WEBP 单向断言、hooks-contracts 自比恒真、memory 空 token 补强 全量验证:typecheck 0 错误 / lint 0 问题 / 系统 Node 2144 通过(301 DB 用例按 ABI 跳过)/ Electron ABI 2445/2445 全量通过 0 跳过
This commit is contained in:
+129
-84
@@ -12,6 +12,34 @@ import log from 'electron-log';
|
||||
export function registerWorkspaceHandlers(ctx: IPCContext): void {
|
||||
const { workspaceService } = ctx;
|
||||
|
||||
// ===== v0.8.0 P2-4: @ 文件提及 =====
|
||||
|
||||
// 工作空间文件名索引(联想数据源;renderer 侧 Fuse 模糊过滤)
|
||||
ipcMain.handle('workspace:listFiles', async (_event, limit: unknown) => {
|
||||
const maxFiles =
|
||||
typeof limit === 'number' && Number.isFinite(limit) && limit > 0
|
||||
? Math.min(5000, Math.floor(limit))
|
||||
: 2000;
|
||||
try {
|
||||
return { success: true, data: workspaceService.listFiles(maxFiles) };
|
||||
} catch (error) {
|
||||
return { success: false, error: (error as Error).message };
|
||||
}
|
||||
});
|
||||
|
||||
// 读取提及文件的文本片段(路径边界 + 512KB 上限 + 二进制拒绝 + MEMORY.md 保护)
|
||||
ipcMain.handle('workspace:readFileClip', async (_event, relPath: unknown, maxBytes: unknown) => {
|
||||
if (typeof relPath !== 'string' || !relPath.trim()) {
|
||||
return { success: false, error: 'Invalid path' };
|
||||
}
|
||||
const cap =
|
||||
typeof maxBytes === 'number' && Number.isFinite(maxBytes) && maxBytes > 0
|
||||
? Math.min(1024 * 1024, Math.floor(maxBytes))
|
||||
: 512 * 1024;
|
||||
log.info(`[WORKSPACE] readFileClip: ${relPath.slice(0, 120)} (cap=${cap})`);
|
||||
return workspaceService.readFileClip(relPath, cap);
|
||||
});
|
||||
|
||||
// 校验工作空间路径:检测路径有效性 + 必需文件状态 + 数据库是否存在
|
||||
ipcMain.handle('workspace:check', async (_event, targetPath: string) => {
|
||||
if (!targetPath || typeof targetPath !== 'string') {
|
||||
@@ -67,96 +95,111 @@ export function registerWorkspaceHandlers(ctx: IPCContext): void {
|
||||
});
|
||||
|
||||
// 从旧工作空间继承文件到新工作空间
|
||||
ipcMain.handle('workspace:inheritFiles', async (_event, params: {
|
||||
targetPath: string;
|
||||
sourcePath: string;
|
||||
files: string[];
|
||||
}) => {
|
||||
const { targetPath, sourcePath, files } = params;
|
||||
if (!targetPath || !sourcePath || !Array.isArray(files)) {
|
||||
return { success: false, error: '参数无效' };
|
||||
}
|
||||
|
||||
const { existsSync, mkdirSync, copyFileSync } = await import('fs');
|
||||
const { resolve } = await import('path');
|
||||
|
||||
const resolvedTarget = resolve(targetPath);
|
||||
const resolvedSource = resolve(sourcePath);
|
||||
|
||||
// 确保目标目录存在
|
||||
if (!existsSync(resolvedTarget)) {
|
||||
mkdirSync(resolvedTarget, { recursive: true });
|
||||
}
|
||||
|
||||
// 继承白名单:键为前端传入的标识,值为实际相对路径分段
|
||||
// 白名单映射防止路径遍历攻击(不直接使用用户传入的路径拼接到 fs 调用)
|
||||
const INHERIT_WHITELIST: Record<string, string[]> = {
|
||||
'SOUL.md': ['SOUL.md'],
|
||||
'.metona/agent.db': ['.metona', 'agent.db'],
|
||||
};
|
||||
|
||||
const inherited: string[] = [];
|
||||
const failed: Array<{ file: string; error: string }> = [];
|
||||
|
||||
for (const fileName of files) {
|
||||
const pathSegments = INHERIT_WHITELIST[fileName];
|
||||
// 不在白名单中:拒绝(防止路径遍历)
|
||||
if (!pathSegments) {
|
||||
failed.push({ file: fileName, error: '不在继承白名单中' });
|
||||
continue;
|
||||
ipcMain.handle(
|
||||
'workspace:inheritFiles',
|
||||
async (
|
||||
_event,
|
||||
params: {
|
||||
targetPath: string;
|
||||
sourcePath: string;
|
||||
files: string[];
|
||||
},
|
||||
) => {
|
||||
const { targetPath, sourcePath, files } = params;
|
||||
if (!targetPath || !sourcePath || !Array.isArray(files)) {
|
||||
return { success: false, error: '参数无效' };
|
||||
}
|
||||
const srcFile = join(resolvedSource, ...pathSegments);
|
||||
const dstFile = join(resolvedTarget, ...pathSegments);
|
||||
try {
|
||||
// 确保目标文件的父目录存在(如 .metona/)
|
||||
const dstDir = join(resolvedTarget, ...pathSegments.slice(0, -1));
|
||||
if (!existsSync(dstDir)) {
|
||||
mkdirSync(dstDir, { recursive: true });
|
||||
}
|
||||
if (!existsSync(srcFile)) {
|
||||
failed.push({ file: fileName, error: '源文件不存在' });
|
||||
|
||||
const { existsSync, mkdirSync, copyFileSync } = await import('fs');
|
||||
const { resolve } = await import('path');
|
||||
|
||||
const resolvedTarget = resolve(targetPath);
|
||||
const resolvedSource = resolve(sourcePath);
|
||||
|
||||
// 确保目标目录存在
|
||||
if (!existsSync(resolvedTarget)) {
|
||||
mkdirSync(resolvedTarget, { recursive: true });
|
||||
}
|
||||
|
||||
// 继承白名单:键为前端传入的标识,值为实际相对路径分段
|
||||
// 白名单映射防止路径遍历攻击(不直接使用用户传入的路径拼接到 fs 调用)
|
||||
const INHERIT_WHITELIST: Record<string, string[]> = {
|
||||
'SOUL.md': ['SOUL.md'],
|
||||
'.metona/agent.db': ['.metona', 'agent.db'],
|
||||
};
|
||||
|
||||
const inherited: string[] = [];
|
||||
const failed: Array<{ file: string; error: string }> = [];
|
||||
|
||||
for (const fileName of files) {
|
||||
const pathSegments = INHERIT_WHITELIST[fileName];
|
||||
// 不在白名单中:拒绝(防止路径遍历)
|
||||
if (!pathSegments) {
|
||||
failed.push({ file: fileName, error: '不在继承白名单中' });
|
||||
continue;
|
||||
}
|
||||
|
||||
// === 数据库文件特殊处理 ===
|
||||
// agent.db 启用了 WAL 模式,直接 copyFileSync 会丢失 WAL 中未 checkpoint 的事务;
|
||||
// 用 better-sqlite3 的 backup API(自带 checkpoint + 一致性快照)
|
||||
if (fileName === '.metona/agent.db') {
|
||||
try {
|
||||
const Database = (await import('better-sqlite3')).default;
|
||||
const srcDb = new Database(srcFile, { readonly: true, fileMustExist: true });
|
||||
try {
|
||||
srcDb.backup(dstFile);
|
||||
inherited.push(fileName);
|
||||
log.info(`[WORKSPACE] Inherited ${fileName} (via SQLite backup): ${resolvedSource} → ${resolvedTarget}`);
|
||||
} finally {
|
||||
srcDb.close();
|
||||
}
|
||||
} catch (err) {
|
||||
// backup 失败时回退到 copyFileSync(至少保证基本可用)
|
||||
log.warn(`[WORKSPACE] SQLite backup failed, fallback to copyFileSync: ${(err as Error).message}`);
|
||||
try {
|
||||
copyFileSync(srcFile, dstFile);
|
||||
inherited.push(fileName);
|
||||
log.info(`[WORKSPACE] Inherited ${fileName} (fallback copyFileSync): ${resolvedSource} → ${resolvedTarget}`);
|
||||
} catch (err2) {
|
||||
failed.push({ file: fileName, error: `backup 和 fallback 均失败: ${(err2 as Error).message}` });
|
||||
}
|
||||
const srcFile = join(resolvedSource, ...pathSegments);
|
||||
const dstFile = join(resolvedTarget, ...pathSegments);
|
||||
try {
|
||||
// 确保目标文件的父目录存在(如 .metona/)
|
||||
const dstDir = join(resolvedTarget, ...pathSegments.slice(0, -1));
|
||||
if (!existsSync(dstDir)) {
|
||||
mkdirSync(dstDir, { recursive: true });
|
||||
}
|
||||
continue;
|
||||
if (!existsSync(srcFile)) {
|
||||
failed.push({ file: fileName, error: '源文件不存在' });
|
||||
continue;
|
||||
}
|
||||
|
||||
// === 数据库文件特殊处理 ===
|
||||
// agent.db 启用了 WAL 模式,直接 copyFileSync 会丢失 WAL 中未 checkpoint 的事务;
|
||||
// 用 better-sqlite3 的 backup API(自带 checkpoint + 一致性快照)
|
||||
if (fileName === '.metona/agent.db') {
|
||||
try {
|
||||
const Database = (await import('better-sqlite3')).default;
|
||||
const srcDb = new Database(srcFile, { readonly: true, fileMustExist: true });
|
||||
try {
|
||||
srcDb.backup(dstFile);
|
||||
inherited.push(fileName);
|
||||
log.info(
|
||||
`[WORKSPACE] Inherited ${fileName} (via SQLite backup): ${resolvedSource} → ${resolvedTarget}`,
|
||||
);
|
||||
} finally {
|
||||
srcDb.close();
|
||||
}
|
||||
} catch (err) {
|
||||
// backup 失败时回退到 copyFileSync(至少保证基本可用)
|
||||
log.warn(
|
||||
`[WORKSPACE] SQLite backup failed, fallback to copyFileSync: ${(err as Error).message}`,
|
||||
);
|
||||
try {
|
||||
copyFileSync(srcFile, dstFile);
|
||||
inherited.push(fileName);
|
||||
log.info(
|
||||
`[WORKSPACE] Inherited ${fileName} (fallback copyFileSync): ${resolvedSource} → ${resolvedTarget}`,
|
||||
);
|
||||
} catch (err2) {
|
||||
failed.push({
|
||||
file: fileName,
|
||||
error: `backup 和 fallback 均失败: ${(err2 as Error).message}`,
|
||||
});
|
||||
}
|
||||
}
|
||||
continue;
|
||||
}
|
||||
|
||||
// === 普通文件直接复制 ===
|
||||
copyFileSync(srcFile, dstFile);
|
||||
inherited.push(fileName);
|
||||
log.info(`[WORKSPACE] Inherited ${fileName}: ${resolvedSource} → ${resolvedTarget}`);
|
||||
} catch (err) {
|
||||
failed.push({ file: fileName, error: (err as Error).message });
|
||||
}
|
||||
|
||||
// === 普通文件直接复制 ===
|
||||
copyFileSync(srcFile, dstFile);
|
||||
inherited.push(fileName);
|
||||
log.info(`[WORKSPACE] Inherited ${fileName}: ${resolvedSource} → ${resolvedTarget}`);
|
||||
} catch (err) {
|
||||
failed.push({ file: fileName, error: (err as Error).message });
|
||||
}
|
||||
}
|
||||
|
||||
return { success: true, inherited, failed };
|
||||
});
|
||||
return { success: true, inherited, failed };
|
||||
},
|
||||
);
|
||||
|
||||
// #51 修复: 校验源数据库完整性,防止继承损坏的数据库导致新工作空间数据丢失
|
||||
ipcMain.handle('workspace:checkDatabaseIntegrity', async (_event, sourcePath: string) => {
|
||||
@@ -175,7 +218,9 @@ export function registerWorkspaceHandlers(ctx: IPCContext): void {
|
||||
const result = db.prepare('PRAGMA integrity_check').get() as { integrity_check: string };
|
||||
const ok = result.integrity_check === 'ok';
|
||||
if (!ok) {
|
||||
log.warn(`[WORKSPACE] Source database integrity check failed: ${result.integrity_check} (source=${sourcePath})`);
|
||||
log.warn(
|
||||
`[WORKSPACE] Source database integrity check failed: ${result.integrity_check} (source=${sourcePath})`,
|
||||
);
|
||||
}
|
||||
return { success: true, ok, detail: result.integrity_check };
|
||||
} finally {
|
||||
|
||||
Reference in New Issue
Block a user