@opengeni/db 0.28.1 → 0.31.1

package/src/session-realtime-context.ts

@@ -3,7 +3,8 @@ import { createHash } from "node:crypto";
 import { ReasoningEffort } from "@opengeni/contracts";
 import { and, asc, desc, eq, inArray, isNull, sql } from "drizzle-orm";
 
-import type { Database } from "./database";
+import type { Database, SessionActivityDatabase } from "./database";
+import { fromPostgresLosslessJson, fromPostgresLosslessText } from "./lossless-json";
 import * as schema from "./schema";
 import { submitHumanPromptInTransaction } from "./session-queue-commands";
 
@@ -177,7 +178,7 @@ function mapProjection(
  * delegation into the same canonical Steer-or-start path used by a human.
  */
 export async function flushSessionRealtimeTranscriptTailInTransaction(
-  db: Database,
+  db: SessionActivityDatabase,
   input: {
     accountId: string;
     workspaceId: string;
@@ -233,7 +234,9 @@ export async function flushSessionRealtimeTranscriptTailInTransaction(
       sequence: schema.sessionRealtimeEntries.sequence,
       role: schema.sessionRealtimeEntries.role,
       text: schema.sessionRealtimeEntries.text,
+      textCodecVersion: schema.sessionRealtimeEntries.textCodecVersion,
       payload: schema.sessionRealtimeEntries.payload,
+      payloadCodecVersion: schema.sessionRealtimeEntries.payloadCodecVersion,
     })
     .from(schema.sessionRealtimeEntries)
     .where(
@@ -248,7 +251,12 @@ export async function flushSessionRealtimeTranscriptTailInTransaction(
       ),
     )
     .orderBy(asc(schema.sessionRealtimeEntries.sequence), asc(schema.sessionRealtimeEntries.id));
-  const rendered = renderSessionRealtimeTail(rows);
+  const decodedRows = rows.map((row) => ({
+    ...row,
+    text: row.text === null ? null : fromPostgresLosslessText(row.text, row.textCodecVersion),
+    payload: fromPostgresLosslessJson(row.payload, row.payloadCodecVersion),
+  }));
+  const rendered = renderSessionRealtimeTail(decodedRows);
   if (!rendered.context) return null;
 
   const [session] = await db
@@ -290,7 +298,7 @@ export async function flushSessionRealtimeTranscriptTailInTransaction(
         source: SESSION_REALTIME_TAIL_SOURCE,
         realtimeId: mode.id,
         lastDelegationItemId: latestDelegation?.delegationItemId ?? null,
-        sourceEntryIds: rows.map((entry) => entry.id),
+        sourceEntryIds: decodedRows.map((entry) => entry.id),
       },
     },
     source: "api",
@@ -346,7 +354,9 @@ export async function listSessionRealtimeContinuityEntriesInTransaction(
       sequence: schema.sessionRealtimeEntries.sequence,
       role: schema.sessionRealtimeEntries.role,
       text: schema.sessionRealtimeEntries.text,
+      textCodecVersion: schema.sessionRealtimeEntries.textCodecVersion,
       payload: schema.sessionRealtimeEntries.payload,
+      payloadCodecVersion: schema.sessionRealtimeEntries.payloadCodecVersion,
       createdAt: schema.sessionRealtimeEntries.createdAt,
       modeStartedAt: schema.sessionRealtimeModes.startedAt,
     })
