diff --git a/src/workbench/extensions/agent/utils/sessionTitle.test.ts b/src/workbench/extensions/agent/utils/sessionTitle.test.ts index 4006a2cf4ff..ab7633e8df7 100644 --- a/src/workbench/extensions/agent/utils/sessionTitle.test.ts +++ b/src/workbench/extensions/agent/utils/sessionTitle.test.ts @@ -44,6 +44,29 @@ describe('deriveSessionTitle', () => { expect(sessionTitle.deriveSessionTitle([userEntry('hello')])).toBe('hello') expect(Intl.Segmenter).toHaveBeenCalledOnce() }) + + it('falls back to code points when Intl.Segmenter is unavailable', async () => { + const originalIntl = Intl + vi.stubGlobal( + 'Intl', + Object.create(originalIntl, { + Segmenter: { value: undefined, configurable: true } + }) + ) + + try { + vi.resetModules() + const sessionTitle = await import('./sessionTitle') + + expect( + sessionTitle.deriveSessionTitle([ + userEntry(`${'a'.repeat(59)}đŸ™‚trailing`) + ]) + ).toBe(`${'a'.repeat(59)}đŸ™‚`) + } finally { + vi.unstubAllGlobals() + } + }) }) describe('withCurrentSessionTitle', () => { diff --git a/src/workbench/extensions/agent/utils/sessionTitle.ts b/src/workbench/extensions/agent/utils/sessionTitle.ts index 5aebf26a3bd..88a7ee60fc6 100644 --- a/src/workbench/extensions/agent/utils/sessionTitle.ts +++ b/src/workbench/extensions/agent/utils/sessionTitle.ts @@ -5,11 +5,29 @@ import type { ConversationEntry } from '@/workbench/extensions/agent/stores/agen const MAX_DERIVED_TITLE_LENGTH = 60 -const graphemeSegmenter = once( - () => new Intl.Segmenter(undefined, { granularity: 'grapheme' }) +const graphemeSegmenter = once(() => + typeof Intl.Segmenter === 'function' + ? new Intl.Segmenter(undefined, { granularity: 'grapheme' }) + : undefined ) -/** First user message, trimmed and capped at 60 graphemes. */ +function truncatedTitle(text: string): string { + const segmenter = graphemeSegmenter() + const title: string[] = [] + + for (const item of segmenter ? segmenter.segment(text) : text) { + const segment = typeof item === 'string' ? item : item.segment + title.push(segment) + if (title.length === MAX_DERIVED_TITLE_LENGTH) break + } + + return title.join('').trimEnd() +} + +/** + * First user message, trimmed and capped at 60 graphemes, or 60 Unicode code + * points when the browser does not provide `Intl.Segmenter`. + */ export function deriveSessionTitle( entries: ConversationEntry[] ): string | undefined { @@ -18,12 +36,7 @@ export function deriveSessionTitle( entry.role === 'user' ) const text = firstUser?.text.trim() ?? '' - return ( - Array.from(graphemeSegmenter().segment(text), ({ segment }) => segment) - .slice(0, MAX_DERIVED_TITLE_LENGTH) - .join('') - .trimEnd() || undefined - ) + return truncatedTitle(text) || undefined } export function withCurrentSessionTitle(