refactor(web): normalize Ask user message text extraction#1371

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
whoisthey merged 2 commits into from
Jun 26, 2026
Merged

refactor(web): normalize Ask user message text extraction #1371

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
41ec0a5
refactor(web): normalize Ask user message text extraction
whoisthey Jun 26, 2026
ebcb2e5
docs: add changelog entry for #1371
whoisthey Jun 26, 2026
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
1 change: 1 addition & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -9,6 +9,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0

### Changed
- [EE] Improved Ask Sourcebot prompt caching by splitting static and dynamic prompt sections and advancing cache breakpoints after every agent step instead of only after each message. [#1366](https://github.com/sourcebot-dev/sourcebot/pull/1366)
- Refactored Ask Sourcebot user message text extraction into a shared helper that robustly handles non-text message parts. [#1371](https://github.com/sourcebot-dev/sourcebot/pull/1371)

### Added
- Added per-step token cost tracking and estimated tool call token usage to Ask Sourcebot chat history. [#1353](https://github.com/sourcebot-dev/sourcebot/pull/1353)
Expand Down
11 changes: 6 additions & 5 deletions packages/web/src/app/(app)/chat/[id]/page.tsx
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -14,6 +14,7 @@ import { __unsafePrisma } from '@/prisma';
import { ChatVisibility } from '@sourcebot/db';
import { Metadata } from 'next';
import { SBChatMessage } from '@/features/chat/types';
import { getUserMessageText } from '@/features/chat/utils';
import { env } from '@sourcebot/shared';
import { hasEntitlement } from '@/lib/entitlements';
import { ChatEntitlementMessage } from '@/features/chat/components/chatEntitlementMessage';
Expand DownExpand Up@@ -54,11 +55,11 @@ export const generateMetadata = async ({ params }: PageProps): Promise<Metadata>

let description = 'A chat on Sourcebot';
if (firstUserMessage) {
const textPart = firstUserMessage.parts.find(p => p.type === 'text');
if (textPart && textPart.type === 'text') {
description = textPart.text.length > 160
? textPart.text.substring(0, 160).trim() + '...'
: textPart.text;
const text = getUserMessageText(firstUserMessage);
if (text) {
description = text.length > 160
? text.substring(0, 160).trim() + '...'
: text;
}
}

Expand Down
4 changes: 2 additions & 2 deletions packages/web/src/ee/features/chat/agent.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -22,7 +22,7 @@ import { randomUUID } from "crypto";
import _dedent from "dedent";
import { ANSWER_TAG, FILE_REFERENCE_PREFIX } from "@/features/chat/constants";
import { Source } from "@/features/chat/types";
import { addLineNumbers, fileReferenceToString, getAnswerPartFromAssistantMessage, getTurnProgressState } from "@/features/chat/utils";
import { addLineNumbers, fileReferenceToString, getAnswerPartFromAssistantMessage, getTurnProgressState, getUserMessageText } from "@/features/chat/utils";
import { createTools } from "./tools";
import { getConnectedMcpClients } from "@/ee/features/chat/mcp/mcpClientFactory";
import { getMcpTools, McpToolsResult } from "@/ee/features/chat/mcp/mcpToolSets";
Expand DownExpand Up@@ -105,7 +105,7 @@ export const createMessageStream = async ({
if (message.role === 'user') {
return {
role: 'user',
content: message.parts[0].type === 'text' ? message.parts[0].text : '',
content: getUserMessageText(message),
};
}

Expand Down
8 changes: 4 additions & 4 deletions packages/web/src/ee/features/chat/components/chatThread/chatThread.tsx
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -5,7 +5,7 @@ import { Button } from '@/components/ui/button';
import { Separator } from '@/components/ui/separator';
import { CustomSlateEditor } from '@/features/chat/customSlateEditor';
import { AdditionalChatRequestParams, CustomEditor, LanguageModelInfo, SBChatMessage, SearchScope, Source } from '@/features/chat/types';
import { createUIMessage, getAllMentionElements, getTurnProgressState, resetEditor, slateContentToString } from '@/features/chat/utils';
import { createUIMessage, getAllMentionElements, getTurnProgressState, getUserMessageText, resetEditor, slateContentToString } from '@/features/chat/utils';
import { useChat } from '@ai-sdk/react';
import { CreateUIMessage, DefaultChatTransport, lastAssistantMessageIsCompleteWithApprovalResponses } from 'ai';
import { ArrowDownIcon, CopyIcon } from 'lucide-react';
Expand DownExpand Up@@ -204,16 +204,16 @@ export const ChatThread = ({
} satisfies AdditionalChatRequestParams,
});

const userMessageText = getUserMessageText(message);
if (
messages.length === 0 &&
message.parts.length > 0 &&
message.parts[0].type === 'text'
userMessageText.length > 0
) {
generateAndUpdateChatNameFromMessage(
{
chatId,
languageModelId: selectedLanguageModel.model,
message: message.parts[0].text,
message: userMessageText,
},
).then((response) => {
if (isServiceError(response)) {
Expand Down
4 changes: 2 additions & 2 deletions packages/web/src/ee/features/chat/components/chatThread/chatThreadListItem.tsx
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -8,7 +8,7 @@ import { CSSProperties, forwardRef, memo, useCallback, useEffect, useMemo, useRe
import scrollIntoView from 'scroll-into-view-if-needed';
import { Reference, referenceSchema, SBChatMessage, Source } from "@/features/chat/types";
import { useExtractReferences } from '../../useExtractReferences';
import { getAnswerPartFromAssistantMessage, getLastStepParts, groupMessageIntoSteps, isSBChatToolPart, repairReferences, tryResolveFileReference } from '@/features/chat/utils';
import { getAnswerPartFromAssistantMessage, getLastStepParts, getUserMessageText, groupMessageIntoSteps, isSBChatToolPart, repairReferences, tryResolveFileReference } from '@/features/chat/utils';
import { AnswerCard } from './answerCard';
import { DetailsCard } from './detailsCard';
import { ApprovalRequestedToolPart, ToolApprovalBanner } from './toolApprovalBanner';
Expand DownExpand Up@@ -49,7 +49,7 @@ const ChatThreadListItemComponent = forwardRef<HTMLDivElement, ChatThreadListIte
const userHasManuallyExpanded = useRef(false);

const userQuestion = useMemo(() => {
return userMessage.parts.length > 0 && userMessage.parts[0].type === 'text' ? userMessage.parts[0].text : '';
return getUserMessageText(userMessage);
}, [userMessage]);

// Take the assistant message and repair any references that are not properly formatted.
Expand Down
71 changes: 70 additions & 1 deletion packages/web/src/features/chat/utils.test.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
import { expect, test, describe, vi } from 'vitest'
import { createUIMessage, fileReferenceToString, getAnswerPartFromAssistantMessage, getLastStepParts, getTurnProgressState, groupMessageIntoSteps, repairReferences } from './utils'
import { createUIMessage, fileReferenceToString, getAnswerPartFromAssistantMessage, getLastStepParts, getTurnProgressState, getUserMessageText, groupMessageIntoSteps, repairReferences } from './utils'
import { FILE_REFERENCE_REGEX, ANSWER_TAG } from './constants';
import { SBChatMessage, SBChatMessagePart } from './types';

Expand DownExpand Up@@ -537,6 +537,75 @@ test('getAnswerPartFromAssistantMessage returns undefined when turn is in progre
expect(result).toBeUndefined();
});

describe('getUserMessageText', () => {
test('returns the text when the text part is first', () => {
const message: SBChatMessage = {
role: 'user',
parts: [
{
type: 'text',
text: 'Hello, world!',
},
],
} as SBChatMessage;

expect(getUserMessageText(message)).toBe('Hello, world!');
});

test('returns the text when a non-text part precedes the text part', () => {
const message: SBChatMessage = {
role: 'user',
parts: [
{
type: 'data-source',
data: {
type: 'file',
path: 'auth.ts',
repo: 'github.com/sourcebot-dev/sourcebot',
name: 'auth.ts',
revision: 'main',
},
},
{
type: 'text',
text: 'Explain this file',
},
],
} as SBChatMessage;

expect(getUserMessageText(message)).toBe('Explain this file');
});

test('returns an empty string when there is no text part', () => {
const message: SBChatMessage = {
role: 'user',
parts: [
{
type: 'data-source',
data: {
type: 'file',
path: 'auth.ts',
repo: 'github.com/sourcebot-dev/sourcebot',
name: 'auth.ts',
revision: 'main',
},
},
],
} as SBChatMessage;

expect(getUserMessageText(message)).toBe('');
});

test('returns an empty string when there are no parts', () => {
const message: SBChatMessage = {
role: 'user',
parts: [],
} as unknown as SBChatMessage;

expect(getUserMessageText(message)).toBe('');
});
});

test('repairReferences fixes missing colon after @file', () => {
const input = 'See the function in @file{github.com/sourcebot-dev/sourcebot::auth.ts} for details.';
const expected = 'See the function in @file:{github.com/sourcebot-dev/sourcebot::auth.ts} for details.';
Expand Down
8 changes: 8 additions & 0 deletions packages/web/src/features/chat/utils.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -397,6 +397,14 @@ export const repairReferences = (text: string): string => {
.replace(/`(@file:\{[^`]+)`\}/g, '$1}');
};

// Extracts the user's text from a message by finding the first text part.
// User messages may contain non-text parts (e.g., file attachments), so we
// cannot assume the text is always at index 0. Accepts anything carrying
// `parts` so it works for both persisted and freshly created messages.
export const getUserMessageText = (message: Pick<SBChatMessage, 'parts'>): string => {
return message.parts.find((part) => part.type === 'text')?.text ?? '';
}

// Attempts to find the part of the assistant's message
// that contains the answer.
export const getAnswerPartFromAssistantMessage = (message: SBChatMessage, isTurnInProgress: boolean): TextUIPart | undefined => {
Expand Down
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Add copy buttons to all 
 blocks\n(function() {\n function addCopyButtons() {\n document.querySelectorAll('pre code').forEach(function(codeBlock) {\n if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;\n codeBlock.parentElement.setAttribute('data-copy-added', 'true');\n \n var btn = document.createElement('button');\n btn.textContent = 'Copy';\n btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';\n btn.onmouseover = function() { this.style.opacity = '1'; };\n btn.onmouseout = function() { this.style.opacity = '0.7'; };\n btn.onclick = function() {\n navigator.clipboard.writeText(codeBlock.textContent).then(function() {\n btn.textContent = 'Copied!';\n setTimeout(function() { btn.textContent = 'Copy'; }, 1500);\n });\n };\n codeBlock.parentElement.style.position = 'relative';\n codeBlock.parentElement.appendChild(btn);\n });\n }\n \n addCopyButtons();\n \n // Re-run on dynamic content\n var observer = new MutationObserver(addCopyButtons);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Add Copy Buttons to Code Blocks");
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '

Skip to content
refactor(web): normalize Ask user message text extraction#1371

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

whoisthey
merged 2 commits into

from

Jun 26, 2026
 Merged


refactor(web): normalize Ask user message text extraction
#1371
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


2 commits


Select commit
Hold shift + click to select a range
41ec0a5

refactor(web): normalize Ask user message text extraction


whoisthey Jun 26, 2026
ebcb2e5

docs: add changelog entry for #1371


whoisthey Jun 26, 2026

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


1 change: 1 addition & 0 deletions
CHANGELOG.md

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -9,6 +9,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0

### Changed
- [EE] Improved Ask Sourcebot prompt caching by splitting static and dynamic prompt sections and advancing cache breakpoints after every agent step instead of only after each message. [#1366](https://github.com/sourcebot-dev/sourcebot/pull/1366)
- Refactored Ask Sourcebot user message text extraction into a shared helper that robustly handles non-text message parts. [#1371](https://github.com/sourcebot-dev/sourcebot/pull/1371)

### Added
- Added per-step token cost tracking and estimated tool call token usage to Ask Sourcebot chat history. [#1353](https://github.com/sourcebot-dev/sourcebot/pull/1353)
Expand Down

11 changes: 6 additions & 5 deletions
packages/web/src/app/(app)/chat/[id]/page.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -14,6 +14,7 @@ import { __unsafePrisma } from '@/prisma';
import { ChatVisibility } from '@sourcebot/db';
import { Metadata } from 'next';
import { SBChatMessage } from '@/features/chat/types';
import { getUserMessageText } from '@/features/chat/utils';
import { env } from '@sourcebot/shared';
import { hasEntitlement } from '@/lib/entitlements';
import { ChatEntitlementMessage } from '@/features/chat/components/chatEntitlementMessage';
Expand DownExpand Up@@ -54,11 +55,11 @@ export const generateMetadata = async ({ params }: PageProps): Promise<Metadata>

 let description = 'A chat on Sourcebot';
 if (firstUserMessage) {
 const textPart = firstUserMessage.parts.find(p => p.type === 'text');
 if (textPart && textPart.type === 'text') {
 description = textPart.text.length > 160
 ? textPart.text.substring(0, 160).trim() + '...'
 : textPart.text;
 const text = getUserMessageText(firstUserMessage);
 if (text) {
 description = text.length > 160
 ? text.substring(0, 160).trim() + '...'
 : text;
 }
 }

Expand Down

4 changes: 2 additions & 2 deletions
packages/web/src/ee/features/chat/agent.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -22,7 +22,7 @@ import { randomUUID } from "crypto";
import _dedent from "dedent";
import { ANSWER_TAG, FILE_REFERENCE_PREFIX } from "@/features/chat/constants";
import { Source } from "@/features/chat/types";
import { addLineNumbers, fileReferenceToString, getAnswerPartFromAssistantMessage, getTurnProgressState } from "@/features/chat/utils";
import { addLineNumbers, fileReferenceToString, getAnswerPartFromAssistantMessage, getTurnProgressState, getUserMessageText } from "@/features/chat/utils";
import { createTools } from "./tools";
import { getConnectedMcpClients } from "@/ee/features/chat/mcp/mcpClientFactory";
import { getMcpTools, McpToolsResult } from "@/ee/features/chat/mcp/mcpToolSets";
Expand DownExpand Up@@ -105,7 +105,7 @@ export const createMessageStream = async ({
 if (message.role === 'user') {
 return {
 role: 'user',
 content: message.parts[0].type === 'text' ? message.parts[0].text : '',
 content: getUserMessageText(message),
 };
 }

Expand Down

8 changes: 4 additions & 4 deletions
packages/web/src/ee/features/chat/components/chatThread/chatThread.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -5,7 +5,7 @@ import { Button } from '@/components/ui/button';
import { Separator } from '@/components/ui/separator';
import { CustomSlateEditor } from '@/features/chat/customSlateEditor';
import { AdditionalChatRequestParams, CustomEditor, LanguageModelInfo, SBChatMessage, SearchScope, Source } from '@/features/chat/types';
import { createUIMessage, getAllMentionElements, getTurnProgressState, resetEditor, slateContentToString } from '@/features/chat/utils';
import { createUIMessage, getAllMentionElements, getTurnProgressState, getUserMessageText, resetEditor, slateContentToString } from '@/features/chat/utils';
import { useChat } from '@ai-sdk/react';
import { CreateUIMessage, DefaultChatTransport, lastAssistantMessageIsCompleteWithApprovalResponses } from 'ai';
import { ArrowDownIcon, CopyIcon } from 'lucide-react';
Expand DownExpand Up@@ -204,16 +204,16 @@ export const ChatThread = ({
 } satisfies AdditionalChatRequestParams,
 });

 const userMessageText = getUserMessageText(message);
 if (
 messages.length === 0 &&
 message.parts.length > 0 &&
 message.parts[0].type === 'text'
 userMessageText.length > 0
 ) {
 generateAndUpdateChatNameFromMessage(
 {
 chatId,
 languageModelId: selectedLanguageModel.model,
 message: message.parts[0].text,
 message: userMessageText,
 },
 ).then((response) => {
 if (isServiceError(response)) {
Expand Down

4 changes: 2 additions & 2 deletions
packages/web/src/ee/features/chat/components/chatThread/chatThreadListItem.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -8,7 +8,7 @@ import { CSSProperties, forwardRef, memo, useCallback, useEffect, useMemo, useRe
import scrollIntoView from 'scroll-into-view-if-needed';
import { Reference, referenceSchema, SBChatMessage, Source } from "@/features/chat/types";
import { useExtractReferences } from '../../useExtractReferences';
import { getAnswerPartFromAssistantMessage, getLastStepParts, groupMessageIntoSteps, isSBChatToolPart, repairReferences, tryResolveFileReference } from '@/features/chat/utils';
import { getAnswerPartFromAssistantMessage, getLastStepParts, getUserMessageText, groupMessageIntoSteps, isSBChatToolPart, repairReferences, tryResolveFileReference } from '@/features/chat/utils';
import { AnswerCard } from './answerCard';
import { DetailsCard } from './detailsCard';
import { ApprovalRequestedToolPart, ToolApprovalBanner } from './toolApprovalBanner';
Expand DownExpand Up@@ -49,7 +49,7 @@ const ChatThreadListItemComponent = forwardRef<HTMLDivElement, ChatThreadListIte
 const userHasManuallyExpanded = useRef(false);

 const userQuestion = useMemo(() => {
 return userMessage.parts.length > 0 && userMessage.parts[0].type === 'text' ? userMessage.parts[0].text : '';
 return getUserMessageText(userMessage);
 }, [userMessage]);

 // Take the assistant message and repair any references that are not properly formatted.
Expand Down

71 changes: 70 additions & 1 deletion
packages/web/src/features/chat/utils.test.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
import { expect, test, describe, vi } from 'vitest'
import { createUIMessage, fileReferenceToString, getAnswerPartFromAssistantMessage, getLastStepParts, getTurnProgressState, groupMessageIntoSteps, repairReferences } from './utils'
import { createUIMessage, fileReferenceToString, getAnswerPartFromAssistantMessage, getLastStepParts, getTurnProgressState, getUserMessageText, groupMessageIntoSteps, repairReferences } from './utils'
import { FILE_REFERENCE_REGEX, ANSWER_TAG } from './constants';
import { SBChatMessage, SBChatMessagePart } from './types';

Expand DownExpand Up@@ -537,6 +537,75 @@ test('getAnswerPartFromAssistantMessage returns undefined when turn is in progre
 expect(result).toBeUndefined();
});

describe('getUserMessageText', () => {
 test('returns the text when the text part is first', () => {
 const message: SBChatMessage = {
 role: 'user',
 parts: [
 {
 type: 'text',
 text: 'Hello, world!',
 },
 ],
 } as SBChatMessage;

 expect(getUserMessageText(message)).toBe('Hello, world!');
 });

 test('returns the text when a non-text part precedes the text part', () => {
 const message: SBChatMessage = {
 role: 'user',
 parts: [
 {
 type: 'data-source',
 data: {
 type: 'file',
 path: 'auth.ts',
 repo: 'github.com/sourcebot-dev/sourcebot',
 name: 'auth.ts',
 revision: 'main',
 },
 },
 {
 type: 'text',
 text: 'Explain this file',
 },
 ],
 } as SBChatMessage;

 expect(getUserMessageText(message)).toBe('Explain this file');
 });

 test('returns an empty string when there is no text part', () => {
 const message: SBChatMessage = {
 role: 'user',
 parts: [
 {
 type: 'data-source',
 data: {
 type: 'file',
 path: 'auth.ts',
 repo: 'github.com/sourcebot-dev/sourcebot',
 name: 'auth.ts',
 revision: 'main',
 },
 },
 ],
 } as SBChatMessage;

 expect(getUserMessageText(message)).toBe('');
 });

 test('returns an empty string when there are no parts', () => {
 const message: SBChatMessage = {
 role: 'user',
 parts: [],
 } as unknown as SBChatMessage;

 expect(getUserMessageText(message)).toBe('');
 });
});

test('repairReferences fixes missing colon after @file', () => {
 const input = 'See the function in @file{github.com/sourcebot-dev/sourcebot::auth.ts} for details.';
 const expected = 'See the function in @file:{github.com/sourcebot-dev/sourcebot::auth.ts} for details.';
Expand Down

8 changes: 8 additions & 0 deletions
packages/web/src/features/chat/utils.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -397,6 +397,14 @@ export const repairReferences = (text: string): string => {
 .replace(/`(@file:\{[^`]+)`\}/g, '$1}');
};

// Extracts the user's text from a message by finding the first text part.
// User messages may contain non-text parts (e.g., file attachments), so we
// cannot assume the text is always at index 0. Accepts anything carrying
// `parts` so it works for both persisted and freshly created messages.
export const getUserMessageText = (message: Pick<SBChatMessage, 'parts'>): string => {
 return message.parts.find((part) => part.type === 'text')?.text ?? '';
}

// Attempts to find the part of the assistant's message
// that contains the answer.
export const getAnswerPartFromAssistantMessage = (message: SBChatMessage, isTurnInProgress: boolean): TextUIPart | undefined => {
Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Force GitHub README to respect dark mode\n(function() {\n var style = document.createElement('style');\n style.textContent = '\n .markdown-body {\n color-scheme: dark light;\n }\n .markdown-body pre { background: #161b22 !important; }\n .markdown-body code { background: rgba(110, 118, 129, 0.4) !important; }\n .markdown-body table th, .markdown-body table td { border-color: #30363d !important; }\n .markdown-body img { background: #0d1117; }\n .markdown-body blockquote { border-left-color: #8b949e; }\n .markdown-body hr { border-color: #30363d; }\n ';\n document.head.appendChild(style);\n})();", "GitHub Dark Mode README Fix");
}
} catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
refactor(web): normalize Ask user message text extraction#1371

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

whoisthey
merged 2 commits into

from

Jun 26, 2026
 Merged


refactor(web): normalize Ask user message text extraction
#1371
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


2 commits


Select commit
Hold shift + click to select a range
41ec0a5

refactor(web): normalize Ask user message text extraction


whoisthey Jun 26, 2026
ebcb2e5

docs: add changelog entry for #1371


whoisthey Jun 26, 2026

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


1 change: 1 addition & 0 deletions
CHANGELOG.md

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -9,6 +9,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0

### Changed
- [EE] Improved Ask Sourcebot prompt caching by splitting static and dynamic prompt sections and advancing cache breakpoints after every agent step instead of only after each message. [#1366](https://github.com/sourcebot-dev/sourcebot/pull/1366)
- Refactored Ask Sourcebot user message text extraction into a shared helper that robustly handles non-text message parts. [#1371](https://github.com/sourcebot-dev/sourcebot/pull/1371)

### Added
- Added per-step token cost tracking and estimated tool call token usage to Ask Sourcebot chat history. [#1353](https://github.com/sourcebot-dev/sourcebot/pull/1353)
Expand Down

11 changes: 6 additions & 5 deletions
packages/web/src/app/(app)/chat/[id]/page.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -14,6 +14,7 @@ import { __unsafePrisma } from '@/prisma';
import { ChatVisibility } from '@sourcebot/db';
import { Metadata } from 'next';
import { SBChatMessage } from '@/features/chat/types';
import { getUserMessageText } from '@/features/chat/utils';
import { env } from '@sourcebot/shared';
import { hasEntitlement } from '@/lib/entitlements';
import { ChatEntitlementMessage } from '@/features/chat/components/chatEntitlementMessage';
Expand DownExpand Up@@ -54,11 +55,11 @@ export const generateMetadata = async ({ params }: PageProps): Promise<Metadata>

 let description = 'A chat on Sourcebot';
 if (firstUserMessage) {
 const textPart = firstUserMessage.parts.find(p => p.type === 'text');
 if (textPart && textPart.type === 'text') {
 description = textPart.text.length > 160
 ? textPart.text.substring(0, 160).trim() + '...'
 : textPart.text;
 const text = getUserMessageText(firstUserMessage);
 if (text) {
 description = text.length > 160
 ? text.substring(0, 160).trim() + '...'
 : text;
 }
 }

Expand Down

4 changes: 2 additions & 2 deletions
packages/web/src/ee/features/chat/agent.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -22,7 +22,7 @@ import { randomUUID } from "crypto";
import _dedent from "dedent";
import { ANSWER_TAG, FILE_REFERENCE_PREFIX } from "@/features/chat/constants";
import { Source } from "@/features/chat/types";
import { addLineNumbers, fileReferenceToString, getAnswerPartFromAssistantMessage, getTurnProgressState } from "@/features/chat/utils";
import { addLineNumbers, fileReferenceToString, getAnswerPartFromAssistantMessage, getTurnProgressState, getUserMessageText } from "@/features/chat/utils";
import { createTools } from "./tools";
import { getConnectedMcpClients } from "@/ee/features/chat/mcp/mcpClientFactory";
import { getMcpTools, McpToolsResult } from "@/ee/features/chat/mcp/mcpToolSets";
Expand DownExpand Up@@ -105,7 +105,7 @@ export const createMessageStream = async ({
 if (message.role === 'user') {
 return {
 role: 'user',
 content: message.parts[0].type === 'text' ? message.parts[0].text : '',
 content: getUserMessageText(message),
 };
 }

Expand Down

8 changes: 4 additions & 4 deletions
packages/web/src/ee/features/chat/components/chatThread/chatThread.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -5,7 +5,7 @@ import { Button } from '@/components/ui/button';
import { Separator } from '@/components/ui/separator';
import { CustomSlateEditor } from '@/features/chat/customSlateEditor';
import { AdditionalChatRequestParams, CustomEditor, LanguageModelInfo, SBChatMessage, SearchScope, Source } from '@/features/chat/types';
import { createUIMessage, getAllMentionElements, getTurnProgressState, resetEditor, slateContentToString } from '@/features/chat/utils';
import { createUIMessage, getAllMentionElements, getTurnProgressState, getUserMessageText, resetEditor, slateContentToString } from '@/features/chat/utils';
import { useChat } from '@ai-sdk/react';
import { CreateUIMessage, DefaultChatTransport, lastAssistantMessageIsCompleteWithApprovalResponses } from 'ai';
import { ArrowDownIcon, CopyIcon } from 'lucide-react';
Expand DownExpand Up@@ -204,16 +204,16 @@ export const ChatThread = ({
 } satisfies AdditionalChatRequestParams,
 });

 const userMessageText = getUserMessageText(message);
 if (
 messages.length === 0 &&
 message.parts.length > 0 &&
 message.parts[0].type === 'text'
 userMessageText.length > 0
 ) {
 generateAndUpdateChatNameFromMessage(
 {
 chatId,
 languageModelId: selectedLanguageModel.model,
 message: message.parts[0].text,
 message: userMessageText,
 },
 ).then((response) => {
 if (isServiceError(response)) {
Expand Down

4 changes: 2 additions & 2 deletions
packages/web/src/ee/features/chat/components/chatThread/chatThreadListItem.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -8,7 +8,7 @@ import { CSSProperties, forwardRef, memo, useCallback, useEffect, useMemo, useRe
import scrollIntoView from 'scroll-into-view-if-needed';
import { Reference, referenceSchema, SBChatMessage, Source } from "@/features/chat/types";
import { useExtractReferences } from '../../useExtractReferences';
import { getAnswerPartFromAssistantMessage, getLastStepParts, groupMessageIntoSteps, isSBChatToolPart, repairReferences, tryResolveFileReference } from '@/features/chat/utils';
import { getAnswerPartFromAssistantMessage, getLastStepParts, getUserMessageText, groupMessageIntoSteps, isSBChatToolPart, repairReferences, tryResolveFileReference } from '@/features/chat/utils';
import { AnswerCard } from './answerCard';
import { DetailsCard } from './detailsCard';
import { ApprovalRequestedToolPart, ToolApprovalBanner } from './toolApprovalBanner';
Expand DownExpand Up@@ -49,7 +49,7 @@ const ChatThreadListItemComponent = forwardRef<HTMLDivElement, ChatThreadListIte
 const userHasManuallyExpanded = useRef(false);

 const userQuestion = useMemo(() => {
 return userMessage.parts.length > 0 && userMessage.parts[0].type === 'text' ? userMessage.parts[0].text : '';
 return getUserMessageText(userMessage);
 }, [userMessage]);

 // Take the assistant message and repair any references that are not properly formatted.
Expand Down

71 changes: 70 additions & 1 deletion
packages/web/src/features/chat/utils.test.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
import { expect, test, describe, vi } from 'vitest'
import { createUIMessage, fileReferenceToString, getAnswerPartFromAssistantMessage, getLastStepParts, getTurnProgressState, groupMessageIntoSteps, repairReferences } from './utils'
import { createUIMessage, fileReferenceToString, getAnswerPartFromAssistantMessage, getLastStepParts, getTurnProgressState, getUserMessageText, groupMessageIntoSteps, repairReferences } from './utils'
import { FILE_REFERENCE_REGEX, ANSWER_TAG } from './constants';
import { SBChatMessage, SBChatMessagePart } from './types';

Expand DownExpand Up@@ -537,6 +537,75 @@ test('getAnswerPartFromAssistantMessage returns undefined when turn is in progre
 expect(result).toBeUndefined();
});

describe('getUserMessageText', () => {
 test('returns the text when the text part is first', () => {
 const message: SBChatMessage = {
 role: 'user',
 parts: [
 {
 type: 'text',
 text: 'Hello, world!',
 },
 ],
 } as SBChatMessage;

 expect(getUserMessageText(message)).toBe('Hello, world!');
 });

 test('returns the text when a non-text part precedes the text part', () => {
 const message: SBChatMessage = {
 role: 'user',
 parts: [
 {
 type: 'data-source',
 data: {
 type: 'file',
 path: 'auth.ts',
 repo: 'github.com/sourcebot-dev/sourcebot',
 name: 'auth.ts',
 revision: 'main',
 },
 },
 {
 type: 'text',
 text: 'Explain this file',
 },
 ],
 } as SBChatMessage;

 expect(getUserMessageText(message)).toBe('Explain this file');
 });

 test('returns an empty string when there is no text part', () => {
 const message: SBChatMessage = {
 role: 'user',
 parts: [
 {
 type: 'data-source',
 data: {
 type: 'file',
 path: 'auth.ts',
 repo: 'github.com/sourcebot-dev/sourcebot',
 name: 'auth.ts',
 revision: 'main',
 },
 },
 ],
 } as SBChatMessage;

 expect(getUserMessageText(message)).toBe('');
 });

 test('returns an empty string when there are no parts', () => {
 const message: SBChatMessage = {
 role: 'user',
 parts: [],
 } as unknown as SBChatMessage;

 expect(getUserMessageText(message)).toBe('');
 });
});

test('repairReferences fixes missing colon after @file', () => {
 const input = 'See the function in @file{github.com/sourcebot-dev/sourcebot::auth.ts} for details.';
 const expected = 'See the function in @file:{github.com/sourcebot-dev/sourcebot::auth.ts} for details.';
Expand Down

8 changes: 8 additions & 0 deletions
packages/web/src/features/chat/utils.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -397,6 +397,14 @@ export const repairReferences = (text: string): string => {
 .replace(/`(@file:\{[^`]+)`\}/g, '$1}');
};

// Extracts the user's text from a message by finding the first text part.
// User messages may contain non-text parts (e.g., file attachments), so we
// cannot assume the text is always at index 0. Accepts anything carrying
// `parts` so it works for both persisted and freshly created messages.
export const getUserMessageText = (message: Pick<SBChatMessage, 'parts'>): string => {
 return message.parts.find((part) => part.type === 'text')?.text ?? '';
}

// Attempts to find the part of the assistant's message
// that contains the answer.
export const getAnswerPartFromAssistantMessage = (message: SBChatMessage, isTurnInProgress: boolean): TextUIPart | undefined => {
Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Highlight search terms from Google/DuckDuckGo/Bing referrer\n(function() {\n var ref = document.referrer;\n var terms = [];\n \n if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) {\n var url = new URL(ref);\n var q = url.searchParams.get('q') || url.searchParams.get('p');\n if (q) {\n terms = q.split(/\\s+/).filter(function(t) { return t.length > 2; });\n }\n }\n \n if (terms.length === 0) return;\n \n var style = document.createElement('style');\n style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }';\n document.head.appendChild(style);\n \n function highlight(node) {\n if (node.nodeType === 3) { // text node\n var text = node.textContent;\n var found = false;\n terms.forEach(function(term) {\n var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\\]\\\\]/g, '\\\\') + ')', 'gi');\n if (regex.test(text)) {\n found = true;\n var frag = document.createDocumentFragment();\n var parts = text.split(regex);\n parts.forEach(function(part, i) {\n if (i % 2 === 0) {\n frag.appendChild(document.createTextNode(part));\n } else {\n var span = document.createElement('span');\n span.className = 'userscript-highlight';\n span.textContent = part;\n frag.appendChild(span);\n }\n });\n node.parentNode.replaceChild(frag, node);\n }\n });\n } else if (node.nodeType === 1 && node.childNodes) { // element\n var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT'];\n if (!skipTags.includes(node.tagName)) {\n Array.from(node.childNodes).forEach(highlight);\n }\n }\n }\n \n highlight(document.body);\n \n // Re-highlight on dynamic content\n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1 || node.nodeType === 3) highlight(node);\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Highlight Search Terms");
}
} catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
refactor(web): normalize Ask user message text extraction#1371

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

whoisthey
merged 2 commits into

from

Jun 26, 2026
 Merged


refactor(web): normalize Ask user message text extraction
#1371
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


2 commits


Select commit
Hold shift + click to select a range
41ec0a5

refactor(web): normalize Ask user message text extraction


whoisthey Jun 26, 2026
ebcb2e5

docs: add changelog entry for #1371


whoisthey Jun 26, 2026

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


1 change: 1 addition & 0 deletions
CHANGELOG.md

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -9,6 +9,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0

### Changed
- [EE] Improved Ask Sourcebot prompt caching by splitting static and dynamic prompt sections and advancing cache breakpoints after every agent step instead of only after each message. [#1366](https://github.com/sourcebot-dev/sourcebot/pull/1366)
- Refactored Ask Sourcebot user message text extraction into a shared helper that robustly handles non-text message parts. [#1371](https://github.com/sourcebot-dev/sourcebot/pull/1371)

### Added
- Added per-step token cost tracking and estimated tool call token usage to Ask Sourcebot chat history. [#1353](https://github.com/sourcebot-dev/sourcebot/pull/1353)
Expand Down

11 changes: 6 additions & 5 deletions
packages/web/src/app/(app)/chat/[id]/page.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -14,6 +14,7 @@ import { __unsafePrisma } from '@/prisma';
import { ChatVisibility } from '@sourcebot/db';
import { Metadata } from 'next';
import { SBChatMessage } from '@/features/chat/types';
import { getUserMessageText } from '@/features/chat/utils';
import { env } from '@sourcebot/shared';
import { hasEntitlement } from '@/lib/entitlements';
import { ChatEntitlementMessage } from '@/features/chat/components/chatEntitlementMessage';
Expand DownExpand Up@@ -54,11 +55,11 @@ export const generateMetadata = async ({ params }: PageProps): Promise<Metadata>

 let description = 'A chat on Sourcebot';
 if (firstUserMessage) {
 const textPart = firstUserMessage.parts.find(p => p.type === 'text');
 if (textPart && textPart.type === 'text') {
 description = textPart.text.length > 160
 ? textPart.text.substring(0, 160).trim() + '...'
 : textPart.text;
 const text = getUserMessageText(firstUserMessage);
 if (text) {
 description = text.length > 160
 ? text.substring(0, 160).trim() + '...'
 : text;
 }
 }

Expand Down

4 changes: 2 additions & 2 deletions
packages/web/src/ee/features/chat/agent.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -22,7 +22,7 @@ import { randomUUID } from "crypto";
import _dedent from "dedent";
import { ANSWER_TAG, FILE_REFERENCE_PREFIX } from "@/features/chat/constants";
import { Source } from "@/features/chat/types";
import { addLineNumbers, fileReferenceToString, getAnswerPartFromAssistantMessage, getTurnProgressState } from "@/features/chat/utils";
import { addLineNumbers, fileReferenceToString, getAnswerPartFromAssistantMessage, getTurnProgressState, getUserMessageText } from "@/features/chat/utils";
import { createTools } from "./tools";
import { getConnectedMcpClients } from "@/ee/features/chat/mcp/mcpClientFactory";
import { getMcpTools, McpToolsResult } from "@/ee/features/chat/mcp/mcpToolSets";
Expand DownExpand Up@@ -105,7 +105,7 @@ export const createMessageStream = async ({
 if (message.role === 'user') {
 return {
 role: 'user',
 content: message.parts[0].type === 'text' ? message.parts[0].text : '',
 content: getUserMessageText(message),
 };
 }

Expand Down

8 changes: 4 additions & 4 deletions
packages/web/src/ee/features/chat/components/chatThread/chatThread.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -5,7 +5,7 @@ import { Button } from '@/components/ui/button';
import { Separator } from '@/components/ui/separator';
import { CustomSlateEditor } from '@/features/chat/customSlateEditor';
import { AdditionalChatRequestParams, CustomEditor, LanguageModelInfo, SBChatMessage, SearchScope, Source } from '@/features/chat/types';
import { createUIMessage, getAllMentionElements, getTurnProgressState, resetEditor, slateContentToString } from '@/features/chat/utils';
import { createUIMessage, getAllMentionElements, getTurnProgressState, getUserMessageText, resetEditor, slateContentToString } from '@/features/chat/utils';
import { useChat } from '@ai-sdk/react';
import { CreateUIMessage, DefaultChatTransport, lastAssistantMessageIsCompleteWithApprovalResponses } from 'ai';
import { ArrowDownIcon, CopyIcon } from 'lucide-react';
Expand DownExpand Up@@ -204,16 +204,16 @@ export const ChatThread = ({
 } satisfies AdditionalChatRequestParams,
 });

 const userMessageText = getUserMessageText(message);
 if (
 messages.length === 0 &&
 message.parts.length > 0 &&
 message.parts[0].type === 'text'
 userMessageText.length > 0
 ) {
 generateAndUpdateChatNameFromMessage(
 {
 chatId,
 languageModelId: selectedLanguageModel.model,
 message: message.parts[0].text,
 message: userMessageText,
 },
 ).then((response) => {
 if (isServiceError(response)) {
Expand Down

4 changes: 2 additions & 2 deletions
packages/web/src/ee/features/chat/components/chatThread/chatThreadListItem.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -8,7 +8,7 @@ import { CSSProperties, forwardRef, memo, useCallback, useEffect, useMemo, useRe
import scrollIntoView from 'scroll-into-view-if-needed';
import { Reference, referenceSchema, SBChatMessage, Source } from "@/features/chat/types";
import { useExtractReferences } from '../../useExtractReferences';
import { getAnswerPartFromAssistantMessage, getLastStepParts, groupMessageIntoSteps, isSBChatToolPart, repairReferences, tryResolveFileReference } from '@/features/chat/utils';
import { getAnswerPartFromAssistantMessage, getLastStepParts, getUserMessageText, groupMessageIntoSteps, isSBChatToolPart, repairReferences, tryResolveFileReference } from '@/features/chat/utils';
import { AnswerCard } from './answerCard';
import { DetailsCard } from './detailsCard';
import { ApprovalRequestedToolPart, ToolApprovalBanner } from './toolApprovalBanner';
Expand DownExpand Up@@ -49,7 +49,7 @@ const ChatThreadListItemComponent = forwardRef<HTMLDivElement, ChatThreadListIte
 const userHasManuallyExpanded = useRef(false);

 const userQuestion = useMemo(() => {
 return userMessage.parts.length > 0 && userMessage.parts[0].type === 'text' ? userMessage.parts[0].text : '';
 return getUserMessageText(userMessage);
 }, [userMessage]);

 // Take the assistant message and repair any references that are not properly formatted.
Expand Down

71 changes: 70 additions & 1 deletion
packages/web/src/features/chat/utils.test.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
import { expect, test, describe, vi } from 'vitest'
import { createUIMessage, fileReferenceToString, getAnswerPartFromAssistantMessage, getLastStepParts, getTurnProgressState, groupMessageIntoSteps, repairReferences } from './utils'
import { createUIMessage, fileReferenceToString, getAnswerPartFromAssistantMessage, getLastStepParts, getTurnProgressState, getUserMessageText, groupMessageIntoSteps, repairReferences } from './utils'
import { FILE_REFERENCE_REGEX, ANSWER_TAG } from './constants';
import { SBChatMessage, SBChatMessagePart } from './types';

Expand DownExpand Up@@ -537,6 +537,75 @@ test('getAnswerPartFromAssistantMessage returns undefined when turn is in progre
 expect(result).toBeUndefined();
});

describe('getUserMessageText', () => {
 test('returns the text when the text part is first', () => {
 const message: SBChatMessage = {
 role: 'user',
 parts: [
 {
 type: 'text',
 text: 'Hello, world!',
 },
 ],
 } as SBChatMessage;

 expect(getUserMessageText(message)).toBe('Hello, world!');
 });

 test('returns the text when a non-text part precedes the text part', () => {
 const message: SBChatMessage = {
 role: 'user',
 parts: [
 {
 type: 'data-source',
 data: {
 type: 'file',
 path: 'auth.ts',
 repo: 'github.com/sourcebot-dev/sourcebot',
 name: 'auth.ts',
 revision: 'main',
 },
 },
 {
 type: 'text',
 text: 'Explain this file',
 },
 ],
 } as SBChatMessage;

 expect(getUserMessageText(message)).toBe('Explain this file');
 });

 test('returns an empty string when there is no text part', () => {
 const message: SBChatMessage = {
 role: 'user',
 parts: [
 {
 type: 'data-source',
 data: {
 type: 'file',
 path: 'auth.ts',
 repo: 'github.com/sourcebot-dev/sourcebot',
 name: 'auth.ts',
 revision: 'main',
 },
 },
 ],
 } as SBChatMessage;

 expect(getUserMessageText(message)).toBe('');
 });

 test('returns an empty string when there are no parts', () => {
 const message: SBChatMessage = {
 role: 'user',
 parts: [],
 } as unknown as SBChatMessage;

 expect(getUserMessageText(message)).toBe('');
 });
});

test('repairReferences fixes missing colon after @file', () => {
 const input = 'See the function in @file{github.com/sourcebot-dev/sourcebot::auth.ts} for details.';
 const expected = 'See the function in @file:{github.com/sourcebot-dev/sourcebot::auth.ts} for details.';
Expand Down

8 changes: 8 additions & 0 deletions
packages/web/src/features/chat/utils.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -397,6 +397,14 @@ export const repairReferences = (text: string): string => {
 .replace(/`(@file:\{[^`]+)`\}/g, '$1}');
};

// Extracts the user's text from a message by finding the first text part.
// User messages may contain non-text parts (e.g., file attachments), so we
// cannot assume the text is always at index 0. Accepts anything carrying
// `parts` so it works for both persisted and freshly created messages.
export const getUserMessageText = (message: Pick<SBChatMessage, 'parts'>): string => {
 return message.parts.find((part) => part.type === 'text')?.text ?? '';
}

// Attempts to find the part of the assistant's message
// that contains the answer.
export const getAnswerPartFromAssistantMessage = (message: SBChatMessage, isTurnInProgress: boolean): TextUIPart | undefined => {
Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Strip utm_, fbclid, gclid, etc. from all links on page\n(function() {\n var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content',\n 'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid',\n 'ref', 'ref_src', 'source', 'medium', 'campaign'];\n \n function cleanUrl(url) {\n try {\n var u = new URL(url, window.location.origin);\n var changed = false;\n trackingParams.forEach(function(p) {\n if (u.searchParams.has(p)) {\n u.searchParams.delete(p);\n changed = true;\n }\n });\n return changed ? u.toString() : url;\n } catch (e) {\n return url;\n }\n }\n \n function cleanLinks() {\n document.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n \n cleanLinks();\n \n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1) {\n if (node.tagName === 'A') cleanLinks();\n node.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Remove Tracking Parameters from Links");
}
} catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); }
})();
(function(){
try {
var __m = "youtube.com";
var __re = new RegExp('^' + "youtube\\.com" + '

Skip to content
refactor(web): normalize Ask user message text extraction#1371

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

whoisthey
merged 2 commits into

from

Jun 26, 2026
 Merged


refactor(web): normalize Ask user message text extraction
#1371
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


2 commits


Select commit
Hold shift + click to select a range
41ec0a5

refactor(web): normalize Ask user message text extraction


whoisthey Jun 26, 2026
ebcb2e5

docs: add changelog entry for #1371


whoisthey Jun 26, 2026

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


1 change: 1 addition & 0 deletions
CHANGELOG.md

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -9,6 +9,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0

### Changed
- [EE] Improved Ask Sourcebot prompt caching by splitting static and dynamic prompt sections and advancing cache breakpoints after every agent step instead of only after each message. [#1366](https://github.com/sourcebot-dev/sourcebot/pull/1366)
- Refactored Ask Sourcebot user message text extraction into a shared helper that robustly handles non-text message parts. [#1371](https://github.com/sourcebot-dev/sourcebot/pull/1371)

### Added
- Added per-step token cost tracking and estimated tool call token usage to Ask Sourcebot chat history. [#1353](https://github.com/sourcebot-dev/sourcebot/pull/1353)
Expand Down

11 changes: 6 additions & 5 deletions
packages/web/src/app/(app)/chat/[id]/page.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -14,6 +14,7 @@ import { __unsafePrisma } from '@/prisma';
import { ChatVisibility } from '@sourcebot/db';
import { Metadata } from 'next';
import { SBChatMessage } from '@/features/chat/types';
import { getUserMessageText } from '@/features/chat/utils';
import { env } from '@sourcebot/shared';
import { hasEntitlement } from '@/lib/entitlements';
import { ChatEntitlementMessage } from '@/features/chat/components/chatEntitlementMessage';
Expand DownExpand Up@@ -54,11 +55,11 @@ export const generateMetadata = async ({ params }: PageProps): Promise<Metadata>

 let description = 'A chat on Sourcebot';
 if (firstUserMessage) {
 const textPart = firstUserMessage.parts.find(p => p.type === 'text');
 if (textPart && textPart.type === 'text') {
 description = textPart.text.length > 160
 ? textPart.text.substring(0, 160).trim() + '...'
 : textPart.text;
 const text = getUserMessageText(firstUserMessage);
 if (text) {
 description = text.length > 160
 ? text.substring(0, 160).trim() + '...'
 : text;
 }
 }

Expand Down

4 changes: 2 additions & 2 deletions
packages/web/src/ee/features/chat/agent.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -22,7 +22,7 @@ import { randomUUID } from "crypto";
import _dedent from "dedent";
import { ANSWER_TAG, FILE_REFERENCE_PREFIX } from "@/features/chat/constants";
import { Source } from "@/features/chat/types";
import { addLineNumbers, fileReferenceToString, getAnswerPartFromAssistantMessage, getTurnProgressState } from "@/features/chat/utils";
import { addLineNumbers, fileReferenceToString, getAnswerPartFromAssistantMessage, getTurnProgressState, getUserMessageText } from "@/features/chat/utils";
import { createTools } from "./tools";
import { getConnectedMcpClients } from "@/ee/features/chat/mcp/mcpClientFactory";
import { getMcpTools, McpToolsResult } from "@/ee/features/chat/mcp/mcpToolSets";
Expand DownExpand Up@@ -105,7 +105,7 @@ export const createMessageStream = async ({
 if (message.role === 'user') {
 return {
 role: 'user',
 content: message.parts[0].type === 'text' ? message.parts[0].text : '',
 content: getUserMessageText(message),
 };
 }

Expand Down

8 changes: 4 additions & 4 deletions
packages/web/src/ee/features/chat/components/chatThread/chatThread.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -5,7 +5,7 @@ import { Button } from '@/components/ui/button';
import { Separator } from '@/components/ui/separator';
import { CustomSlateEditor } from '@/features/chat/customSlateEditor';
import { AdditionalChatRequestParams, CustomEditor, LanguageModelInfo, SBChatMessage, SearchScope, Source } from '@/features/chat/types';
import { createUIMessage, getAllMentionElements, getTurnProgressState, resetEditor, slateContentToString } from '@/features/chat/utils';
import { createUIMessage, getAllMentionElements, getTurnProgressState, getUserMessageText, resetEditor, slateContentToString } from '@/features/chat/utils';
import { useChat } from '@ai-sdk/react';
import { CreateUIMessage, DefaultChatTransport, lastAssistantMessageIsCompleteWithApprovalResponses } from 'ai';
import { ArrowDownIcon, CopyIcon } from 'lucide-react';
Expand DownExpand Up@@ -204,16 +204,16 @@ export const ChatThread = ({
 } satisfies AdditionalChatRequestParams,
 });

 const userMessageText = getUserMessageText(message);
 if (
 messages.length === 0 &&
 message.parts.length > 0 &&
 message.parts[0].type === 'text'
 userMessageText.length > 0
 ) {
 generateAndUpdateChatNameFromMessage(
 {
 chatId,
 languageModelId: selectedLanguageModel.model,
 message: message.parts[0].text,
 message: userMessageText,
 },
 ).then((response) => {
 if (isServiceError(response)) {
Expand Down

4 changes: 2 additions & 2 deletions
packages/web/src/ee/features/chat/components/chatThread/chatThreadListItem.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -8,7 +8,7 @@ import { CSSProperties, forwardRef, memo, useCallback, useEffect, useMemo, useRe
import scrollIntoView from 'scroll-into-view-if-needed';
import { Reference, referenceSchema, SBChatMessage, Source } from "@/features/chat/types";
import { useExtractReferences } from '../../useExtractReferences';
import { getAnswerPartFromAssistantMessage, getLastStepParts, groupMessageIntoSteps, isSBChatToolPart, repairReferences, tryResolveFileReference } from '@/features/chat/utils';
import { getAnswerPartFromAssistantMessage, getLastStepParts, getUserMessageText, groupMessageIntoSteps, isSBChatToolPart, repairReferences, tryResolveFileReference } from '@/features/chat/utils';
import { AnswerCard } from './answerCard';
import { DetailsCard } from './detailsCard';
import { ApprovalRequestedToolPart, ToolApprovalBanner } from './toolApprovalBanner';
Expand DownExpand Up@@ -49,7 +49,7 @@ const ChatThreadListItemComponent = forwardRef<HTMLDivElement, ChatThreadListIte
 const userHasManuallyExpanded = useRef(false);

 const userQuestion = useMemo(() => {
 return userMessage.parts.length > 0 && userMessage.parts[0].type === 'text' ? userMessage.parts[0].text : '';
 return getUserMessageText(userMessage);
 }, [userMessage]);

 // Take the assistant message and repair any references that are not properly formatted.
Expand Down

71 changes: 70 additions & 1 deletion
packages/web/src/features/chat/utils.test.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
import { expect, test, describe, vi } from 'vitest'
import { createUIMessage, fileReferenceToString, getAnswerPartFromAssistantMessage, getLastStepParts, getTurnProgressState, groupMessageIntoSteps, repairReferences } from './utils'
import { createUIMessage, fileReferenceToString, getAnswerPartFromAssistantMessage, getLastStepParts, getTurnProgressState, getUserMessageText, groupMessageIntoSteps, repairReferences } from './utils'
import { FILE_REFERENCE_REGEX, ANSWER_TAG } from './constants';
import { SBChatMessage, SBChatMessagePart } from './types';

Expand DownExpand Up@@ -537,6 +537,75 @@ test('getAnswerPartFromAssistantMessage returns undefined when turn is in progre
 expect(result).toBeUndefined();
});

describe('getUserMessageText', () => {
 test('returns the text when the text part is first', () => {
 const message: SBChatMessage = {
 role: 'user',
 parts: [
 {
 type: 'text',
 text: 'Hello, world!',
 },
 ],
 } as SBChatMessage;

 expect(getUserMessageText(message)).toBe('Hello, world!');
 });

 test('returns the text when a non-text part precedes the text part', () => {
 const message: SBChatMessage = {
 role: 'user',
 parts: [
 {
 type: 'data-source',
 data: {
 type: 'file',
 path: 'auth.ts',
 repo: 'github.com/sourcebot-dev/sourcebot',
 name: 'auth.ts',
 revision: 'main',
 },
 },
 {
 type: 'text',
 text: 'Explain this file',
 },
 ],
 } as SBChatMessage;

 expect(getUserMessageText(message)).toBe('Explain this file');
 });

 test('returns an empty string when there is no text part', () => {
 const message: SBChatMessage = {
 role: 'user',
 parts: [
 {
 type: 'data-source',
 data: {
 type: 'file',
 path: 'auth.ts',
 repo: 'github.com/sourcebot-dev/sourcebot',
 name: 'auth.ts',
 revision: 'main',
 },
 },
 ],
 } as SBChatMessage;

 expect(getUserMessageText(message)).toBe('');
 });

 test('returns an empty string when there are no parts', () => {
 const message: SBChatMessage = {
 role: 'user',
 parts: [],
 } as unknown as SBChatMessage;

 expect(getUserMessageText(message)).toBe('');
 });
});

test('repairReferences fixes missing colon after @file', () => {
 const input = 'See the function in @file{github.com/sourcebot-dev/sourcebot::auth.ts} for details.';
 const expected = 'See the function in @file:{github.com/sourcebot-dev/sourcebot::auth.ts} for details.';
Expand Down

8 changes: 8 additions & 0 deletions
packages/web/src/features/chat/utils.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -397,6 +397,14 @@ export const repairReferences = (text: string): string => {
 .replace(/`(@file:\{[^`]+)`\}/g, '$1}');
};

// Extracts the user's text from a message by finding the first text part.
// User messages may contain non-text parts (e.g., file attachments), so we
// cannot assume the text is always at index 0. Accepts anything carrying
// `parts` so it works for both persisted and freshly created messages.
export const getUserMessageText = (message: Pick<SBChatMessage, 'parts'>): string => {
 return message.parts.find((part) => part.type === 'text')?.text ?? '';
}

// Attempts to find the part of the assistant's message
// that contains the answer.
export const getAnswerPartFromAssistantMessage = (message: SBChatMessage, isTurnInProgress: boolean): TextUIPart | undefined => {
Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Auto-enable theater mode on YouTube\n(function() {\n function tryTheater() {\n var btn = document.querySelector('button[aria-label=\"Theater mode\"], ytd-player #player button[title=\"Theater mode\"]');\n if (btn && !btn.classList.contains('activated')) {\n btn.click();\n }\n }\n \n // Try immediately\n tryTheater();\n \n // Try after navigation (SPA)\n var lastUrl = location.href;\n setInterval(function() {\n if (location.href !== lastUrl) {\n lastUrl = location.href;\n setTimeout(tryTheater, 500);\n }\n }, 1000);\n \n // Also try on player load\n var observer = new MutationObserver(tryTheater);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "YouTube Theater Mode Default");
}
} catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
refactor(web): normalize Ask user message text extraction#1371

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

whoisthey
merged 2 commits into

from

Jun 26, 2026
 Merged


refactor(web): normalize Ask user message text extraction
#1371
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


2 commits


Select commit
Hold shift + click to select a range
41ec0a5

refactor(web): normalize Ask user message text extraction


whoisthey Jun 26, 2026
ebcb2e5

docs: add changelog entry for #1371


whoisthey Jun 26, 2026

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


1 change: 1 addition & 0 deletions
CHANGELOG.md

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -9,6 +9,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0

### Changed
- [EE] Improved Ask Sourcebot prompt caching by splitting static and dynamic prompt sections and advancing cache breakpoints after every agent step instead of only after each message. [#1366](https://github.com/sourcebot-dev/sourcebot/pull/1366)
- Refactored Ask Sourcebot user message text extraction into a shared helper that robustly handles non-text message parts. [#1371](https://github.com/sourcebot-dev/sourcebot/pull/1371)

### Added
- Added per-step token cost tracking and estimated tool call token usage to Ask Sourcebot chat history. [#1353](https://github.com/sourcebot-dev/sourcebot/pull/1353)
Expand Down

11 changes: 6 additions & 5 deletions
packages/web/src/app/(app)/chat/[id]/page.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -14,6 +14,7 @@ import { __unsafePrisma } from '@/prisma';
import { ChatVisibility } from '@sourcebot/db';
import { Metadata } from 'next';
import { SBChatMessage } from '@/features/chat/types';
import { getUserMessageText } from '@/features/chat/utils';
import { env } from '@sourcebot/shared';
import { hasEntitlement } from '@/lib/entitlements';
import { ChatEntitlementMessage } from '@/features/chat/components/chatEntitlementMessage';
Expand DownExpand Up@@ -54,11 +55,11 @@ export const generateMetadata = async ({ params }: PageProps): Promise<Metadata>

 let description = 'A chat on Sourcebot';
 if (firstUserMessage) {
 const textPart = firstUserMessage.parts.find(p => p.type === 'text');
 if (textPart && textPart.type === 'text') {
 description = textPart.text.length > 160
 ? textPart.text.substring(0, 160).trim() + '...'
 : textPart.text;
 const text = getUserMessageText(firstUserMessage);
 if (text) {
 description = text.length > 160
 ? text.substring(0, 160).trim() + '...'
 : text;
 }
 }

Expand Down

4 changes: 2 additions & 2 deletions
packages/web/src/ee/features/chat/agent.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -22,7 +22,7 @@ import { randomUUID } from "crypto";
import _dedent from "dedent";
import { ANSWER_TAG, FILE_REFERENCE_PREFIX } from "@/features/chat/constants";
import { Source } from "@/features/chat/types";
import { addLineNumbers, fileReferenceToString, getAnswerPartFromAssistantMessage, getTurnProgressState } from "@/features/chat/utils";
import { addLineNumbers, fileReferenceToString, getAnswerPartFromAssistantMessage, getTurnProgressState, getUserMessageText } from "@/features/chat/utils";
import { createTools } from "./tools";
import { getConnectedMcpClients } from "@/ee/features/chat/mcp/mcpClientFactory";
import { getMcpTools, McpToolsResult } from "@/ee/features/chat/mcp/mcpToolSets";
Expand DownExpand Up@@ -105,7 +105,7 @@ export const createMessageStream = async ({
 if (message.role === 'user') {
 return {
 role: 'user',
 content: message.parts[0].type === 'text' ? message.parts[0].text : '',
 content: getUserMessageText(message),
 };
 }

Expand Down

8 changes: 4 additions & 4 deletions
packages/web/src/ee/features/chat/components/chatThread/chatThread.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -5,7 +5,7 @@ import { Button } from '@/components/ui/button';
import { Separator } from '@/components/ui/separator';
import { CustomSlateEditor } from '@/features/chat/customSlateEditor';
import { AdditionalChatRequestParams, CustomEditor, LanguageModelInfo, SBChatMessage, SearchScope, Source } from '@/features/chat/types';
import { createUIMessage, getAllMentionElements, getTurnProgressState, resetEditor, slateContentToString } from '@/features/chat/utils';
import { createUIMessage, getAllMentionElements, getTurnProgressState, getUserMessageText, resetEditor, slateContentToString } from '@/features/chat/utils';
import { useChat } from '@ai-sdk/react';
import { CreateUIMessage, DefaultChatTransport, lastAssistantMessageIsCompleteWithApprovalResponses } from 'ai';
import { ArrowDownIcon, CopyIcon } from 'lucide-react';
Expand DownExpand Up@@ -204,16 +204,16 @@ export const ChatThread = ({
 } satisfies AdditionalChatRequestParams,
 });

 const userMessageText = getUserMessageText(message);
 if (
 messages.length === 0 &&
 message.parts.length > 0 &&
 message.parts[0].type === 'text'
 userMessageText.length > 0
 ) {
 generateAndUpdateChatNameFromMessage(
 {
 chatId,
 languageModelId: selectedLanguageModel.model,
 message: message.parts[0].text,
 message: userMessageText,
 },
 ).then((response) => {
 if (isServiceError(response)) {
Expand Down

4 changes: 2 additions & 2 deletions
packages/web/src/ee/features/chat/components/chatThread/chatThreadListItem.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -8,7 +8,7 @@ import { CSSProperties, forwardRef, memo, useCallback, useEffect, useMemo, useRe
import scrollIntoView from 'scroll-into-view-if-needed';
import { Reference, referenceSchema, SBChatMessage, Source } from "@/features/chat/types";
import { useExtractReferences } from '../../useExtractReferences';
import { getAnswerPartFromAssistantMessage, getLastStepParts, groupMessageIntoSteps, isSBChatToolPart, repairReferences, tryResolveFileReference } from '@/features/chat/utils';
import { getAnswerPartFromAssistantMessage, getLastStepParts, getUserMessageText, groupMessageIntoSteps, isSBChatToolPart, repairReferences, tryResolveFileReference } from '@/features/chat/utils';
import { AnswerCard } from './answerCard';
import { DetailsCard } from './detailsCard';
import { ApprovalRequestedToolPart, ToolApprovalBanner } from './toolApprovalBanner';
Expand DownExpand Up@@ -49,7 +49,7 @@ const ChatThreadListItemComponent = forwardRef<HTMLDivElement, ChatThreadListIte
 const userHasManuallyExpanded = useRef(false);

 const userQuestion = useMemo(() => {
 return userMessage.parts.length > 0 && userMessage.parts[0].type === 'text' ? userMessage.parts[0].text : '';
 return getUserMessageText(userMessage);
 }, [userMessage]);

 // Take the assistant message and repair any references that are not properly formatted.
Expand Down

71 changes: 70 additions & 1 deletion
packages/web/src/features/chat/utils.test.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
import { expect, test, describe, vi } from 'vitest'
import { createUIMessage, fileReferenceToString, getAnswerPartFromAssistantMessage, getLastStepParts, getTurnProgressState, groupMessageIntoSteps, repairReferences } from './utils'
import { createUIMessage, fileReferenceToString, getAnswerPartFromAssistantMessage, getLastStepParts, getTurnProgressState, getUserMessageText, groupMessageIntoSteps, repairReferences } from './utils'
import { FILE_REFERENCE_REGEX, ANSWER_TAG } from './constants';
import { SBChatMessage, SBChatMessagePart } from './types';

Expand DownExpand Up@@ -537,6 +537,75 @@ test('getAnswerPartFromAssistantMessage returns undefined when turn is in progre
 expect(result).toBeUndefined();
});

describe('getUserMessageText', () => {
 test('returns the text when the text part is first', () => {
 const message: SBChatMessage = {
 role: 'user',
 parts: [
 {
 type: 'text',
 text: 'Hello, world!',
 },
 ],
 } as SBChatMessage;

 expect(getUserMessageText(message)).toBe('Hello, world!');
 });

 test('returns the text when a non-text part precedes the text part', () => {
 const message: SBChatMessage = {
 role: 'user',
 parts: [
 {
 type: 'data-source',
 data: {
 type: 'file',
 path: 'auth.ts',
 repo: 'github.com/sourcebot-dev/sourcebot',
 name: 'auth.ts',
 revision: 'main',
 },
 },
 {
 type: 'text',
 text: 'Explain this file',
 },
 ],
 } as SBChatMessage;

 expect(getUserMessageText(message)).toBe('Explain this file');
 });

 test('returns an empty string when there is no text part', () => {
 const message: SBChatMessage = {
 role: 'user',
 parts: [
 {
 type: 'data-source',
 data: {
 type: 'file',
 path: 'auth.ts',
 repo: 'github.com/sourcebot-dev/sourcebot',
 name: 'auth.ts',
 revision: 'main',
 },
 },
 ],
 } as SBChatMessage;

 expect(getUserMessageText(message)).toBe('');
 });

 test('returns an empty string when there are no parts', () => {
 const message: SBChatMessage = {
 role: 'user',
 parts: [],
 } as unknown as SBChatMessage;

 expect(getUserMessageText(message)).toBe('');
 });
});

test('repairReferences fixes missing colon after @file', () => {
 const input = 'See the function in @file{github.com/sourcebot-dev/sourcebot::auth.ts} for details.';
 const expected = 'See the function in @file:{github.com/sourcebot-dev/sourcebot::auth.ts} for details.';
Expand Down

8 changes: 8 additions & 0 deletions
packages/web/src/features/chat/utils.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -397,6 +397,14 @@ export const repairReferences = (text: string): string => {
 .replace(/`(@file:\{[^`]+)`\}/g, '$1}');
};

// Extracts the user's text from a message by finding the first text part.
// User messages may contain non-text parts (e.g., file attachments), so we
// cannot assume the text is always at index 0. Accepts anything carrying
// `parts` so it works for both persisted and freshly created messages.
export const getUserMessageText = (message: Pick<SBChatMessage, 'parts'>): string => {
 return message.parts.find((part) => part.type === 'text')?.text ?? '';
}

// Attempts to find the part of the assistant's message
// that contains the answer.
export const getAnswerPartFromAssistantMessage = (message: SBChatMessage, isTurnInProgress: boolean): TextUIPart | undefined => {
Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Remove or un-stick sticky/fixed headers that block content\n(function() {\n function unstick() {\n document.querySelectorAll('header, nav, [role=\"banner\"], .header, .navbar, .sticky, .fixed-top, [style*=\"position: fixed\"], [style*=\"position:sticky\"]').forEach(function(el) {\n if (el.style.position === 'fixed' || el.style.position === 'sticky' || \n getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {\n el.style.position = 'static';\n el.style.top = 'auto';\n el.style.zIndex = 'auto';\n }\n });\n }\n \n unstick();\n \n var observer = new MutationObserver(unstick);\n observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });\n})();", "Kill Sticky Headers");
}
} catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
refactor(web): normalize Ask user message text extraction#1371

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

whoisthey
merged 2 commits into

from

Jun 26, 2026
 Merged


refactor(web): normalize Ask user message text extraction
#1371
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


2 commits


Select commit
Hold shift + click to select a range
41ec0a5

refactor(web): normalize Ask user message text extraction


whoisthey Jun 26, 2026
ebcb2e5

docs: add changelog entry for #1371


whoisthey Jun 26, 2026

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


1 change: 1 addition & 0 deletions
CHANGELOG.md

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -9,6 +9,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0

### Changed
- [EE] Improved Ask Sourcebot prompt caching by splitting static and dynamic prompt sections and advancing cache breakpoints after every agent step instead of only after each message. [#1366](https://github.com/sourcebot-dev/sourcebot/pull/1366)
- Refactored Ask Sourcebot user message text extraction into a shared helper that robustly handles non-text message parts. [#1371](https://github.com/sourcebot-dev/sourcebot/pull/1371)

### Added
- Added per-step token cost tracking and estimated tool call token usage to Ask Sourcebot chat history. [#1353](https://github.com/sourcebot-dev/sourcebot/pull/1353)
Expand Down

11 changes: 6 additions & 5 deletions
packages/web/src/app/(app)/chat/[id]/page.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -14,6 +14,7 @@ import { __unsafePrisma } from '@/prisma';
import { ChatVisibility } from '@sourcebot/db';
import { Metadata } from 'next';
import { SBChatMessage } from '@/features/chat/types';
import { getUserMessageText } from '@/features/chat/utils';
import { env } from '@sourcebot/shared';
import { hasEntitlement } from '@/lib/entitlements';
import { ChatEntitlementMessage } from '@/features/chat/components/chatEntitlementMessage';
Expand DownExpand Up@@ -54,11 +55,11 @@ export const generateMetadata = async ({ params }: PageProps): Promise<Metadata>

 let description = 'A chat on Sourcebot';
 if (firstUserMessage) {
 const textPart = firstUserMessage.parts.find(p => p.type === 'text');
 if (textPart && textPart.type === 'text') {
 description = textPart.text.length > 160
 ? textPart.text.substring(0, 160).trim() + '...'
 : textPart.text;
 const text = getUserMessageText(firstUserMessage);
 if (text) {
 description = text.length > 160
 ? text.substring(0, 160).trim() + '...'
 : text;
 }
 }

Expand Down

4 changes: 2 additions & 2 deletions
packages/web/src/ee/features/chat/agent.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -22,7 +22,7 @@ import { randomUUID } from "crypto";
import _dedent from "dedent";
import { ANSWER_TAG, FILE_REFERENCE_PREFIX } from "@/features/chat/constants";
import { Source } from "@/features/chat/types";
import { addLineNumbers, fileReferenceToString, getAnswerPartFromAssistantMessage, getTurnProgressState } from "@/features/chat/utils";
import { addLineNumbers, fileReferenceToString, getAnswerPartFromAssistantMessage, getTurnProgressState, getUserMessageText } from "@/features/chat/utils";
import { createTools } from "./tools";
import { getConnectedMcpClients } from "@/ee/features/chat/mcp/mcpClientFactory";
import { getMcpTools, McpToolsResult } from "@/ee/features/chat/mcp/mcpToolSets";
Expand DownExpand Up@@ -105,7 +105,7 @@ export const createMessageStream = async ({
 if (message.role === 'user') {
 return {
 role: 'user',
 content: message.parts[0].type === 'text' ? message.parts[0].text : '',
 content: getUserMessageText(message),
 };
 }

Expand Down

8 changes: 4 additions & 4 deletions
packages/web/src/ee/features/chat/components/chatThread/chatThread.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -5,7 +5,7 @@ import { Button } from '@/components/ui/button';
import { Separator } from '@/components/ui/separator';
import { CustomSlateEditor } from '@/features/chat/customSlateEditor';
import { AdditionalChatRequestParams, CustomEditor, LanguageModelInfo, SBChatMessage, SearchScope, Source } from '@/features/chat/types';
import { createUIMessage, getAllMentionElements, getTurnProgressState, resetEditor, slateContentToString } from '@/features/chat/utils';
import { createUIMessage, getAllMentionElements, getTurnProgressState, getUserMessageText, resetEditor, slateContentToString } from '@/features/chat/utils';
import { useChat } from '@ai-sdk/react';
import { CreateUIMessage, DefaultChatTransport, lastAssistantMessageIsCompleteWithApprovalResponses } from 'ai';
import { ArrowDownIcon, CopyIcon } from 'lucide-react';
Expand DownExpand Up@@ -204,16 +204,16 @@ export const ChatThread = ({
 } satisfies AdditionalChatRequestParams,
 });

 const userMessageText = getUserMessageText(message);
 if (
 messages.length === 0 &&
 message.parts.length > 0 &&
 message.parts[0].type === 'text'
 userMessageText.length > 0
 ) {
 generateAndUpdateChatNameFromMessage(
 {
 chatId,
 languageModelId: selectedLanguageModel.model,
 message: message.parts[0].text,
 message: userMessageText,
 },
 ).then((response) => {
 if (isServiceError(response)) {
Expand Down

4 changes: 2 additions & 2 deletions
packages/web/src/ee/features/chat/components/chatThread/chatThreadListItem.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -8,7 +8,7 @@ import { CSSProperties, forwardRef, memo, useCallback, useEffect, useMemo, useRe
import scrollIntoView from 'scroll-into-view-if-needed';
import { Reference, referenceSchema, SBChatMessage, Source } from "@/features/chat/types";
import { useExtractReferences } from '../../useExtractReferences';
import { getAnswerPartFromAssistantMessage, getLastStepParts, groupMessageIntoSteps, isSBChatToolPart, repairReferences, tryResolveFileReference } from '@/features/chat/utils';
import { getAnswerPartFromAssistantMessage, getLastStepParts, getUserMessageText, groupMessageIntoSteps, isSBChatToolPart, repairReferences, tryResolveFileReference } from '@/features/chat/utils';
import { AnswerCard } from './answerCard';
import { DetailsCard } from './detailsCard';
import { ApprovalRequestedToolPart, ToolApprovalBanner } from './toolApprovalBanner';
Expand DownExpand Up@@ -49,7 +49,7 @@ const ChatThreadListItemComponent = forwardRef<HTMLDivElement, ChatThreadListIte
 const userHasManuallyExpanded = useRef(false);

 const userQuestion = useMemo(() => {
 return userMessage.parts.length > 0 && userMessage.parts[0].type === 'text' ? userMessage.parts[0].text : '';
 return getUserMessageText(userMessage);
 }, [userMessage]);

 // Take the assistant message and repair any references that are not properly formatted.
Expand Down

71 changes: 70 additions & 1 deletion
packages/web/src/features/chat/utils.test.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
import { expect, test, describe, vi } from 'vitest'
import { createUIMessage, fileReferenceToString, getAnswerPartFromAssistantMessage, getLastStepParts, getTurnProgressState, groupMessageIntoSteps, repairReferences } from './utils'
import { createUIMessage, fileReferenceToString, getAnswerPartFromAssistantMessage, getLastStepParts, getTurnProgressState, getUserMessageText, groupMessageIntoSteps, repairReferences } from './utils'
import { FILE_REFERENCE_REGEX, ANSWER_TAG } from './constants';
import { SBChatMessage, SBChatMessagePart } from './types';

Expand DownExpand Up@@ -537,6 +537,75 @@ test('getAnswerPartFromAssistantMessage returns undefined when turn is in progre
 expect(result).toBeUndefined();
});

describe('getUserMessageText', () => {
 test('returns the text when the text part is first', () => {
 const message: SBChatMessage = {
 role: 'user',
 parts: [
 {
 type: 'text',
 text: 'Hello, world!',
 },
 ],
 } as SBChatMessage;

 expect(getUserMessageText(message)).toBe('Hello, world!');
 });

 test('returns the text when a non-text part precedes the text part', () => {
 const message: SBChatMessage = {
 role: 'user',
 parts: [
 {
 type: 'data-source',
 data: {
 type: 'file',
 path: 'auth.ts',
 repo: 'github.com/sourcebot-dev/sourcebot',
 name: 'auth.ts',
 revision: 'main',
 },
 },
 {
 type: 'text',
 text: 'Explain this file',
 },
 ],
 } as SBChatMessage;

 expect(getUserMessageText(message)).toBe('Explain this file');
 });

 test('returns an empty string when there is no text part', () => {
 const message: SBChatMessage = {
 role: 'user',
 parts: [
 {
 type: 'data-source',
 data: {
 type: 'file',
 path: 'auth.ts',
 repo: 'github.com/sourcebot-dev/sourcebot',
 name: 'auth.ts',
 revision: 'main',
 },
 },
 ],
 } as SBChatMessage;

 expect(getUserMessageText(message)).toBe('');
 });

 test('returns an empty string when there are no parts', () => {
 const message: SBChatMessage = {
 role: 'user',
 parts: [],
 } as unknown as SBChatMessage;

 expect(getUserMessageText(message)).toBe('');
 });
});

test('repairReferences fixes missing colon after @file', () => {
 const input = 'See the function in @file{github.com/sourcebot-dev/sourcebot::auth.ts} for details.';
 const expected = 'See the function in @file:{github.com/sourcebot-dev/sourcebot::auth.ts} for details.';
Expand Down

8 changes: 8 additions & 0 deletions
packages/web/src/features/chat/utils.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -397,6 +397,14 @@ export const repairReferences = (text: string): string => {
 .replace(/`(@file:\{[^`]+)`\}/g, '$1}');
};

// Extracts the user's text from a message by finding the first text part.
// User messages may contain non-text parts (e.g., file attachments), so we
// cannot assume the text is always at index 0. Accepts anything carrying
// `parts` so it works for both persisted and freshly created messages.
export const getUserMessageText = (message: Pick<SBChatMessage, 'parts'>): string => {
 return message.parts.find((part) => part.type === 'text')?.text ?? '';
}

// Attempts to find the part of the assistant's message
// that contains the answer.
export const getAnswerPartFromAssistantMessage = (message: SBChatMessage, isTurnInProgress: boolean): TextUIPart | undefined => {
Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Universal Dark Mode - works on any site\n(function() {\n var enabled = true;\n \n function applyDarkMode() {\n if (!enabled) return;\n \n // Create style element if it doesn't exist\n var style = document.getElementById('universal-dark-mode-style');\n if (!style) {\n style = document.createElement('style');\n style.id = 'universal-dark-mode-style';\n document.head.appendChild(style);\n }\n \n // Dark mode CSS - inverts colors but preserves images/video\n style.textContent = '\n /* Invert everything except media */\n html {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #1a1a2e !important;\n }\n \n /* Restore images, videos, iframes, canvas */\n img, video, iframe, canvas, svg, picture, [style*=\"background-image\"] {\n filter: invert(1) hue-rotate(180deg) !important;\n }\n \n /* Preserve specific elements that should not be inverted */\n .no-dark-mode, .no-dark-mode *,\n [data-theme=\"light\"], [data-theme=\"light\"],\n .ace_editor, .ace_editor *,\n .CodeMirror, .CodeMirror *,\n .monaco-editor, .monaco-editor *,\n .markdown-body pre, .markdown-body pre *,\n .highlight, .highlight *,\n pre code, pre code * {\n filter: none !important;\n }\n \n /* Fix common UI elements */\n .modal, .popup, .dropdown-menu, .tooltip, .popover {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #2d2d44 !important;\n border-color: #444 !important;\n }\n \n /* Scrollbars */\n ::-webkit-scrollbar { background: #1a1a2e !important; }\n ::-webkit-scrollbar-thumb { background: #444 !important; }\n ::-webkit-scrollbar-thumb:hover { background: #555 !important; }\n \n /* Selection */\n ::selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ';\n }\n \n function removeDarkMode() {\n var style = document.getElementById('universal-dark-mode-style');\n if (style) style.remove();\n }\n \n // Toggle with Alt+Shift+D\n document.addEventListener('keydown', function(e) {\n if (e.altKey && e.shiftKey && e.key === 'D') {\n e.preventDefault();\n enabled = !enabled;\n if (enabled) {\n applyDarkMode();\n console.log('[Universal Dark Mode] Enabled');\n } else {\n removeDarkMode();\n console.log('[Universal Dark Mode] Disabled');\n }\n }\n });\n \n // Apply on load\n applyDarkMode();\n \n // Re-apply on dynamic content\n var observer = new MutationObserver(function(mutations) {\n if (enabled && !document.getElementById('universal-dark-mode-style')) {\n applyDarkMode();\n }\n });\n observer.observe(document.head, { childList: true });\n \n console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle');\n})();", "Universal Dark Mode");
}
} catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); }
})();
})();

Skip to content
refactor(web): normalize Ask user message text extraction#1371

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

whoisthey
merged 2 commits into

from

Jun 26, 2026
 Merged


refactor(web): normalize Ask user message text extraction
#1371
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


2 commits


Select commit
Hold shift + click to select a range
41ec0a5

refactor(web): normalize Ask user message text extraction


whoisthey Jun 26, 2026
ebcb2e5

docs: add changelog entry for #1371


whoisthey Jun 26, 2026

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


1 change: 1 addition & 0 deletions
CHANGELOG.md

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -9,6 +9,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0

### Changed
- [EE] Improved Ask Sourcebot prompt caching by splitting static and dynamic prompt sections and advancing cache breakpoints after every agent step instead of only after each message. [#1366](https://github.com/sourcebot-dev/sourcebot/pull/1366)
- Refactored Ask Sourcebot user message text extraction into a shared helper that robustly handles non-text message parts. [#1371](https://github.com/sourcebot-dev/sourcebot/pull/1371)

### Added
- Added per-step token cost tracking and estimated tool call token usage to Ask Sourcebot chat history. [#1353](https://github.com/sourcebot-dev/sourcebot/pull/1353)
Expand Down

11 changes: 6 additions & 5 deletions
packages/web/src/app/(app)/chat/[id]/page.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -14,6 +14,7 @@ import { __unsafePrisma } from '@/prisma';
import { ChatVisibility } from '@sourcebot/db';
import { Metadata } from 'next';
import { SBChatMessage } from '@/features/chat/types';
import { getUserMessageText } from '@/features/chat/utils';
import { env } from '@sourcebot/shared';
import { hasEntitlement } from '@/lib/entitlements';
import { ChatEntitlementMessage } from '@/features/chat/components/chatEntitlementMessage';
Expand DownExpand Up@@ -54,11 +55,11 @@ export const generateMetadata = async ({ params }: PageProps): Promise<Metadata>

 let description = 'A chat on Sourcebot';
 if (firstUserMessage) {
 const textPart = firstUserMessage.parts.find(p => p.type === 'text');
 if (textPart && textPart.type === 'text') {
 description = textPart.text.length > 160
 ? textPart.text.substring(0, 160).trim() + '...'
 : textPart.text;
 const text = getUserMessageText(firstUserMessage);
 if (text) {
 description = text.length > 160
 ? text.substring(0, 160).trim() + '...'
 : text;
 }
 }

Expand Down

4 changes: 2 additions & 2 deletions
packages/web/src/ee/features/chat/agent.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -22,7 +22,7 @@ import { randomUUID } from "crypto";
import _dedent from "dedent";
import { ANSWER_TAG, FILE_REFERENCE_PREFIX } from "@/features/chat/constants";
import { Source } from "@/features/chat/types";
import { addLineNumbers, fileReferenceToString, getAnswerPartFromAssistantMessage, getTurnProgressState } from "@/features/chat/utils";
import { addLineNumbers, fileReferenceToString, getAnswerPartFromAssistantMessage, getTurnProgressState, getUserMessageText } from "@/features/chat/utils";
import { createTools } from "./tools";
import { getConnectedMcpClients } from "@/ee/features/chat/mcp/mcpClientFactory";
import { getMcpTools, McpToolsResult } from "@/ee/features/chat/mcp/mcpToolSets";
Expand DownExpand Up@@ -105,7 +105,7 @@ export const createMessageStream = async ({
 if (message.role === 'user') {
 return {
 role: 'user',
 content: message.parts[0].type === 'text' ? message.parts[0].text : '',
 content: getUserMessageText(message),
 };
 }

Expand Down

8 changes: 4 additions & 4 deletions
packages/web/src/ee/features/chat/components/chatThread/chatThread.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -5,7 +5,7 @@ import { Button } from '@/components/ui/button';
import { Separator } from '@/components/ui/separator';
import { CustomSlateEditor } from '@/features/chat/customSlateEditor';
import { AdditionalChatRequestParams, CustomEditor, LanguageModelInfo, SBChatMessage, SearchScope, Source } from '@/features/chat/types';
import { createUIMessage, getAllMentionElements, getTurnProgressState, resetEditor, slateContentToString } from '@/features/chat/utils';
import { createUIMessage, getAllMentionElements, getTurnProgressState, getUserMessageText, resetEditor, slateContentToString } from '@/features/chat/utils';
import { useChat } from '@ai-sdk/react';
import { CreateUIMessage, DefaultChatTransport, lastAssistantMessageIsCompleteWithApprovalResponses } from 'ai';
import { ArrowDownIcon, CopyIcon } from 'lucide-react';
Expand DownExpand Up@@ -204,16 +204,16 @@ export const ChatThread = ({
 } satisfies AdditionalChatRequestParams,
 });

 const userMessageText = getUserMessageText(message);
 if (
 messages.length === 0 &&
 message.parts.length > 0 &&
 message.parts[0].type === 'text'
 userMessageText.length > 0
 ) {
 generateAndUpdateChatNameFromMessage(
 {
 chatId,
 languageModelId: selectedLanguageModel.model,
 message: message.parts[0].text,
 message: userMessageText,
 },
 ).then((response) => {
 if (isServiceError(response)) {
Expand Down

4 changes: 2 additions & 2 deletions
packages/web/src/ee/features/chat/components/chatThread/chatThreadListItem.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -8,7 +8,7 @@ import { CSSProperties, forwardRef, memo, useCallback, useEffect, useMemo, useRe
import scrollIntoView from 'scroll-into-view-if-needed';
import { Reference, referenceSchema, SBChatMessage, Source } from "@/features/chat/types";
import { useExtractReferences } from '../../useExtractReferences';
import { getAnswerPartFromAssistantMessage, getLastStepParts, groupMessageIntoSteps, isSBChatToolPart, repairReferences, tryResolveFileReference } from '@/features/chat/utils';
import { getAnswerPartFromAssistantMessage, getLastStepParts, getUserMessageText, groupMessageIntoSteps, isSBChatToolPart, repairReferences, tryResolveFileReference } from '@/features/chat/utils';
import { AnswerCard } from './answerCard';
import { DetailsCard } from './detailsCard';
import { ApprovalRequestedToolPart, ToolApprovalBanner } from './toolApprovalBanner';
Expand DownExpand Up@@ -49,7 +49,7 @@ const ChatThreadListItemComponent = forwardRef<HTMLDivElement, ChatThreadListIte
 const userHasManuallyExpanded = useRef(false);

 const userQuestion = useMemo(() => {
 return userMessage.parts.length > 0 && userMessage.parts[0].type === 'text' ? userMessage.parts[0].text : '';
 return getUserMessageText(userMessage);
 }, [userMessage]);

 // Take the assistant message and repair any references that are not properly formatted.
Expand Down

71 changes: 70 additions & 1 deletion
packages/web/src/features/chat/utils.test.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
import { expect, test, describe, vi } from 'vitest'
import { createUIMessage, fileReferenceToString, getAnswerPartFromAssistantMessage, getLastStepParts, getTurnProgressState, groupMessageIntoSteps, repairReferences } from './utils'
import { createUIMessage, fileReferenceToString, getAnswerPartFromAssistantMessage, getLastStepParts, getTurnProgressState, getUserMessageText, groupMessageIntoSteps, repairReferences } from './utils'
import { FILE_REFERENCE_REGEX, ANSWER_TAG } from './constants';
import { SBChatMessage, SBChatMessagePart } from './types';

Expand DownExpand Up@@ -537,6 +537,75 @@ test('getAnswerPartFromAssistantMessage returns undefined when turn is in progre
 expect(result).toBeUndefined();
});

describe('getUserMessageText', () => {
 test('returns the text when the text part is first', () => {
 const message: SBChatMessage = {
 role: 'user',
 parts: [
 {
 type: 'text',
 text: 'Hello, world!',
 },
 ],
 } as SBChatMessage;

 expect(getUserMessageText(message)).toBe('Hello, world!');
 });

 test('returns the text when a non-text part precedes the text part', () => {
 const message: SBChatMessage = {
 role: 'user',
 parts: [
 {
 type: 'data-source',
 data: {
 type: 'file',
 path: 'auth.ts',
 repo: 'github.com/sourcebot-dev/sourcebot',
 name: 'auth.ts',
 revision: 'main',
 },
 },
 {
 type: 'text',
 text: 'Explain this file',
 },
 ],
 } as SBChatMessage;

 expect(getUserMessageText(message)).toBe('Explain this file');
 });

 test('returns an empty string when there is no text part', () => {
 const message: SBChatMessage = {
 role: 'user',
 parts: [
 {
 type: 'data-source',
 data: {
 type: 'file',
 path: 'auth.ts',
 repo: 'github.com/sourcebot-dev/sourcebot',
 name: 'auth.ts',
 revision: 'main',
 },
 },
 ],
 } as SBChatMessage;

 expect(getUserMessageText(message)).toBe('');
 });

 test('returns an empty string when there are no parts', () => {
 const message: SBChatMessage = {
 role: 'user',
 parts: [],
 } as unknown as SBChatMessage;

 expect(getUserMessageText(message)).toBe('');
 });
});

test('repairReferences fixes missing colon after @file', () => {
 const input = 'See the function in @file{github.com/sourcebot-dev/sourcebot::auth.ts} for details.';
 const expected = 'See the function in @file:{github.com/sourcebot-dev/sourcebot::auth.ts} for details.';
Expand Down

8 changes: 8 additions & 0 deletions
packages/web/src/features/chat/utils.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -397,6 +397,14 @@ export const repairReferences = (text: string): string => {
 .replace(/`(@file:\{[^`]+)`\}/g, '$1}');
};

// Extracts the user's text from a message by finding the first text part.
// User messages may contain non-text parts (e.g., file attachments), so we
// cannot assume the text is always at index 0. Accepts anything carrying
// `parts` so it works for both persisted and freshly created messages.
export const getUserMessageText = (message: Pick<SBChatMessage, 'parts'>): string => {
 return message.parts.find((part) => part.type === 'text')?.text ?? '';
}

// Attempts to find the part of the assistant's message
// that contains the answer.
export const getAnswerPartFromAssistantMessage = (message: SBChatMessage, isTurnInProgress: boolean): TextUIPart | undefined => {
Expand Down
Loading