@@ -371,10 +381,13 @@ export async function listSessionRealtimeContinuityEntriesInTransaction(
     )
     .limit(maximumEntries);
   return rows.reverse().flatMap((row) => {
-    const turnId = row.payload.turnId;
+    const text =
+      row.text === null ? null : fromPostgresLosslessText(row.text, row.textCodecVersion);
+    const payload = fromPostgresLosslessJson(row.payload, row.payloadCodecVersion);
+    const turnId = payload.turnId;
     if (
       (row.role !== "user" && row.role !== "assistant") ||
-      typeof row.text !== "string" ||
+      typeof text !== "string" ||
       typeof turnId !== "string"
     ) {
       return [];
@@ -384,7 +397,7 @@ export async function listSessionRealtimeContinuityEntriesInTransaction(
         realtimeId: row.realtimeId,
         sequence: row.sequence,
         role: row.role,
-        text: takeUtf8Head(row.text, 16_000),
+        text: takeUtf8Head(text, 16_000),
         turnId,
         createdAt: row.createdAt.toISOString(),
       },

package/src/session-realtime-ledger.ts

@@ -3,8 +3,12 @@ import { createHash } from "node:crypto";
 import { LatencyMode, ReasoningEffort, type SessionRealtimeMode } from "@opengeni/contracts";
 import { and, asc, desc, eq, inArray, isNull, or, sql } from "drizzle-orm";
 
-import { sanitizeEventPayload } from "./event-payload-sanitizer";
-import type { Database } from "./database";
+import type { Database, SessionActivityDatabase } from "./database";
+import {
+  fromPostgresLosslessJson,
+  fromPostgresLosslessText,
+  LOSSLESS_CONTENT_CODEC_VERSION,
+} from "./lossless-json";
 import * as schema from "./schema";
 import {
   assertSessionRealtimeOwnerInTransaction,
@@ -259,8 +263,8 @@ function mapEntry(row: EntryRow): SessionRealtimeLedgerEntry {
     sourceUpdateId: row.sourceUpdateId,
     historyItemId: row.historyItemId,
     turnId: row.turnId,
-    text: row.text,
-    payload: row.payload,
+    text: row.text === null ? null : fromPostgresLosslessText(row.text, row.textCodecVersion),
+    payload: fromPostgresLosslessJson(row.payload, row.payloadCodecVersion),
     clientAckedAt: row.clientAckedAt?.toISOString() ?? null,
     providerAckedAt: row.providerAckedAt?.toISOString() ?? null,
     createdAt: row.createdAt.toISOString(),
@@ -288,7 +292,7 @@ function assertBoundedString(
 }
 
 function boundedPayload(input: Record<string, unknown> | undefined): Record<string, unknown> {
-  const payload = sanitizeEventPayload(input ?? {});
+  const payload = input ?? {};
   if (
     Buffer.byteLength(JSON.stringify(payload), "utf8") > SESSION_REALTIME_LEDGER_MAX_PAYLOAD_BYTES
   ) {
@@ -1019,6 +1023,9 @@ function inboundReplayMatches(
   text: string | null,
   payload: Record<string, unknown>,
 ): boolean {
+  const storedText =
+    row.text === null ? null : fromPostgresLosslessText(row.text, row.textCodecVersion);
+  const storedPayload = fromPostgresLosslessJson(row.payload, row.payloadCodecVersion);
   return (
     row.direction === "provider_in" &&
     row.kind === input.kind &&
@@ -1026,8 +1033,9 @@ function inboundReplayMatches(
     row.providerEventId === (input.providerEventId ?? null) &&
     row.delegationItemId === (input.delegationItemId ?? null) &&
     row.sourceUpdateId === null &&
-    row.text === text &&
-    JSON.stringify(canonicalJsonValue(row.payload)) === JSON.stringify(canonicalJsonValue(payload))
+    storedText === text &&
+    JSON.stringify(canonicalJsonValue(storedPayload)) ===
+      JSON.stringify(canonicalJsonValue(payload))
   );
 }
 
@@ -1055,17 +1063,19 @@ async function appendInvalidDelegationFailure(
     kind: "error",
     delegationItemId: incoming.delegationItemId ?? null,
     text: failure.message,
+    textCodecVersion: LOSSLESS_CONTENT_CODEC_VERSION,
     payload: {
       code: failure.code,
       callOperationId: incoming.operationId,
     },
+    payloadCodecVersion: LOSSLESS_CONTENT_CODEC_VERSION,
     createdAt: now,
     updatedAt: now,
   });
 }
 
 async function admitRealtimeDelegationInTransaction(
-  db: Database,
+  db: SessionActivityDatabase,
   input: Pick<
     SyncSessionRealtimeLedgerInput,
     "workspaceId" | "sessionId" | "realtimeId" | "connectionEpoch" | "ownerSubjectId"
@@ -1189,7 +1199,11 @@ async function materializeRealtimeUpdates(
     )
     .orderBy(asc(schema.sessionSystemUpdates.createdAt), asc(schema.sessionSystemUpdates.id))
     .limit(SESSION_REALTIME_LEDGER_MAX_OUTBOUND);
-  const updates = rows.map(({ update }) => update);
+  const updates = rows.map(({ update }) => ({
+    ...update,
+    summary: fromPostgresLosslessText(update.summary, update.summaryCodecVersion),
+    payload: fromPostgresLosslessJson(update.payload, update.payloadCodecVersion),
+  }));
   if (updates.length === 0) return;
   await db.insert(schema.sessionRealtimeEntries).values(
     updates.map((update) => ({
@@ -1204,6 +1218,7 @@ async function materializeRealtimeUpdates(
       kind: "session_update",
       sourceUpdateId: update.id,
       text: update.summary,
+      textCodecVersion: LOSSLESS_CONTENT_CODEC_VERSION,
       payload: boundedPayload({
         updateId: update.id,
         kind: update.kind,
@@ -1213,6 +1228,7 @@ async function materializeRealtimeUpdates(
         payload: update.payload,
         lineage: update.lineage,
       }),
+      payloadCodecVersion: LOSSLESS_CONTENT_CODEC_VERSION,
       createdAt: now,
       updatedAt: now,
     })),
@@ -1252,7 +1268,7 @@ function assertProviderAckSequences(values: number[] | undefined, maximum: numbe
 }
 
 export async function syncSessionRealtimeLedgerInTransaction(
-  db: Database,
+  db: SessionActivityDatabase,
   input: SyncSessionRealtimeLedgerInput,
   hooks: SyncSessionRealtimeLedgerHooks = {},
 ): Promise<SyncSessionRealtimeLedgerResult> {
@@ -1404,7 +1420,9 @@ export async function syncSessionRealtimeLedgerInTransaction(
         delegationItemId: incoming.delegationItemId ?? null,
         historyItemId: null,
         text,
+        textCodecVersion: LOSSLESS_CONTENT_CODEC_VERSION,
         payload,
+        payloadCodecVersion: LOSSLESS_CONTENT_CODEC_VERSION,
         createdAt: now,
         updatedAt: now,
       })
@@ -1612,7 +1630,9 @@ export async function appendSessionRealtimeOutboundInTransaction(
       kind: input.kind,
       delegationItemId: input.delegationItemId,
       text,
+      textCodecVersion: LOSSLESS_CONTENT_CODEC_VERSION,
       payload,
+      payloadCodecVersion: LOSSLESS_CONTENT_CODEC_VERSION,
       createdAt: now,
       updatedAt: now,
     })
@@ -1757,6 +1777,7 @@ export async function projectSessionRealtimeDelegationProgressInTransaction(
         delegationItemId: call.delegationItemId,
         turnId: input.turnId,
         text: chunk,
+        textCodecVersion: LOSSLESS_CONTENT_CODEC_VERSION,
         payload: boundedPayload({
           route: "delegation_context",
           channel: "commentary",
@@ -1772,6 +1793,7 @@ export async function projectSessionRealtimeDelegationProgressInTransaction(
           chunkIndex,
           chunkCount: chunks.length,
         }),
+        payloadCodecVersion: LOSSLESS_CONTENT_CODEC_VERSION,
         createdAt: now,
         updatedAt: now,
       })),

package/src/session-realtime-mirror.ts

@@ -3,8 +3,8 @@ import { createHash } from "node:crypto";
 import type { HumanInputQuestion, HumanInputResponse } from "@opengeni/contracts";
 import { and, desc, eq, gt, sql } from "drizzle-orm";
 
-import { sanitizeEventPayload } from "./event-payload-sanitizer";
 import type { Database } from "./database";
+import { LOSSLESS_CONTENT_CODEC_VERSION } from "./lossless-json";
 import * as schema from "./schema";
 
 const SESSION_REALTIME_MIRROR_MAX_TEXT_BYTES = 131_072;
@@ -59,7 +59,7 @@ function boundedText(value: string): string {
 }
 
 function boundedPayload(value: Record<string, unknown>): Record<string, unknown> {
-  const payload = sanitizeEventPayload(value);
+  const payload = value;
   if (
     Buffer.byteLength(JSON.stringify(payload), "utf8") > SESSION_REALTIME_MIRROR_MAX_PAYLOAD_BYTES
   ) {
@@ -137,7 +137,9 @@ export async function mirrorSessionRealtimeContextInTransaction(
       direction: "provider_out",
       kind: "session_update",
       text: boundedText(input.text),
+      textCodecVersion: LOSSLESS_CONTENT_CODEC_VERSION,
       payload,
+      payloadCodecVersion: LOSSLESS_CONTENT_CODEC_VERSION,
       createdAt: now,
       updatedAt: now,
     })

package/src/session-realtime-terminal.ts

@@ -1,9 +1,18 @@
 import { createHash } from "node:crypto";
 
+import {
+  retainedOutputUnavailable,
+  validateRetainedOutputEvidence,
+  type RetainedOutputEvidence,
+} from "@opengeni/contracts";
 import { and, eq, inArray, sql } from "drizzle-orm";
 
-import { sanitizeEventPayload } from "./event-payload-sanitizer";
 import type { Database } from "./database";
+import {
+  fromPostgresLosslessJson,
+  fromPostgresLosslessText,
+  LOSSLESS_CONTENT_CODEC_VERSION,
+} from "./lossless-json";
 import { mirrorSessionRealtimeContextInTransaction } from "./session-realtime-mirror";
 import * as schema from "./schema";
 
@@ -17,9 +26,11 @@ export type ProjectSessionRealtimeDelegationTerminalInput = {
   turnId: string;
   turnStatus: "completed" | "failed" | "cancelled" | "superseded";
   terminalEvent: {
+    id: string | null;
     type: "turn.completed" | "turn.failed" | "turn.cancelled" | "turn.superseded";
     payload: Record<string, unknown>;
   };
+  retainedOutputEvidence?: unknown;
   now?: Date;
 };
 
@@ -71,20 +82,48 @@ function deterministicTerminalOperationId(turnId: string): string {
 }
 
 function boundedPayload(input: Record<string, unknown> | undefined): Record<string, unknown> {
-  const payload = sanitizeEventPayload(input ?? {});
+  const payload = input ?? {};
   if (Buffer.byteLength(JSON.stringify(payload), "utf8") > MAX_PAYLOAD_BYTES) {
     throw new Error("Realtime payload exceeds the durable ledger limit");
   }
   return payload;
 }
 
-function assertBoundedText(value: string, label: string): void {
-  if (Buffer.byteLength(value, "utf8") > MAX_TEXT_BYTES) {
-    throw new Error(`${label} exceeds the durable realtime ledger limit`);
-  }
+function payloadBytes(value: Record<string, unknown>): number {
+  return Buffer.byteLength(JSON.stringify(value), "utf8");
+}
+
+function fitsRealtimePayload(value: Record<string, unknown>): boolean {
+  return payloadBytes(value) <= MAX_PAYLOAD_BYTES;
+}
+
+function retainedEvidence(value: unknown): RetainedOutputEvidence {
+  return validateRetainedOutputEvidence(value) ?? retainedOutputUnavailable();
+}
+
+function terminalReference(
+  input: ProjectSessionRealtimeDelegationTerminalInput,
+  terminal: Record<string, unknown>,
+): Record<string, unknown> {
+  const output = typeof terminal.output === "string" ? terminal.output : null;
+  return {
+    canonicalEvent: {
+      id: input.terminalEvent.id,
+      type: input.terminalEvent.type,
+    },
+    truncation: {
+      truncated: true,
+      reason: "realtime_ledger_limit",
+      originalBytes: payloadBytes(terminal),
+      outputBytes: output === null ? null : Buffer.byteLength(output, "utf8"),
+      fullEvidence: retainedEvidence(input.retainedOutputEvidence),
+    },
+  };
 }
 
-function terminalProjection(input: ProjectSessionRealtimeDelegationTerminalInput): {
+export function buildSessionRealtimeDelegationTerminalProjection(
+  input: ProjectSessionRealtimeDelegationTerminalInput,
+): {
   kind: "delegation_result" | "error";
   text: string;
   payload: Record<string, unknown>;
@@ -95,19 +134,33 @@ function terminalProjection(input: ProjectSessionRealtimeDelegationTerminalInput
       `Realtime delegation terminal event ${input.terminalEvent.type} does not match ${input.turnStatus}`,
     );
   }
-  const terminal = boundedPayload(input.terminalEvent.payload);
+  const terminal = input.terminalEvent.payload;
   if (input.turnStatus === "completed") {
     const output =
       typeof terminal.output === "string" ? terminal.output : "Delegated turn completed.";
-    assertBoundedText(output, "Delegation result");
+    const exactPayload = {
+      status: input.turnStatus,
+      turnId: input.turnId,
+      terminalEventId: input.terminalEvent.id,
+      terminalEventType: input.terminalEvent.type,
+      terminal,
+    };
+    if (Buffer.byteLength(output, "utf8") <= MAX_TEXT_BYTES && fitsRealtimePayload(exactPayload)) {
+      return {
+        kind: "delegation_result",
+        text: output,
+        payload: exactPayload,
+      };
+    }
     return {
       kind: "delegation_result",
-      text: output,
+      text: "Delegated turn completed. The full result remains in the canonical session event.",
       payload: boundedPayload({
         status: input.turnStatus,
         turnId: input.turnId,
+        terminalEventId: input.terminalEvent.id,
         terminalEventType: input.terminalEvent.type,
-        terminal,
+        terminal: terminalReference(input, terminal),
       }),
     };
   }
@@ -119,16 +172,31 @@ function terminalProjection(input: ProjectSessionRealtimeDelegationTerminalInput
     typeof terminal.error === "string" && terminal.error.length > 0
       ? terminal.error
       : `Delegated turn ${input.turnStatus}.`;
-  assertBoundedText(message, "Delegation error");
+  const exactPayload = {
+    code,
+    status: input.turnStatus,
+    turnId: input.turnId,
+    terminalEventId: input.terminalEvent.id,
+    terminalEventType: input.terminalEvent.type,
+    terminal,
+  };
+  if (Buffer.byteLength(message, "utf8") <= MAX_TEXT_BYTES && fitsRealtimePayload(exactPayload)) {
+    return {
+      kind: "error",
+      text: message,
+      payload: exactPayload,
+    };
+  }
   return {
     kind: "error",
-    text: message,
+    text: `Delegated turn ${input.turnStatus}. The full diagnostic remains in the canonical session event.`,
     payload: boundedPayload({
-      code,
+      ...(Buffer.byteLength(code, "utf8") <= 256 ? { code } : {}),
       status: input.turnStatus,
       turnId: input.turnId,
+      terminalEventId: input.terminalEvent.id,
       terminalEventType: input.terminalEvent.type,
-      terminal,
+      terminal: terminalReference(input, terminal),
     }),
   };
 }
@@ -150,8 +218,8 @@ function mapEntry(
     sourceUpdateId: row.sourceUpdateId,
     historyItemId: row.historyItemId,
     turnId: row.turnId,
-    text: row.text,
-    payload: row.payload,
+    text: row.text === null ? null : fromPostgresLosslessText(row.text, row.textCodecVersion),
+    payload: fromPostgresLosslessJson(row.payload, row.payloadCodecVersion),
     clientAckedAt: row.clientAckedAt?.toISOString() ?? null,
     providerAckedAt: row.providerAckedAt?.toISOString() ?? null,
     createdAt: row.createdAt.toISOString(),
@@ -187,7 +255,7 @@ export async function projectSessionRealtimeDelegationTerminalInTransaction(
   if (calls.length > 1) {
     throw new Error(`Delegation turn ${input.turnId} has multiple accepted realtime calls`);
   }
-  const projected = terminalProjection(input);
+  const projected = buildSessionRealtimeDelegationTerminalProjection(input);
   const now = input.now ?? new Date();
   const call = calls[0] ?? null;
   const [mode] = call
@@ -225,10 +293,8 @@ export async function projectSessionRealtimeDelegationTerminalInTransaction(
       channel: "speakable",
       text: projected.text,
       payload: {
+        ...projected.payload,
         route: "session_context",
-        status: input.turnStatus,
-        terminalEventType: input.terminalEvent.type,
-        terminal: boundedPayload(input.terminalEvent.payload),
         ...(call ? { priorRealtimeId: call.realtimeId } : {}),
       },
       now,
@@ -296,7 +362,9 @@ export async function projectSessionRealtimeDelegationTerminalInTransaction(
       delegationItemId: call.delegationItemId,
       turnId: input.turnId,
       text: projected.text,
+      textCodecVersion: LOSSLESS_CONTENT_CODEC_VERSION,
       payload,
+      payloadCodecVersion: LOSSLESS_CONTENT_CODEC_VERSION,
       createdAt: now,
       updatedAt: now,
     })

package/src/session-realtime.ts

@@ -8,8 +8,8 @@ import type {
 } from "@opengeni/contracts";
 import { and, asc, eq, gt, inArray, isNull, or } from "drizzle-orm";
 
-import { sanitizeEventPayload } from "./event-payload-sanitizer";
-import type { Database } from "./database";
+import type { Database, SessionActivityDatabase } from "./database";
+import { LOSSLESS_CONTENT_CODEC_VERSION } from "./lossless-json";
 import { flushSessionRealtimeTranscriptTailInTransaction } from "./session-realtime-context";
 import {
   evaluateSessionControl,
@@ -161,7 +161,7 @@ function assertOwner(
 }
 
 async function appendRealtimeLifecycleEvent(
-  db: Database,
+  db: SessionActivityDatabase,
   session: SessionRow,
   sequence: number,
   type: Extract<SessionEventType, "session.realtime.started" | "session.realtime.ended">,
@@ -185,7 +185,8 @@ async function appendRealtimeLifecycleEvent(
       sessionId: session.id,
       sequence,
       type,
-      payload: sanitizeEventPayload(payload),
+      payload: payload,
+      payloadCodecVersion: LOSSLESS_CONTENT_CODEC_VERSION,
       occurredAt: now,
     })
     .returning();
@@ -258,7 +259,7 @@ async function registerNormalModeWake(db: Database, session: SessionRow, reason:
 }
 
 async function endWithEvent(
-  db: Database,
+  db: SessionActivityDatabase,
   session: SessionRow,
   row: RealtimeRow,
   reason: SessionRealtimeEndReason,
@@ -351,7 +352,7 @@ function assertRealtimeAdmission(session: SessionRow): void {
 }
 
 export async function beginSessionRealtimeInTransaction(
-  db: Database,
+  db: SessionActivityDatabase,
   input: BeginSessionRealtimeInput,
 ): Promise<SessionRealtimeMutationResult> {
   const now = input.now ?? new Date();
@@ -552,7 +553,7 @@ export async function assertSessionRealtimeOwnerInTransaction(
 }
 
 export async function renewSessionRealtimeInTransaction(
-  db: Database,
+  db: SessionActivityDatabase,
   input: RenewSessionRealtimeInput,
 ): Promise<RenewSessionRealtimeResult> {
   const now = input.now ?? new Date();
@@ -615,7 +616,7 @@ export async function renewSessionRealtimeInTransaction(
 }
 
 export async function endSessionRealtimeInTransaction(
-  db: Database,
+  db: SessionActivityDatabase,
   input: EndSessionRealtimeInput,
 ): Promise<SessionRealtimeMutationResult> {
   const now = input.now ?? new Date();
@@ -648,7 +649,7 @@ export async function endSessionRealtimeInTransaction(
 
 /** Lazily settle an expired voice lease under the canonical session lock. */
 export async function settleExpiredSessionRealtimeInTransaction(
-  db: Database,
+  db: SessionActivityDatabase,
   session: SessionRow,
   now = new Date(),
 ): Promise<SessionRow> {

package/src/session-tool-call-settlement.ts

@@ -2,8 +2,9 @@ import type { SessionEvent } from "@opengeni/contracts";
 import { boundModelToolOutputItem } from "@opengeni/codex";
 import { and, asc, eq, sql } from "drizzle-orm";
 import type { Database } from "./database";
-import { sanitizeEventPayload, sanitizeModelPayload } from "./event-payload-sanitizer";
+import { fromPostgresLosslessJson, LOSSLESS_CONTENT_CODEC_VERSION } from "./lossless-json";
 import * as schema from "./schema";
+import { cancelUnacceptedVideoGenerationsForToolCallsInTransaction } from "./video-generation";
 
 export const TOOL_RESULT_TYPE_BY_CALL_TYPE: Readonly<Record<string, string>> = {
   function_call: "function_call_result",
@@ -93,7 +94,7 @@ function mapEvent(row: typeof schema.sessionEvents.$inferSelect): SessionEvent {
     sessionId: row.sessionId,
     sequence: row.sequence,
     type: row.type as SessionEvent["type"],
-    payload: row.payload,
+    payload: fromPostgresLosslessJson(row.payload, row.payloadCodecVersion),
     occurredAt: row.occurredAt.toISOString(),
     clientEventId: row.clientEventId,
     turnId: row.turnId,
@@ -115,7 +116,7 @@ export async function closePendingSessionToolCallsInTransaction(
   tx: Database,
   input: ClosePendingSessionToolCallsInput,
 ): Promise<{ sequence: number; events: SessionEvent[]; closed: number }> {
-  const pending = await tx
+  const pendingRows = await tx
     .select()
     .from(schema.sessionPendingToolCalls)
     .where(
@@ -127,12 +128,21 @@ export async function closePendingSessionToolCallsInTransaction(
     )
     .orderBy(asc(schema.sessionPendingToolCalls.createdAt), asc(schema.sessionPendingToolCalls.id))
     .for("update");
+  const pending = pendingRows.map((row) => ({
+    ...row,
+    callItem: fromPostgresLosslessJson(row.callItem, row.callItemCodecVersion),
+    resultItem:
+      row.resultItem === null
+        ? null
+        : fromPostgresLosslessJson(row.resultItem, row.resultItemCodecVersion),
+  }));
   if (pending.length === 0) return { sequence: input.sequence, events: [], closed: 0 };
 
   const history = await tx
     .select({
       position: schema.sessionHistoryItems.position,
       item: schema.sessionHistoryItems.item,
+      itemCodecVersion: schema.sessionHistoryItems.itemCodecVersion,
       active: schema.sessionHistoryItems.active,
     })
     .from(schema.sessionHistoryItems)
@@ -144,6 +154,10 @@ export async function closePendingSessionToolCallsInTransaction(
       ),
     )
     .orderBy(asc(schema.sessionHistoryItems.position));
+  const decodedHistory = history.map((row) => ({
+    ...row,
+    item: fromPostgresLosslessJson(row.item, row.itemCodecVersion),
+  }));
   const [{ maxPosition } = { maxPosition: -1 }] = await tx
     .select({ maxPosition: sql<number>`coalesce(max(${schema.sessionHistoryItems.position}), -1)` })
     .from(schema.sessionHistoryItems)
@@ -173,23 +187,23 @@ export async function closePendingSessionToolCallsInTransaction(
   const eventValues: Array<typeof schema.sessionEvents.$inferInsert> = [];
   const resolutions = pending.map((call) => {
     const resultType = TOOL_RESULT_TYPE_BY_CALL_TYPE[call.callType];
-    const existingCall = history.find(
+    const existingCall = decodedHistory.find(
       ({ item }) => historyItemType(item) === call.callType && historyCallId(item) === call.callId,
     );
     const existingResult = resultType
-      ? history.find(
+      ? decodedHistory.find(
           ({ item, position }) =>
             position > (existingCall?.position ?? Number.MAX_SAFE_INTEGER) &&
             historyItemType(item) === resultType &&
             historyCallId(item) === call.callId,
         )
       : undefined;
-    const activeCall = history.find(
+    const activeCall = decodedHistory.find(
       ({ item, active }) =>
         active && historyItemType(item) === call.callType && historyCallId(item) === call.callId,
     );
     const activeResult = resultType
-      ? history.find(
+      ? decodedHistory.find(
           ({ item, active, position }) =>
             active &&
             position > (activeCall?.position ?? Number.MAX_SAFE_INTEGER) &&
@@ -232,7 +246,8 @@ export async function closePendingSessionToolCallsInTransaction(
         sessionId: input.sessionId,
         turnId: input.turnId,
         position: nextPosition++,
-        item: sanitizeModelPayload(resolution.call.callItem),
+        item: resolution.call.callItem,
+        itemCodecVersion: LOSSLESS_CONTENT_CODEC_VERSION,
         active: true,
       });
     }
@@ -255,12 +270,11 @@ export async function closePendingSessionToolCallsInTransaction(
         sessionId: input.sessionId,
         turnId: input.turnId,
         position: nextPosition++,
-        item: sanitizeModelPayload(
-          boundModelToolOutputItem(
-            resolution.result,
-            resolution.call.modelToolOutputTruncationTokens ?? undefined,
-          ),
+        item: boundModelToolOutputItem(
+          resolution.result,
+          resolution.call.modelToolOutputTruncationTokens ?? undefined,
         ),
+        itemCodecVersion: LOSSLESS_CONTENT_CODEC_VERSION,
         active: true,
       });
     }
@@ -280,7 +294,7 @@ export async function closePendingSessionToolCallsInTransaction(
       turnGeneration: resolution.call.executionGeneration,
       turnAttemptId: resolution.call.attemptId,
       turnAssociation: "current",
-      payload: sanitizeEventPayload({
+      payload: {
         id: resolution.call.callId,
         output: resolution.interrupted
           ? {
@@ -302,7 +316,8 @@ export async function closePendingSessionToolCallsInTransaction(
           unsupportedCallShape:
             resolution.interrupted && (!resolution.result || !resolution.rawCallIsValid),
         },
-      }),
+      },
+      payloadCodecVersion: LOSSLESS_CONTENT_CODEC_VERSION,
       occurredAt: input.now,
     });
   }
@@ -312,6 +327,14 @@ export async function closePendingSessionToolCallsInTransaction(
     eventValues.length > 0
       ? await tx.insert(schema.sessionEvents).values(eventValues).returning()
       : [];
+  await cancelUnacceptedVideoGenerationsForToolCallsInTransaction(tx, {
+    workspaceId: input.workspaceId,
+    sessionId: input.sessionId,
+    turnId: input.turnId,
+    toolCallIds: pending.map((call) => call.callId),
+    reason: input.reason,
+    now: input.now,
+  });
   await tx
     .delete(schema.sessionPendingToolCalls)
     .where(