Skip to content

Commit f3508bf

Browse files
committed
fix(app): guard message memos against undefined state on deep-link render
When navigating directly to a deep-linked session URL, the messages store may not be populated yet. Guard userMessages and visibleUserMessages memos with messagesReady() and null checks to prevent TypeError when calling .filter() on undefined. Fixes anomalyco#21569
1 parent cd8e8a9 commit f3508bf

1 file changed

Lines changed: 10 additions & 4 deletions

File tree

‎packages/app/src/pages/session.tsx‎

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -465,15 +465,21 @@ export default function Page() {
465465
return sync.session.history.loading(id)
466466
})
467467
const userMessages = createMemo(
468-
() => messages().filter((m) => m.role === "user") as UserMessage[],
468+
() => {
469+
const msgs = messages()
470+
if (!msgs || !messagesReady()) return emptyUserMessages
471+
return msgs.filter((m) => m.role === "user") as UserMessage[]
472+
},
469473
emptyUserMessages,
470474
{ equals: same },
471475
)
472476
const visibleUserMessages = createMemo(
473477
() => {
478+
const msgs = userMessages()
479+
if (!msgs) return emptyUserMessages
474480
const revert = revertMessageID()
475-
if (!revert) return userMessages()
476-
return userMessages().filter((m) => m.id < revert)
481+
if (!revert) return msgs
482+
return msgs.filter((m) => m.id < revert)
477483
},
478484
emptyUserMessages,
479485
{
@@ -1497,7 +1503,7 @@ export default function Page() {
14971503
const historyWindow = createSessionHistoryWindow({
14981504
sessionID: () => params.id,
14991505
messagesReady,
1500-
loaded: () => messages().length,
1506+
loaded: () => (messages() ?? []).length,
15011507
visibleUserMessages,
15021508
historyMore,
15031509
historyLoading,

0 commit comments

Comments
 (0)