@k2b/cloud 0.26.0 → 0.28.0

package/src/ai/solid.ts

@@ -6,7 +6,7 @@ export {
   type CreateAiChatControllerOptions,
   createAiChatController,
 } from "./client/controller";
-export { conversationFileSource } from "./client/file-source";
+export { type ConversationFileSource, conversationFileSource } from "./client/file-source";
 export {
   type AiActiveTurn,
   type AiChatProjection,

package/src/ai/store.ts

@@ -4,8 +4,10 @@ import { type SQL, sql } from "bun";
 import { type CapabilityActionReview, CapabilityActionReviewSchema } from "../contracts/capabilities";
 import { logger } from "../services/logging";
 import { toPgTextArray } from "../services/postgres";
+import { aiTurnErrorText } from "./chat/turn-error";
 import { AI_MEMORY_LEARNING_DEFAULT_ENABLED } from "./prefs";
 import type { AiTurnBlock } from "./protocol";
+import { AiRunTimeout } from "./run-timeout";
 import { withAiShortId, withAiShortIdForDb } from "./short-id";
 import { parseAiTodoPlan } from "./todo-contracts";
 import { activeTurnWaits } from "./turn-timing";
@@ -29,6 +31,7 @@ import type {
   AiToolPresentation,
   AiTurn,
   AiTurnClaim,
+  AiTurnError,
   AiTurnRunConfig,
   AiTurnStatus,
   AiTurnSteer,
@@ -112,6 +115,7 @@ type ConversationRow = {
   latest_browser_pending?: boolean;
   latest_turn_error?: string | null;
   latest_turn_completed_at?: Date | string | null;
+  latest_turn_short_id?: string | null;
   enrich_fail_count: number | null;
   project_id: string | null;
   draft_content: unknown;
@@ -304,10 +308,10 @@ const rowToConversationResourceRef = (row: ConversationResourceRefRow): AiConver
 });
 
 type ResourceCursor = { at: string; type: string; id: string };
-const encodeResourceCursor = (row: ConversationResourceRefRow): string =>
-  encodeURIComponent(JSON.stringify({ at: iso(row.last_seen_at), type: row.resource_type, id: row.resource_id } satisfies ResourceCursor));
-const encodeSourceCursor = (row: ConversationSourceRow): string =>
-  encodeURIComponent(JSON.stringify({ at: iso(row.last_seen_at), type: row.source_kind, id: row.source_key } satisfies ResourceCursor));
+const encodeResourceCursor = (row: ConversationResourceRefRow & { cursor_at: string }): string =>
+  encodeURIComponent(JSON.stringify({ at: row.cursor_at, type: row.resource_type, id: row.resource_id } satisfies ResourceCursor));
+const encodeSourceCursor = (row: ConversationSourceRow & { cursor_at: string }): string =>
+  encodeURIComponent(JSON.stringify({ at: row.cursor_at, type: row.source_kind, id: row.source_key } satisfies ResourceCursor));
 const decodeResourceCursor = (value: string | undefined): ResourceCursor | null => {
   if (!value) return null;
   try {
@@ -348,6 +352,7 @@ const rowToConversationSource = (row: ConversationSourceRow): AiConversationSour
   lastSeenAt: iso(row.last_seen_at),
   sourceTurnId: row.source_turn_id,
   sourceCallId: row.source_call_id,
+  sourceMessageSeq: null,
 });
 
 const rowToInterChatMessage = (row: InterChatMessageRow): AiInterChatMessage => ({
@@ -389,10 +394,10 @@ const interChatMessageSelect = () => sql`
 `;
 
 type ResourceOccurrenceCursor = ResourceCursor & { chat: string };
-const encodeResourceOccurrenceCursor = (row: ConversationResourceOccurrenceRow): string =>
+const encodeResourceOccurrenceCursor = (row: ConversationResourceOccurrenceRow & { cursor_at: string }): string =>
   encodeURIComponent(
     JSON.stringify({
-      at: iso(row.last_seen_at),
+      at: row.cursor_at,
       type: row.resource_type,
       id: row.resource_id,
       chat: row.conversation_short_id,
@@ -551,6 +556,7 @@ const rowToConversation = (row: ConversationRow): AiConversation => ({
   lastUsedAt: iso(row.last_used_at),
   runStatus: conversationRunStatus(row.latest_turn_status, row.latest_browser_pending),
   runError: row.latest_turn_status === "failed" ? row.latest_turn_error?.trim() || "Assistant response failed." : null,
+  runTurnId: row.latest_turn_short_id ?? null,
   unreadCompletion:
     Boolean(
       row.background_received_at &&
@@ -722,10 +728,10 @@ const loadConversationSummary = async (input: {
       latest.status AS latest_turn_status,
       ${browserWorkPending()} AS latest_browser_pending,
       latest.error AS latest_turn_error,
-      latest.completed_at AS latest_turn_completed_at
+      latest.completed_at AS latest_turn_completed_at, latest.short_id AS latest_turn_short_id
     FROM ai.conversations conversation
     LEFT JOIN LATERAL (
-      SELECT status, error, completed_at, live_blocks
+      SELECT short_id, status, error, completed_at, live_blocks
       FROM ai.turns
       WHERE conversation_id = conversation.id AND NOT COALESCE(run_config ? 'background', false)
       ORDER BY created_at DESC, id DESC
@@ -783,13 +789,30 @@ const messageSearchText = (message: Message): string => {
  * time limit, or a turn the sweep finalizes. History reads the ending from the last assistant message, so such a turn
  * never looks finished. A failure replaces the `aborted` that a loop cut off by its run time limit recorded, so the
  * limit never looks like a user stop. A call the user approved that never returned keeps its approval in history.
+ * A failure's reason goes to the turn's last message, also when that is the user's own, so history can say why the
+ * turn failed and what to do next.
  */
 const recordTurnEnd = async (
   db: typeof sql,
-  input: { conversationId: string; turnId: string; reason: "aborted" | "error" },
+  input: { conversationId: string; turnId: string; reason: "aborted" | "error"; turnError?: AiTurnError | null },
 ): Promise<void> => {
   const replaces = input.reason === "error" ? "aborted" : null;
   for (const table of ["ai.messages", "ai.task_messages"]) {
+    if (input.turnError) {
+      await db`
+        UPDATE ${db(table)}
+        SET meta = COALESCE(meta, '{}'::jsonb) || jsonb_build_object('turnError', ${JSON.stringify(input.turnError)}::text::jsonb)
+        WHERE id = (
+          SELECT id
+          FROM ${db(table)}
+          WHERE conversation_id = ${input.conversationId}
+            AND loop_id = ${input.turnId}::text
+            AND kind = 'message'
+          ORDER BY seq DESC
+          LIMIT 1
+        )
+      `;
+    }
     await db`
       UPDATE ${db(table)}
       SET loop_done_reason = ${input.reason}
@@ -1183,10 +1206,10 @@ export const aiConversations: AiConversationService = {
         latest.status AS latest_turn_status,
         ${browserWorkPending()} AS latest_browser_pending,
         latest.error AS latest_turn_error,
-        latest.completed_at AS latest_turn_completed_at
+        latest.completed_at AS latest_turn_completed_at, latest.short_id AS latest_turn_short_id
       FROM ai.conversations conversation
       LEFT JOIN LATERAL (
-        SELECT status, error, completed_at, live_blocks
+        SELECT short_id, status, error, completed_at, live_blocks
         FROM ai.turns
         WHERE NOT COALESCE(run_config ? 'background', false) AND conversation_id = conversation.id
         ORDER BY created_at DESC, id DESC
@@ -1239,12 +1262,12 @@ export const aiConversations: AiConversationService = {
       SELECT conversation.*, ${effectiveDone()} AS is_done,
         EXISTS (SELECT 1 FROM ai.chat_tasks schedule WHERE schedule.conversation_id = conversation.id AND schedule.state = 'active') AS has_active_schedule,
         latest.status AS latest_turn_status, ${browserWorkPending()} AS latest_browser_pending,
-        latest.error AS latest_turn_error, latest.completed_at AS latest_turn_completed_at,
+        latest.error AS latest_turn_error, latest.completed_at AS latest_turn_completed_at, latest.short_id AS latest_turn_short_id,
         jsonb_build_object('completed', COALESCE(progress.completed,0), 'total', COALESCE(progress.total,0),
           'step', progress.step, 'tool', ai.sidebar_tool_label(latest.live_blocks)->>'label') AS activity
       FROM ai.conversations conversation
       LEFT JOIN LATERAL (
-        SELECT status, error, completed_at, live_blocks FROM ai.turns
+        SELECT short_id, status, error, completed_at, live_blocks FROM ai.turns
         WHERE NOT COALESCE(run_config ? 'background', false) AND conversation_id = conversation.id ORDER BY created_at DESC, id DESC LIMIT 1
       ) latest ON TRUE
       LEFT JOIN LATERAL (
@@ -1286,10 +1309,10 @@ export const aiConversations: AiConversationService = {
         latest.status AS latest_turn_status,
         ${browserWorkPending()} AS latest_browser_pending,
         latest.error AS latest_turn_error,
-        latest.completed_at AS latest_turn_completed_at
+        latest.completed_at AS latest_turn_completed_at, latest.short_id AS latest_turn_short_id
       FROM ai.conversations conversation
       LEFT JOIN LATERAL (
-        SELECT status, error, completed_at, live_blocks
+        SELECT short_id, status, error, completed_at, live_blocks
         FROM ai.turns
         WHERE NOT COALESCE(run_config ? 'background', false) AND conversation_id = conversation.id
         ORDER BY created_at DESC, id DESC
@@ -1440,9 +1463,19 @@ export const aiConversations: AiConversationService = {
             preview = COALESCE(EXCLUDED.preview, ai.conversation_resource_refs.preview),
             icon = COALESCE(EXCLUDED.icon, ai.conversation_resource_refs.icon),
             href = COALESCE(EXCLUDED.href, ai.conversation_resource_refs.href),
-            source_turn_id = COALESCE(EXCLUDED.source_turn_id, ai.conversation_resource_refs.source_turn_id),
+            -- Project context is indexed on every turn without a call. It must not move a resource a tool call
+            -- read to the latest turn, or the chat would show it as read just now.
+            source_turn_id = CASE
+              WHEN EXCLUDED.source_call_id IS NULL AND ai.conversation_resource_refs.source_call_id IS NOT NULL
+                THEN ai.conversation_resource_refs.source_turn_id
+              ELSE COALESCE(EXCLUDED.source_turn_id, ai.conversation_resource_refs.source_turn_id)
+            END,
             source_call_id = COALESCE(EXCLUDED.source_call_id, ai.conversation_resource_refs.source_call_id),
-            last_seen_at = now()
+            last_seen_at = CASE
+              WHEN EXCLUDED.source_call_id IS NULL AND ai.conversation_resource_refs.source_call_id IS NOT NULL
+                THEN ai.conversation_resource_refs.last_seen_at
+              ELSE now()
+            END
         `;
       }
     });
@@ -1452,9 +1485,10 @@ export const aiConversations: AiConversationService = {
     const limit = Math.min(Math.max(Math.floor(input.limit ?? 20), 1), 100);
     const pattern = searchPattern(input.search);
     const cursor = decodeResourceCursor(input.before);
-    const rows = await sql<ConversationResourceRefRow[]>`
+    const rows = await sql<(ConversationResourceRefRow & { cursor_at: string })[]>`
       SELECT indexed.resource_type, indexed.resource_id, indexed.title, indexed.preview, indexed.icon, indexed.href,
-             source_turn.short_id AS source_turn_id, indexed.source_call_id, indexed.first_seen_at, indexed.last_seen_at
+             source_turn.short_id AS source_turn_id, indexed.source_call_id, indexed.first_seen_at, indexed.last_seen_at,
+             to_char(indexed.last_seen_at AT TIME ZONE 'UTC', 'YYYY-MM-DD"T"HH24:MI:SS.US"Z"') AS cursor_at
       FROM ai.conversation_resource_refs indexed
       LEFT JOIN ai.turns source_turn ON source_turn.id = indexed.source_turn_id
       WHERE indexed.conversation_id = ${input.conversationId}::uuid
@@ -1475,11 +1509,12 @@ export const aiConversations: AiConversationService = {
     const limit = Math.min(Math.max(Math.floor(input.limit ?? 20), 1), 100);
     const pattern = searchPattern(input.search);
     const cursor = decodeResourceOccurrenceCursor(input.before);
-    const rows = await sql<ConversationResourceOccurrenceRow[]>`
+    const rows = await sql<(ConversationResourceOccurrenceRow & { cursor_at: string })[]>`
       SELECT indexed.resource_type, indexed.resource_id, indexed.title, indexed.preview, indexed.icon, indexed.href,
              source_turn.short_id AS source_turn_id, indexed.source_call_id, indexed.first_seen_at, indexed.last_seen_at,
              conversation.short_id AS conversation_short_id, conversation.title AS conversation_title,
-             conversation.updated_at AS conversation_updated_at
+             conversation.updated_at AS conversation_updated_at,
+             to_char(indexed.last_seen_at AT TIME ZONE 'UTC', 'YYYY-MM-DD"T"HH24:MI:SS.US"Z"') AS cursor_at
       FROM ai.conversation_resource_refs indexed
       JOIN ai.conversations conversation ON conversation.id = indexed.conversation_id
       LEFT JOIN ai.turns source_turn ON source_turn.id = indexed.source_turn_id
@@ -1502,17 +1537,21 @@ export const aiConversations: AiConversationService = {
     const source = input.source;
     await sql`
       INSERT INTO ai.conversation_sources (
-        conversation_id, kind, source_key, title, preview, icon, href, source_turn_id, source_call_id
+        conversation_id, kind, source_key, title, preview, icon, href, resource_type, resource_id, source_turn_id, source_call_id
       ) VALUES (
         ${input.conversationId}::uuid, ${source.kind}, ${source.key}, ${source.title}, ${source.preview ?? null},
-        ${source.icon ?? null}, ${source.href ?? null}, ${input.turnId ?? null}::uuid, ${input.callId ?? null}
+        ${source.icon ?? null}, ${source.href ?? null}, ${source.ref?.type ?? null}, ${source.ref?.id ?? null},
+        ${input.turnId ?? null}::uuid, ${input.callId ?? null}
       )
       ON CONFLICT (conversation_id, kind, source_key)
       DO UPDATE SET
         title = EXCLUDED.title,
-        preview = COALESCE(EXCLUDED.preview, ai.conversation_sources.preview),
+        -- A new delivery describes the result anew; an old description must not outlive changed content.
+        preview = CASE WHEN EXCLUDED.kind = 'result' THEN EXCLUDED.preview ELSE COALESCE(EXCLUDED.preview, ai.conversation_sources.preview) END,
         icon = COALESCE(EXCLUDED.icon, ai.conversation_sources.icon),
         href = COALESCE(EXCLUDED.href, ai.conversation_sources.href),
+        resource_type = COALESCE(EXCLUDED.resource_type, ai.conversation_sources.resource_type),
+        resource_id = COALESCE(EXCLUDED.resource_id, ai.conversation_sources.resource_id),
         occurrences = ai.conversation_sources.occurrences +
           CASE WHEN ai.conversation_sources.source_call_id IS DISTINCT FROM EXCLUDED.source_call_id THEN 1 ELSE 0 END,
         source_turn_id = COALESCE(EXCLUDED.source_turn_id, ai.conversation_sources.source_turn_id),
@@ -1525,50 +1564,85 @@ export const aiConversations: AiConversationService = {
     const limit = Math.min(Math.max(Math.floor(input.limit ?? 20), 1), 100);
     const pattern = searchPattern(input.search);
     const cursor = decodeResourceCursor(input.before);
-    const rows = await sql<ConversationSourceRow[]>`
-      SELECT *
-      FROM (
-        SELECT source.kind AS source_kind, source.source_key, source.title, source.preview,
-               source.icon, source.href, NULL::text AS path, NULL::text AS media_type, NULL::bigint AS size,
-               NULL::text AS resource_type, NULL::text AS resource_id, source.occurrences,
-               turn.short_id AS source_turn_id, source.source_call_id, source.first_seen_at, source.last_seen_at
-        FROM ai.conversation_sources source
-        LEFT JOIN ai.turns turn ON turn.id = source.source_turn_id
-        WHERE source.conversation_id = ${input.conversationId}::uuid
-
-        UNION ALL
-
-        SELECT 'file' AS source_kind, file.path AS source_key,
-               regexp_replace(file.path, '^.*/', '') AS title, 'Attached to the conversation' AS preview,
-               CASE WHEN file.media_type LIKE 'image/%' THEN 'ti ti-photo' ELSE 'ti ti-file' END AS icon,
-               NULL::text AS href, file.path, file.media_type, file.size,
-               NULL::text AS resource_type, NULL::text AS resource_id, 1 AS occurrences,
-               NULL::text AS source_turn_id, NULL::text AS source_call_id,
-               file.updated_at AS first_seen_at, file.updated_at AS last_seen_at
-        FROM ai.files file
-        WHERE file.conversation_id = ${input.conversationId}::uuid
-
-        UNION ALL
-
-        SELECT 'resource' AS source_kind, indexed.resource_type || ':' || indexed.resource_id AS source_key,
-               COALESCE(indexed.title, indexed.resource_type || ' ' || indexed.resource_id) AS title,
-               indexed.preview, indexed.icon, indexed.href, NULL::text AS path, NULL::text AS media_type, NULL::bigint AS size,
-               indexed.resource_type, indexed.resource_id, 1 AS occurrences,
-               turn.short_id AS source_turn_id, indexed.source_call_id, indexed.first_seen_at, indexed.last_seen_at
-        FROM ai.conversation_resource_refs indexed
-        LEFT JOIN ai.turns turn ON turn.id = indexed.source_turn_id
-        WHERE indexed.conversation_id = ${input.conversationId}::uuid
-      ) source
-      WHERE (${pattern}::text IS NULL OR LOWER(source.title || ' ' || COALESCE(source.preview, '') || ' ' || source.source_key) LIKE ${pattern})
-        AND (${cursor?.at ?? null}::timestamptz IS NULL OR (source.last_seen_at, source.source_kind, source.source_key) <
-          (${cursor?.at ?? null}::timestamptz, ${cursor?.type ?? null}::text, ${cursor?.id ?? null}::text))
-      ORDER BY source.last_seen_at DESC, source.source_kind DESC, source.source_key DESC
-      LIMIT ${limit + 1}
-    `;
-    const page = rows.slice(0, limit);
+    const kinds = input.kinds?.length ? toPgTextArray([...input.kinds]) : null;
+    const observed = input.observed === true;
+    const rows = await sql<(ConversationSourceRow & { total: number | string; source_message_seq: number | null; cursor_at: string })[]>`
+      WITH matched AS (
+        SELECT *
+        FROM (
+          SELECT source.kind AS source_kind, source.source_key, source.title, source.preview,
+                 source.icon, source.href, file.path, file.media_type, file.size,
+                 source.resource_type, source.resource_id, source.occurrences,
+                 turn.short_id AS source_turn_id, source.source_turn_id AS turn_uuid, source.source_call_id,
+                 source.first_seen_at, source.last_seen_at
+          FROM ai.conversation_sources source
+          LEFT JOIN ai.turns turn ON turn.id = source.source_turn_id
+          LEFT JOIN ai.files file
+            ON source.kind = 'result' AND file.conversation_id = source.conversation_id AND file.path = source.source_key
+          WHERE source.conversation_id = ${input.conversationId}::uuid
+
+          UNION ALL
+
+          SELECT 'file' AS source_kind, file.path AS source_key,
+                 regexp_replace(file.path, '^.*/', '') AS title, 'Attached to the conversation' AS preview,
+                 CASE WHEN file.media_type LIKE 'image/%' THEN 'ti ti-photo' ELSE 'ti ti-file' END AS icon,
+                 NULL::text AS href, file.path, file.media_type, file.size,
+                 NULL::text AS resource_type, NULL::text AS resource_id, 1 AS occurrences,
+                 NULL::text AS source_turn_id, NULL::uuid AS turn_uuid, NULL::text AS source_call_id,
+                 file.updated_at AS first_seen_at, file.updated_at AS last_seen_at
+          FROM ai.files file
+          WHERE file.conversation_id = ${input.conversationId}::uuid
+
+          UNION ALL
+
+          SELECT 'resource' AS source_kind, indexed.resource_type || ':' || indexed.resource_id AS source_key,
+                 COALESCE(indexed.title, indexed.resource_type || ' ' || indexed.resource_id) AS title,
+                 indexed.preview, indexed.icon, indexed.href, NULL::text AS path, NULL::text AS media_type, NULL::bigint AS size,
+                 indexed.resource_type, indexed.resource_id, 1 AS occurrences,
+                 turn.short_id AS source_turn_id, indexed.source_turn_id AS turn_uuid, indexed.source_call_id,
+                 indexed.first_seen_at, indexed.last_seen_at
+          FROM ai.conversation_resource_refs indexed
+          LEFT JOIN ai.turns turn ON turn.id = indexed.source_turn_id
+          WHERE indexed.conversation_id = ${input.conversationId}::uuid
+        ) source
+        WHERE (${kinds}::text[] IS NULL OR source.source_kind = ANY(${kinds}::text[]))
+          AND (NOT ${observed} OR source.source_kind <> 'resource' OR source.source_call_id IS NOT NULL)
+          AND (${pattern}::text IS NULL OR LOWER(source.title || ' ' || COALESCE(source.preview, '') || ' ' || source.source_key) LIKE ${pattern})
+      ),
+      page AS (
+        SELECT *
+        FROM matched source
+        WHERE ${cursor?.at ?? null}::timestamptz IS NULL OR (source.last_seen_at, source.source_kind, source.source_key) <
+          (${cursor?.at ?? null}::timestamptz, ${cursor?.type ?? null}::text, ${cursor?.id ?? null}::text)
+        ORDER BY source.last_seen_at DESC, source.source_kind DESC, source.source_key DESC
+        LIMIT ${limit + 1}
+      )
+      SELECT page.*, to_char(page.last_seen_at AT TIME ZONE 'UTC', 'YYYY-MM-DD"T"HH24:MI:SS.US"Z"') AS cursor_at, totals.total,
+             COALESCE(
+               (SELECT message.seq FROM ai.messages message
+                WHERE message.conversation_id = ${input.conversationId}::uuid AND message.loop_id = page.turn_uuid::text
+                  AND message.role = 'assistant' AND page.source_call_id IS NOT NULL
+                  AND (CASE WHEN jsonb_typeof(message.message) = 'string' THEN (message.message #>> '{}')::jsonb ELSE message.message END) -> 'content'
+                      @> jsonb_build_array(jsonb_build_object('type', 'tool_call', 'id', page.source_call_id))
+                ORDER BY message.seq ASC
+                LIMIT 1),
+               (SELECT min(message.seq) FROM ai.messages message
+                WHERE message.conversation_id = ${input.conversationId}::uuid AND message.loop_id = page.turn_uuid::text)
+             ) AS source_message_seq
+      FROM (SELECT count(*) AS total FROM matched) totals
+      LEFT JOIN page ON true
+      ORDER BY page.last_seen_at DESC, page.source_kind DESC, page.source_key DESC
+    `;
+    // One row carries the total even when the page is empty.
+    const total = Number(rows[0]?.total ?? 0);
+    const page = rows.filter((row) => row.source_kind !== null).slice(0, limit);
     return {
-      sources: page.map(rowToConversationSource),
+      sources: page.map((row) => ({
+        ...rowToConversationSource(row),
+        sourceMessageSeq: row.source_message_seq === null ? null : Number(row.source_message_seq),
+      })),
       ...(rows.length > limit && page.at(-1) ? { nextCursor: encodeSourceCursor(page.at(-1)!) } : {}),
+      total,
     };
   },
 
@@ -2905,6 +2979,7 @@ export const aiConversations: AiConversationService = {
           conversationId: input.conversationId,
           turnId: input.turnId,
           reason: input.status === "aborted" ? "aborted" : "error",
+          turnError: input.status === "failed" ? (input.turnError ?? { code: "failed" }) : null,
         });
         await tx`
           UPDATE ai.turn_steers
@@ -2925,11 +3000,12 @@ export const aiConversations: AiConversationService = {
     // 1) Finalize turns that exhausted actual recovery attempts. Resuming a
     // resolved user/frontend action is normal progress and does not consume
     // this budget.
+    // The sweep does not know a turn's language; the chat words the recorded reason in the reader's.
     const exhaustedRows = await sql<{ id: string; conversation_id: string; error: string; attempt: number; live_seq: number | string }[]>`
       UPDATE ai.turns
       SET status = 'failed',
           completed_at = now(),
-          error = 'AI turn exhausted its recovery attempts.',
+          error = ${aiTurnErrorText({ code: "interrupted" }, "en")},
           lease_owner = NULL,
           lease_expires_at = NULL,
           live_blocks = NULL
@@ -2977,11 +3053,13 @@ export const aiConversations: AiConversationService = {
     `;
 
     // 2) Finalize over-budget turns without a live lease.
-    const budgetRows = await sql<{ id: string; conversation_id: string; error: string; attempt: number; live_seq: number | string }[]>`
+    const budgetRows = await sql<
+      { id: string; conversation_id: string; error: string; attempt: number; live_seq: number | string; run_budget_ms: number | null }[]
+    >`
       UPDATE ai.turns
       SET status = 'failed',
           completed_at = now(),
-          error = 'Run time limit reached. You can continue the task in a new message.',
+          error = ${aiTurnErrorText({ code: "time_limit" }, "en")},
           lease_owner = NULL,
           lease_expires_at = NULL,
           live_blocks = NULL
@@ -2995,8 +3073,12 @@ export const aiConversations: AiConversationService = {
           AND (lease_owner IS NULL OR lease_expires_at IS NULL OR lease_expires_at < now())
         LIMIT ${limit}
       )
-      RETURNING id, conversation_id, error, attempt, live_seq
+      RETURNING id, conversation_id, error, attempt, live_seq, run_budget_ms
     `;
+    const turnErrors = new Map<string, AiTurnError>([
+      ...exhaustedRows.map((row): [string, AiTurnError] => [row.id, { code: "interrupted" }]),
+      ...budgetRows.map((row): [string, AiTurnError] => [row.id, new AiRunTimeout(Number(row.run_budget_ms) || null).turnError()]),
+    ]);
     result.failed = [...exhaustedRows, ...budgetRows].map((row) => ({
       conversationId: row.conversation_id,
       turnId: row.id,
@@ -3035,10 +3117,12 @@ export const aiConversations: AiConversationService = {
     // History tells a stop from a turn that failed or whose wait expired, as it does for turns that end on their own.
     const stopped = new Set(abortedRows.filter((row) => row.stopped).map((row) => row.id));
     for (const finalized of [...result.failed, ...result.aborted]) {
+      const stop = stopped.has(finalized.turnId);
       await recordTurnEnd(sql, {
         conversationId: finalized.conversationId,
         turnId: finalized.turnId,
-        reason: stopped.has(finalized.turnId) ? "aborted" : "error",
+        reason: stop ? "aborted" : "error",
+        turnError: stop ? null : (turnErrors.get(finalized.turnId) ?? { code: "wait_expired" }),
       });
       await sql`
         UPDATE ai.pending_actions