diff --git a/.gitignore b/.gitignore index 5de0d42ef..fc60a7e7a 100644 --- a/.gitignore +++ b/.gitignore @@ -61,4 +61,4 @@ test.pdb portable/ DBX_*_x64-portable.zip .agents/skills -.pnpm-store/ \ No newline at end of file +.pnpm-store/* \ No newline at end of file diff --git a/apps/desktop/src/components/editor/AiAssistant.vue b/apps/desktop/src/components/editor/AiAssistant.vue index c7f77a0f1..c08f5ae26 100644 --- a/apps/desktop/src/components/editor/AiAssistant.vue +++ b/apps/desktop/src/components/editor/AiAssistant.vue @@ -48,6 +48,8 @@ interface ChatMessage { reasoning?: string; isThinking?: boolean; agentSteps?: AiAgentStepItem[]; + /** Hidden system-generated context summary; not rendered in chat UI but included in LLM history. */ + kind?: "contextSummary"; } const props = defineProps<{ @@ -76,6 +78,10 @@ const showConversationList = ref(false); const promptTextareaRef = ref(null); const promptCompositionActive = ref(false); const shikiCodeHighlighter = ref(); +const agentTokens = ref<{ input: number; output: number } | null>(null); + +/** Deferred context compaction info; applied after stream ends to avoid shifting assistantIdx. */ +const pendingCompaction = ref<{ summary: string; compactedMessages: number } | null>(null); // 新增:输入框拖拽调整相关常量 const AI_TEXTAREA_MIN_ROWS = 3; @@ -126,8 +132,30 @@ function selectAction(action: AiAction) { } } +/** Messages visible in the chat UI (excludes hidden context summaries). */ +const visibleMessages = computed(() => messages.value.filter((m) => m.kind !== "contextSummary")); + +function messagesForAgentHistory(historyMessages: ChatMessage[]): AiMessage[] { + let latestSummaryIndex = -1; + for (let i = historyMessages.length - 1; i >= 0; i--) { + if (historyMessages[i].kind === "contextSummary") { + latestSummaryIndex = i; + break; + } + } + if (latestSummaryIndex < 0) { + return historyMessages.map((m) => ({ role: m.role, content: m.content })); + } + const compactedHistory = historyMessages.slice(latestSummaryIndex); + const firstMsg = historyMessages[0]; + if (firstMsg && firstMsg.role === "user" && firstMsg.kind !== "contextSummary") { + return [{ role: "user" as const, content: firstMsg.content }, ...compactedHistory.map((m) => ({ role: m.role, content: m.content }))]; + } + return compactedHistory.map((m) => ({ role: m.role, content: m.content })); +} + const chatTitle = computed(() => { - const first = messages.value.find((m) => m.role === "user"); + const first = messages.value.find((m) => m.role === "user" && m.kind !== "contextSummary"); return first ? first.content.slice(0, 30) : t("ai.newChat"); }); @@ -305,6 +333,32 @@ function parseExplainFromData(explainData: unknown, dbType: string): ParsedExpla } } +function agentEventToStep(event: AgentEvent, index: number): AiAgentStepItem | undefined { + if (event.type === "context_compacted") { + return { + key: `compact-${index}`, + labelKey: "ai.agentSteps.contextCompacted", + tone: "active", + toolResult: `Compacted ${event.compacted_messages} messages. Estimated prompt tokens: ${event.estimated_before.toLocaleString()} -> ${event.estimated_after.toLocaleString()}. Summary: ${event.summary_tokens.toLocaleString()} tokens.`, + isError: false, + }; + } + + if (event.type !== "tool_call_start" && event.type !== "tool_call_end") return undefined; + + return { + key: `${event.tool_call_id || ""}-${event.type}`, + labelKey: event.type === "tool_call_start" ? "ai.agentSteps.callingTool" : event.is_error ? "ai.agentSteps.toolError" : "ai.agentSteps.toolDone", + tone: (event.type === "tool_call_start" ? "active" : event.is_error ? "danger" : "success") as AiAgentStepTone, + titleKey: undefined, + titleParams: { tool: event.tool_name || "" }, + toolName: event.tool_name, + toolArgs: event.type === "tool_call_start" ? (event.args as Record) : undefined, + toolResult: event.type === "tool_call_end" && !event.is_error ? extractToolResultContent(event.result) : undefined, + isError: event.type === "tool_call_end" ? event.is_error : undefined, + }; +} + function toggleReasoning(index: number) { const next = new Set(expandedReasoning.value); if (next.has(index)) { @@ -536,14 +590,12 @@ async function send() { const sessionId = uuid(); currentSessionId.value = sessionId; const agentEvents: AgentEvent[] = []; + agentTokens.value = null; try { const context = await buildAiContext(props.tab, props.connection, { mentionedTables, }); - const history: AiMessage[] = messages.value.slice(0, -2).map((m) => ({ - role: m.role, - content: m.content, - })); + const history: AiMessage[] = messagesForAgentHistory(messages.value.slice(0, -2)); await runAgentStream( { config: settings.aiConfig, @@ -561,23 +613,27 @@ async function send() { if (event.type === "reasoning_delta" && event.delta) { appendAssistantReasoning(assistantIdx, event.delta); } + if (event.type === "agent_end") { + if (event.input_tokens || event.output_tokens) { + agentTokens.value = { input: event.input_tokens ?? 0, output: event.output_tokens ?? 0 }; + } + } + if (event.type === "context_compacted") { + const msg = messages.value[assistantIdx]; + if (msg) { + if (!msg.agentSteps) msg.agentSteps = []; + const step = agentEventToStep(event, agentEvents.length - 1); + if (step) msg.agentSteps.push(step); + } + pendingCompaction.value = { summary: event.summary, compactedMessages: event.compacted_messages }; + } // Real-time agent step rendering if (event.type === "tool_call_start" || event.type === "tool_call_end") { const msg = messages.value[assistantIdx]; if (msg) { if (!msg.agentSteps) msg.agentSteps = []; - msg.agentSteps.push({ - key: `${event.tool_call_id || ""}-${event.type}`, - labelKey: event.type === "tool_call_start" ? "ai.agentSteps.callingTool" : event.is_error ? "ai.agentSteps.toolError" : "ai.agentSteps.toolDone", - tone: (event.type === "tool_call_start" ? "active" : event.is_error ? "danger" : "success") as AiAgentStepTone, - titleKey: undefined, - titleParams: { tool: event.tool_name || "" }, - toolName: event.tool_name, - toolArgs: event.type === "tool_call_start" ? (event.args as Record) : undefined, - toolResult: event.type === "tool_call_end" && !event.is_error ? extractToolResultContent(event.result) : undefined, - isError: event.type === "tool_call_end" ? event.is_error : undefined, - explainData: event.type === "tool_call_end" ? extractExplainData(event.result) : undefined, - }); + const step = agentEventToStep(event, agentEvents.length - 1); + if (step) msg.agentSteps.push(step); } } scrollToBottom(); @@ -593,20 +649,7 @@ async function send() { isGenerating.value = false; // Render agent tool call steps from agent events if (msg && agentEvents.length > 0 && !msg.agentSteps?.length) { - msg.agentSteps = agentEvents - .filter((e) => e.type === "tool_call_start" || e.type === "tool_call_end") - .map((e) => ({ - key: `${e.tool_call_id || ""}-${e.type}`, - labelKey: e.type === "tool_call_start" ? "ai.agentSteps.callingTool" : e.is_error ? "ai.agentSteps.toolError" : "ai.agentSteps.toolDone", - tone: e.type === "tool_call_start" ? "active" : e.is_error ? "danger" : "success", - titleKey: undefined, - titleParams: { tool: e.tool_name || "" }, - toolName: e.tool_name, - toolArgs: e.type === "tool_call_start" ? (e.args as Record) : undefined, - toolResult: e.type === "tool_call_end" && !e.is_error ? extractToolResultContent(e.result) : undefined, - isError: e.type === "tool_call_end" ? e.is_error : undefined, - explainData: e.type === "tool_call_end" ? extractExplainData(e.result) : undefined, - })); + msg.agentSteps = agentEvents.map((e, index) => agentEventToStep(e, index)).filter((step): step is AiAgentStepItem => Boolean(step)); } // Fallback: use aiAgentPlan for backward compatibility if (msg && !msg.agentSteps?.length) { @@ -622,6 +665,20 @@ async function send() { } activeAction.value = "generate"; currentSessionId.value = ""; + // Apply deferred context compaction after streaming so assistantIdx stays stable. + // Visible chat history is kept for the user; future LLM history starts from this hidden summary. + if (pendingCompaction.value) { + const { summary, compactedMessages } = pendingCompaction.value; + pendingCompaction.value = null; + const insertAt = Math.min(1 + compactedMessages, messages.value.length - 1); + if (summary) { + messages.value.splice(insertAt, 0, { + role: "user", + content: summary, + kind: "contextSummary", + }); + } + } persistConversation(); scrollToBottom(); } @@ -665,7 +722,7 @@ function clearMessages() { async function persistConversation() { if (!messages.value.length || !props.connection) return; if (!conversationId.value) conversationId.value = uuid(); - const first = messages.value.find((m) => m.role === "user"); + const first = messages.value.find((m) => m.role === "user" && m.kind !== "contextSummary"); await saveAiConversation({ id: conversationId.value, title: first ? first.content.slice(0, 50) : "Untitled", @@ -675,6 +732,7 @@ async function persistConversation() { role: m.role, content: m.content, ...(m.reasoning ? { reasoning: m.reasoning } : {}), + ...(m.kind ? { kind: m.kind } : {}), })), createdAt: new Date().toISOString(), updatedAt: new Date().toISOString(), @@ -692,7 +750,10 @@ function selectConversation(conv: AiConversation) { role: m.role as "user" | "assistant", content: m.content, reasoning: m.reasoning, + kind: m.kind, })); + agentTokens.value = null; + pendingCompaction.value = null; showConversationList.value = false; scrollToBottom(); } @@ -854,7 +915,7 @@ const messageRenderer = computed(() => {
-