@schlessera/brain-ui-server 0.34.0 → 0.35.0

package/dist/activity/sql.js

@@ -0,0 +1,114 @@
+/** SQL owned by the activity store, kept together so the store reads as operations. */
+export const ACTIVITY_SQL = {
+    nextSeq: "SELECT COALESCE(MAX(seq), 0) AS hi FROM activity_changes WHERE run_id = ?",
+    insertChange: "INSERT INTO activity_changes (run_id, seq, span_id, event_index) VALUES (?, ?, ?, ?)",
+    spanById: "SELECT * FROM activity_spans WHERE span_id = ?",
+    spanStateById: "SELECT run_id, outcome, attrs FROM activity_spans WHERE span_id = ?",
+    endSpan: `UPDATE activity_spans SET outcome = ?, outcome_reason = ?, ended_at = ?, attrs = ?,
+         input_tokens = COALESCE(?, input_tokens),
+         output_tokens = COALESCE(?, output_tokens),
+         cache_read_tokens = COALESCE(?, cache_read_tokens),
+         cache_creation_tokens = COALESCE(?, cache_creation_tokens),
+         cost_usd = COALESCE(?, cost_usd),
+         model = COALESCE(?, model)
+       WHERE span_id = ?`,
+    openSpansByRun: "SELECT span_id FROM activity_spans WHERE run_id = ? AND outcome IS NULL ORDER BY started_at DESC",
+    spansByRun: "SELECT * FROM activity_spans WHERE run_id = ? ORDER BY started_at",
+    upsertRollup: `INSERT INTO activity_run_rollups
+         (run_id, origin, name, session_id, job_name, principal_id, principal_label,
+          principal_kind, started_at, ended_at, outcome,
+          duration_ms, span_count, input_tokens, output_tokens, cache_read_tokens,
+          cache_creation_tokens, cost_usd, effective_cost_usd, billing_mode,
+          pricing_estimate, failure_reason, detail_pruned)
+       VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, 0)
+       ON CONFLICT(run_id) DO UPDATE SET
+         ended_at = excluded.ended_at, outcome = excluded.outcome,
+         duration_ms = excluded.duration_ms, span_count = excluded.span_count,
+         input_tokens = excluded.input_tokens, output_tokens = excluded.output_tokens,
+         cache_read_tokens = excluded.cache_read_tokens,
+         cache_creation_tokens = excluded.cache_creation_tokens,
+         cost_usd = COALESCE(activity_run_rollups.cost_usd, excluded.cost_usd),
+         effective_cost_usd = CASE
+           WHEN activity_run_rollups.effective_cost_usd IS NOT NULL
+             THEN activity_run_rollups.effective_cost_usd
+           WHEN activity_run_rollups.billing_mode IS NULL
+             OR activity_run_rollups.billing_mode = excluded.billing_mode
+             THEN excluded.effective_cost_usd
+           ELSE NULL
+         END,
+         billing_mode = COALESCE(activity_run_rollups.billing_mode, excluded.billing_mode),
+         pricing_estimate = CASE
+           WHEN activity_run_rollups.pricing_estimate IS NOT NULL
+             THEN activity_run_rollups.pricing_estimate
+           WHEN activity_run_rollups.billing_mode IS NULL
+             OR activity_run_rollups.billing_mode = excluded.billing_mode
+             THEN excluded.pricing_estimate
+           ELSE NULL
+         END,
+         failure_reason = excluded.failure_reason`,
+    insertSpan: `INSERT INTO activity_spans
+             (span_id, run_id, parent_span_id, name, kind, origin, session_id, job_name, principal_id,
+              attrs, started_at, writer, last_heartbeat_at)
+           VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)`,
+    patchSpan: `UPDATE activity_spans SET principal_id = COALESCE(?, principal_id),
+             attrs = ?, wait_until = COALESCE(?, wait_until),
+             input_tokens = COALESCE(?, input_tokens),
+             output_tokens = COALESCE(?, output_tokens),
+             cache_read_tokens = COALESCE(?, cache_read_tokens),
+             cache_creation_tokens = COALESCE(?, cache_creation_tokens),
+             cost_usd = COALESCE(?, cost_usd),
+             model = COALESCE(?, model)
+           WHERE span_id = ?`,
+    spanRunById: "SELECT run_id FROM activity_spans WHERE span_id = ?",
+    nextEventIndex: "SELECT COALESCE(MAX(event_index), -1) + 1 AS idx FROM activity_events WHERE span_id = ?",
+    insertEvent: "INSERT INTO activity_events (span_id, event_index, ts, event_type, payload) VALUES (?, ?, ?, ?, ?)",
+    heartbeat: "UPDATE activity_spans SET last_heartbeat_at = ? WHERE span_id = ? AND outcome IS NULL",
+    openSessionRuns: "SELECT DISTINCT run_id FROM activity_spans WHERE outcome IS NULL AND origin = 'session'",
+    staleRoots: `SELECT span_id, run_id FROM activity_spans
+           WHERE outcome IS NULL AND parent_span_id IS NULL
+             AND writer != ? AND COALESCE(last_heartbeat_at, started_at) < ?`,
+    stuckRoots: "SELECT * FROM activity_spans WHERE outcome IS NULL AND parent_span_id IS NULL AND started_at < ?",
+    spanChanges: `SELECT c.change_id, c.run_id, c.seq, s.*
+           FROM activity_changes c
+           JOIN activity_spans s ON s.span_id = c.span_id
+           WHERE c.change_id > ? AND c.event_index IS NULL
+           ORDER BY c.change_id LIMIT ?`,
+    eventChanges: `SELECT c.change_id, c.run_id, c.seq, e.*
+           FROM activity_changes c
+           JOIN activity_events e
+             ON e.span_id = c.span_id AND e.event_index = c.event_index
+           WHERE c.change_id > ? AND c.event_index IS NOT NULL
+           ORDER BY c.change_id LIMIT ?`,
+    terminalRootChanges: `SELECT MAX(c.change_id) AS change_id, s.*
+           FROM activity_changes c
+           JOIN activity_spans s ON s.span_id = c.span_id
+           WHERE c.change_id > ? AND c.event_index IS NULL
+             AND s.parent_span_id IS NULL AND s.outcome IS NOT NULL
+           GROUP BY s.span_id
+           ORDER BY change_id LIMIT ?`,
+    latestChangeCursor: "SELECT COALESCE(MAX(change_id), 0) AS hi FROM activity_changes",
+    eventsByRun: `SELECT e.* FROM activity_events e
+               JOIN activity_spans s ON s.span_id = e.span_id
+               WHERE s.run_id = ? ORDER BY e.ts, e.event_index`,
+    openRootSpans: "SELECT * FROM activity_spans WHERE outcome IS NULL AND parent_span_id IS NULL ORDER BY started_at DESC",
+    pruneCandidates: `SELECT run_id, ended_at AS ended FROM activity_run_rollups r
+             WHERE detail_pruned = 0 AND ended_at IS NOT NULL
+               AND ((ended_at < ? AND ended_at < ?) OR ended_at < ?)
+               AND NOT EXISTS (
+                 SELECT 1 FROM activity_spans s
+                 WHERE s.run_id = r.run_id AND s.outcome IS NULL
+               )
+             LIMIT ?`,
+    markDetailPruned: "UPDATE activity_run_rollups SET detail_pruned = 1 WHERE run_id = ?",
+    markDigestCoverageGap: "UPDATE activity_run_rollups SET failure_reason = COALESCE(failure_reason, 'digest coverage gap') WHERE run_id = ?",
+    deleteEventsByRun: `DELETE FROM activity_events WHERE span_id IN
+               (SELECT span_id FROM activity_spans WHERE run_id = ?)`,
+    deleteSpansByRun: "DELETE FROM activity_spans WHERE run_id = ?",
+    deleteChangesByRun: "DELETE FROM activity_changes WHERE run_id = ?",
+    compactChanges: `DELETE FROM activity_changes WHERE change_id < (
+             SELECT COALESCE(MAX(change_id), 0) FROM activity_changes
+           ) - 100000 AND run_id NOT IN (
+             SELECT DISTINCT run_id FROM activity_spans WHERE outcome IS NULL
+           )`,
+};
+//# sourceMappingURL=sql.js.map

