From c3481dfcfe435b0be9a9336c8e1c69c72bf0c508 Mon Sep 17 00:00:00 2001 From: Danil Nikolaev Date: Mon, 18 May 2026 16:10:03 +0300 Subject: [PATCH] Inline tool rank audit into stage --- PIPELINE_TODO.md | 2 +- src/ai/tool-rank-audit.ts | 43 --------------------------------------- src/ai/tool-rank-stage.ts | 40 +++++++++++++++++++++++++++++++++++- 3 files changed, 40 insertions(+), 45 deletions(-) delete mode 100644 src/ai/tool-rank-audit.ts diff --git a/PIPELINE_TODO.md b/PIPELINE_TODO.md index 9f7d9bc..54a4c7c 100644 --- a/PIPELINE_TODO.md +++ b/PIPELINE_TODO.md @@ -71,7 +71,7 @@ - [x] Добавить stage `filter_tools`, который фильтрует provider-specific tools по результату ranker. - [x] Хранить `ToolRankDecision` в `UserRequestPipelineState.toolRankDecisions`. - [x] Сохранять `ToolRankDecision` в `request_audit.details`. -- [ ] Убрать дублирующий ручной `tool-rank-audit.ts`, если stage полностью заменит его. +- [x] Убрать дублирующий ручной `tool-rank-audit.ts`, если stage полностью заменит его. - [x] Сохранить status UX: `🧩 Выбираю подходящие инструменты...`. - [x] Гарантировать `clearStatus()` после ranker success/failure. - [ ] Добавить fallback через `PipelineFallbackExecutor`: main model, all tools, no tools. diff --git a/src/ai/tool-rank-audit.ts b/src/ai/tool-rank-audit.ts deleted file mode 100644 index 595fce0..0000000 --- a/src/ai/tool-rank-audit.ts +++ /dev/null @@ -1,43 +0,0 @@ -import {AiProvider} from "../model/ai-provider"; -import type {TelegramStreamMessage} from "./telegram-stream-message"; -import type {PipelineAuditEvent} from "./user-request-pipeline"; -import {logError} from "../util/utils"; - -export async function storeToolRankAudit(params: { - streamMessage: TelegramStreamMessage; - provider: AiProvider; - model: string; - round: number; - startedAt: number; - startedAtIso: string; - availableTools: string[]; - selectedTools?: string[]; - usedRanker?: boolean; - error?: unknown; -}): Promise { - const event: PipelineAuditEvent = { - stage: "tool_rank", - status: params.error ? "failed" : "succeeded", - startedAt: params.startedAtIso, - finishedAt: new Date().toISOString(), - durationMs: Date.now() - params.startedAt, - provider: params.provider, - model: params.model, - details: { - round: params.round, - availableTools: params.availableTools, - selectedTools: params.selectedTools ?? [], - usedRanker: params.usedRanker ?? false, - toolRankDecision: { - provider: params.provider, - round: params.round, - availableTools: params.availableTools, - selectedTools: params.selectedTools ?? [], - usedRanker: params.usedRanker ?? false, - }, - }, - error: params.error instanceof Error ? params.error.message : params.error ? String(params.error) : undefined, - }; - - await params.streamMessage.storePipelineAudit([event]).catch(logError); -} diff --git a/src/ai/tool-rank-stage.ts b/src/ai/tool-rank-stage.ts index dc3a795..21e54c4 100644 --- a/src/ai/tool-rank-stage.ts +++ b/src/ai/tool-rank-stage.ts @@ -4,6 +4,7 @@ import type {TelegramStreamMessage} from "./telegram-stream-message.js"; import type {RuntimeConfigSnapshot} from "./unified-ai-runner.shared.js"; import {allToolSchemaNames, toolSchemaNames} from "./tool-schema-utils.js"; import type {ToolRanker} from "./unified-ai-runner.tool-ranker.js"; +import type {PipelineAuditEvent} from "./user-request-pipeline/types.js"; function latestUserText(messages: readonly { role?: string; content?: unknown }[]): string { for (let i = messages.length - 1; i >= 0; i--) { @@ -53,11 +54,48 @@ export async function runToolRankStage(params: { const toolRanker = params.toolRanker ?? new (await import("./unified-ai-runner.tool-ranker.js")).ToolRanker(params.config); const startedAt = Date.now(); const startedAtIso = new Date().toISOString(); - const storeAudit = params.storeAudit ?? (await import("./tool-rank-audit.js")).storeToolRankAudit; const filterSelectedTools = (selectedToolNames: readonly string[]): BoundaryValue[] => { const selected = new Set(selectedToolNames); return params.availableTools.filter(tool => toolSchemaNames(tool).some(name => selected.has(name))); }; + const storeAudit = params.storeAudit ?? (async (auditParams: { + streamMessage: TelegramStreamMessage; + provider: AiProvider; + model: string; + round: number; + startedAt: number; + startedAtIso: string; + availableTools: string[]; + selectedTools?: string[]; + usedRanker?: boolean; + error?: unknown; + }) => { + const event: PipelineAuditEvent = { + stage: "tool_rank", + status: auditParams.error ? "failed" : "succeeded", + startedAt: auditParams.startedAtIso, + finishedAt: new Date().toISOString(), + durationMs: Date.now() - auditParams.startedAt, + provider: auditParams.provider, + model: auditParams.model, + details: { + round: auditParams.round, + availableTools: auditParams.availableTools, + selectedTools: auditParams.selectedTools ?? [], + usedRanker: auditParams.usedRanker ?? false, + toolRankDecision: { + provider: auditParams.provider, + round: auditParams.round, + availableTools: auditParams.availableTools, + selectedTools: auditParams.selectedTools ?? [], + usedRanker: auditParams.usedRanker ?? false, + }, + }, + error: auditParams.error instanceof Error ? auditParams.error.message : auditParams.error ? String(auditParams.error) : undefined, + }; + + await auditParams.streamMessage.storePipelineAudit([event]); + }); params.streamMessage.setStatus("🧩 Выбираю подходящие инструменты..."); await params.streamMessage.flush();