Skip to content

fix: remove old url extract #1260

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
zerob13 merged 1 commit into from
Jan 8, 2026
Merged

fix: remove old url extract #1260

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 2 additions & 9 deletions src/main/presenter/agentPresenter/message/messageBuilder.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@ import { ModelType } from '@shared/model'
import { CONVERSATION, ModelConfig, SearchResult, ChatMessage } from '@shared/presenter'
import type { MCPToolDefinition } from '@shared/presenter'

import { ContentEnricher } from '../../content/contentEnricher'
import { modelCapabilities } from '../../configPresenter/modelCapabilities'
import { enhanceSystemPromptWithDateTime } from '../utility/promptEnhancer'
import { ToolCallCenter } from '../tool/toolCallCenter'
Expand Down Expand Up @@ -33,7 +32,6 @@ export interface PreparePromptContentParams {
userContent: string
contextMessages: Message[]
searchResults: SearchResult[] | null
urlResults: SearchResult[]
userMessage: Message
vision: boolean
imageFiles: MessageFile[]
Expand Down Expand Up @@ -63,7 +61,6 @@ export async function preparePromptContent({
userContent,
contextMessages,
searchResults: _searchResults,
urlResults,
userMessage,
vision,
imageFiles,
Expand All @@ -84,10 +81,6 @@ export async function preparePromptContent({
const isAgentMode = chatMode === 'agent'

const isImageGeneration = modelType === ModelType.ImageGeneration
const enrichedUserMessage =
!isImageGeneration && urlResults.length > 0
? '\n\n' + ContentEnricher.enrichUserMessageWithUrlContent(userContent, urlResults)
: ''

const finalSystemPrompt = enhanceSystemPromptWithDateTime(systemPrompt, {
isImageGeneration,
Expand Down Expand Up @@ -116,7 +109,7 @@ export async function preparePromptContent({

const systemPromptTokens =
!isImageGeneration && finalSystemPrompt ? approximateTokenSize(finalSystemPrompt) : 0
const userMessageTokens = approximateTokenSize(userContent + enrichedUserMessage)
const userMessageTokens = approximateTokenSize(userContent)
const toolDefinitionsTokens = toolDefinitions.reduce((acc, tool) => {
return acc + approximateTokenSize(JSON.stringify(tool))
}, 0)
Expand All @@ -137,7 +130,7 @@ export async function preparePromptContent({
isImageGeneration ? '' : finalSystemPrompt,
artifacts,
userContent,
enrichedUserMessage,
'',
imageFiles,
vision,
supportsFunctionCall
Expand Down
17 changes: 4 additions & 13 deletions src/main/presenter/agentPresenter/streaming/streamGenerationHandler.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,12 +9,7 @@ import type {
UserMessageContent
} from '@shared/chat'
import type { CONVERSATION, MCPToolResponse, SearchResult } from '@shared/presenter'
import { ContentEnricher } from '../../content/contentEnricher'
import {
buildUserMessageContext,
formatUserMessageContent,
getNormalizedUserMessageText
} from '../message/messageFormatter'
import { buildUserMessageContext, formatUserMessageContent } from '../message/messageFormatter'
import { preparePromptContent } from '../message/messageBuilder'
import type { GeneratingMessageState } from './types'
import { presenter } from '@/presenter'
Expand Down Expand Up @@ -89,7 +84,7 @@ export class StreamGenerationHandler extends BaseHandler {

this.throwIfCancelled(state.message.id)

const { userContent, urlResults, imageFiles } = await this.processUserMessageContent(
const { userContent, imageFiles } = await this.processUserMessageContent(
userMessage as UserMessage
)

Expand Down Expand Up @@ -119,7 +114,6 @@ export class StreamGenerationHandler extends BaseHandler {
userContent,
contextMessages,
searchResults,
urlResults,
userMessage,
vision: Boolean(modelConfig?.vision),
imageFiles: modelConfig?.vision ? imageFiles : [],
Expand Down Expand Up @@ -269,7 +263,6 @@ export class StreamGenerationHandler extends BaseHandler {
userContent: 'continue',
contextMessages,
searchResults: null,
urlResults: [],
userMessage,
vision: false,
imageFiles: [],
Expand Down Expand Up @@ -475,10 +468,8 @@ export class StreamGenerationHandler extends BaseHandler {

async processUserMessageContent(
userMessage: UserMessage
): Promise<{ userContent: string; urlResults: SearchResult[]; imageFiles: MessageFile[] }> {
): Promise<{ userContent: string; imageFiles: MessageFile[] }> {
const userContent = buildUserMessageContext(userMessage.content)
const normalizedText = getNormalizedUserMessageText(userMessage.content)
const urlResults = await ContentEnricher.extractAndEnrichUrls(normalizedText)

const imageFiles =
userMessage.content.files?.filter((file) => {
Expand All @@ -488,7 +479,7 @@ export class StreamGenerationHandler extends BaseHandler {
return isImage
}) || []

return { userContent, urlResults, imageFiles }
return { userContent, imageFiles }
}

async updateGenerationState(state: GeneratingMessageState, promptTokens: number): Promise<void> {
Expand Down
1 change: 0 additions & 1 deletion src/main/presenter/agentPresenter/utility/utilityHandler.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -366,7 +366,6 @@ export class UtilityHandler extends BaseHandler {
userContent,
contextMessages,
searchResults: null,
urlResults: [],
userMessage,
vision: visionEnabled,
imageFiles: [],
Expand Down