@k2b/cloud 0.25.0 → 0.27.0

package/src/ai/skill-seeds.ts

@@ -14,6 +14,29 @@ Help the user turn a recurring workflow, specialist knowledge, or a set of instr
 - Ask only about a missing choice that would materially change discovery, behavior, or output. If the request is already clear, draft the Skill directly.
 - Preserve the user's scope. Do not turn one example, preference, or past failure into a universal rule unless the user clearly intends that.
 
+## Choose the right place
+
+Recommend the lightest place that does the job:
+
+- one lasting fact or preference, such as reports always as PDF: personalization memory;
+- always using one mailbox, notebook, or Space for a kind of request: a personalization workflow default, which Assistant learns from the user's stated rule or repeated use;
+- rules for one Project's shared work: Project instructions;
+- a recurring procedure, judgment, or output format used across chats: a Skill;
+- work that should run at a set time: a scheduled task, which can load the Skill;
+- a repeated calculation or an interactive tool: a Studio App that the Skill references.
+
+## Draft from the conversation
+
+When the Skill comes from work in this conversation, capture what made it succeed:
+
+- when to load it, as narrowly as the user's real requests: name the subject, such as the team or the report, not only the output format;
+- the steps and the exact capability IDs that worked, so later runs can call load_tools without searching;
+- every correction the user made, rewritten as a positive rule; corrections are the most valuable content;
+- the output shape, as a compact template when layout matters;
+- inputs by role and title, such as "the Space Sales"; when a personalization workflow default already routes this kind of request, refer to it instead of repeating it. Never copy IDs of mailboxes, Spaces, notebooks, records, or other resources from the chat; the exact ID of a Studio App the Skill calls is the one exception.
+
+Keep only procedure, format, and stable references. Leave out content from attachments, mails, web pages, or other quoted data; names of people or customers, amounts, and example records from this chat; one-off values; and failed attempts. Before the create review, tell the user in one or two sentences what the Skill will do and when it will load.
+
 ## Design the Skill
 
 ### Name
@@ -59,9 +82,10 @@ Read the draft once as if you were a different Assistant receiving it later. Che
 - the workflow can run without private conversation context;
 - instructions are direct, non-repetitive, and compatible with available capabilities;
 - examples generalize beyond the original case;
+- it holds no names of people or customers, amounts, records, or resource IDs from this conversation, except the exact ID of a Studio App it calls;
 - no surprising mutation, permission expansion, or external side effect is implied.
 
