@jini-ai/chat 0.6.5 → 0.6.7

package/dist/server/run-finalizer/entry.js

@@ -1,5 +1,9 @@
 import { isTerminalRunStatus } from '../../core/messages.js';
 import { readSseFrames, runContentFromEvents, runEventsForSave, runInterruptedNotice, translateRunFrame } from '../../core/run-events/entry.js';
+/** An error frame keeps a later successful end from settling as a success. */
+function endStatus({ failed, terminal }, _optional = {}) {
+    return failed && terminal === "succeeded" ? "failed" : terminal;
+}
 /** Follow replayable run streams and save through atomic host ledger operations.
  * The host retains authorization, owner scope, kernel transactions, boot reconciliation, HTTP
  * credentials and excluded run-ID prefixes. Replay starts at zero; error-before-success and
@@ -22,11 +26,14 @@ export function createAssistantRunFinalizer(args, options = {}) {
         catch { /* The host owns reporting failures. */ }
     }
     const active = new Map();
-    async function settle(watch, status, events) {
-        watch.terminal = true;
+    function clearTrailing(watch) {
         if (watch.trailing)
             scheduler.cancel({ handle: watch.trailing.handle });
         watch.trailing = undefined;
+    }
+    async function settle(watch, status, events) {
+        watch.terminal = true;
+        clearTrailing(watch);
         await args.ledger.settle({
             conversationId: watch.conversationId,
             messageId: watch.messageId,
@@ -57,9 +64,7 @@ export function createAssistantRunFinalizer(args, options = {}) {
             }
             return;
         }
-        if (watch.trailing)
-            scheduler.cancel({ handle: watch.trailing.handle });
-        watch.trailing = undefined;
+        clearTrailing(watch);
         watch.checkpointedEvents = watch.events.length;
         watch.checkpointedAt = now();
         watch.checkpointPending = true;
@@ -77,29 +82,36 @@ export function createAssistantRunFinalizer(args, options = {}) {
             void checkpoint(watch);
         });
     }
-    async function readStream(watch) {
+    /** The connection's event body, or why it cannot be followed. Non-success bodies are cancelled. */
+    async function openStream(watch) {
         const response = await daemon.openEvents({ runId: watch.runId, principalId: watch.principalId });
-        if (response.status === 404 || !response.ok || !response.body) {
-            await response.body?.cancel().catch(() => undefined);
-            return response.status === 404 ? { kind: "gone" } : { kind: "dropped" };
-        }
+        if (response.ok && response.body)
+            return { kind: "open", body: response.body };
+        await response.body?.cancel().catch(() => undefined);
+        return response.status === 404 ? { kind: "gone" } : { kind: "dropped" };
+    }
+    async function consumeFrames(watch, body) {
         // Each connection replays the complete history, rather than appending duplicate deltas.
         watch.events = [];
         watch.failed = false;
         const carry = {};
-        for await (const frame of readSseFrames({ body: response.body })) {
+        for await (const frame of readSseFrames({ body })) {
             const outcome = translateRunFrame({ kind: frame.event, raw: frame.data, notices: args.notices }, { carry });
             watch.events.push(...outcome.events);
             if (outcome.error)
                 watch.failed = true;
             if (outcome.terminal) {
                 watch.terminal = true;
-                return { kind: "ended", status: watch.failed && outcome.terminal === "succeeded" ? "failed" : outcome.terminal };
+                return { kind: "ended", status: endStatus({ failed: watch.failed, terminal: outcome.terminal }) };
             }
             void checkpoint(watch);
         }
         return { kind: "dropped" };
     }
+    async function readStream(watch) {
+        const opened = await openStream(watch);
+        return opened.kind === "open" ? consumeFrames(watch, opened.body) : opened;
+    }
     async function follow(watch) {
         for (let attempt = 0; attempt <= maxReconnects; attempt += 1) {
             const result = await readStream(watch).catch(() => ({ kind: "dropped" }));
@@ -140,9 +152,7 @@ export function createAssistantRunFinalizer(args, options = {}) {
             })
                 .finally(() => {
                 watch.terminal = true;
-                if (watch.trailing)
-                    scheduler.cancel({ handle: watch.trailing.handle });
-                watch.trailing = undefined;
+                clearTrailing(watch);
                 active.delete(runId);
             });
             active.set(runId, { watch, done });

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

@@ -18,8 +18,8 @@ export declare function listConversations({ db, projectId }: {
 }): {
     latestRun: {
         durationMs?: number;
-        endedAt?: number | undefined;
-        startedAt?: number | undefined;
+        endedAt?: number;
+        startedAt?: number;
         status: string;
     } | undefined;
     totalDurationMs?: number;
@@ -41,13 +41,13 @@ export declare function getConversation({ db, id }: {
     db: SqliteDb;
     id: string;
 }): {
-    totalDurationMs?: number;
     latestRun: {
         durationMs?: number;
-        endedAt?: number | undefined;
-        startedAt?: number | undefined;
+        endedAt?: number;
+        startedAt?: number;
         status: string;
     } | undefined;
+    totalDurationMs?: number;
     id: any;
     projectId: any;
     title: any;
@@ -75,13 +75,13 @@ export declare function insertConversation({ db, c }: {
     db: SqliteDb;
     c: DbRow;
 }): {
-    totalDurationMs?: number;
     latestRun: {
         durationMs?: number;
-        endedAt?: number | undefined;
-        startedAt?: number | undefined;
+        endedAt?: number;
+        startedAt?: number;
         status: string;
     } | undefined;
+    totalDurationMs?: number;
     id: any;
     projectId: any;
     title: any;
@@ -102,13 +102,13 @@ export declare function updateConversation({ db, id, patch }: {
     id: string;
     patch: DbRow;
 }): {
-    totalDurationMs?: number;
     latestRun: {
         durationMs?: number;
-        endedAt?: number | undefined;
-        startedAt?: number | undefined;
+        endedAt?: number;
+        startedAt?: number;
         status: string;
     } | undefined;
+    totalDurationMs?: number;
     id: any;
     projectId: any;
     title: any;

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.