package/dist/activity/sql.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"sql.js","sourceRoot":"","sources":["../../src/activity/sql.ts"],"names":[],"mappings":"AAAA,uFAAuF;AACvF,MAAM,CAAC,MAAM,YAAY,GAAG;IAC1B,OAAO,EAAE,2EAA2E;IACpF,YAAY,EACV,sFAAsF;IACxF,QAAQ,EAAE,gDAAgD;IAC1D,aAAa,EAAE,qEAAqE;IACpF,OAAO,EAAE;;;;;;;yBAOc;IACvB,cAAc,EACZ,kGAAkG;IACpG,UAAU,EAAE,mEAAmE;IAC/E,YAAY,EAAE;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;kDA+BkC;IAChD,UAAU,EAAE;;;0DAG4C;IACxD,SAAS,EAAE;;;;;;;;6BAQgB;IAC3B,WAAW,EAAE,qDAAqD;IAClE,cAAc,EACZ,yFAAyF;IAC3F,WAAW,EACT,oGAAoG;IACtG,SAAS,EACP,uFAAuF;IACzF,eAAe,EACb,yFAAyF;IAC3F,UAAU,EAAE;;6EAE+D;IAC3E,UAAU,EACR,kGAAkG;IACpG,WAAW,EAAE;;;;wCAIyB;IACtC,YAAY,EAAE;;;;;wCAKwB;IACtC,mBAAmB,EAAE;;;;;;sCAMe;IACpC,kBAAkB,EAAE,gEAAgE;IACpF,WAAW,EAAE;;+DAEgD;IAC7D,aAAa,EACX,wGAAwG;IAC1G,eAAe,EAAE;;;;;;;qBAOE;IACnB,gBAAgB,EAAE,oEAAoE;IACtF,qBAAqB,EACnB,mHAAmH;IACrH,iBAAiB,EAAE;qEACgD;IACnE,gBAAgB,EAAE,6CAA6C;IAC/D,kBAAkB,EAAE,+CAA+C;IACnE,cAAc,EAAE;;;;aAIL;CACH,CAAC"}

