An AI-powered search engine with a generative UI
TypeScript generative-aigenerative-uinextjsollamareactsearxngshadcn-uitailwindcsstavilytypescriptupstashvercel-ai-sdk
refactor: migrate Langfuse integration from langfuse-vercel to JS SDK v5 (#917)
Yoshiki Miura9cf917aad30e
diff --git a/.env.local.example b/.env.local.exampleindex 17ca402f..ca6b7f49 100644--- a/.env.local.example+++ b/.env.local.example@@ -140,7 +140,7 @@ ANONYMOUS_USER_ID=anonymous-user# ENABLE_LANGFUSE_TRACING=true# LANGFUSE_SECRET_KEY=[YOUR_LANGFUSE_SECRET_KEY]# LANGFUSE_PUBLIC_KEY=[YOUR_LANGFUSE_PUBLIC_KEY]-# LANGFUSE_BASEURL=https://cloud.langfuse.com+# LANGFUSE_BASE_URL=https://cloud.langfuse.com# Performance Logging# ENABLE_PERF_LOGGING=truediff --git a/app/api/feedback/__tests__/route.test.ts b/app/api/feedback/__tests__/route.test.tsindex 6168396d..f0211cc3 100644--- a/app/api/feedback/__tests__/route.test.ts+++ b/app/api/feedback/__tests__/route.test.ts@@ -30,17 +30,19 @@ vi.mock('@/lib/utils/telemetry', () => ({isTracingEnabled: vi.fn(() => false)}))-vi.mock('langfuse', () => ({- Langfuse: vi.fn(function () {+vi.mock('@langfuse/client', () => ({+ LangfuseClient: vi.fn(function () {return {- score: vi.fn(),- flushAsync: vi.fn(() => Promise.resolve())+ score: {+ create: vi.fn(),+ flush: vi.fn(() => Promise.resolve())+ }}})}))// Import after mocking-import { Langfuse } from 'langfuse'+import { LangfuseClient } from '@langfuse/client'import { updateMessageFeedback } from '@/lib/actions/feedback'import { isTracingEnabled } from '@/lib/utils/telemetry'@@ -59,12 +61,14 @@ describe('Feedback API Route', () => {success: true})- const mockScore = vi.fn()+ const mockScoreCreate = vi.fn()const mockFlush = vi.fn().mockResolvedValue(undefined)- vi.mocked(Langfuse).mockImplementation(function () {+ vi.mocked(LangfuseClient).mockImplementation(function () {return {- score: mockScore,- flushAsync: mockFlush+ score: {+ create: mockScoreCreate,+ flush: mockFlush+ }} as any} as any)@@ -86,7 +90,7 @@ describe('Feedback API Route', () => {expect(response.status).toBe(200)expect(text).toBe('Feedback recorded successfully')- expect(mockScore).toHaveBeenCalledWith({+ expect(mockScoreCreate).toHaveBeenCalledWith({traceId: 'test-trace-id',name: 'user_feedback',value: 1,@@ -106,12 +110,14 @@ describe('Feedback API Route', () => {success: true})- const mockScore = vi.fn()+ const mockScoreCreate = vi.fn()const mockFlush = vi.fn().mockResolvedValue(undefined)- vi.mocked(Langfuse).mockImplementation(function () {+ vi.mocked(LangfuseClient).mockImplementation(function () {return {- score: mockScore,- flushAsync: mockFlush+ score: {+ create: mockScoreCreate,+ flush: mockFlush+ }} as any} as any)@@ -130,7 +136,7 @@ describe('Feedback API Route', () => {const response = await POST(request)expect(response.status).toBe(200)- expect(mockScore).toHaveBeenCalledWith({+ expect(mockScoreCreate).toHaveBeenCalledWith({traceId: 'test-trace-id',name: 'user_feedback',value: -1,@@ -207,12 +213,14 @@ describe('Feedback API Route', () => {error: 'Database error'})- const mockScore = vi.fn()+ const mockScoreCreate = vi.fn()const mockFlush = vi.fn().mockResolvedValue(undefined)- vi.mocked(Langfuse).mockImplementation(function () {+ vi.mocked(LangfuseClient).mockImplementation(function () {return {- score: mockScore,- flushAsync: mockFlush+ score: {+ create: mockScoreCreate,+ flush: mockFlush+ }} as any} as any)@@ -246,12 +254,14 @@ describe('Feedback API Route', () => {it('should work without messageId', async () => {vi.mocked(isTracingEnabled).mockReturnValue(true)- const mockScore = vi.fn()+ const mockScoreCreate = vi.fn()const mockFlush = vi.fn().mockResolvedValue(undefined)- vi.mocked(Langfuse).mockImplementation(function () {+ vi.mocked(LangfuseClient).mockImplementation(function () {return {- score: mockScore,- flushAsync: mockFlush+ score: {+ create: mockScoreCreate,+ flush: mockFlush+ }} as any} as any)diff --git a/app/api/feedback/route.ts b/app/api/feedback/route.tsindex 8bd9a19a..2e275a91 100644--- a/app/api/feedback/route.ts+++ b/app/api/feedback/route.ts@@ -1,4 +1,4 @@-import { Langfuse } from 'langfuse'+import { LangfuseClient } from '@langfuse/client'import { updateMessageFeedback } from '@/lib/actions/feedback'import { hasSupabasePublicConfig } from '@/lib/supabase/keys'@@ -32,10 +32,10 @@ export async function POST(req: Request) {}// Initialize Langfuse client- const langfuse = new Langfuse()+ const langfuse = new LangfuseClient()// Send score to Langfuse- langfuse.score({+ langfuse.score.create({traceId,name: 'user_feedback',value: score,@@ -43,7 +43,7 @@ export async function POST(req: Request) {})// Flush to ensure the score is sent- await langfuse.flushAsync()+ await langfuse.score.flush()// Get current user for RLS contextlet userId: string | null = nulldiff --git a/bun.lock b/bun.lockindex dc0b78f5..84a1b590 100644--- a/bun.lock+++ b/bun.lock@@ -15,9 +15,15 @@"@aws-sdk/s3-request-presigner": "3.859.0","@json-render/core": "^0.16.0","@json-render/react": "^0.16.0",- "@opentelemetry/api-logs": "0.57.2",- "@opentelemetry/instrumentation": "0.57.2",- "@opentelemetry/sdk-logs": "0.57.2",+ "@langfuse/client": "^5.9.1",+ "@langfuse/otel": "^5.9.1",+ "@langfuse/tracing": "^5.9.1",+ "@opentelemetry/api-logs": "0.220.0",+ "@opentelemetry/core": "^2.9.0",+ "@opentelemetry/instrumentation": "0.220.0",+ "@opentelemetry/resources": "^2.9.0",+ "@opentelemetry/sdk-logs": "0.220.0",+ "@opentelemetry/sdk-trace-base": "^2.9.0","@paralleldrive/cuid2": "^2.2.2","@radix-ui/react-alert-dialog": "^1.0.5","@radix-ui/react-avatar": "^1.1.9",@@ -45,7 +51,7 @@"@tailwindcss/typography": "^0.5.12","@upstash/redis": "^1.35.5","@vercel/analytics": "^1.5.0",- "@vercel/otel": "^1.13.0",+ "@vercel/otel": "^2.1.3","ai": "^6.0.180","ai-sdk-ollama": "^3.8.4","class-variance-authority": "^0.7.1",@@ -59,7 +65,6 @@"js-tiktoken": "^1.0.20","jsdom": "^26.1.0","katex": "^0.16.10",- "langfuse-vercel": "^3.38.4","next": "^16.2.6","node-html-parser": "^6.1.13","postgres": "^3.4.5",@@ -427,6 +432,14 @@"@json-render/react": ["@json-render/[email protected]", "", { "dependencies": { "@json-render/core": "0.16.0" }, "peerDependencies": { "react": "^19.2.3" } }, "sha512-PJQjLftGYZ5LNlA1IFww+yNOAJZRW2feEcH/L10u/8M/b/zImr9wfqQVMDyC87myoEzhyucpkQ6joISeZdKxsw=="],+ "@langfuse/client": ["@langfuse/[email protected]", "", { "dependencies": { "@langfuse/core": "^5.9.1", "@langfuse/tracing": "^5.9.1", "mustache": "^4.2.0" }, "peerDependencies": { "@opentelemetry/api": "^1.9.0" } }, "sha512-v9lb9GXc7ujmY2k97830MfIg+m1LQWkQNzXP+u2F3KwHVaEvD8zy4v1gLhbTkvemTggAx/tR+tv8BC9CeojTrA=="],++ "@langfuse/core": ["@langfuse/[email protected]", "", { "peerDependencies": { "@opentelemetry/api": "^1.9.0" } }, "sha512-KvyAskAO+2ixJwr9wy148ttR/Zn3oapvOJ2Br4Xcp6zhDpjSIIGB4jW/jkp53/KU9MyEHj0RSFPK/yKoxLC4KA=="],++ "@langfuse/otel": ["@langfuse/[email protected]", "", { "dependencies": { "@langfuse/core": "^5.9.1" }, "peerDependencies": { "@opentelemetry/api": "^1.9.0", "@opentelemetry/core": "^2.0.1", "@opentelemetry/exporter-trace-otlp-http": ">=0.202.0 <1.0.0", "@opentelemetry/sdk-trace-base": "^2.0.1" } }, "sha512-viM5Qq/AIPZPXfO7YdSmDHxEDSrNU/MyGzuE9zKA6hGBII1iLowU+qL99O+TjnXqxoADqlNibhY2pg1/WTIPcw=="],++ "@langfuse/tracing": ["@langfuse/[email protected]", "", { "dependencies": { "@langfuse/core": "^5.9.1" }, "peerDependencies": { "@opentelemetry/api": "^1.9.0" } }, "sha512-tJRyVAv1JkuOPh4Uz5eWUNH8U4jcJVtK2F5QNy5cZUzXCSrXobCSHusPbxY6VFZcLcFgtpDtSaxL7ev1tV2JNQ=="],+"@mermaid-js/parser": ["@mermaid-js/[email protected]", "", { "dependencies": { "langium": "^4.0.0" } }, "sha512-opmV19kN1JsK0T6HhhokHpcVkqKpF+x2pPDKKM2ThHtZAB5F4PROopk0amuVYK5qMrIA4erzpNm8gmPNJgMDxQ=="],"@napi-rs/wasm-runtime": ["@napi-rs/[email protected]", "", { "dependencies": { "@emnapi/core": "^1.4.3", "@emnapi/runtime": "^1.4.3", "@tybys/wasm-util": "^0.10.0" } }, "sha512-ZVWUcfwY4E/yPitQJl481FjFo3K22D6qF0DuFH6Y/nbnE11GY5uguDxZMGXPQ8WQ0128MXQD7TnfHyK4oWoIJQ=="],@@ -463,21 +476,29 @@"@opentelemetry/api": ["@opentelemetry/[email protected]", "", {}, "sha512-3giAOQvZiH5F9bMlMiv8+GSPMeqg0dbaeo58/0SlA9sxSqZhnUtxzX9/2FzyhS9sWQf5S0GJE0AKBrFqjpeYcg=="],- "@opentelemetry/api-logs": ["@opentelemetry/[email protected]", "", { "dependencies": { "@opentelemetry/api": "^1.3.0" } }, "sha512-uIX52NnTM0iBh84MShlpouI7UKqkZ7MrUszTmaypHBu4r7NofznSnQRfJ+uUeDtQDj6w8eFGg5KBLDAwAPz1+A=="],+ "@opentelemetry/api-logs": ["@opentelemetry/[email protected]", "", { "dependencies": { "@opentelemetry/api": "^1.3.0" } }, "sha512-CmVa4ImJ+ynfrPMNaAXHET6Bhb44SwzmfyVJFq9ni2jgXJR/l7C6gfVFddNmHP+ZOkP9cf4f9DBe68qVLTHc9w=="],++ "@opentelemetry/core": ["@opentelemetry/[email protected]", "", { "dependencies": { "@opentelemetry/semantic-conventions": "^1.29.0" }, "peerDependencies": { "@opentelemetry/api": ">=1.0.0 <1.10.0" } }, "sha512-m2nckMT80NnmjTYSPjJQObBJ+8dgkoajEOUbznL8AHZ3T3yHRk2P7gI1PhEBc1+lOnrYE9UWrWHqJDsmqjmNbw=="],- "@opentelemetry/core": ["@opentelemetry/[email protected]", "", { "dependencies": { "@opentelemetry/semantic-conventions": "1.28.0" }, "peerDependencies": { "@opentelemetry/api": ">=1.0.0 <1.10.0" } }, "sha512-OOCM2C/QIURhJMuKaekP3TRBxBKxG/TWWA0TL2J6nXUtDnuCtccy49LUJF8xPFXMX+0LMcxFpCo8M9cGY1W6rQ=="],+ "@opentelemetry/exporter-trace-otlp-http": ["@opentelemetry/[email protected]", "", { "dependencies": { "@opentelemetry/core": "2.9.0", "@opentelemetry/otlp-exporter-base": "0.220.0", "@opentelemetry/otlp-transformer": "0.220.0", "@opentelemetry/resources": "2.9.0", "@opentelemetry/sdk-trace": "2.9.0" }, "peerDependencies": { "@opentelemetry/api": "^1.3.0" } }, "sha512-/+ExB3lRkf+erv4PnoywyL7RHKITidxtUpUTS55k7OQ0dB42S7gEF1gry7swb9MSm1hYLUhJg4QQh9W8SpwwqA=="],- "@opentelemetry/instrumentation": ["@opentelemetry/[email protected]", "", { "dependencies": { "@opentelemetry/api-logs": "0.57.2", "@types/shimmer": "^1.2.0", "import-in-the-middle": "^1.8.1", "require-in-the-middle": "^7.1.1", "semver": "^7.5.2", "shimmer": "^1.2.1" }, "peerDependencies": { "@opentelemetry/api": "^1.3.0" } }, "sha512-BdBGhQBh8IjZ2oIIX6F2/Q3LKm/FDDKi6ccYKcBTeilh6SNdNKveDOLk73BkSJjQLJk6qe4Yh+hHw1UPhCDdrg=="],+ "@opentelemetry/instrumentation": ["@opentelemetry/[email protected]", "", { "dependencies": { "@opentelemetry/api-logs": "0.220.0", "import-in-the-middle": "^3.0.0", "require-in-the-middle": "^8.0.0" }, "peerDependencies": { "@opentelemetry/api": "^1.3.0" } }, "sha512-xQx3E2WxP1mDvKzxLxX+CTCtNLa560YJZ3087qYHerl2YmiKpv7AH+dAy7vmx+eVrZ5BwhfWUAVoKOoxCNHcpw=="],- "@opentelemetry/resources": ["@opentelemetry/[email protected]", "", { "dependencies": { "@opentelemetry/core": "1.30.1", "@opentelemetry/semantic-conventions": "1.28.0" }, "peerDependencies": { "@opentelemetry/api": ">=1.0.0 <1.10.0" } }, "sha512-5UxZqiAgLYGFjS4s9qm5mBVo433u+dSPUFWVWXmLAD4wB65oMCoXaJP1KJa9DIYYMeHu3z4BZcStG3LC593cWA=="],+ "@opentelemetry/otlp-exporter-base": ["@opentelemetry/[email protected]", "", { "dependencies": { "@opentelemetry/core": "2.9.0", "@opentelemetry/otlp-transformer": "0.220.0" }, "peerDependencies": { "@opentelemetry/api": "^1.3.0" } }, "sha512-CXYo8UD5Mn9YbgebO2EL4wejtA+gxLmLiu6HCk2KH2BR7XhFN6/6p1UlCb23DYCjeYkndevLHuejCCN1yx4+OQ=="],- "@opentelemetry/sdk-logs": ["@opentelemetry/[email protected]", "", { "dependencies": { "@opentelemetry/api-logs": "0.57.2", "@opentelemetry/core": "1.30.1", "@opentelemetry/resources": "1.30.1" }, "peerDependencies": { "@opentelemetry/api": ">=1.4.0 <1.10.0" } }, "sha512-TXFHJ5c+BKggWbdEQ/inpgIzEmS2BGQowLE9UhsMd7YYlUfBQJ4uax0VF/B5NYigdM/75OoJGhAV3upEhK+3gg=="],+ "@opentelemetry/otlp-transformer": ["@opentelemetry/[email protected]", "", { "dependencies": { "@opentelemetry/api-logs": "0.220.0", "@opentelemetry/core": "2.9.0", "@opentelemetry/resources": "2.9.0", "@opentelemetry/sdk-logs": "0.220.0", "@opentelemetry/sdk-metrics": "2.9.0", "@opentelemetry/sdk-trace": "2.9.0" }, "peerDependencies": { "@opentelemetry/api": "^1.3.0" } }, "sha512-lXGrv7KXZ0gNH9SVNUaa6vv6phVYGvJxfXAlMbzbakiXru75f5MZl8Z7oqiMMQD77riVHJCFlQvbZs/VVN2/4A=="],- "@opentelemetry/sdk-metrics": ["@opentelemetry/[email protected]", "", { "dependencies": { "@opentelemetry/core": "1.30.1", "@opentelemetry/resources": "1.30.1" }, "peerDependencies": { "@opentelemetry/api": ">=1.3.0 <1.10.0" } }, "sha512-q9zcZ0Okl8jRgmy7eNW3Ku1XSgg3sDLa5evHZpCwjspw7E8Is4K/haRPDJrBcX3YSn/Y7gUvFnByNYEKQNbNog=="],+ "@opentelemetry/resources": ["@opentelemetry/[email protected]", "", { "dependencies": { "@opentelemetry/core": "2.9.0", "@opentelemetry/semantic-conventions": "^1.29.0" }, "peerDependencies": { "@opentelemetry/api": ">=1.3.0 <1.10.0" } }, "sha512-jyA5MBLQ+Dkl3+JsZkUoUvL7yHvU64kLsvpXKarWm6347Sl1t1bXFTFykUePNpT5WH5pm9a2Qtt03iIYQhZ1Fg=="],- "@opentelemetry/sdk-trace-base": ["@opentelemetry/[email protected]", "", { "dependencies": { "@opentelemetry/core": "1.30.1", "@opentelemetry/resources": "1.30.1", "@opentelemetry/semantic-conventions": "1.28.0" }, "peerDependencies": { "@opentelemetry/api": ">=1.0.0 <1.10.0" } }, "sha512-jVPgBbH1gCy2Lb7X0AVQ8XAfgg0pJ4nvl8/IiQA6nxOsPvS+0zMJaFSs2ltXe0J6C8dqjcnpyqINDJmU30+uOg=="],+ "@opentelemetry/sdk-logs": ["@opentelemetry/[email protected]", "", { "dependencies": { "@opentelemetry/api-logs": "0.220.0", "@opentelemetry/core": "2.9.0", "@opentelemetry/resources": "2.9.0", "@opentelemetry/semantic-conventions": "^1.29.0" }, "peerDependencies": { "@opentelemetry/api": ">=1.4.0 <1.10.0" } }, "sha512-WywcTkQtv2iNmt+6y5Kcd4rzvx9bLVsBa2Nwcmg01IUaBTkTow3W4d9KE5vNBpEDtb9tp21WcRBY/lANRrApYA=="],- "@opentelemetry/semantic-conventions": ["@opentelemetry/[email protected]", "", {}, "sha512-lp4qAiMTD4sNWW4DbKLBkfiMZ4jbAboJIGOQr5DvciMRI494OapieI9qiODpOt0XBr1LjIDy1xAGAnVs5supTA=="],+ "@opentelemetry/sdk-metrics": ["@opentelemetry/[email protected]", "", { "dependencies": { "@opentelemetry/core": "2.9.0", "@opentelemetry/resources": "2.9.0" }, "peerDependencies": { "@opentelemetry/api": ">=1.9.0 <1.10.0" } }, "sha512-Xx8RGS4H5XEBl01WuCreMIpiah9cCXMbSkeuIePPdD2cUpq/vUzYmj8E/MK1OsbOc93FuAD4jfn2WOacKwLn7Q=="],++ "@opentelemetry/sdk-trace": ["@opentelemetry/[email protected]", "", { "dependencies": { "@opentelemetry/core": "2.9.0", "@opentelemetry/resources": "2.9.0", "@opentelemetry/semantic-conventions": "^1.29.0" }, "peerDependencies": { "@opentelemetry/api": ">=1.3.0 <1.10.0" } }, "sha512-sGA19HvtrrSKYsseHphluH6j3p6Xa3fqc7c7y8f/7mYWejc1lyDFcpSdD1kYa50HCLUeEo4zA5bW0pniaPszuw=="],++ "@opentelemetry/sdk-trace-base": ["@opentelemetry/[email protected]", "", { "dependencies": { "@opentelemetry/core": "2.9.0", "@opentelemetry/resources": "2.9.0", "@opentelemetry/sdk-trace": "2.9.0", "@opentelemetry/semantic-conventions": "^1.29.0" }, "peerDependencies": { "@opentelemetry/api": ">=1.3.0 <1.10.0" } }, "sha512-cp9zmTl62R8PJrpvFcmc8N2JQU/xfa0S+61q511Nji+QxCfZ8Ifvg7H27G8cANe4crg4RTrWsVvanHiXjSp6ag=="],++ "@opentelemetry/semantic-conventions": ["@opentelemetry/[email protected]", "", {}, "sha512-eSYWTm620tTk45EKSedaUL8MFYI8hW164hIXsgIHyxu3VobUB3fFCu5t0hQby6OoWRPsG1KkKUG2M5UadiLiVg=="],"@paralleldrive/cuid2": ["@paralleldrive/[email protected]", "", { "dependencies": { "@noble/hashes": "^1.1.5" } }, "sha512-ZOBkgDwEdoYVlSeRbYYXs0S9MejQofiVYoTbKzy/6GQa39/q5tQU2IX46+shYnUkpEl3wc+J6wRlar7r2EK2xA=="],@@ -913,8 +934,6 @@"@types/react-dom": ["@types/[email protected]", "", { "peerDependencies": { "@types/react": "^18.0.0" } }, "sha512-MEe3UeoENYVFXzoXEWsvcpg6ZvlrFNlOQ7EOsvhI3CfAXwzPfO8Qwuxd40nepsYKqyyVQnTdEfv68q91yLcKrQ=="],- "@types/shimmer": ["@types/[email protected]", "", {}, "sha512-UE7oxhQLLd9gub6JKIAhDq06T0F6FnztwMNRvYgjeQSBeMc1ZG/tA47EwfduvkuQS8apbkM/lpLpWsaCeYsXVg=="],-"@types/tough-cookie": ["@types/[email protected]", "", {}, "sha512-/Ad8+nIOV7Rl++6f1BdKxFSMgmoqEoYbHRpPcx3JEfv8VRsQe9Z4mCXeJBzxs7mbHY/XOZZuXlRNfhpVPbs6ZA=="],"@types/trusted-types": ["@types/[email protected]", "", {}, "sha512-ScaPdn1dQczgbl0QFTeTOmVHFULt394XJgOQNoyVhZ6r2vLnMLJfBPd53SB52T/3G36VI1/g2MZaX0cwDuXsfw=="],@@ -993,7 +1012,7 @@"@vercel/oidc": ["@vercel/[email protected]", "", {}, "sha512-UycprH3T6n3jH0k44NHMa7pnFHGu/N05MjojYr+Mc6I7obkoLIJujSWwin1pCvdy/eOxrI/l3uDLQsmcrOb4ug=="],- "@vercel/otel": ["@vercel/[email protected]", "", { "peerDependencies": { "@opentelemetry/api": ">=1.7.0 <2.0.0", "@opentelemetry/api-logs": ">=0.46.0 <0.200.0", "@opentelemetry/instrumentation": ">=0.46.0 <0.200.0", "@opentelemetry/resources": ">=1.19.0 <2.0.0", "@opentelemetry/sdk-logs": ">=0.46.0 <0.200.0", "@opentelemetry/sdk-metrics": ">=1.19.0 <2.0.0", "@opentelemetry/sdk-trace-base": ">=1.19.0 <2.0.0" } }, "sha512-esRkt470Y2jRK1B1g7S1vkt4Csu44gp83Zpu8rIyPoqy2BKgk4z7ik1uSMswzi45UogLHFl6yR5TauDurBQi4Q=="],+ "@vercel/otel": ["@vercel/[email protected]", "", { "peerDependencies": { "@opentelemetry/api": ">=1.9.0 <2.0.0", "@opentelemetry/api-logs": ">=0.200.0 <0.300.0", "@opentelemetry/instrumentation": ">=0.200.0 <0.300.0", "@opentelemetry/resources": ">=2.0.0 <3.0.0", "@opentelemetry/sdk-logs": ">=0.200.0 <0.300.0", "@opentelemetry/sdk-metrics": ">=2.0.0 <3.0.0", "@opentelemetry/sdk-trace-base": ">=2.0.0 <3.0.0" } }, "sha512-Ofvzs9qhftRD1YMLuPnhbXjQZG6IKrJ9AmEKmRHRGfoWlV89ed2gAOkvddkFiZDFZJm2rrFNdeZKRVxoCdnWiw=="],"@vitejs/plugin-react": ["@vitejs/[email protected]", "", { "dependencies": { "@babel/core": "^7.28.0", "@babel/plugin-transform-react-jsx-self": "^7.27.1", "@babel/plugin-transform-react-jsx-source": "^7.27.1", "@rolldown/pluginutils": "1.0.0-beta.27", "@types/babel__core": "^7.20.5", "react-refresh": "^0.17.0" }, "peerDependencies": { "vite": "^4.2.0 || ^5.0.0 || ^6.0.0 || ^7.0.0" } }, "sha512-gUu9hwfWvvEDBBmgtAowQCojwZmJ5mcLn3aufeCsitijs3+f2NsrPtlAWIR6OPiqljl96GVCUbLe0HyqIpVaoA=="],@@ -1013,8 +1032,6 @@"acorn": ["[email protected]", "", { "bin": { "acorn": "bin/acorn" } }, "sha512-UVJyE9MttOsBQIDKw1skb9nAwQuR5wuGD3+82K6JgJlm/Y+KI92oNsMNGZCYdDsVtRHSak0pcV5Dno5+4jh9sw=="],- "acorn-import-attributes": ["[email protected]", "", { "peerDependencies": { "acorn": "^8" } }, "sha512-n02Vykv5uA3eHGM/Z2dQrcD56kL8TyDb2p1+0P83PClMnC/nc+anbQRhIOWnSq4Ke/KvDPrY3C9hDtC/A3eHnQ=="],-"acorn-jsx": ["[email protected]", "", { "peerDependencies": { "acorn": "^6.0.0 || ^7.0.0 || ^8.0.0" } }, "sha512-rq9s+JNhf0IChjtDXxllJ7g41oZk5SlXtp0LHwyA5cejwn7vKmKp4pPri6YEePv2PU65sAsegbXtIinmDFDXgQ=="],"agent-base": ["[email protected]", "", {}, "sha512-MnA+YT8fwfJPgBx3m60MNqakm30XOkyIoH1y6huTQvC0PwZG7ki8NacLBcrPbNoo8vEZy7Jpuk7+jMO+CUovTQ=="],@@ -1111,7 +1128,7 @@"chownr": ["[email protected]", "", {}, "sha512-+IxzY9BZOQd/XuYPRmrvEVjF/nqj5kgT4kEq7VofrDoM1MxoRjEWkrCC3EtLi59TVawxTAn+orJwFQcrqEN1+g=="],- "cjs-module-lexer": ["[email protected]", "", {}, "sha512-9z8TZaGM1pfswYeXrUpzPrkx8UnWYdhJclsiYMm6x/w5+nN+8Tf/LnAgfLGQCm59qAOxU8WwHEq2vNwF6i4j+Q=="],+ "cjs-module-lexer": ["[email protected]", "", {}, "sha512-4bHTS2YuzUvtoLjdy+98ykbNB5jS0+07EvFNXerqZQJ89F7DI6ET7OQo/HJuW6K0aVsKA9hj9/RVb2kQVOrPDQ=="],"class-variance-authority": ["[email protected]", "", { "dependencies": { "clsx": "^2.1.1" } }, "sha512-Ka+9Trutv7G8M6WT6SeiRWz792K5qEqIGEGzXKhAE6xOWAY6pPH8U+9IY3oCMv6kqTmLsv7Xh/2w2RigkePMsg=="],@@ -1497,7 +1514,7 @@"import-fresh": ["[email protected]", "", { "dependencies": { "parent-module": "^1.0.0", "resolve-from": "^4.0.0" } }, "sha512-TR3KfrTZTYLPB6jUjfx6MF9WcWrHL9su5TObK4ZkYgBdWKPOFoSoQIdEuTuR82pmtxH2spWG9h6etwfr1pLBqQ=="],- "import-in-the-middle": ["[email protected]", "", { "dependencies": { "acorn": "^8.14.0", "acorn-import-attributes": "^1.9.5", "cjs-module-lexer": "^1.2.2", "module-details-from-path": "^1.0.3" } }, "sha512-5tCuY9BV8ujfOpwtAGgsTx9CGUapcFMEEyByLv1B+v2+6DhAcw+Zr0nhQT7uwaZ7DiourxFEscghOR8e1aPLQw=="],+ "import-in-the-middle": ["[email protected]", "", { "dependencies": { "cjs-module-lexer": "^2.2.0", "es-module-lexer": "^2.2.0", "module-details-from-path": "^1.0.4" } }, "sha512-0rymlHSFLwZ0ixx8DaQkoIyZojJPY2a0K2nEYslhKJ6jIYO/m0IcCb7iQsFPmS7WmKwISZiIrv5Icstrw/CmqA=="],"imurmurhash": ["[email protected]", "", {}, "sha512-JmXMZ6wuvDmLiHEml9ykzqO6lwFbof0GG4IkcGaENdCRDDmMVnny7s5HsIgHCbaq0w2MyPhDqkhTUgS2LU2PHA=="],@@ -1615,12 +1632,6 @@"khroma": ["[email protected]", "", {}, "sha512-Ls993zuzfayK269Svk9hzpeGUKob/sIgZzyHYdjQoAdQetRKpOLj+k/QQQ/6Qi0Yz65mlROrfd+Ev+1+7dz9Kw=="],- "langfuse": ["[email protected]", "", { "dependencies": { "langfuse-core": "^3.38.4" } }, "sha512-2UqMeHLl3DGNX1Nh/cO4jGhk7TzDJ6gjQLlyS9rwFCKVO81xot6b58yeTsTB5YrWupWsOxQtMNoQYIQGOUlH9Q=="],-- "langfuse-core": ["[email protected]", "", { "dependencies": { "mustache": "^4.2.0" } }, "sha512-onTAqcEGhoXuBgqDFXe2t+bt9Vi+5YChRgdz3voM49JKoHwtVZQiUdqTfjSivGR75eSbYoiaIL8IRoio+jaqwg=="],-- "langfuse-vercel": ["[email protected]", "", { "dependencies": { "langfuse": "^3.38.4", "langfuse-core": "^3.38.4" }, "peerDependencies": { "ai": ">=3.2.44" } }, "sha512-gyhQuim2b1qpI7yiGnww9qzqsdpD59XagD+QB3eGHIrX+1ao7vbcrwL14H0GlsLIUM10Nud9wtEbxiFZP1PB7g=="],-"langium": ["[email protected]", "", { "dependencies": { "chevrotain": "~11.1.1", "chevrotain-allstar": "~0.3.1", "vscode-languageserver": "~9.0.1", "vscode-languageserver-textdocument": "~1.0.11", "vscode-uri": "~3.1.0" } }, "sha512-zu9QWmjpzJcomzdJQAHgDVhLGq5bLosVak1KVa40NzQHXfqr4eAHupvnPOVXEoLkg6Ocefvf/93d//SB7du4YQ=="],"language-subtag-registry": ["[email protected]", "", {}, "sha512-0K65Lea881pHotoGEa5gDlMxt3pctLi2RplBb7Ezh4rRdLEOtgi7n4EwK9lamnUCkKBqaeKRVebTq6BAxSkpXQ=="],@@ -1947,7 +1958,7 @@"remend": ["[email protected]", "", {}, "sha512-iIhggPkhW3hFImKtB10w0dz4EZbs28mV/dmbcYVonWEJ6UGHHpP+bFZnTh6GNWJONg5m+U56JrL+8IxZRdgWjw=="],- "require-in-the-middle": ["[email protected]", "", { "dependencies": { "debug": "^4.3.5", "module-details-from-path": "^1.0.3", "resolve": "^1.22.8" } }, "sha512-gAZ+kLqBdHarXB64XpAe2VCjB7rIRv+mU8tfRWziHRJ5umKsIHN2tLLv6EtMw7WCdP19S0ERVMldNvxYCHnhSQ=="],+ "require-in-the-middle": ["[email protected]", "", { "dependencies": { "debug": "^4.3.5", "module-details-from-path": "^1.0.3" } }, "sha512-QT7FVMXfWOYFbeRBF6nu+I6tr2Tf3u0q8RIEjNob/heKY/nh7drD/k7eeMFmSQgnTtCzLDcCu/XEnpW2wk4xCQ=="],"resolve": ["[email protected]", "", { "dependencies": { "is-core-module": "^2.16.0", "path-parse": "^1.0.7", "supports-preserve-symlinks-flag": "^1.0.0" }, "bin": { "resolve": "bin/resolve" } }, "sha512-NPRy+/ncIMeDlTAsuqwKIiferiawhefFJtkNSW0qZJEqMEb+qBt/77B/jGeeek+F0uOeN05CDa6HXbbIgtVX4w=="],@@ -1981,7 +1992,7 @@"scheduler": ["[email protected]", "", {}, "sha512-eNv+WrVbKu1f3vbYJT/xtiF5syA5HPIMtf9IgY/nKg0sWqzAUEvqY/xm7OcZc/qafLx/iO9FgOmeSAp4v5ti/Q=="],- "semver": ["[email protected]", "", { "bin": { "semver": "bin/semver.js" } }, "sha512-RF0Fw+rO5AMf9MAyaRXI4AV0Ulj5lMHqVxxdSgiVbixSCXoEmmX/jk0CuJw4+3SqroYO9VoUh+HcuJivvtJemA=="],+ "semver": ["[email protected]", "", { "bin": { "semver": "bin/semver.js" } }, "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA=="],"set-cookie-parser": ["[email protected]", "", {}, "sha512-IOc8uWeOZgnb3ptbCURJWNjWUPcO3ZnTTdzsurqERrP6nPyv+paC55vJM0LpOlT2ne+Ix+9+CRG1MNLlyZ4GjQ=="],@@ -1997,8 +2008,6 @@"shebang-regex": ["[email protected]", "", {}, "sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A=="],- "shimmer": ["[email protected]", "", {}, "sha512-sQTKC1Re/rM6XyFM6fIAGHRPVGvyXfgzIDvzoq608vM+jeyVD0Tu1E6Np0Kc2zAIFWIj963V2800iF/9LPieQw=="],-"side-channel": ["[email protected]", "", { "dependencies": { "es-errors": "^1.3.0", "object-inspect": "^1.13.3", "side-channel-list": "^1.0.0", "side-channel-map": "^1.0.1", "side-channel-weakmap": "^1.0.2" } }, "sha512-ZX99e6tRweoUXqR+VBrslhda51Nh5MTQwou5tnUDgbtyM0dBgmhEDtWGP/xbKn6hqfPRHujUNwz5fy/wbbhnpw=="],"side-channel-list": ["[email protected]", "", { "dependencies": { "es-errors": "^1.3.0", "object-inspect": "^1.13.3" } }, "sha512-FCLHtRD/gnpCiCHEiJLOwdmFP+wzCmDEkc9y7NsYxeF4u7Btsn1ZuwgwJGxImImHicJArLP4R0yX4c2KCrMrTA=="],@@ -2259,10 +2268,6 @@"@babel/core/debug": ["[email protected]", "", { "dependencies": { "ms": "^2.1.3" } }, "sha512-KcKCqiftBJcZr++7ykoDIEwSa3XWowTfNPo92BYxjXiyYEVrUQh2aLyhxBCwww+heortUFxEJYcRzosstTEBYQ=="],- "@babel/core/semver": ["[email protected]", "", { "bin": { "semver": "bin/semver.js" } }, "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA=="],-- "@babel/helper-compilation-targets/semver": ["[email protected]", "", { "bin": { "semver": "bin/semver.js" } }, "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA=="],-"@babel/traverse/debug": ["[email protected]", "", { "dependencies": { "ms": "^2.1.3" } }, "sha512-KcKCqiftBJcZr++7ykoDIEwSa3XWowTfNPo92BYxjXiyYEVrUQh2aLyhxBCwww+heortUFxEJYcRzosstTEBYQ=="],"@esbuild-kit/core-utils/esbuild": ["[email protected]", "", { "optionalDependencies": { "@esbuild/android-arm": "0.18.20", "@esbuild/android-arm64": "0.18.20", "@esbuild/android-x64": "0.18.20", "@esbuild/darwin-arm64": "0.18.20", "@esbuild/darwin-x64": "0.18.20", "@esbuild/freebsd-arm64": "0.18.20", "@esbuild/freebsd-x64": "0.18.20", "@esbuild/linux-arm": "0.18.20", "@esbuild/linux-arm64": "0.18.20", "@esbuild/linux-ia32": "0.18.20", "@esbuild/linux-loong64": "0.18.20", "@esbuild/linux-mips64el": "0.18.20", "@esbuild/linux-ppc64": "0.18.20", "@esbuild/linux-riscv64": "0.18.20", "@esbuild/linux-s390x": "0.18.20", "@esbuild/linux-x64": "0.18.20", "@esbuild/netbsd-x64": "0.18.20", "@esbuild/openbsd-x64": "0.18.20", "@esbuild/sunos-x64": "0.18.20", "@esbuild/win32-arm64": "0.18.20", "@esbuild/win32-ia32": "0.18.20", "@esbuild/win32-x64": "0.18.20" }, "bin": { "esbuild": "bin/esbuild" } }, "sha512-ceqxoedUrcayh7Y7ZX6NdbbDzGROiyVBgC4PriJThBKSVPWnnFHZAkfI1lJT8QFkOwH4qOS2SJkS4wvpGl8BpA=="],@@ -2369,16 +2374,12 @@"eslint-plugin-import/minimatch": ["[email protected]", "", { "dependencies": { "brace-expansion": "^1.1.7" } }, "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw=="],- "eslint-plugin-import/semver": ["[email protected]", "", { "bin": { "semver": "bin/semver.js" } }, "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA=="],-"eslint-plugin-jsx-a11y/minimatch": ["[email protected]", "", { "dependencies": { "brace-expansion": "^1.1.7" } }, "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw=="],"eslint-plugin-react/minimatch": ["[email protected]", "", { "dependencies": { "brace-expansion": "^1.1.7" } }, "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw=="],"eslint-plugin-react/resolve": ["[email protected]", "", { "dependencies": { "is-core-module": "^2.13.0", "path-parse": "^1.0.7", "supports-preserve-symlinks-flag": "^1.0.0" }, "bin": { "resolve": "bin/resolve" } }, "sha512-U7WjGVG9sH8tvjW5SmGbQuui75FiyjAX72HX15DwBBwF9dNiQZRQAg9nnPhYy+TUnE0+VcrttuvNI8oSxZcocA=="],- "eslint-plugin-react/semver": ["[email protected]", "", { "bin": { "semver": "bin/semver.js" } }, "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA=="],-"eslint-plugin-react-hooks/zod": ["[email protected]", "", {}, "sha512-nGFJTnJN6cM2v9kXL+SOBq3AtjQby3Mv5ySGFof5UGRHrRioSJ5iG680cYNjE/yWk671nROcpPj4hAS8nyLhSw=="],"exa-js/dotenv": ["[email protected]", "", {}, "sha512-47qPchRCykZC03FhkYAhrvwU4xDBFIj1QPqaarj6mdM/hgUzfPHcpkHJOn3mJAufFeeAxAzeGsr5X0M4k6fLZQ=="],@@ -2391,7 +2392,9 @@"https-proxy-agent/debug": ["[email protected]", "", { "dependencies": { "ms": "^2.1.3" } }, "sha512-KcKCqiftBJcZr++7ykoDIEwSa3XWowTfNPo92BYxjXiyYEVrUQh2aLyhxBCwww+heortUFxEJYcRzosstTEBYQ=="],- "import-in-the-middle/acorn": ["[email protected]", "", { "bin": { "acorn": "bin/acorn" } }, "sha512-NZyJarBfL7nWwIq+FDL6Zp/yHEhePMNnnJ0y3qfieCrmNvYct8uvtiV41UvlSe6apAfk0fY1FbWx+NwfmpvtTg=="],+ "import-in-the-middle/es-module-lexer": ["[email protected]", "", {}, "sha512-shc1dbU90Yl/xq1QrC7QRtfcwURZuVRfPhZbDoldJ1cn1gzDvBaBWlv0eFolj5+0znnPJz5TXLxsN77X/12KTA=="],++ "is-bun-module/semver": ["[email protected]", "", { "bin": { "semver": "bin/semver.js" } }, "sha512-RF0Fw+rO5AMf9MAyaRXI4AV0Ulj5lMHqVxxdSgiVbixSCXoEmmX/jk0CuJw4+3SqroYO9VoUh+HcuJivvtJemA=="],"lru-cache/yallist": ["[email protected]", "", {}, "sha512-a4UGQaWPH59mOXUYnAG2ewncQS4i4F43Tv3JoAM+s2VDAmS9NsK8GpDMLrCHPksFT7h3K6TOoUNn2pb7RoXx4g=="],@@ -2419,8 +2422,6 @@"pretty-format/react-is": ["[email protected]", "", {}, "sha512-w2GsyukL62IJnlaff/nRegPQR94C/XXamvMWmSHRJ4y7Ts/4ocGRmTHvOs8PSE6pB3dWOrD/nueuU5sduBsQ4w=="],- "require-in-the-middle/debug": ["[email protected]", "", { "dependencies": { "ms": "^2.1.3" } }, "sha512-KcKCqiftBJcZr++7ykoDIEwSa3XWowTfNPo92BYxjXiyYEVrUQh2aLyhxBCwww+heortUFxEJYcRzosstTEBYQ=="],-"sharp/detect-libc": ["[email protected]", "", {}, "sha512-Btj2BOOO83o3WyH59e8MgXsxEQVcarkUOpEYrubB0urwnN10yQ364rsiByU11nZlqWYZm05i/of7io4mzihBtQ=="],"sharp/semver": ["[email protected]", "", { "bin": { "semver": "bin/semver.js" } }, "sha512-vFKC2IEtQnVhpT78h1Yp8wzwrf8CM+MzKMHGJZfBtzhZNycRFnXsHk6E5TxIkkMsgNS7mdX3AGB7x2QM2di4lA=="],diff --git a/docs/CONFIGURATION.md b/docs/CONFIGURATION.mdindex ba3eeb78..f723085f 100644--- a/docs/CONFIGURATION.md+++ b/docs/CONFIGURATION.md@@ -263,7 +263,7 @@ Enable tracing and monitoring with Langfuse:```bashLANGFUSE_SECRET_KEY=[YOUR_SECRET_KEY]LANGFUSE_PUBLIC_KEY=[YOUR_PUBLIC_KEY]-LANGFUSE_HOST=https://cloud.langfuse.com+LANGFUSE_BASE_URL=https://cloud.langfuse.com```### File Uploaddiff --git a/instrumentation.test.ts b/instrumentation.test.tsnew file mode 100644index 00000000..500f2a31--- /dev/null+++ b/instrumentation.test.ts@@ -0,0 +1,33 @@+import { describe, expect, it, vi } from 'vitest'++// Mock the modules before any imports+vi.mock('@langfuse/otel', () => ({+ LangfuseSpanProcessor: vi.fn()+}))+vi.mock('@vercel/otel', () => ({+ registerOTel: vi.fn()+}))++// Import after mocking+import { LangfuseSpanProcessor } from '@langfuse/otel'+import { registerOTel } from '@vercel/otel'++import { langfuseSpanProcessor, register } from './instrumentation'++describe('instrumentation', () => {+ it('exports a shared LangfuseSpanProcessor instance for force-flushing', () => {+ expect(LangfuseSpanProcessor).toHaveBeenCalledTimes(1)+ expect(langfuseSpanProcessor).toBeInstanceOf(LangfuseSpanProcessor)+ })++ it('registers the Langfuse span processor with OTel', async () => {+ delete process.env.OLLAMA_BASE_URL++ await register()++ expect(registerOTel).toHaveBeenCalledWith({+ serviceName: 'morphic-ai-search',+ spanProcessors: [langfuseSpanProcessor]+ })+ })+})diff --git a/instrumentation.ts b/instrumentation.tsindex a13833da..04e4b72a 100644--- a/instrumentation.ts+++ b/instrumentation.ts@@ -1,10 +1,14 @@+import { LangfuseSpanProcessor } from '@langfuse/otel'import { registerOTel } from '@vercel/otel'-import { LangfuseExporter } from 'langfuse-vercel'++// Exported so request handlers can force-flush pending spans before the+// serverless function exits+export const langfuseSpanProcessor = new LangfuseSpanProcessor()export async function register() {registerOTel({serviceName: 'morphic-ai-search',- traceExporter: new LangfuseExporter()+ spanProcessors: [langfuseSpanProcessor]})// Initialize Ollama validation on server startup (only when configured)diff --git a/lib/actions/__tests__/chat.test.ts b/lib/actions/__tests__/chat.test.tsindex e0e4d5b2..ca0bfe6c 100644--- a/lib/actions/__tests__/chat.test.ts+++ b/lib/actions/__tests__/chat.test.ts@@ -582,8 +582,7 @@ describe('Chat Actions', () => {expect(generateChatTitle).toHaveBeenCalledWith({userMessageContent: 'Hello, how are you?',- modelId,- parentTraceId: undefined+ modelId})expect(dbActions.updateChatTitle).toHaveBeenCalledWith(chatId,diff --git a/lib/actions/__tests__/feedback.test.ts b/lib/actions/__tests__/feedback.test.tsindex ee9e9f7b..49246936 100644--- a/lib/actions/__tests__/feedback.test.ts+++ b/lib/actions/__tests__/feedback.test.ts@@ -2,11 +2,11 @@ import { beforeEach, describe, expect, it, vi } from 'vitest'// Mock the modules before any importsvi.mock('@/lib/db')-vi.mock('langfuse')+vi.mock('@langfuse/client')vi.mock('@/lib/utils/telemetry')// Import after mocking-import { Langfuse } from 'langfuse'+import { LangfuseClient } from '@langfuse/client'import { db } from '@/lib/db'import { isTracingEnabled } from '@/lib/utils/telemetry'@@ -92,13 +92,15 @@ describe('Feedback Actions', () => {// Enable tracingvi.mocked(isTracingEnabled).mockReturnValue(true)- // Mock Langfuse- const mockScore = vi.fn()+ // Mock LangfuseClient+ const mockScoreCreate = vi.fn()const mockFlush = vi.fn().mockResolvedValue(undefined)- vi.mocked(Langfuse).mockImplementation(function () {+ vi.mocked(LangfuseClient).mockImplementation(function () {return {- score: mockScore,- flushAsync: mockFlush+ score: {+ create: mockScoreCreate,+ flush: mockFlush+ }} as any} as any)@@ -121,8 +123,8 @@ describe('Feedback Actions', () => {const result = await updateMessageFeedback(messageId, score)expect(result).toEqual({ success: true })- expect(Langfuse).toHaveBeenCalled()- expect(mockScore).toHaveBeenCalledWith({+ expect(LangfuseClient).toHaveBeenCalled()+ expect(mockScoreCreate).toHaveBeenCalledWith({traceId: 'test-trace-id',name: 'user-feedback',value: score,diff --git a/lib/actions/chat.ts b/lib/actions/chat.tsindex ba564fe6..e0171297 100644--- a/lib/actions/chat.ts+++ b/lib/actions/chat.ts@@ -329,15 +329,13 @@ export async function saveChatTitle(chat: Chat | null,chatId: string,message: UIMessage | null,- modelId: string,- parentTraceId?: string+ modelId: string) {if (!chat && message) {const userContent = getTextFromParts(message.parts)const title = await generateChatTitle({userMessageContent: userContent,- modelId,- parentTraceId+ modelId})await dbActions.updateChatTitle(chatId, title)revalidateTag(`chat-${chatId}`, 'max')diff --git a/lib/actions/feedback.ts b/lib/actions/feedback.tsindex ac91d11e..0173ae01 100644--- a/lib/actions/feedback.ts+++ b/lib/actions/feedback.ts@@ -1,7 +1,7 @@'use server'+import { LangfuseClient } from '@langfuse/client'import { eq } from 'drizzle-orm'-import { Langfuse } from 'langfuse'import { db } from '@/lib/db'import { messages } from '@/lib/db/schema'@@ -53,14 +53,15 @@ export async function updateMessageFeedback(// Send feedback to Langfuse if trace ID exists and tracing is enabledconst traceId = (result.metadata as UIMessageMetadata)?.traceIdif (traceId && isTracingEnabled()) {- const langfuse = new Langfuse()- langfuse.score({+ const langfuse = new LangfuseClient()+ langfuse.score.create({traceId,name: 'user-feedback',value: score,comment: score === 1 ? 'Thumbs up' : 'Thumbs down'})- await langfuse.flushAsync()+ // Flush before the server action returns so the score is not lost+ await langfuse.score.flush()}return { success: true }diff --git a/lib/agents/researcher.ts b/lib/agents/researcher.tsindex 4115814e..04381abd 100644--- a/lib/agents/researcher.ts+++ b/lib/agents/researcher.ts@@ -70,12 +70,10 @@ function wrapSearchToolForQuickMode<export function createResearcher({model,modelConfig,- parentTraceId,searchMode = 'adaptive'}: {model: stringmodelConfig?: Model- parentTraceId?: stringsearchMode?: SearchMode}) {try {@@ -133,17 +131,14 @@ export function createResearcher({...(modelConfig?.providerOptions && {providerOptions: modelConfig.providerOptions}),+ // Spans join the parent Langfuse trace via OTel context propagationexperimental_telemetry: {isEnabled: isTracingEnabled(),functionId: 'research-agent',metadata: {modelId: model,agentType: 'researcher',- searchMode,- ...(parentTraceId && {- langfuseTraceId: parentTraceId,- langfuseUpdateParent: false- })+ searchMode}}})diff --git a/lib/agents/title-generator.ts b/lib/agents/title-generator.tsindex 26cc4f42..b04239be 100644--- a/lib/agents/title-generator.ts+++ b/lib/agents/title-generator.ts@@ -7,7 +7,6 @@ interface GenerateChatTitleParams {userMessageContent: stringmodelId: stringabortSignal?: AbortSignal- parentTraceId?: string}/**@@ -19,8 +18,7 @@ interface GenerateChatTitleParams {export async function generateChatTitle({userMessageContent,modelId,- abortSignal,- parentTraceId+ abortSignal}: GenerateChatTitleParams): Promise<string> {// Fallback title uses the first 75 characters of the message or a default string.const fallbackTitle = userMessageContent.substring(0, 75).trim() || 'New Chat'@@ -33,17 +31,14 @@ export async function generateChatTitle({system: systemPrompt,prompt: userMessageContent,abortSignal,+ // Spans join the parent Langfuse trace via OTel context propagationexperimental_telemetry: {isEnabled: isTracingEnabled(),functionId: 'title-generation',metadata: {modelId: modelId,agentType: 'title-generator',- promptLength: userMessageContent.length,- ...(parentTraceId && {- langfuseTraceId: parentTraceId,- langfuseUpdateParent: false- })+ promptLength: userMessageContent.length}}})diff --git a/lib/streaming/create-chat-stream-response.ts b/lib/streaming/create-chat-stream-response.tsindex de62cd35..fb4507d5 100644--- a/lib/streaming/create-chat-stream-response.ts+++ b/lib/streaming/create-chat-stream-response.ts@@ -1,11 +1,11 @@+import type { LangfuseSpan } from '@langfuse/tracing'+import { propagateAttributes, startActiveObservation } from '@langfuse/tracing'import {consumeStream,convertToModelMessages,pruneMessages,smoothStream} from 'ai'-import { randomUUID } from 'crypto'-import { Langfuse } from 'langfuse'import { researcher } from '@/lib/agents/researcher'import {@@ -33,6 +33,8 @@ import { stripSpecFromMessages } from './helpers/strip-spec-from-messages'import type { StreamContext } from './helpers/types'import { BaseStreamConfig } from './types'+import { langfuseSpanProcessor } from '@/instrumentation'+// Constantsconst DEFAULT_CHAT_TITLE = 'Untitled'@@ -78,185 +80,195 @@ export async function createChatStreamResponse(perfLog('loadChat skipped for new chat')}- // Create parent trace ID for grouping all operations- let parentTraceId: string | undefined- let langfuse: Langfuse | undefined-- if (isTracingEnabled()) {- parentTraceId = randomUUID()- langfuse = new Langfuse()+ const executeStream = async (rootSpan?: LangfuseSpan): Promise<Response> => {+ // Real OTel trace ID, stored in message metadata so feedback scores can+ // be attached to this trace later+ const parentTraceId = rootSpan?.traceId- // Create parent trace with name "research"- langfuse.trace({- id: parentTraceId,- name: 'research',- metadata: {- chatId,- userId,- modelId: `${model.providerId}:${model.id}`,- trigger+ const endTracing = async () => {+ if (rootSpan) {+ rootSpan.end()+ await langfuseSpanProcessor.forceFlush()}- })- }+ }- // Create stream context with trace ID- const context: StreamContext = {- chatId,- userId,- modelId: `${model.providerId}:${model.id}`,- messageId,- trigger,- initialChat,- abortSignal,- parentTraceId,- isNewChat- }+ // Create stream context with trace ID+ const context: StreamContext = {+ chatId,+ userId,+ modelId: `${model.providerId}:${model.id}`,+ messageId,+ trigger,+ initialChat,+ abortSignal,+ parentTraceId,+ isNewChat+ }- // Declare titlePromise in outer scope for onFinish access- let titlePromise: Promise<string> | undefined+ // Declare titlePromise in outer scope for onFinish access+ let titlePromise: Promise<string> | undefined- try {- // Prepare messages for the model- const prepareStart = performance.now()- perfLog(- `prepareMessages - Invoked: trigger=${trigger}, isNewChat=${isNewChat}`- )- const messagesToModel = await prepareMessages(context, message)- perfTime('prepareMessages completed (stream)', prepareStart)+ try {+ // Prepare messages for the model+ const prepareStart = performance.now()+ perfLog(+ `prepareMessages - Invoked: trigger=${trigger}, isNewChat=${isNewChat}`+ )+ const messagesToModel = await prepareMessages(context, message)+ perfTime('prepareMessages completed (stream)', prepareStart)- // Get the researcher agent with parent trace ID and search mode.- const researchAgent = researcher({- model: context.modelId,- modelConfig: model,- parentTraceId,- searchMode- })+ // Get the researcher agent with search mode+ const researchAgent = researcher({+ model: context.modelId,+ modelConfig: model,+ searchMode+ })- // For OpenAI models, strip reasoning parts from UIMessages before conversion- // OpenAI's Responses API requires reasoning items and their following items to be kept together- // See: https://github.com/vercel/ai/issues/11036- const isOpenAI = context.modelId.startsWith('openai:')- const messagesWithoutSpec = stripSpecFromMessages(messagesToModel)- const messagesToConvert = isOpenAI- ? stripReasoningParts(messagesWithoutSpec)- : messagesWithoutSpec+ // For OpenAI models, strip reasoning parts from UIMessages before conversion+ // OpenAI's Responses API requires reasoning items and their following items to be kept together+ // See: https://github.com/vercel/ai/issues/11036+ const isOpenAI = context.modelId.startsWith('openai:')+ const messagesWithoutSpec = stripSpecFromMessages(messagesToModel)+ const messagesToConvert = isOpenAI+ ? stripReasoningParts(messagesWithoutSpec)+ : messagesWithoutSpec- // Convert to model messages and apply context window management- let modelMessages = await convertToModelMessages(messagesToConvert, {- convertDataPart- })+ // Convert to model messages and apply context window management+ let modelMessages = await convertToModelMessages(messagesToConvert, {+ convertDataPart+ })- // Prune messages to reduce token usage while keeping recent context- modelMessages = pruneMessages({- messages: modelMessages,- reasoning: 'before-last-message',- toolCalls: 'before-last-2-messages',- emptyMessages: 'remove'- })+ // Prune messages to reduce token usage while keeping recent context+ modelMessages = pruneMessages({+ messages: modelMessages,+ reasoning: 'before-last-message',+ toolCalls: 'before-last-2-messages',+ emptyMessages: 'remove'+ })- if (shouldTruncateMessages(modelMessages, model)) {- const maxTokens = getMaxAllowedTokens(model)- const originalCount = modelMessages.length- modelMessages = truncateMessages(modelMessages, maxTokens, model.id)+ if (shouldTruncateMessages(modelMessages, model)) {+ const maxTokens = getMaxAllowedTokens(model)+ const originalCount = modelMessages.length+ modelMessages = truncateMessages(modelMessages, maxTokens, model.id)- if (process.env.NODE_ENV === 'development') {- console.log(- `Context window limit reached. Truncating from ${originalCount} to ${modelMessages.length} messages`- )+ if (process.env.NODE_ENV === 'development') {+ console.log(+ `Context window limit reached. Truncating from ${originalCount} to ${modelMessages.length} messages`+ )+ }}- }- // Start title generation in parallel if it's a new chat- if (!initialChat && message) {- const userContent = getTextFromParts(message.parts)- titlePromise = generateChatTitle({- userMessageContent: userContent,- modelId: context.modelId,+ // Start title generation in parallel if it's a new chat+ if (!initialChat && message) {+ const userContent = getTextFromParts(message.parts)+ titlePromise = generateChatTitle({+ userMessageContent: userContent,+ modelId: context.modelId,+ abortSignal+ }).catch(error => {+ console.error('Error generating title:', error)+ return DEFAULT_CHAT_TITLE+ })+ }++ const llmStart = performance.now()+ perfLog(+ `researchAgent.stream - Start: model=${context.modelId}, searchMode=${searchMode}`+ )+ const result = await researchAgent.stream({+ messages: modelMessages,abortSignal,- parentTraceId- }).catch(error => {- console.error('Error generating title:', error)- return DEFAULT_CHAT_TITLE+ experimental_transform: smoothStream({ chunking: 'word' }),+ ...(isUsageLogging() && {+ onStepFinish: step => {+ logUsage(+ { scope: 'step', modelId: context.modelId },+ step.usage,+ step.providerMetadata+ )+ }+ })})- }+ result.consumeStream()- const llmStart = performance.now()- perfLog(- `researchAgent.stream - Start: model=${context.modelId}, searchMode=${searchMode}`- )- const result = await researchAgent.stream({- messages: modelMessages,- abortSignal,- experimental_transform: smoothStream({ chunking: 'word' }),- ...(isUsageLogging() && {- onStepFinish: step => {- logUsage(- { scope: 'step', modelId: context.modelId },- step.usage,- step.providerMetadata+ // Log the session-total usage once the stream settles (does not block the+ // response; consumeStream above already drives it to completion).+ if (isUsageLogging()) {+ Promise.resolve(result.totalUsage)+ .then(usage =>+ logUsage({ scope: 'total', modelId: context.modelId }, usage))- }- })- })- result.consumeStream()-- // Log the session-total usage once the stream settles (does not block the- // response; consumeStream above already drives it to completion).- if (isUsageLogging()) {- Promise.resolve(result.totalUsage)- .then(usage =>- logUsage({ scope: 'total', modelId: context.modelId }, usage)- )- .catch(() => {})- }+ .catch(() => {})+ }- return result.toUIMessageStreamResponse({- messageMetadata: ({ part }) => {- if (part.type === 'start') {- return {- traceId: parentTraceId,- searchMode,- modelId: context.modelId+ return result.toUIMessageStreamResponse({+ messageMetadata: ({ part }) => {+ if (part.type === 'start') {+ return {+ traceId: parentTraceId,+ searchMode,+ modelId: context.modelId+ }}- }- },- onFinish: async ({ responseMessage, isAborted }) => {- try {- perfTime('researchAgent.stream completed', llmStart)- if (isAborted || !responseMessage) return+ },+ onFinish: async ({ responseMessage, isAborted }) => {+ try {+ perfTime('researchAgent.stream completed', llmStart)+ if (isAborted || !responseMessage) return- // Persist stream results to database- await persistStreamResults(- responseMessage,- chatId,- userId,- titlePromise,- parentTraceId,- searchMode,- context.modelId,- context.pendingInitialSave,- context.pendingInitialUserMessage- )- } finally {- if (langfuse) {- await langfuse.flushAsync()+ // Persist stream results to database+ await persistStreamResults(+ responseMessage,+ chatId,+ userId,+ titlePromise,+ parentTraceId,+ searchMode,+ context.modelId,+ context.pendingInitialSave,+ context.pendingInitialUserMessage+ )+ } finally {+ await endTracing()}- }- },- onError: (error: unknown) => {- console.error('Stream response error:', error)- return serializePublicError(error)- },- consumeSseStream: consumeStream- })- } catch (error) {- if (langfuse) {- await langfuse.flushAsync()+ },+ onError: (error: unknown) => {+ console.error('Stream response error:', error)+ return serializePublicError(error)+ },+ consumeSseStream: consumeStream+ })+ } catch (error) {+ await endTracing()+ console.error('Stream execution error:', error)+ return createPublicErrorResponse(error, {+ status: 500,+ statusText: 'Internal Server Error'+ })}- console.error('Stream execution error:', error)- return createPublicErrorResponse(error, {- status: 500,- statusText: 'Internal Server Error'- })}++ if (!isTracingEnabled()) {+ return executeStream()+ }++ // Wrap execution in a root Langfuse observation so the researcher and+ // title-generation spans share a single trace+ return propagateAttributes(+ {+ traceName: 'research',+ userId,+ sessionId: chatId,+ metadata: {+ chatId,+ userId,+ modelId: `${model.providerId}:${model.id}`,+ ...(trigger && { trigger })+ }+ },+ () =>+ startActiveObservation('research', span => executeStream(span), {+ endOnExit: false+ })+ )}diff --git a/lib/streaming/create-ephemeral-chat-stream-response.ts b/lib/streaming/create-ephemeral-chat-stream-response.tsindex 54e4cdec..0480a303 100644--- a/lib/streaming/create-ephemeral-chat-stream-response.ts+++ b/lib/streaming/create-ephemeral-chat-stream-response.ts@@ -1,3 +1,5 @@+import type { LangfuseSpan } from '@langfuse/tracing'+import { propagateAttributes, startActiveObservation } from '@langfuse/tracing'import type { UIMessage } from 'ai'import {consumeStream,@@ -5,8 +7,6 @@ import {pruneMessages,smoothStream} from 'ai'-import { randomUUID } from 'crypto'-import { Langfuse } from 'langfuse'import { researcher } from '@/lib/agents/researcher'import {@@ -27,6 +27,8 @@ import { stripReasoningParts } from './helpers/strip-reasoning-parts'import { stripSpecFromMessages } from './helpers/strip-spec-from-messages'import { BaseStreamConfig } from './types'+import { langfuseSpanProcessor } from '@/instrumentation'+type EphemeralStreamConfig = Pick<BaseStreamConfig,'model' | 'abortSignal' | 'searchMode'@@ -47,108 +49,120 @@ export async function createEphemeralChatStreamResponse(})}- // Create parent trace ID for grouping all operations- let parentTraceId: string | undefined- let langfuse: Langfuse | undefined-- if (isTracingEnabled()) {- parentTraceId = randomUUID()- langfuse = new Langfuse()+ const executeStream = async (rootSpan?: LangfuseSpan): Promise<Response> => {+ // Real OTel trace ID, sent to the client in message metadata so feedback+ // scores can be attached to this trace later+ const parentTraceId = rootSpan?.traceId- langfuse.trace({- id: parentTraceId,- name: 'research',- metadata: {- chatId,- userId: 'guest',- modelId: `${model.providerId}:${model.id}`,- trigger: 'submit-message'+ const endTracing = async () => {+ if (rootSpan) {+ rootSpan.end()+ await langfuseSpanProcessor.forceFlush()}- })- }+ }- try {- const isOpenAI = `${model.providerId}:${model.id}`.startsWith('openai:')- const messagesWithoutSpec = stripSpecFromMessages(messages)- const messagesToConvert = isOpenAI- ? stripReasoningParts(messagesWithoutSpec)- : messagesWithoutSpec+ try {+ const isOpenAI = `${model.providerId}:${model.id}`.startsWith('openai:')+ const messagesWithoutSpec = stripSpecFromMessages(messages)+ const messagesToConvert = isOpenAI+ ? stripReasoningParts(messagesWithoutSpec)+ : messagesWithoutSpec- let modelMessages = await convertToModelMessages(messagesToConvert, {- convertDataPart- })+ let modelMessages = await convertToModelMessages(messagesToConvert, {+ convertDataPart+ })- modelMessages = pruneMessages({- messages: modelMessages,- reasoning: 'before-last-message',- toolCalls: 'before-last-2-messages',- emptyMessages: 'remove'- })+ modelMessages = pruneMessages({+ messages: modelMessages,+ reasoning: 'before-last-message',+ toolCalls: 'before-last-2-messages',+ emptyMessages: 'remove'+ })- if (shouldTruncateMessages(modelMessages, model)) {- const maxTokens = getMaxAllowedTokens(model)- modelMessages = truncateMessages(modelMessages, maxTokens, model.id)- }+ if (shouldTruncateMessages(modelMessages, model)) {+ const maxTokens = getMaxAllowedTokens(model)+ modelMessages = truncateMessages(modelMessages, maxTokens, model.id)+ }- const researchAgent = researcher({- model: `${model.providerId}:${model.id}`,- modelConfig: model,- parentTraceId,- searchMode- })+ const researchAgent = researcher({+ model: `${model.providerId}:${model.id}`,+ modelConfig: model,+ searchMode+ })- const modelId = `${model.providerId}:${model.id}`- const result = await researchAgent.stream({- messages: modelMessages,- abortSignal,- experimental_transform: smoothStream({ chunking: 'word' }),- ...(isUsageLogging() && {- onStepFinish: step => {- logUsage(- { scope: 'step', modelId },- step.usage,- step.providerMetadata- )- }+ const modelId = `${model.providerId}:${model.id}`+ const result = await researchAgent.stream({+ messages: modelMessages,+ abortSignal,+ experimental_transform: smoothStream({ chunking: 'word' }),+ ...(isUsageLogging() && {+ onStepFinish: step => {+ logUsage(+ { scope: 'step', modelId },+ step.usage,+ step.providerMetadata+ )+ }+ })})- })- result.consumeStream()+ result.consumeStream()- if (isUsageLogging()) {- Promise.resolve(result.totalUsage)- .then(usage => logUsage({ scope: 'total', modelId }, usage))- .catch(() => {})- }+ if (isUsageLogging()) {+ Promise.resolve(result.totalUsage)+ .then(usage => logUsage({ scope: 'total', modelId }, usage))+ .catch(() => {})+ }- return result.toUIMessageStreamResponse({- messageMetadata: ({ part }) => {- if (part.type === 'start') {- return {- traceId: parentTraceId,- searchMode,- modelId: `${model.providerId}:${model.id}`+ return result.toUIMessageStreamResponse({+ messageMetadata: ({ part }) => {+ if (part.type === 'start') {+ return {+ traceId: parentTraceId,+ searchMode,+ modelId: `${model.providerId}:${model.id}`+ }}- }- },- onFinish: async () => {- if (langfuse) {- await langfuse.flushAsync()- }- },- onError: (error: unknown) => {- console.error('Ephemeral stream response error:', error)- return serializePublicError(error)- },- consumeSseStream: consumeStream- })- } catch (error) {- if (langfuse) {- await langfuse.flushAsync()+ },+ onFinish: async () => {+ await endTracing()+ },+ onError: (error: unknown) => {+ console.error('Ephemeral stream response error:', error)+ return serializePublicError(error)+ },+ consumeSseStream: consumeStream+ })+ } catch (error) {+ await endTracing()+ console.error('Ephemeral stream execution error:', error)+ return createPublicErrorResponse(error, {+ status: 500,+ statusText: 'Internal Server Error'+ })}- console.error('Ephemeral stream execution error:', error)- return createPublicErrorResponse(error, {- status: 500,- statusText: 'Internal Server Error'- })}++ if (!isTracingEnabled()) {+ return executeStream()+ }++ // Wrap execution in a root Langfuse observation so all spans share a+ // single trace+ return propagateAttributes(+ {+ traceName: 'research',+ userId: 'guest',+ ...(chatId && { sessionId: chatId }),+ metadata: {+ ...(chatId && { chatId }),+ userId: 'guest',+ modelId: `${model.providerId}:${model.id}`,+ trigger: 'submit-message'+ }+ },+ () =>+ startActiveObservation('research', span => executeStream(span), {+ endOnExit: false+ })+ )}diff --git a/package.json b/package.jsonindex ad483125..f80915a5 100644--- a/package.json+++ b/package.json@@ -28,9 +28,15 @@"@aws-sdk/s3-request-presigner": "3.859.0","@json-render/core": "^0.16.0","@json-render/react": "^0.16.0",- "@opentelemetry/api-logs": "0.57.2",- "@opentelemetry/instrumentation": "0.57.2",- "@opentelemetry/sdk-logs": "0.57.2",+ "@langfuse/client": "^5.9.1",+ "@langfuse/otel": "^5.9.1",+ "@langfuse/tracing": "^5.9.1",+ "@opentelemetry/api-logs": "0.220.0",+ "@opentelemetry/core": "^2.9.0",+ "@opentelemetry/instrumentation": "0.220.0",+ "@opentelemetry/resources": "^2.9.0",+ "@opentelemetry/sdk-logs": "0.220.0",+ "@opentelemetry/sdk-trace-base": "^2.9.0","@paralleldrive/cuid2": "^2.2.2","@radix-ui/react-alert-dialog": "^1.0.5","@radix-ui/react-avatar": "^1.1.9",@@ -58,7 +64,7 @@"@tailwindcss/typography": "^0.5.12","@upstash/redis": "^1.35.5","@vercel/analytics": "^1.5.0",- "@vercel/otel": "^1.13.0",+ "@vercel/otel": "^2.1.3","ai": "^6.0.180","ai-sdk-ollama": "^3.8.4","class-variance-authority": "^0.7.1",@@ -72,7 +78,6 @@"js-tiktoken": "^1.0.20","jsdom": "^26.1.0","katex": "^0.16.10",- "langfuse-vercel": "^3.38.4","next": "^16.2.6","node-html-parser": "^6.1.13","postgres": "^3.4.5",