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:
@@ -84,7 +84,7 @@ export class WebFetchTool implements IMetonaTool {
|
||||
timeoutMs: 240_000,
|
||||
};
|
||||
|
||||
async execute(args: Record<string, unknown>, _context: ToolExecutionContext): Promise<unknown> {
|
||||
async execute(args: Record<string, unknown>, context: ToolExecutionContext): Promise<unknown> {
|
||||
const url = args.url as string;
|
||||
const mobileUA = (args.mobile_ua as boolean) ?? false;
|
||||
const enableRetry = (args.retry as boolean) ?? true;
|
||||
@@ -96,6 +96,11 @@ export class WebFetchTool implements IMetonaTool {
|
||||
return { url, content: '', success: false, error: 'URL must start with http:// or https://' };
|
||||
}
|
||||
|
||||
// v0.8.0 P1-2: abort 立即生效 —— 引擎中断(超时/用户停止)时不再继续后续阶段
|
||||
if (context.signal?.aborted) {
|
||||
return { url, content: '', success: false, error: 'Fetch aborted' };
|
||||
}
|
||||
|
||||
// v0.6.4 P2-2: SSRF 校验 —— 覆盖 Phase1 HTTP 与 Phase3 浏览器两条通道的入口。
|
||||
// 协议白名单 / 私有段 IP / 云元数据地址一律拒绝。
|
||||
try {
|
||||
@@ -117,7 +122,12 @@ export class WebFetchTool implements IMetonaTool {
|
||||
logTool('web_fetch', `Fetching: ${url}`);
|
||||
|
||||
// ===== Phase 1: HTTP 抓取 =====
|
||||
const phase1Result = await this.httpFetch(url, mobileUA, enableRetry);
|
||||
const phase1Result = await this.httpFetch(url, mobileUA, enableRetry, context.signal);
|
||||
|
||||
// v0.8.0 P1-2: HTTP 阶段被 abort —— 直接终止,不进浏览器回退
|
||||
if (context.signal?.aborted) {
|
||||
return { url, content: '', success: false, error: 'Fetch aborted' };
|
||||
}
|
||||
|
||||
if (phase1Result.success && !phase1Result.intercepted) {
|
||||
// 根据 extract_mode 选择返回内容:'html' 模式返回清理后的 HTML,'text' 模式返回纯文本
|
||||
@@ -136,7 +146,7 @@ export class WebFetchTool implements IMetonaTool {
|
||||
'web_fetch',
|
||||
`Phase 2: Content too short (${phase1Content.length} chars), upgrading to browser`,
|
||||
);
|
||||
const browserResult = await this.browserFetch(url);
|
||||
const browserResult = await this.browserFetch(url, context.signal);
|
||||
if (browserResult) {
|
||||
return this.buildSuccess(url, browserResult, 'browser', maxChars);
|
||||
}
|
||||
@@ -159,7 +169,7 @@ export class WebFetchTool implements IMetonaTool {
|
||||
};
|
||||
}
|
||||
logTool('web_fetch', `Phase 3: Falling back to browser (${phase1Result.reason})`);
|
||||
const browserResult = await this.browserFetch(url);
|
||||
const browserResult = await this.browserFetch(url, context.signal);
|
||||
if (browserResult) {
|
||||
return this.buildSuccess(url, browserResult, 'browser', maxChars);
|
||||
}
|
||||
@@ -179,6 +189,7 @@ export class WebFetchTool implements IMetonaTool {
|
||||
url: string,
|
||||
mobileUA: boolean,
|
||||
enableRetry: boolean,
|
||||
signal?: AbortSignal,
|
||||
): Promise<{
|
||||
success: boolean;
|
||||
html: string;
|
||||
@@ -206,7 +217,14 @@ export class WebFetchTool implements IMetonaTool {
|
||||
let redirectBlocked: string | null = null;
|
||||
|
||||
for (let hop = 0; hop <= MAX_REDIRECT_HOPS; hop++) {
|
||||
response = await ssrfPinnedFetch(currentUrl, { headers, redirect: 'manual' }, 20_000);
|
||||
// v0.8.0 P1-2: 每跳透传引擎级 abort signal —— 用户中断时底层 fetch
|
||||
// 立即取消(含重定向链中间跳)
|
||||
response = await ssrfPinnedFetch(
|
||||
currentUrl,
|
||||
{ headers, redirect: 'manual' },
|
||||
20_000,
|
||||
signal,
|
||||
);
|
||||
const next = resolveRedirectTarget(response, currentUrl);
|
||||
if (next === null) break; // 非重定向(或无/非法 Location)—— 当前响应即终态
|
||||
if (hop === MAX_REDIRECT_HOPS) {
|
||||
@@ -261,6 +279,7 @@ export class WebFetchTool implements IMetonaTool {
|
||||
if (response.status >= 500 && attempt < maxRetries - 1) {
|
||||
await this.sleep(
|
||||
backoffBase * Math.pow(2, attempt) + Math.random() * backoffBase * 0.6,
|
||||
signal,
|
||||
);
|
||||
continue;
|
||||
}
|
||||
@@ -293,9 +312,22 @@ export class WebFetchTool implements IMetonaTool {
|
||||
return { success: true, html, text, intercepted: false, reason: '' };
|
||||
} catch (err) {
|
||||
const errorMsg = (err as Error).message;
|
||||
// v0.8.0 P1-2: abort 语义 —— 不重试、不睡眠,直接终止本阶段
|
||||
if (signal?.aborted || (err as Error & { name?: string }).name === 'AbortError') {
|
||||
return {
|
||||
success: false,
|
||||
html: '',
|
||||
text: '',
|
||||
intercepted: false,
|
||||
reason: 'Fetch aborted',
|
||||
};
|
||||
}
|
||||
if (attempt < maxRetries - 1) {
|
||||
logTool('web_fetch', `Attempt ${attempt + 1} failed: ${errorMsg}, retrying...`);
|
||||
await this.sleep(backoffBase * Math.pow(2, attempt) + Math.random() * backoffBase * 0.6);
|
||||
await this.sleep(
|
||||
backoffBase * Math.pow(2, attempt) + Math.random() * backoffBase * 0.6,
|
||||
signal,
|
||||
);
|
||||
continue;
|
||||
}
|
||||
return { success: false, html: '', text: '', intercepted: false, reason: errorMsg };
|
||||
@@ -313,7 +345,7 @@ export class WebFetchTool implements IMetonaTool {
|
||||
|
||||
// ===== Phase 2/3: 浏览器回退(使用共享 BrowserWindowManager 单例) =====
|
||||
|
||||
private async browserFetch(url: string): Promise<string | null> {
|
||||
private async browserFetch(url: string, signal?: AbortSignal): Promise<string | null> {
|
||||
// 查缓存(浏览器阶段产出的是纯文本,与 text 模式同键)
|
||||
const cached = fetchCache.get(`text:${url}`);
|
||||
if (cached) {
|
||||
@@ -322,10 +354,13 @@ export class WebFetchTool implements IMetonaTool {
|
||||
}
|
||||
|
||||
try {
|
||||
// v0.8.0 P1-2: 引擎级 abort 透传 —— 中断时 BrowserWindowManager 停止页面
|
||||
// 加载并终止抓取序列(此前浏览器回退完全不受 abort 控制)
|
||||
if (signal?.aborted) return null;
|
||||
// 崩溃修复: 走 manager.fetchPageText(内部串行化完整的 open→等待→evaluate 序列)。
|
||||
// 原实现直接 open/evaluate 共享单例 —— web_search 并行抓取触发多个回退同时进入时,
|
||||
// 后到者销毁前者的窗口(ERR_ABORTED ×3 = 应用崩溃 ×3,见 manager 注释)。
|
||||
const text = await getBrowserManager().fetchPageText(url);
|
||||
const text = await getBrowserManager().fetchPageText(url, signal);
|
||||
|
||||
if (text && text.trim().length >= 80) {
|
||||
// 拦截检测(浏览器渲染后仍可能是验证码挑战页)
|
||||
@@ -383,7 +418,23 @@ export class WebFetchTool implements IMetonaTool {
|
||||
};
|
||||
}
|
||||
|
||||
private sleep(ms: number): Promise<void> {
|
||||
return new Promise((resolve) => setTimeout(resolve, ms));
|
||||
/** v0.8.0 P1-2: abort 感知的 sleep —— 中断期间不再等待退避间隔 */
|
||||
private sleep(ms: number, signal?: AbortSignal): Promise<void> {
|
||||
return new Promise((resolve) => {
|
||||
if (signal?.aborted) return resolve();
|
||||
const cleanup = (): void => {
|
||||
clearTimeout(timer);
|
||||
signal?.removeEventListener('abort', onAbort);
|
||||
};
|
||||
const onAbort = (): void => {
|
||||
cleanup();
|
||||
resolve();
|
||||
};
|
||||
const timer = setTimeout(() => {
|
||||
cleanup();
|
||||
resolve();
|
||||
}, ms);
|
||||
signal?.addEventListener('abort', onAbort, { once: true });
|
||||
});
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user