-For an existing Skill, read it first and preserve fields the user did not ask to change. Prefer a narrow correction over accumulating rules for every observed example.
+For an existing Skill, read it first and preserve fields the user did not ask to change. Prefer a narrow correction over accumulating rules for every observed example. Built-in Skills and Skills shared with others change for everyone who uses them, so change one only when you can edit it and the user wants the change for everyone. \`core.ai.skill.read\` shows your permission, and \`core.ai.skill.access.read\` shows who else can use a Skill you manage. Otherwise leave the Skill unchanged. When personalization memory is on, a correction meant only for the user can become a preference; memory saves only the user's own words, so ask the user to state the rule, such as "always write mails formally".
 
 ## Use Cloud Skill capabilities
 
@@ -82,6 +106,10 @@ Pass the exact current revision to mutations and read again after a revision con
 
 Creating, changing, and deleting Skills are reviewed mutations. Prepare the concrete content the user requested, then use the Capability review instead of asking for an extra confirmation that duplicates it.
 
+## After saving
+
+Say that the Skill now loads for matching requests and can also be selected with /skill. When a later run needs a correction, update the Skill narrowly instead of creating another one. Share it only when the user asks.
+
 ## Optional App-backed workflows
 
 A Skill can reference a reusable Studio App and its published actions instead of duplicating code. Load \`assistant-code-mode\` only when building, changing, or discovering such an App is useful. Apps may be stateless scripts, agent-only services with shared data, dashboards, or a combination. Many Skills need no code and many Apps need no Skill.
@@ -438,7 +466,7 @@ const BUILTIN_CLOUD_AI_SKILLS: AiSkillTemplate[] = [
   ASSISTANT_CODE_MODE_SKILL,
   ASSISTANT_DATA_ANALYSIS_SKILL,
   {
-    version: 6,
+    version: 7,
     key: "grids:cloud-grids",
     name: "cloud-grids",
     description:
@@ -463,7 +491,7 @@ const BUILTIN_CLOUD_AI_SKILLS: AiSkillTemplate[] = [
     instructions: SCHEDULED_TASKS_INSTRUCTIONS,
   },
   {
-    version: 2,
+    version: 3,
     key: "core:skill-creator",
     name: "skill-creator",
     description:

package/src/ai/skills.ts

@@ -562,7 +562,33 @@ async function linkedSkillProjects(skillId: string, subject: AccessSubject | nul
   return result;
 }
 
+export type AiConversationSkillUse = { name: string; description: string; turns: number; lastLoadedAt: string };
+
 export const aiSkills = {
+  /**
+   * Skills a chat loaded, from the revision snapshots its turns pinned, most recently loaded first. The caller resolves
+   * the chat for its owner first; this is the chat's own history and does not recheck current Skill access.
+   */
+  async listConversationUses(conversationId: string, limit = 50): Promise<AiConversationSkillUse[]> {
+    const rows = await sql<{ name: string; description: string; turns: number | string; last_loaded_at: Date | string }[]>`
+      SELECT snapshot.skill_name AS name,
+             (array_agg(snapshot.description ORDER BY snapshot.loaded_at DESC))[1] AS description,
+             count(*) AS turns, max(snapshot.loaded_at) AS last_loaded_at
+      FROM ai.turn_skill_snapshots snapshot
+      JOIN ai.turns turn ON turn.id = snapshot.turn_id
+      WHERE turn.conversation_id = ${conversationId}::uuid
+      GROUP BY snapshot.skill_name
+      ORDER BY max(snapshot.loaded_at) DESC, snapshot.skill_name ASC
+      LIMIT ${Math.min(Math.max(Math.floor(limit), 1), 100)}
+    `;
+    return rows.map((row) => ({
+      name: row.name,
+      description: row.description,
+      turns: Number(row.turns),
+      lastLoadedAt: (row.last_loaded_at instanceof Date ? row.last_loaded_at : new Date(row.last_loaded_at)).toISOString(),
+    }));
+  },
+
   async seedOnce(template: AiSkillTemplate): Promise<void> {
     const { fields, hash } = validateTemplate(template);
     await sql.begin(async (tx) => {

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

@@ -8,6 +8,7 @@ import { AI_MEMORY_LEARNING_DEFAULT_ENABLED } from "./prefs";
 import type { AiTurnBlock } from "./protocol";
 import { withAiShortId, withAiShortIdForDb } from "./short-id";
 import { parseAiTodoPlan } from "./todo-contracts";
+import { activeTurnWaits } from "./turn-timing";
 import type {
   AiConversation,
   AiConversationDraft,
@@ -303,10 +304,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 {
@@ -347,6 +348,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 => ({
@@ -388,10 +390,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,
@@ -777,6 +779,76 @@ const messageSearchText = (message: Message): string => {
   return text.slice(0, SEARCH_TEXT_MAX_CHARS);
 };
 
+/**
+ * Record how a turn ended on its messages when its loop could not record it: a stop while an approval waits, a run
+ * 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.
+ */
+const recordTurnEnd = async (
+  db: typeof sql,
+  input: { conversationId: string; turnId: string; reason: "aborted" | "error" },
+): Promise<void> => {
+  const replaces = input.reason === "error" ? "aborted" : null;
+  for (const table of ["ai.messages", "ai.task_messages"]) {
+    await db`
+      UPDATE ${db(table)}
+      SET loop_done_reason = ${input.reason}
+      WHERE id = (
+        SELECT id
+        FROM ${db(table)}
+        WHERE conversation_id = ${input.conversationId}
+          AND loop_id = ${input.turnId}::text
+          AND compacted_at IS NULL
+          AND kind = 'message'
+          AND role = 'assistant'
+        ORDER BY seq DESC
+        LIMIT 1
+      )
+        AND (loop_done_reason IS NULL OR loop_done_reason = ${replaces}::text)
+    `;
+    // An approved call without a result keeps the decision on the message that holds the call. A decision on a custom
+    // approval belongs to the call that asked for it.
+    await db`
+      UPDATE ${db(table)} target
+      SET meta = jsonb_set(
+        COALESCE(target.meta, '{}'::jsonb),
+        '{toolOutcomes}',
+        COALESCE(target.meta->'toolOutcomes', '{}'::jsonb) || outcomes.value
+      )
+      FROM (
+        SELECT message.id, jsonb_object_agg(approved.call_id, 'approved'::text) AS value
+        FROM (
+          SELECT DISTINCT
+            CASE
+              WHEN action.kind = 'custom_approval' THEN COALESCE(substring(action.call_id FROM '^(.*)-approval-[0-9]+$'), action.call_id)
+              ELSE action.call_id
+            END AS call_id
+          FROM ai.pending_actions action
+          WHERE action.turn_id = ${input.turnId}
+            AND action.resolved_event->>'type' = 'approval_response'
+            AND action.resolved_event->>'approved' = 'true'
+        ) approved
+        JOIN ${db(table)} message
+          ON message.conversation_id = ${input.conversationId}
+          AND message.loop_id = ${input.turnId}::text
+          AND message.role = 'assistant'
+          AND message.message->'content' @> jsonb_build_array(jsonb_build_object('type', 'tool_call', 'id', approved.call_id))
+        WHERE NOT EXISTS (
+          SELECT 1
+          FROM ${db(table)} result
+          WHERE result.conversation_id = ${input.conversationId}
+            AND result.loop_id = ${input.turnId}::text
+            AND result.role = 'tool_result'
+            AND result.message->>'callId' = approved.call_id
+        )
+        GROUP BY message.id
+      ) outcomes
+      WHERE target.id = outcomes.id
+    `;
+  }
+};
+
 /** Insert a message inside an open conversation-lock transaction and bump the conversation. */
 const insertMessageLocked = async (
   input: {
@@ -925,10 +997,14 @@ const toolMessageMeta = (
   message: Message,
   presentations: ReadonlyMap<string, AiToolPresentation> | undefined,
   rejectedToolCallIds: ReadonlySet<string> | undefined,
+  approvedToolCallIds?: ReadonlySet<string>,
 ): AiStoredMessage["meta"] => {
   if (message.role === "tool_result" && rejectedToolCallIds?.has(message.callId)) {
     return { toolOutcomes: { [message.callId]: "rejected" } };
   }
+  if (message.role === "tool_result" && approvedToolCallIds?.has(message.callId)) {
+    return { toolOutcomes: { [message.callId]: "approved" } };
+  }
   if (message.role !== "assistant" || !presentations || presentations.size === 0) return null;
   const toolPresentations = Object.fromEntries(
     message.content.flatMap((block) => {
@@ -1365,9 +1441,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
         `;
       }
     });
