Skip to content

fix: prevent null reference reading 'error' in MessagesBoundary #1284

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
claude-code-best merged 3 commits into from
Jun 25, 2026
+6 −2
Merged

fix: prevent null reference reading 'error' in MessagesBoundary #1284

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
2c80150
fix: prevent null reference reading 'error' in MessagesBoundary
wsolarq11 Jun 24, 2026
10855cf
merge upstream/main
wsolarq11 Jun 25, 2026
c094516
fix: remove semicolons for biome compliance
wsolarq11 Jun 25, 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
4 changes: 3 additions & 1 deletion src/utils/messages.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -753,6 +753,7 @@ export function normalizeMessages(messages: Message[]): NormalizedMessage[] {
// and remains true for all subsequent messages in the normalization process.
let isNewChain = false
return messages.flatMap(message => {
if (!message) return []
switch (message.type) {
case 'assistant': {
const aMsg = message as AssistantMessage
Expand All @@ -776,7 +777,7 @@ export function normalizeMessages(messages: Message[]): NormalizedMessage[] {
isVirtual: message.isVirtual,
requestId: message.requestId,
uuid,
error: message.error,
error: message?.error,
isApiErrorMessage: message.isApiErrorMessage,
advisorModel: message.advisorModel,
} as NormalizedAssistantMessage
Expand Down Expand Up @@ -2376,6 +2377,7 @@ export function normalizeMessagesForAPI(
},
)
.forEach(message => {
if (!message) return []
switch (message.type) {
case 'system': {
// local_command system messages need to be included as user messages
Expand Down
4 changes: 3 additions & 1 deletion src/utils/messages/mappers.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@ export function toInternalMessages(
messages: readonly DeepImmutable<SDKMessage>[],
): Message[] {
return messages.flatMap(message => {
if (!message) return []
switch (message.type) {
case 'assistant':
return [
Expand Down Expand Up @@ -127,6 +128,7 @@ export function fromSDKCompactMetadata(

export function toSDKMessages(messages: Message[]): SDKMessage[] {
return messages.flatMap((message): SDKMessage[] => {
if (!message) return []
switch (message.type) {
case 'assistant':
return [
Expand All @@ -138,7 +140,7 @@ export function toSDKMessages(messages: Message[]): SDKMessage[] {
session_id: getSessionId(),
parent_tool_use_id: null,
uuid: message.uuid,
error: message.error,
error: message?.error,
},
]
case 'user':
Expand Down