@@ -10,7 +10,12 @@
1010 */
1111
1212 import { Database } from "bun:sqlite";
13-import type { AssistantMessage, Message } from "@mariozechner/pi-ai";
13+import type {
14+ AssistantMessage,
15+ Message,
16+ ToolResultMessage,
17+ UserMessage,
18+} from "@mariozechner/pi-ai";
1419
1520 // ---------------------------------------------------------------------------
1621 // Types
@@ -140,6 +145,21 @@ type MaxTurnRow = { max_turn: number | null };
140145 /** Row shape for `SELECT data` queries. */
141146 type DataRow = { data: string };
142147
148+const EMPTY_ASSISTANT_USAGE: AssistantMessage["usage"] = {
149+ input: 0,
150+ output: 0,
151+ cacheRead: 0,
152+ cacheWrite: 0,
153+ totalTokens: 0,
154+ cost: {
155+ input: 0,
156+ output: 0,
157+ cacheRead: 0,
158+ cacheWrite: 0,
159+ total: 0,
160+ },
161+};
162+
143163 /** Row shape returned by `SELECT * FROM prompt_history`. */
144164 type PromptHistoryRow = {
145165 id: number;
@@ -319,14 +339,189 @@ function getMultipartUserPreview(
319339 return collapsePreviewText(text);
320340 }
321341
342+function isTextContentBlock(
343+ value: unknown,
344+): value is { type: "text"; text: string } {
345+ const record = toRecord(value);
346+ return record?.type === "text" && typeof record.text === "string";
347+}
348+
349+function isImageContentBlock(
350+ value: unknown,
351+): value is { type: "image"; data: string; mimeType: string } {
352+ const record = toRecord(value);
353+ return (
354+ record?.type === "image" &&
355+ typeof record.data === "string" &&
356+ typeof record.mimeType === "string"
357+ );
358+}
359+
360+function isThinkingContentBlock(
361+ value: unknown,
362+): value is Extract<AssistantMessage["content"][number], { type: "thinking" }> {
363+ const record = toRecord(value);
364+ return record?.type === "thinking" && typeof record.thinking === "string";
365+}
366+
367+function isToolCallContentBlock(
368+ value: unknown,
369+): value is Extract<AssistantMessage["content"][number], { type: "toolCall" }> {
370+ const record = toRecord(value);
371+ return (
372+ record?.type === "toolCall" &&
373+ typeof record.id === "string" &&
374+ typeof record.name === "string" &&
375+ toRecord(record.arguments) !== null
376+ );
377+}
378+
379+function isAssistantUsage(value: unknown): value is AssistantMessage["usage"] {
380+ const usageRecord = toRecord(value);
381+ const costRecord = toRecord(usageRecord?.cost);
382+ return (
383+ usageRecord !== null &&
384+ costRecord !== null &&
385+ readFiniteNumber(usageRecord, "input") !== null &&
386+ readFiniteNumber(usageRecord, "output") !== null &&
387+ readFiniteNumber(usageRecord, "cacheRead") !== null &&
388+ readFiniteNumber(usageRecord, "cacheWrite") !== null &&
389+ readFiniteNumber(usageRecord, "totalTokens") !== null &&
390+ readFiniteNumber(costRecord, "input") !== null &&
391+ readFiniteNumber(costRecord, "output") !== null &&
392+ readFiniteNumber(costRecord, "cacheRead") !== null &&
393+ readFiniteNumber(costRecord, "cacheWrite") !== null &&
394+ readFiniteNumber(costRecord, "total") !== null
395+ );
396+}
397+
398+function isStopReason(value: unknown): value is AssistantMessage["stopReason"] {
399+ return (
400+ value === "stop" ||
401+ value === "length" ||
402+ value === "toolUse" ||
403+ value === "error" ||
404+ value === "aborted"
405+ );
406+}
407+
408+function isUserMessageRecord(value: unknown): value is UserMessage {
409+ const record = toRecord(value);
410+ if (!record || record.role !== "user") {
411+ return false;
412+ }
413+
414+ return (
415+ readFiniteNumber(record, "timestamp") !== null &&
416+ (typeof record.content === "string" ||
417+ (Array.isArray(record.content) &&
418+ record.content.every(
419+ (block) => isTextContentBlock(block) || isImageContentBlock(block),
420+ )))
421+ );
422+}
423+
424+function parseAssistantMessageRecord(value: unknown): AssistantMessage | null {
425+ const record = toRecord(value);
426+ if (!record || record.role !== "assistant") {
427+ return null;
428+ }
429+
430+ const timestamp = readFiniteNumber(record, "timestamp");
431+ if (
432+ !Array.isArray(record.content) ||
433+ !record.content.every(
434+ (block) =>
435+ isTextContentBlock(block) ||
436+ isThinkingContentBlock(block) ||
437+ isToolCallContentBlock(block),
438+ ) ||
439+ typeof record.api !== "string" ||
440+ typeof record.provider !== "string" ||
441+ typeof record.model !== "string" ||
442+ !isStopReason(record.stopReason) ||
443+ (record.errorMessage !== undefined &&
444+ typeof record.errorMessage !== "string") ||
445+ timestamp === null
446+ ) {
447+ return null;
448+ }
449+
450+ return {
451+ role: "assistant",
452+ content: record.content,
453+ api: record.api,
454+ provider: record.provider,
455+ model: record.model,
456+ usage: isAssistantUsage(record.usage)
457+ ? record.usage
458+ : structuredClone(EMPTY_ASSISTANT_USAGE),
459+ stopReason: record.stopReason,
460+ ...(typeof record.errorMessage === "string"
461+ ? { errorMessage: record.errorMessage }
462+ : {}),
463+ timestamp,
464+ };
465+}
466+
467+function isToolResultMessageRecord(value: unknown): value is ToolResultMessage {
468+ const record = toRecord(value);
469+ if (!record || record.role !== "toolResult") {
470+ return false;
471+ }
472+
473+ return (
474+ typeof record.toolCallId === "string" &&
475+ typeof record.toolName === "string" &&
476+ typeof record.isError === "boolean" &&
477+ Array.isArray(record.content) &&
478+ record.content.every(
479+ (block) => isTextContentBlock(block) || isImageContentBlock(block),
480+ ) &&
481+ readFiniteNumber(record, "timestamp") !== null
482+ );
483+}
484+
485+function isUiMessageRecord(value: unknown): value is UiMessage {
486+ const record = toRecord(value);
487+ if (!record || record.role !== "ui") {
488+ return false;
489+ }
490+
491+ return (
492+ record.kind === "info" &&
493+ typeof record.content === "string" &&
494+ readFiniteNumber(record, "timestamp") !== null
495+ );
496+}
497+
498+function parsePersistedMessage(data: string): PersistedMessage | null {
499+ let parsed: unknown;
500+ try {
501+ parsed = JSON.parse(data) as unknown;
502+ } catch {
503+ return null;
504+ }
505+
506+ if (
507+ isUserMessageRecord(parsed) ||
508+ isToolResultMessageRecord(parsed) ||
509+ isUiMessageRecord(parsed)
510+ ) {
511+ return parsed;
512+ }
513+
514+ return parseAssistantMessageRecord(parsed);
515+}
516+
322517 /** Read the first-user preview cached by the session-list query. */
323518 function readFirstUserPreview(messageData: string | null): string | null {
324519 if (!messageData) {
325520 return null;
326521 }
327522
328- const message = JSON.parse(messageData) as PersistedMessage;
329- if (message.role !== "user") {
523+ const message = parsePersistedMessage(messageData);
524+ if (!message || message.role !== "user") {
330525 return null;
331526 }
332527
@@ -434,7 +629,7 @@ export function filterModelMessages(
434629 }
435630
436631 function toRecord(value: unknown): Record<string, unknown> | null {
437- return typeof value === "object" && value !== null
632+ return typeof value === "object" && value !== null && !Array.isArray(value)
438633 ? (value as Record<string, unknown>)
439634 : null;
440635 }
@@ -620,7 +815,8 @@ export function appendMessage(
620815 * Load all messages for a session in insertion order.
621816 *
622817 * Messages are deserialized from their JSON representation back into
623- * persisted app messages. The ordering matches the original append order
818+ * persisted app messages. Invalid rows are skipped so corrupted session data
819+ * does not crash the app. The ordering matches the original append order
624820 * (by autoincrement `id`), preserving the conversation flow.
625821 *
626822 * @param db - Open database handle.
@@ -633,7 +829,16 @@ export function loadMessages(
633829 sessionId: string,
634830 ): PersistedMessage[] {
635831 const rows = db.query<DataRow, [string]>(SQL.loadMessages).all(sessionId);
636- return rows.map((row) => JSON.parse(row.data) as PersistedMessage);
832+ const messages: PersistedMessage[] = [];
833+
834+ for (const row of rows) {
835+ const message = parsePersistedMessage(row.data);
836+ if (message) {
837+ messages.push(message);
838+ }
839+ }
840+
841+ return messages;
637842 }
638843
639844 // ---------------------------------------------------------------------------