@jini-ai/chat 0.6.5 → 0.6.7

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;