@@ -1377,9 +1463,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
@@ -1400,11 +1487,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
@@ -1427,17 +1515,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),
@@ -1450,50 +1542,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 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
     `;
-    const page = rows.slice(0, limit);
+    // 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,
     };
   },
 
@@ -2618,10 +2745,14 @@ export const aiConversations: AiConversationService = {
       LIMIT 1
     `;
     if (!rows[0]) return null;
+    // The waits let a reconnecting client show work time without time spent waiting for the user.
+    const waits = await activeTurnWaits(rows[0].id);
     return {
       turn: rowToTurn(rows[0]),
       liveBlocks: rowToLiveBlocks(rows[0]),
       liveSeq: Number(rows[0].live_seq ?? 0),
+      actionWaitMs: Math.max(0, Math.round(waits.actionWaitMs)),
+      waitingSince: waits.waitingSince,
     };
   },
 
@@ -2822,6 +2953,11 @@ export const aiConversations: AiConversationService = {
           AND status = 'pending'
       `;
       if (input.status !== "completed") {
+        await recordTurnEnd(tx, {
+          conversationId: input.conversationId,
+          turnId: input.turnId,
+          reason: input.status === "aborted" ? "aborted" : "error",
+        });
         await tx`
           UPDATE ai.turn_steers
           SET status = 'discarded', consumed_at = COALESCE(consumed_at, now())
@@ -2922,7 +3058,7 @@ export const aiConversations: AiConversationService = {
     }));
 
     // 3) Finalize aborts: cancel-requested turns without a live lease, and expired waits.
-    const abortedRows = await sql<{ id: string; conversation_id: string; attempt: number; live_seq: number | string }[]>`
+    const abortedRows = await sql<{ id: string; conversation_id: string; attempt: number; live_seq: number | string; stopped: boolean }[]>`
       UPDATE ai.turns
       SET status = 'aborted',
           completed_at = now(),
@@ -2939,7 +3075,7 @@ export const aiConversations: AiConversationService = {
           )
         LIMIT ${limit}
       )
-      RETURNING id, conversation_id, attempt, live_seq
+      RETURNING id, conversation_id, attempt, live_seq, cancel_requested_at IS NOT NULL AS stopped
     `;
     result.aborted = abortedRows.map((row) => ({
       conversationId: row.conversation_id,
@@ -2948,7 +3084,14 @@ export const aiConversations: AiConversationService = {
       seq: Number(row.live_seq) + 1,
     }));
 
+    // 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]) {
+      await recordTurnEnd(sql, {
+        conversationId: finalized.conversationId,
+        turnId: finalized.turnId,
+        reason: stopped.has(finalized.turnId) ? "aborted" : "error",
+      });
       await sql`
         UPDATE ai.pending_actions
         SET status = 'aborted', resolved_at = COALESCE(resolved_at, now())
@@ -3300,7 +3443,7 @@ export const aiConversations: AiConversationService = {
     append: async (message, opts) => {
       // Initial input and durable steering are already persisted transactionally before Nessi appends them.
       if (message.role === "user") return;
-      const meta = toolMessageMeta(message, input.toolPresentations, input.rejectedToolCallIds);
+      const meta = toolMessageMeta(message, input.toolPresentations, input.rejectedToolCallIds, input.approvedToolCallIds);
 
       if (input.turnId && input.leaseOwner) {
         const appended = await appendTurnOwnedMessage({