@jini-ai/chat 0.6.6 → 0.6.10

package/dist/store/legacy/sqlite/conversations.js

@@ -1,17 +1,15 @@
 import { rows } from '@jini-ai/db/core';
 /**
- * Returns all conversations for a project, newest first, each enriched with message count,
- * the latest assistant run summary, and total accumulated run duration across all terminal runs.
- * @param db Open SQLite database handle.
- * @param projectId The project whose conversations to list.
+ * @internal Builds the summary query shared by `listConversations` and `getConversation`: every
+ * conversation matching `filterColumn = ?`, each enriched with message count, the latest assistant
+ * run summary, and total accumulated run duration across all terminal runs.
  */
-export function listConversations({ db, projectId }) {
-    return rows(db
-        .prepare(`WITH project_conversations AS (
+function conversationSummarySql(filterColumn) {
+    return `WITH selected_conversations AS (
           SELECT id, project_id AS projectId, title, session_mode AS sessionMode,
                  created_at AS createdAt, updated_at AS updatedAt
             FROM conversations
-           WHERE project_id = ?
+           WHERE ${filterColumn} = ?
         ),
         latest_runs AS (
           SELECT conversation_id AS conversationId,
@@ -30,7 +28,7 @@ export function listConversations({ db, projectId }) {
                        ORDER BY m.position DESC
                      ) AS rn
                 FROM messages m
-                JOIN project_conversations c ON c.id = m.conversation_id
+                JOIN selected_conversations c ON c.id = m.conversation_id
                WHERE m.role = 'assistant'
                  AND m.run_status IS NOT NULL
             )
@@ -40,14 +38,14 @@ export function listConversations({ db, projectId }) {
           SELECT m.conversation_id AS conversationId,
                  COUNT(*) AS messageCount
             FROM messages m
-            JOIN project_conversations c ON c.id = m.conversation_id
+            JOIN selected_conversations c ON c.id = m.conversation_id
            GROUP BY m.conversation_id
         ),
         total_run_durations AS (
           SELECT m.conversation_id AS conversationId,
-                 SUM(${terminalRunDurationSql('m')}) AS totalDurationMs
+                 SUM(${TERMINAL_RUN_DURATION_SQL}) AS totalDurationMs
             FROM messages m
-            JOIN project_conversations c ON c.id = m.conversation_id
+            JOIN selected_conversations c ON c.id = m.conversation_id
            WHERE m.role = 'assistant'
              AND m.run_status IN ('succeeded', 'failed', 'canceled')
            GROUP BY m.conversation_id
@@ -57,11 +55,20 @@ export function listConversations({ db, projectId }) {
                lr.latestRunStatus, lr.latestRunStartedAt,
                lr.latestRunEndedAt, lr.latestRunEventsJson,
                trd.totalDurationMs
-          FROM project_conversations c
+          FROM selected_conversations c
           LEFT JOIN latest_runs lr ON lr.conversationId = c.id
           LEFT JOIN message_counts mc ON mc.conversationId = c.id
-          LEFT JOIN total_run_durations trd ON trd.conversationId = c.id
-         ORDER BY c.updatedAt DESC`)
+          LEFT JOIN total_run_durations trd ON trd.conversationId = c.id`;
+}
+/**
+ * Returns all conversations for a project, newest first, each enriched with message count,
+ * the latest assistant run summary, and total accumulated run duration across all terminal runs.
+ * @param db Open SQLite database handle.
+ * @param projectId The project whose conversations to list.
+ */
+export function listConversations({ db, projectId }) {
+    return rows(db
+        .prepare(`${conversationSummarySql('project_id')}\n         ORDER BY c.updatedAt DESC`)
         .all(projectId)).map(normalizeConversation);
 }
 /**
@@ -71,19 +78,8 @@ export function listConversations({ db, projectId }) {
  * @param id Conversation id.
  */
 export function getConversation({ db, id }) {
-    const r = db
-        .prepare(`SELECT id, project_id AS projectId, title, session_mode AS sessionMode,
-              created_at AS createdAt, updated_at AS updatedAt,
-              (SELECT COUNT(*) FROM messages WHERE conversation_id = conversations.id) AS messageCount
-         FROM conversations WHERE id = ?`)
-        .get(id);
-    if (!r)
-        return null;
-    return {
-        ...normalizeConversation(r),
-        latestRun: latestConversationRunSummary(db, r.id) ?? undefined,
-        ...numberProperty('totalDurationMs', totalConversationRunDurationMs(db, r.id)),
-    };
+    const r = db.prepare(conversationSummarySql('id')).get(id);
+    return r ? normalizeConversation(r) : null;
 }
 /** @internal Shapes a raw SQLite row into the canonical conversation object, including run summary. */
 function normalizeConversation(r) {
@@ -114,6 +110,11 @@ function normalizeConversation(r) {
 export function normalizeConversationSessionMode({ value }) {
     return value === 'chat' || value === 'plan' ? value : 'design';
 }
+/** @internal Converts a nullable SQLite value to a finite number, or undefined when absent or non-finite. */
+function finiteNumber(value) {
+    const n = value == null ? undefined : Number(value);
+    return n !== undefined && Number.isFinite(n) ? n : undefined;
+}
 /**
  * @internal Produces a single-key object `{ [key]: number }` only when value is a finite number,
  * omitting the key entirely otherwise. Generic over `key` (rather than plain `string`) so the
@@ -122,46 +123,15 @@ export function normalizeConversationSessionMode({ value }) {
  * through at the call site.
  */
 function numberProperty(key, value) {
-    const n = value == null ? undefined : Number(value);
-    return typeof n === 'number' && Number.isFinite(n)
-        ? { [key]: n }
-        : {};
-}
-/** @internal Queries the most recent assistant run summary for a conversation (used by getConversation's per-row fetch path). */
-function latestConversationRunSummary(db, conversationId) {
-    const row = db
-        .prepare(`SELECT run_status AS runStatus,
-              started_at AS startedAt,
-              ended_at AS endedAt,
-              events_json AS eventsJson
-         FROM messages
-        WHERE conversation_id = ?
-          AND role = 'assistant'
-          AND run_status IS NOT NULL
-        ORDER BY position DESC
-        LIMIT 1`)
-        .get(conversationId);
-    return conversationRunSummaryFromRow(row);
+    const n = finiteNumber(value);
+    return n === undefined ? {} : { [key]: n };
 }
-/** @internal Sums terminal-run duration across all succeeded/failed/canceled assistant messages in a conversation. */
-function totalConversationRunDurationMs(db, conversationId) {
-    const row = db
-        .prepare(`SELECT SUM(${terminalRunDurationSql()}) AS totalDurationMs
-         FROM messages
-        WHERE conversation_id = ?
-          AND role = 'assistant'
-          AND run_status IN ('succeeded', 'failed', 'canceled')`)
-        .get(conversationId);
-    return row?.totalDurationMs == null ? undefined : Number(row.totalDurationMs);
-}
-/** @internal Emits the SQL CASE expression that resolves a terminal run's duration: wall-clock diff when both timestamps exist, otherwise the latest usage event's durationMs. */
-function terminalRunDurationSql(alias) {
-    const p = alias ? `${alias}.` : '';
-    return `CASE
-            WHEN ${p}started_at IS NOT NULL AND ${p}ended_at IS NOT NULL THEN
+/** @internal The SQL CASE expression that resolves a terminal run's duration (over messages alias `m`): wall-clock diff when both timestamps exist, otherwise the latest usage event's durationMs. */
+const TERMINAL_RUN_DURATION_SQL = `CASE
+            WHEN m.started_at IS NOT NULL AND m.ended_at IS NOT NULL THEN
               CASE
-                WHEN CAST(${p}ended_at AS INTEGER) >= CAST(${p}started_at AS INTEGER)
-                  THEN CAST(${p}ended_at AS INTEGER) - CAST(${p}started_at AS INTEGER)
+                WHEN CAST(m.ended_at AS INTEGER) >= CAST(m.started_at AS INTEGER)
+                  THEN CAST(m.ended_at AS INTEGER) - CAST(m.started_at AS INTEGER)
                 ELSE 0
               END
             ELSE (
@@ -172,8 +142,8 @@ function terminalRunDurationSql(alias) {
                      END
                 FROM json_each(
                   CASE
-                    WHEN json_valid(${p}events_json) AND json_type(${p}events_json) = 'array'
-                      THEN ${p}events_json
+                    WHEN json_valid(m.events_json) AND json_type(m.events_json) = 'array'
+                      THEN m.events_json
                     ELSE '[]'
                   END
                 ) AS usage_event
@@ -184,49 +154,50 @@ function terminalRunDurationSql(alias) {
                LIMIT 1
             )
           END`;
-}
 /** @internal Converts a raw message row (runStatus/startedAt/endedAt/eventsJson) into a run summary object, or null when no run status is present. */
 function conversationRunSummaryFromRow(row) {
-    if (!row || typeof row.runStatus !== 'string')
+    if (typeof row.runStatus !== 'string')
         return null;
-    const startedAt = row.startedAt == null ? undefined : Number(row.startedAt);
-    const endedAt = row.endedAt == null ? undefined : Number(row.endedAt);
-    const usageDurationMs = latestUsageDurationMs(row.eventsJson);
-    const durationMs = Number.isFinite(startedAt) && Number.isFinite(endedAt)
+    const startedAt = finiteNumber(row.startedAt);
+    const endedAt = finiteNumber(row.endedAt);
+    const durationMs = startedAt !== undefined && endedAt !== undefined
         ? Math.max(0, endedAt - startedAt)
-        : usageDurationMs;
+        : latestUsageDurationMs(row.eventsJson);
     return {
         status: row.runStatus,
-        ...(Number.isFinite(startedAt) ? { startedAt } : {}),
-        ...(Number.isFinite(endedAt) ? { endedAt } : {}),
-        ...(typeof durationMs === 'number' && Number.isFinite(durationMs)
-            ? { durationMs }
-            : {}),
+        ...numberProperty('startedAt', startedAt),
+        ...numberProperty('endedAt', endedAt),
+        ...numberProperty('durationMs', durationMs),
     };
 }
 /** @internal Parses events_json to find the most recent usage event's durationMs; returns undefined when events_json is absent or malformed. */
 function latestUsageDurationMs(eventsJson) {
+    const events = parseEventsArray(eventsJson);
+    for (let i = events.length - 1; i >= 0; i -= 1) {
+        const durationMs = usageEventDurationMs(events[i]);
+        if (durationMs !== undefined)
+            return Math.max(0, durationMs);
+    }
+    return undefined;
+}
+/** @internal Parses events_json as an array; absent, malformed, or non-array JSON yields an empty list. */
+function parseEventsArray(eventsJson) {
     if (typeof eventsJson !== 'string' || eventsJson.length === 0)
-        return undefined;
+        return [];
     try {
         const events = JSON.parse(eventsJson);
-        if (!Array.isArray(events))
-            return undefined;
-        for (let i = events.length - 1; i >= 0; i -= 1) {
-            const event = events[i];
-            if (event &&
-                typeof event === 'object' &&
-                event.kind === 'usage' &&
-                typeof event.durationMs === 'number' &&
-                Number.isFinite(event.durationMs)) {
-                return Math.max(0, event.durationMs);
-            }
-        }
+        return Array.isArray(events) ? events : [];
     }
     catch {
-        return undefined;
+        return [];
     }
-    return undefined;
+}
+/** @internal Returns a usage event's finite durationMs, or undefined for any other event shape. */
+function usageEventDurationMs(event) {
+    if (!event || typeof event !== 'object')
+        return undefined;
+    const { kind, durationMs } = event;
+    return kind === 'usage' && typeof durationMs === 'number' && Number.isFinite(durationMs) ? durationMs : undefined;
 }
 /**
  * Inserts a new conversation row and returns the full conversation record (including run summary).
@@ -238,7 +209,7 @@ export function insertConversation({ db, c }) {
     db.prepare(`INSERT INTO conversations
        (id, project_id, title, session_mode, created_at, updated_at)
      VALUES (?, ?, ?, ?, ?, ?)`).run(c.id, c.projectId, c.title ?? null, normalizeConversationSessionMode({ value: c.sessionMode }), c.createdAt, c.updatedAt);
-    return getConversation({ db: db, id: c.id });
+    return getConversation({ db, id: c.id });
 }
 /**
  * Applies a partial patch to an existing conversation, merging with the current record.
@@ -248,7 +219,7 @@ export function insertConversation({ db, c }) {
  * @param patch Fields to overwrite; sessionMode and updatedAt are normalized before persisting.
  */
 export function updateConversation({ db, id, patch }) {
-    const existing = getConversation({ db: db, id: id });
+    const existing = getConversation({ db, id });
     if (!existing)
         return null;
     const merged = {
@@ -261,7 +232,7 @@ export function updateConversation({ db, id, patch }) {
     };
     db.prepare(`UPDATE conversations
         SET title = ?, session_mode = ?, updated_at = ? WHERE id = ?`).run(merged.title ?? null, merged.sessionMode, merged.updatedAt, id);
-    return getConversation({ db: db, id: id });
+    return getConversation({ db, id });
 }
 /**
  * Removes a conversation row by id. Cascading deletes on messages are handled by the schema.

package/dist/store/legacy/sqlite/messages.d.ts

@@ -116,7 +116,15 @@ export declare function appendMessageStatusEvent({ db, messageId, event }: {
     db: SqliteDb;
     messageId: string;
     event: DbRow;
-}): any[] | null;
+}): (DbRow | {
+    kind: string;
+    label: string;
+    detail: string;
+} | {
+    kind: string;
+    label: string;
+    detail?: never;
+})[] | null;
 /**
  * Appends an arbitrary agent event to the message's events array, also streaming `text` deltas
  * into the `content` column so the message text grows incrementally during a run.
@@ -130,7 +138,7 @@ export declare function appendMessageAgentEvent({ db, messageId, event }: {
     db: SqliteDb;
     messageId: string;
     event: DbRow;
-}): any[] | null;
+}): DbRow[] | null;
 /**
  * Hard-deletes a single message row by id.
  * @param db - Open SQLite connection.

package/dist/store/legacy/sqlite/messages.js

@@ -77,60 +77,92 @@ export function upsertMessage({ db, conversationId, m: incoming }, options = {})
         ? (options.redactUserText ?? redactUserText)({ text: incoming.content })
         : null;
     const m = redaction ? { ...incoming, content: redaction.text } : incoming;
-    const runUpsert = db.transaction(() => {
-        const existing = db
-            .prepare(`SELECT conversation_id AS conversationId, position FROM messages WHERE id = ?`)
-            .get(m.id);
-        if (existing && existing.conversationId !== conversationId) {
-            throw new MessageConversationMismatchError({ messageId: m.id, actualConversationId: existing.conversationId, requestedConversationId: conversationId });
-        }
-        const now = Date.now();
-        if (existing) {
-            db.prepare(`UPDATE messages
-            SET role = ?, content = ?, agent_id = ?, agent_name = ?,
-                run_id = ?, run_status = ?, last_run_event_id = ?,
-                events_json = ?, attachments_json = ?,
-                session_mode = ?, run_context_json = ?,
-                telemetry_finalized_at = CASE
-                  WHEN ? THEN COALESCE(telemetry_finalized_at, ?)
-                  ELSE telemetry_finalized_at
-                END,
-                started_at = ?, ended_at = ?
-          WHERE id = ? AND conversation_id = ?`).run(m.role, m.content, m.agentId ?? null, m.agentName ?? null, m.runId ?? null, m.runStatus ?? null, m.lastRunEventId ?? null, m.events ? JSON.stringify(m.events) : null, m.attachments ? JSON.stringify(m.attachments) : null, normalizeMessageSessionModeForStorage(m.sessionMode), m.runContext ? JSON.stringify(m.runContext) : null, m.telemetryFinalized === true ? 1 : 0, now, m.startedAt ?? null, m.endedAt ?? null, m.id, conversationId);
-        }
-        else {
-            const max = db
-                .prepare(`SELECT COALESCE(MAX(position), -1) AS m FROM messages WHERE conversation_id = ?`)
-                .get(conversationId);
-            const position = (max?.m ?? -1) + 1;
-            const createdAt = typeof m.createdAt === 'number' && Number.isFinite(m.createdAt)
-                ? m.createdAt
-                : now;
-            // 18 values: id, conversation_id, role, content, agent_id, agent_name,
-            // run_id, run_status, last_run_event_id, events_json, attachments_json,
-            // session_mode, run_context_json, telemetry_finalized_at, started_at,
-            // ended_at, position, created_at.
-            db.prepare(`INSERT INTO messages
-           (id, conversation_id, role, content, agent_id, agent_name,
-            run_id, run_status, last_run_event_id, events_json,
-            attachments_json, session_mode, run_context_json,
-            telemetry_finalized_at, started_at, ended_at, position, created_at)
-         VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)`).run(m.id, conversationId, m.role, m.content, m.agentId ?? null, m.agentName ?? null, m.runId ?? null, m.runStatus ?? null, m.lastRunEventId ?? null, m.events ? JSON.stringify(m.events) : null, m.attachments ? JSON.stringify(m.attachments) : null, normalizeMessageSessionModeForStorage(m.sessionMode), m.runContext ? JSON.stringify(m.runContext) : null, m.telemetryFinalized === true ? now : null, m.startedAt ?? null, m.endedAt ?? null, position, createdAt);
-        }
-        // Bump conversation activity so recency-sorted listings (e.g. `listConversations`) reflect this write.
-        db.prepare(`UPDATE conversations SET updated_at = ? WHERE id = ?`).run(now, conversationId);
-        const row = db
-            .prepare(`SELECT ${MESSAGE_COLS} FROM messages WHERE id = ? AND conversation_id = ?`)
-            .get(m.id, conversationId);
-        return row ? normalizeMessage(row) : null;
-    });
-    const saved = runUpsert.immediate();
+    const saved = db.transaction(() => writeMessage({ db, conversationId, m })).immediate();
     if (!saved || !redaction?.secretRedacted)
         return saved;
     const signal = { secretRedacted: true, count: redaction.count };
     options.onSecretRedacted?.(signal);
     return { ...saved, secretRedaction: signal };
 }
+/**
+ * @internal `upsertMessage`'s transaction body: mismatch check, insert-or-update, conversation
+ * `updated_at` bump, and re-fetch. Must run inside the caller's `BEGIN IMMEDIATE` transaction.
+ */
+function writeMessage({ db, conversationId, m }) {
+    const existing = db
+        .prepare(`SELECT conversation_id AS conversationId FROM messages WHERE id = ?`)
+        .get(m.id);
+    if (existing && existing.conversationId !== conversationId) {
+        throw new MessageConversationMismatchError({ messageId: m.id, actualConversationId: existing.conversationId, requestedConversationId: conversationId });
+    }
+    const now = Date.now();
+    if (existing)
+        updateMessageRow({ db, conversationId, m, now });
+    else
+        insertMessageRow({ db, conversationId, m, now });
+    // Bump conversation activity so recency-sorted listings (e.g. `listConversations`) reflect this write.
+    db.prepare(`UPDATE conversations SET updated_at = ? WHERE id = ?`).run(now, conversationId);
+    const row = db
+        .prepare(`SELECT ${MESSAGE_COLS} FROM messages WHERE id = ? AND conversation_id = ?`)
+        .get(m.id, conversationId);
+    return row ? normalizeMessage(row) : null;
+}
+/**
+ * @internal Values for the columns both write paths set, in this order: role, content, agent_id,
+ * agent_name, run_id, run_status, last_run_event_id, events_json, attachments_json, session_mode,
+ * run_context_json. JSON sub-fields are stringified; absent values become null.
+ */
+function messageFieldValues(m) {
+    return [
+        m.role,
+        m.content,
+        ...[m.agentId, m.agentName, m.runId, m.runStatus, m.lastRunEventId].map(orNull),
+        jsonOrNull(m.events),
+        jsonOrNull(m.attachments),
+        normalizeMessageSessionMode(m.sessionMode) ?? null,
+        jsonOrNull(m.runContext),
+    ];
+}
+/** @internal Maps undefined/null to null (SQLite-safe) and keeps every other value. */
+function orNull(value) {
+    return value ?? null;
+}
+/** @internal Stringifies a truthy JSON sub-field; falsy values are stored as null. */
+function jsonOrNull(value) {
+    return value ? JSON.stringify(value) : null;
+}
+/** @internal Rewrites an existing row in place; preserves `telemetry_finalized_at` once set (one-way latch). */
+function updateMessageRow({ db, conversationId, m, now }) {
+    db.prepare(`UPDATE messages
+        SET role = ?, content = ?, agent_id = ?, agent_name = ?,
+            run_id = ?, run_status = ?, last_run_event_id = ?,
+            events_json = ?, attachments_json = ?,
+            session_mode = ?, run_context_json = ?,
+            telemetry_finalized_at = CASE
+              WHEN ? THEN COALESCE(telemetry_finalized_at, ?)
+              ELSE telemetry_finalized_at
+            END,
+            started_at = ?, ended_at = ?
+      WHERE id = ? AND conversation_id = ?`).run(...messageFieldValues(m), m.telemetryFinalized === true ? 1 : 0, now, orNull(m.startedAt), orNull(m.endedAt), m.id, conversationId);
+}
+/** @internal Inserts a new row at the end of the conversation's position sequence. */
+function insertMessageRow({ db, conversationId, m, now }) {
+    const max = db
+        .prepare(`SELECT COALESCE(MAX(position), -1) AS m FROM messages WHERE conversation_id = ?`)
+        .get(conversationId);
+    const position = (max?.m ?? -1) + 1;
+    const createdAt = Number.isFinite(m.createdAt) ? m.createdAt : now;
+    // 18 values: id, conversation_id, role, content, agent_id, agent_name,
+    // run_id, run_status, last_run_event_id, events_json, attachments_json,
+    // session_mode, run_context_json, telemetry_finalized_at, started_at,
+    // ended_at, position, created_at.
+    db.prepare(`INSERT INTO messages
+       (id, conversation_id, role, content, agent_id, agent_name,
+        run_id, run_status, last_run_event_id, events_json,
+        attachments_json, session_mode, run_context_json,
+        telemetry_finalized_at, started_at, ended_at, position, created_at)
+     VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)`).run(m.id, conversationId, ...messageFieldValues(m), m.telemetryFinalized === true ? now : null, orNull(m.startedAt), orNull(m.endedAt), position, createdAt);
+}
 /**
  * Reads whether telemetry has been finalized for a message without loading the full row.
  * Used to decide whether to enqueue a finalization job.
@@ -162,19 +194,14 @@ export function getMessageTelemetryFinalizationState({ db, messageId }) {
  * @returns The updated events array, or null if the message does not exist or label is empty.
  */
 export function appendMessageStatusEvent({ db, messageId, event }) {
-    const label = typeof event?.label === 'string' ? event.label.trim() : '';
-    const detail = typeof event?.detail === 'string' ? event.detail.trim() : '';
+    const label = trimmedString(event?.label);
+    const detail = trimmedString(event?.detail);
     if (!label)
         return null;
-    const row = db
-        .prepare(`SELECT events_json AS eventsJson FROM messages WHERE id = ?`)
-        .get(messageId);
-    if (!row)
+    const events = readStoredEvents({ db, messageId });
+    if (!events)
         return null;
-    const parsed = parseJsonOrUndef(row.eventsJson);
-    const events = Array.isArray(parsed) ? parsed : [];
-    const last = events[events.length - 1];
-    if (last?.kind === 'status' && last.label === label && (last.detail ?? '') === detail) {
+    if (isRepeatedStatus(events[events.length - 1], { label, detail })) {
         return events;
     }
     const nextEvent = detail
@@ -185,6 +212,24 @@ export function appendMessageStatusEvent({ db, messageId, event }) {
         .run(JSON.stringify(next), messageId);
     return next;
 }
+/** @internal Trimmed string value, or '' for anything that is not a string. */
+function trimmedString(value) {
+    return typeof value === 'string' ? value.trim() : '';
+}
+/** @internal True when `last` is a status event with the same label and (absent-as-empty) detail. */
+function isRepeatedStatus(last, { label, detail }) {
+    return last?.kind === 'status' && last.label === label && (last.detail ?? '') === detail;
+}
+/** @internal Reads a message's stored events (non-array JSON reads as []), or null when the message does not exist. */
+function readStoredEvents({ db, messageId }) {
+    const row = db
+        .prepare(`SELECT events_json AS eventsJson FROM messages WHERE id = ?`)
+        .get(messageId);
+    if (!row)
+        return null;
+    const parsed = parseJsonOrUndef(row.eventsJson);
+    return Array.isArray(parsed) ? parsed : [];
+}
 /**
  * Appends an arbitrary agent event to the message's events array, also streaming `text` deltas
  * into the `content` column so the message text grows incrementally during a run.
@@ -195,18 +240,12 @@ export function appendMessageStatusEvent({ db, messageId, event }) {
  * @returns The updated events array, or null if the message does not exist or kind is empty.
  */
 export function appendMessageAgentEvent({ db, messageId, event }) {
-    if (!event || typeof event !== 'object')
-        return null;
-    const kind = typeof event.kind === 'string' ? event.kind : '';
+    const kind = agentEventKind(event);
     if (!kind)
         return null;
-    const row = db
-        .prepare(`SELECT content, events_json AS eventsJson FROM messages WHERE id = ?`)
-        .get(messageId);
-    if (!row)
+    const events = readStoredEvents({ db, messageId });
+    if (!events)
         return null;
-    const parsed = parseJsonOrUndef(row.eventsJson);
-    const events = Array.isArray(parsed) ? parsed : [];
     const last = events[events.length - 1];
     if (last && JSON.stringify(last) === JSON.stringify(event)) {
         return events;
@@ -217,6 +256,13 @@ export function appendMessageAgentEvent({ db, messageId, event }) {
         .run(textDelta, JSON.stringify(next), messageId);
     return next;
 }
+/** @internal An agent event's `kind`, or '' when the event is not an object or has no string kind. */
+function agentEventKind(event) {
+    if (!event || typeof event !== 'object')
+        return '';
+    const { kind } = event;
+    return typeof kind === 'string' ? kind : '';
+}
 /**
  * Hard-deletes a single message row by id.
  * @param db - Open SQLite connection.
@@ -249,8 +295,4 @@ function normalizeMessage(row) {
 function normalizeMessageSessionMode(value) {
     return value === 'chat' || value === 'design' || value === 'plan' ? value : undefined;
 }
-/** @internal Same validation as normalizeMessageSessionMode but returns null (SQLite-safe) for unrecognised values. */
-function normalizeMessageSessionModeForStorage(value) {
-    return value === 'chat' || value === 'design' || value === 'plan' ? value : null;
-}
 //# sourceMappingURL=messages.js.map

package/dist/store/runtime/chat-history-store.js

@@ -3,6 +3,13 @@ import { createSqliteChatStore } from "../sqlite/index.js";
 import { createPgliteChatStore } from "../pglite/index.js";
 import { createPostgresChatStore } from "../postgres/index.js";
 import { chatKernelTables } from "../sql/boundary.js";
+function isOrphanDaemonAnswer({ previous, answer, isDaemonRunId }, _optional = {}) {
+    return previous?.role !== "user" && answer.role === "assistant" && Boolean(answer.runId && isDaemonRunId({ runId: answer.runId }));
+}
+function isEarlierOrEqualQuestion({ question, answer }, _optional = {}) {
+    return question.role === "user" && question.createdAt !== undefined && answer.createdAt !== undefined
+        && question.createdAt <= answer.createdAt;
+}
 function repairLegacyTurnOrder({ messages, isDaemonRunId }, _optional = {}) {
     const ordered = [];
     for (let index = 0; index < messages.length; index++) {
@@ -11,9 +18,8 @@ function repairLegacyTurnOrder({ messages, isDaemonRunId }, _optional = {}) {
         // Legacy acceptance saved no question ID. Repair only an orphan daemon answer immediately
         // followed by an earlier/equal-clock user row; a preceding question already owns its answer.
         // A global timestamp sort would reorder valid follow-ups when browser/server clocks disagree.
-        if (ordered.at(-1)?.role !== "user" && answer.role === "assistant" && answer.runId && isDaemonRunId({ runId: answer.runId })
-            && question?.role === "user" && question.createdAt !== undefined && answer.createdAt !== undefined
-            && question.createdAt <= answer.createdAt) {
+        if (isOrphanDaemonAnswer({ previous: ordered.at(-1), answer, isDaemonRunId }) && question !== undefined
+            && isEarlierOrEqualQuestion({ question, answer })) {
             ordered.push(question, answer);
             index++;
         }

package/dist/store/runtime/durable-run-store.d.ts

@@ -1,13 +1,13 @@
 import type { RunIdPolicy } from "../../core/durable-runs/ports.js";
 import { type AgentEvent } from "../../core/index.js";
 import type { ChatKernel, ChatDatabase } from "./kernel.js";
-import type { DurableRun, DurableRunStore } from "../../core/durable-runs/ports.js";
+import type { DurableRunHead, DurableRunStore } from "../../core/durable-runs/ports.js";
 export declare const RUN_SLOT_BUSY = "Another answer in this chat is still running. This turn is queued in your browser.";
 export declare class RunSlotBusyError extends Error {
     constructor();
 }
 export declare function attemptCanExecute({ run }: {
-    run: DurableRun | null;
+    run: DurableRunHead | null;
 }, _optional?: {}): boolean;
 export declare function savedRunEvents({ json }: {
     json: string | null;