package/dist/activity/store.d.ts

@@ -33,6 +33,7 @@
 import type { Database } from "bun:sqlite";
 import { type BillingMode } from "@schlessera/brain-ui-sdk/protocol";
 import { type PricingRates } from "../pricing/model-pricing.js";
+import type { PrincipalKind } from "../db/principals.js";
 export declare const SPAN_OUTCOMES: readonly ["success", "error", "timeout", "cancelled", "denied", "interrupted"];
 export type SpanOutcome = (typeof SPAN_OUTCOMES)[number];
 export type SpanKind = "turn" | "tool" | "subagent" | "cron";
@@ -55,6 +56,7 @@ export interface SpanRow {
     origin: SpanOrigin;
     sessionId: string | null;
     jobName: string | null;
+    principalId: string | null;
     attrs: Record<string, unknown>;
     startedAt: number;
     waitUntil: number | null;
@@ -80,6 +82,9 @@ export interface RunRollupRow {
     name: string;
     sessionId: string | null;
     jobName: string | null;
+    principalId: string | null;
+    principalLabel: string | null;
+    principalKind: PrincipalKind | null;
     startedAt: number;
     endedAt: number | null;
     outcome: SpanOutcome | null;
@@ -139,6 +144,7 @@ export interface StartSpanInput {
     origin: SpanOrigin;
     sessionId?: string;
     jobName?: string;
+    principalId?: string;
     attrs?: Record<string, unknown>;
     startedAt?: number;
 }
@@ -187,6 +193,7 @@ export interface ActivityStore {
     endSpan(spanId: string, input: EndSpanInput): boolean;
     /** Non-terminal field updates (usage enrichment, wait boundary, attrs). */
     patchSpan(spanId: string, patch: {
+        principalId?: string;
         attrs?: Record<string, unknown>;
         usage?: SpanUsage;
         waitUntil?: number;

package/dist/activity/store.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"store.d.ts","sourceRoot":"","sources":["../../src/activity/store.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"store.d.ts","sourceRoot":"","sources":["../../src/activity/store.ts"],"names":[],"mappings":"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"}

package/dist/activity/store.js

@@ -1,6 +1,7 @@
 import { isBillingMode } from "@schlessera/brain-ui-sdk/protocol";
 import { resolveAmbientBillingMode, resolveStandalonePricingConfig, } from "../config/env.js";
 import { createModelPricing } from "../pricing/model-pricing.js";
+import { ACTIVITY_SQL } from "./sql.js";
 export const SPAN_OUTCOMES = [
     "success",
     "error",
@@ -9,6 +10,9 @@ export const SPAN_OUTCOMES = [
     "denied",
     "interrupted",
 ];
+function isPrincipalKind(value) {
+    return (value === "owner" || value === "agent" || value === "ambient" || value === "system");
+}
 /** The one snake→camel mapper for rollup rows — every reader shares it. */
 export function rowToRunRollup(r) {
     return {
@@ -17,6 +21,9 @@ export function rowToRunRollup(r) {
         name: r.name,
         sessionId: r.session_id,
         jobName: r.job_name,
+        principalId: r.principal_id ?? null,
+        principalLabel: r.principal_label ?? null,
+        principalKind: isPrincipalKind(r.principal_kind) ? r.principal_kind : null,
         startedAt: r.started_at,
         endedAt: r.ended_at,
         outcome: r.outcome,
@@ -69,12 +76,12 @@ export function createActivityStore(db, options = {}) {
     const inWrite = (fn) => db.transaction(fn).immediate();
     function nextSeq(runId) {
         const row = db
-            .query("SELECT COALESCE(MAX(seq), 0) AS hi FROM activity_changes WHERE run_id = ?")
+            .query(ACTIVITY_SQL.nextSeq)
             .get(runId);
         return row.hi + 1;
     }
     function logChange(runId, seq, spanId, eventIndex) {
-        db.query("INSERT INTO activity_changes (run_id, seq, span_id, event_index) VALUES (?, ?, ?, ?)").run(runId, seq, spanId, eventIndex ?? null);
+        db.query(ACTIVITY_SQL.insertChange).run(runId, seq, spanId, eventIndex ?? null);
     }
     function rowToSpan(r) {
         return {
@@ -86,6 +93,7 @@ export function createActivityStore(db, options = {}) {
             origin: r.origin,
             sessionId: r.session_id,
             jobName: r.job_name,
+            principalId: r.principal_id ?? null,
             attrs: safeParse(r.attrs) ?? {},
             startedAt: r.started_at,
             waitUntil: r.wait_until,
@@ -116,18 +124,18 @@ export function createActivityStore(db, options = {}) {
         };
     }
     function getSpanRaw(spanId) {
-        const r = db.query("SELECT * FROM activity_spans WHERE span_id = ?").get(spanId);
+        const r = db.query(ACTIVITY_SQL.spanById).get(spanId);
         return r ? rowToSpan(r) : null;
     }
     function runHighWaterSeqRaw(runId) {
         const row = db
-            .query("SELECT COALESCE(MAX(seq), 0) AS hi FROM activity_changes WHERE run_id = ?")
+            .query(ACTIVITY_SQL.nextSeq)
             .get(runId);
         return row.hi;
     }
     function endSpanInTx(spanId, input) {
         const existing = db
-            .query("SELECT run_id, outcome, attrs FROM activity_spans WHERE span_id = ?")
+            .query(ACTIVITY_SQL.spanStateById)
             .get(spanId);
         if (!existing || existing.outcome !== null)
             return false;
@@ -136,21 +144,14 @@ export function createActivityStore(db, options = {}) {
             ? JSON.stringify({ ...(safeParse(existing.attrs) ?? {}), ...input.attrs })
             : existing.attrs;
         const u = input.usage ?? {};
-        db.query(`UPDATE activity_spans SET outcome = ?, outcome_reason = ?, ended_at = ?, attrs = ?,
-         input_tokens = COALESCE(?, input_tokens),
-         output_tokens = COALESCE(?, output_tokens),
-         cache_read_tokens = COALESCE(?, cache_read_tokens),
-         cache_creation_tokens = COALESCE(?, cache_creation_tokens),
-         cost_usd = COALESCE(?, cost_usd),
-         model = COALESCE(?, model)
-       WHERE span_id = ?`).run(input.outcome, input.reason ?? null, endedAt, attrs, u.inputTokens ?? null, u.outputTokens ?? null, u.cacheReadTokens ?? null, u.cacheCreationTokens ?? null, u.costUsd ?? null, u.model ?? null, spanId);
+        db.query(ACTIVITY_SQL.endSpan).run(input.outcome, input.reason ?? null, endedAt, attrs, u.inputTokens ?? null, u.outputTokens ?? null, u.cacheReadTokens ?? null, u.cacheCreationTokens ?? null, u.costUsd ?? null, u.model ?? null, spanId);
         logChange(existing.run_id, nextSeq(existing.run_id), spanId);
         return true;
     }
     /** Close every open span of the run (children first) and roll it up. */
     function closeRunInTx(runId, outcome, reason) {
         const open = db
-            .query("SELECT span_id FROM activity_spans WHERE run_id = ? AND outcome IS NULL ORDER BY started_at DESC")
+            .query(ACTIVITY_SQL.openSpansByRun)
             .all(runId);
         let closed = 0;
         for (const { span_id } of open) {
@@ -163,7 +164,7 @@ export function createActivityStore(db, options = {}) {
     }
     function rollupRunInTx(runId) {
         const spans = db
-            .query("SELECT * FROM activity_spans WHERE run_id = ? ORDER BY started_at")
+            .query(ACTIVITY_SQL.spansByRun)
             .all(runId)
             .map(rowToSpan);
         if (spans.length === 0)
@@ -214,37 +215,12 @@ export function createActivityStore(db, options = {}) {
                     ? (priced.estimate ? 1 : 0)
                     : null;
         const costUsd = root.usage.costUsd ?? priced?.costUsd ?? null;
-        db.query(`INSERT INTO activity_run_rollups
-         (run_id, origin, name, session_id, job_name, started_at, ended_at, outcome,
-          duration_ms, span_count, input_tokens, output_tokens, cache_read_tokens,
-          cache_creation_tokens, cost_usd, effective_cost_usd, billing_mode,
-          pricing_estimate, failure_reason, detail_pruned)
-       VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, 0)
-       ON CONFLICT(run_id) DO UPDATE SET
-         ended_at = excluded.ended_at, outcome = excluded.outcome,
-         duration_ms = excluded.duration_ms, span_count = excluded.span_count,
-         input_tokens = excluded.input_tokens, output_tokens = excluded.output_tokens,
-         cache_read_tokens = excluded.cache_read_tokens,
-         cache_creation_tokens = excluded.cache_creation_tokens,
-         cost_usd = COALESCE(activity_run_rollups.cost_usd, excluded.cost_usd),
-         effective_cost_usd = CASE
-           WHEN activity_run_rollups.effective_cost_usd IS NOT NULL
-             THEN activity_run_rollups.effective_cost_usd
-           WHEN activity_run_rollups.billing_mode IS NULL
-             OR activity_run_rollups.billing_mode = excluded.billing_mode
-             THEN excluded.effective_cost_usd
-           ELSE NULL
-         END,
-         billing_mode = COALESCE(activity_run_rollups.billing_mode, excluded.billing_mode),
-         pricing_estimate = CASE
-           WHEN activity_run_rollups.pricing_estimate IS NOT NULL
-             THEN activity_run_rollups.pricing_estimate
-           WHEN activity_run_rollups.billing_mode IS NULL
-             OR activity_run_rollups.billing_mode = excluded.billing_mode
-             THEN excluded.pricing_estimate
-           ELSE NULL
-         END,
-         failure_reason = excluded.failure_reason`
+        const principal = root.principalId
+            ? db
+                .query("SELECT label, kind FROM principals WHERE id = ?")
+                .get(root.principalId)
+            : null;
+        db.query(ACTIVITY_SQL.upsertRollup
         // Every cost column is FROZEN at first non-NULL write (AE5): a re-rollup
         // after a pricing refresh must not silently reprice history — only a
         // still-NULL slot may be filled by a later computation. cost_usd gets
@@ -255,17 +231,14 @@ export function createActivityStore(db, options = {}) {
         // and a slot left NULL under one classification must never be filled by
         // a number computed under a different one (a subscription $0 landing on
         // an api-classified row would fabricate a cross-classified price).
-        ).run(runId, root.origin, root.name, root.sessionId, root.jobName, root.startedAt, root.endedAt, root.outcome, root.endedAt !== null ? root.endedAt - root.startedAt : null, spans.length, root.usage.inputTokens ?? null, root.usage.outputTokens ?? null, root.usage.cacheReadTokens ?? null, root.usage.cacheCreationTokens ?? null, costUsd, effectiveCostUsd, billingMode, pricingEstimate, failure);
+        ).run(runId, root.origin, root.name, root.sessionId, root.jobName, root.principalId, principal?.label ?? null, principal?.kind ?? null, root.startedAt, root.endedAt, root.outcome, root.endedAt !== null ? root.endedAt - root.startedAt : null, spans.length, root.usage.inputTokens ?? null, root.usage.outputTokens ?? null, root.usage.cacheReadTokens ?? null, root.usage.cacheCreationTokens ?? null, costUsd, effectiveCostUsd, billingMode, pricingEstimate, failure);
     }
     return {
         writer,
         startSpan(input) {
             return inWrite(() => {
                 const startedAt = input.startedAt ?? Date.now();
-                db.query(`INSERT INTO activity_spans
-             (span_id, run_id, parent_span_id, name, kind, origin, session_id, job_name,
-              attrs, started_at, writer, last_heartbeat_at)
-           VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)`).run(input.spanId, input.runId, input.parentSpanId ?? null, input.name, input.kind, input.origin, input.sessionId ?? null, input.jobName ?? null, input.attrs ? JSON.stringify(input.attrs) : null, startedAt, writer, input.parentSpanId ? null : startedAt);
+                db.query(ACTIVITY_SQL.insertSpan).run(input.spanId, input.runId, input.parentSpanId ?? null, input.name, input.kind, input.origin, input.sessionId ?? null, input.jobName ?? null, input.principalId ?? null, input.attrs ? JSON.stringify(input.attrs) : null, startedAt, writer, input.parentSpanId ? null : startedAt);
                 logChange(input.runId, nextSeq(input.runId), input.spanId);
                 return getSpanRaw(input.spanId);
             });
@@ -276,7 +249,7 @@ export function createActivityStore(db, options = {}) {
         patchSpan(spanId, patch) {
             return inWrite(() => {
                 const existing = db
-                    .query("SELECT run_id, outcome, attrs FROM activity_spans WHERE span_id = ?")
+                    .query(ACTIVITY_SQL.spanStateById)
                     .get(spanId);
                 if (!existing || existing.outcome !== null)
                     return false;
@@ -284,14 +257,7 @@ export function createActivityStore(db, options = {}) {
                     ? JSON.stringify({ ...(safeParse(existing.attrs) ?? {}), ...patch.attrs })
                     : existing.attrs;
                 const u = patch.usage ?? {};
-                db.query(`UPDATE activity_spans SET attrs = ?, wait_until = COALESCE(?, wait_until),
-             input_tokens = COALESCE(?, input_tokens),
-             output_tokens = COALESCE(?, output_tokens),
-             cache_read_tokens = COALESCE(?, cache_read_tokens),
-             cache_creation_tokens = COALESCE(?, cache_creation_tokens),
-             cost_usd = COALESCE(?, cost_usd),
-             model = COALESCE(?, model)
-           WHERE span_id = ?`).run(attrs, patch.waitUntil ?? null, u.inputTokens ?? null, u.outputTokens ?? null, u.cacheReadTokens ?? null, u.cacheCreationTokens ?? null, u.costUsd ?? null, u.model ?? null, spanId);
+                db.query(ACTIVITY_SQL.patchSpan).run(patch.principalId ?? null, attrs, patch.waitUntil ?? null, u.inputTokens ?? null, u.outputTokens ?? null, u.cacheReadTokens ?? null, u.cacheCreationTokens ?? null, u.costUsd ?? null, u.model ?? null, spanId);
                 logChange(existing.run_id, nextSeq(existing.run_id), spanId);
                 return true;
             });
@@ -299,16 +265,16 @@ export function createActivityStore(db, options = {}) {
         appendEvent(spanId, eventType, payload, ts, cap) {
             return inWrite(() => {
                 const span = db
-                    .query("SELECT run_id FROM activity_spans WHERE span_id = ?")
+                    .query(ACTIVITY_SQL.spanRunById)
                     .get(spanId);
                 if (!span)
                     return null;
                 const next = db
-                    .query("SELECT COALESCE(MAX(event_index), -1) + 1 AS idx FROM activity_events WHERE span_id = ?")
+                    .query(ACTIVITY_SQL.nextEventIndex)
                     .get(spanId);
                 const stored = capPayload(payload, cap);
                 const at = ts ?? Date.now();
-                db.query("INSERT INTO activity_events (span_id, event_index, ts, event_type, payload) VALUES (?, ?, ?, ?, ?)").run(spanId, next.idx, at, eventType, JSON.stringify(stored));
+                db.query(ACTIVITY_SQL.insertEvent).run(spanId, next.idx, at, eventType, JSON.stringify(stored));
                 logChange(span.run_id, nextSeq(span.run_id), spanId, next.idx);
                 // Built from the values just written — no read-back needed.
                 return {
@@ -325,7 +291,7 @@ export function createActivityStore(db, options = {}) {
             inWrite(() => {
                 // Deliberately NOT change-logged: a heartbeat is liveness metadata,
                 // not activity the client needs a delta for.
-                db.query("UPDATE activity_spans SET last_heartbeat_at = ? WHERE span_id = ? AND outcome IS NULL").run(at ?? Date.now(), spanId);
+                db.query(ACTIVITY_SQL.heartbeat).run(at ?? Date.now(), spanId);
             });
         },
         cascadeClose(runId, outcome, reason) {
@@ -346,7 +312,7 @@ export function createActivityStore(db, options = {}) {
             // loop re-checks open-ness inside the transaction (endSpanInTx is
             // write-once), so a race just skips.
             const open = db
-                .query("SELECT DISTINCT run_id FROM activity_spans WHERE outcome IS NULL AND origin = 'session'")
+                .query(ACTIVITY_SQL.openSessionRuns)
                 .all();
             if (open.length === 0)
                 return 0;
@@ -365,9 +331,7 @@ export function createActivityStore(db, options = {}) {
             // legitimately long, quiet run with a live writer is never killed.
             // Candidate read outside the write transaction, same as sweepOwnOrphans.
             const staleRoots = db
-                .query(`SELECT span_id, run_id FROM activity_spans
-           WHERE outcome IS NULL AND parent_span_id IS NULL
-             AND writer != ? AND COALESCE(last_heartbeat_at, started_at) < ?`)
+                .query(ACTIVITY_SQL.staleRoots)
                 .all(writer, cutoff);
             if (staleRoots.length === 0)
                 return 0;
@@ -383,7 +347,7 @@ export function createActivityStore(db, options = {}) {
         findStuck(thresholdMs, now) {
             const cutoff = (now ?? Date.now()) - thresholdMs;
             return db
-                .query("SELECT * FROM activity_spans WHERE outcome IS NULL AND parent_span_id IS NULL AND started_at < ?")
+                .query(ACTIVITY_SQL.stuckRoots)
                 .all(cutoff).map(rowToSpan);
         },
         changesSince(changeCursor, limit = 500) {
@@ -391,19 +355,10 @@ export function createActivityStore(db, options = {}) {
             // change whose span/event row was pruned drops out via the join, same
             // as the old per-row miss.
             const spanRows = db
-                .query(`SELECT c.change_id, c.run_id, c.seq, s.*
-           FROM activity_changes c
-           JOIN activity_spans s ON s.span_id = c.span_id
-           WHERE c.change_id > ? AND c.event_index IS NULL
-           ORDER BY c.change_id LIMIT ?`)
+                .query(ACTIVITY_SQL.spanChanges)
                 .all(changeCursor, limit);
             const eventRows = db
-                .query(`SELECT c.change_id, c.run_id, c.seq, e.*
-           FROM activity_changes c
-           JOIN activity_events e
-             ON e.span_id = c.span_id AND e.event_index = c.event_index
-           WHERE c.change_id > ? AND c.event_index IS NOT NULL
-           ORDER BY c.change_id LIMIT ?`)
+                .query(ACTIVITY_SQL.eventChanges)
                 .all(changeCursor, limit);
             const changes = [
                 ...spanRows.map((r) => ({
@@ -426,19 +381,13 @@ export function createActivityStore(db, options = {}) {
         },
         terminalRootChangesSince(changeCursor, limit = 500) {
             const rows = db
-                .query(`SELECT MAX(c.change_id) AS change_id, s.*
-           FROM activity_changes c
-           JOIN activity_spans s ON s.span_id = c.span_id
-           WHERE c.change_id > ? AND c.event_index IS NULL
-             AND s.parent_span_id IS NULL AND s.outcome IS NOT NULL
-           GROUP BY s.span_id
-           ORDER BY change_id LIMIT ?`)
+                .query(ACTIVITY_SQL.terminalRootChanges)
                 .all(changeCursor, limit);
             return rows.map((r) => ({ changeId: r.change_id, span: rowToSpan(r) }));
         },
         latestChangeCursor() {
             const row = db
-                .query("SELECT COALESCE(MAX(change_id), 0) AS hi FROM activity_changes")
+                .query(ACTIVITY_SQL.latestChangeCursor)
                 .get();
             return row.hi;
         },
@@ -448,17 +397,15 @@ export function createActivityStore(db, options = {}) {
             // exactly this moment (no gap between snapshot and first delta).
             return db.transaction(() => {
                 const spans = db
-                    .query("SELECT * FROM activity_spans WHERE run_id = ? ORDER BY started_at")
+                    .query(ACTIVITY_SQL.spansByRun)
                     .all(runId).map(rowToSpan);
                 if (spans.length === 0)
                     return null;
                 const events = db
-                    .query(`SELECT e.* FROM activity_events e
-               JOIN activity_spans s ON s.span_id = e.span_id
-               WHERE s.run_id = ? ORDER BY e.ts, e.event_index`)
+                    .query(ACTIVITY_SQL.eventsByRun)
                     .all(runId).map(rowToEvent);
                 const cursor = db
-                    .query("SELECT COALESCE(MAX(change_id), 0) AS hi FROM activity_changes")
+                    .query(ACTIVITY_SQL.latestChangeCursor)
                     .get();
                 return {
                     runId,
@@ -473,7 +420,7 @@ export function createActivityStore(db, options = {}) {
         getSpan: getSpanRaw,
         openRootSpans() {
             return db
-                .query("SELECT * FROM activity_spans WHERE outcome IS NULL AND parent_span_id IS NULL ORDER BY started_at DESC")
+                .query(ACTIVITY_SQL.openRootSpans)
                 .all().map(rowToSpan);
         },
         rollupRun(runId) {
@@ -500,36 +447,24 @@ export function createActivityStore(db, options = {}) {
                 // run — that terminal write is what made the run prunable), guarded
                 // against any run that still has an open span.
                 const candidates = db
-                    .query(`SELECT run_id, ended_at AS ended FROM activity_run_rollups r
-             WHERE detail_pruned = 0 AND ended_at IS NOT NULL
-               AND ((ended_at < ? AND ended_at < ?) OR ended_at < ?)
-               AND NOT EXISTS (
-                 SELECT 1 FROM activity_spans s
-                 WHERE s.run_id = r.run_id AND s.outcome IS NULL
-               )
-             LIMIT ?`)
+                    .query(ACTIVITY_SQL.pruneCandidates)
                     .all(floor, retentionCutoff, ceiling, batch);
                 let spansDeleted = 0;
                 for (const { run_id, ended } of candidates) {
-                    db.query("UPDATE activity_run_rollups SET detail_pruned = 1 WHERE run_id = ?").run(run_id);
+                    db.query(ACTIVITY_SQL.markDetailPruned).run(run_id);
                     if (ended >= floor) {
                         // Pruned by the hard ceiling alone — the digest never covered
                         // this run; make the coverage gap visible on the rollup.
-                        db.query("UPDATE activity_run_rollups SET failure_reason = COALESCE(failure_reason, 'digest coverage gap') WHERE run_id = ?").run(run_id);
+                        db.query(ACTIVITY_SQL.markDigestCoverageGap).run(run_id);
                     }
-                    db.query(`DELETE FROM activity_events WHERE span_id IN
-               (SELECT span_id FROM activity_spans WHERE run_id = ?)`).run(run_id);
-                    const res = db.query("DELETE FROM activity_spans WHERE run_id = ?").run(run_id);
+                    db.query(ACTIVITY_SQL.deleteEventsByRun).run(run_id);
+                    const res = db.query(ACTIVITY_SQL.deleteSpansByRun).run(run_id);
                     spansDeleted += res.changes;
-                    db.query("DELETE FROM activity_changes WHERE run_id = ?").run(run_id);
+                    db.query(ACTIVITY_SQL.deleteChangesByRun).run(run_id);
                 }
                 // The change log only serves live polling; rows this deep in the past
                 // are unreachable by any live cursor. Keep runs with open spans.
-                db.query(`DELETE FROM activity_changes WHERE change_id < (
-             SELECT COALESCE(MAX(change_id), 0) FROM activity_changes
-           ) - 100000 AND run_id NOT IN (
-             SELECT DISTINCT run_id FROM activity_spans WHERE outcome IS NULL
-           )`).run();
+                db.query(ACTIVITY_SQL.compactChanges).run();
                 return { runsPruned: candidates.length, spansDeleted };
             });
         },