@sentry/junior 0.246.0 → 0.248.0

package/dist/api.js

@@ -1,24 +1,27 @@
-import { Et as automationEventCatalog, G as listChildAgents, Ht as getConversation, L as editEventAutomation, Mt as cancelHumanFacingPendingMessages, O as parseSlackThreadId, P as editScheduledAutomation, R as AutomationEditError, St as getEventCatalog, T as readLiveAttachment, V as resolveTaskOutcomes, g as readStats, it as getChildAgentLabel, z as eventAutomationTriggerAvailable } from "./agent-runner-DSKpHjHW.js";
-import { d as logException, p as logWarn } from "./logging-DVtMYOdD.js";
+import { K as listChildAgents, L as editEventAutomation, O as parseSlackThreadId, P as editScheduledAutomation, R as AutomationEditError, T as readLiveAttachment, V as resolveTaskOutcomes, g as readStats, ot as getChildAgentLabel, z as eventAutomationTriggerAvailable } from "./agent-runner-CnlFtbzb.js";
+import { d as logException, p as logWarn } from "./logging-OpC2jwiV.js";
 import { d as parseSlackTeamId, g as parseSlackMessageTs, l as parseSlackChannelId } from "./actor-BTtLaeWy.js";
-import { E as resolveRootConversationId, T as hasAgentTurnUsage, _ as locationFromRow, b as parseSessionSource, c as getConversationEventStore, d as getDb, f as getSqlExecutor, i as resolveViewerUser, m as withConversationEventLock, o as updateViewerDisplayName, t as findUserByEmail, u as getConversationStore, w as agentTurnUsageSchema } from "./viewer-D5hbx6TE.js";
-import { c as juniorIdentities, d as juniorDestinations, l as juniorUsers, o as conversationReadColumns, s as juniorConversations } from "./agent-invocations-BO6ddZax.js";
-import { _ as juniorConversationEvents, b as juniorCodeChanges, f as juniorConversationParticipants, g as juniorConversationMetrics, m as juniorConversationBriefs, v as juniorApiTokens, x as juniorCodeRepositories } from "./executor-bmmuRY-w.js";
+import { E as resolveRootConversationId, T as hasAgentTurnUsage, _ as locationFromRow, b as parseSessionSource, c as getConversationEventStore, d as getDb, f as getSqlExecutor, i as resolveViewerUser, m as withConversationEventLock, o as updateViewerDisplayName, t as findUserByEmail, u as getConversationStore, w as agentTurnUsageSchema, x as addAgentTurnUsage } from "./viewer-CX41TWYr.js";
+import { c as juniorIdentities, d as juniorDestinations, l as juniorUsers, o as conversationReadColumns, s as juniorConversations } from "./agent-invocations-D_YoNnAn.js";
+import { _ as juniorConversationEvents, b as juniorCodeChanges, f as juniorConversationParticipants, g as juniorConversationMetrics, m as juniorConversationBriefs, v as juniorApiTokens, x as juniorCodeRepositories } from "./executor-oIZAkQZb.js";
 import { u as contextProvenance } from "./history-Nte1oVed.js";
-import { A as requireAutomationRevision, D as sameDefinitionValue, E as readAutomationVersion, O as AutomationConflictError, Ot as loadTurnProjection, a as readScheduledAutomation, b as saveEventAutomation, dn as piMessageFromHistoryItem, g as getEventAutomation, k as automationRevision, m as eventAutomationBelongsToUser, o as saveScheduledAutomation, w as automationDefinition, x as setEventAutomationStatus } from "./tasks-B9OIjl2K.js";
-import { At as listConversationAnnotations, C as WorkspaceValidationError, M as workspaceRepoCheckoutPath, O as SANDBOX_RUNTIME, Pt as lookupSlackUser, S as updateWorkspace, St as buildSentryConversationUrl, Wt as withSlackRetries, _ as deleteWorkspace, _t as conversationNotArchivedForUser, b as listWorkspaces, bt as readLatestConversationBrief, dt as conversationArchiveTimes, ft as conversationArchivedForEmail, g as createWorkspace, gt as conversationNotArchivedForEmail, ht as conversationHasParticipantUser, jt as listConversationAnnotationsById, lt as createPluginLogger, mt as conversationHasParticipantEmail, pt as conversationArchivedForUser, u as getPlugins, ut as readConversationAccessFromSql, v as getWorkspace, vt as viewerConversationMembership, x as listWorkspacesByRepository, xt as readConversationEventPage, zt as getSlackClient } from "./agent-hooks-DpklSWZg.js";
-import { A as forkConversationBodySchema, F as INPUT_IMAGE_TYPES, O as createConversationBodySchema, P as readMessageAttachments, T as conversationStatsReportSchema, _ as conversationParamsSchema, a as cancelConversationPendingMessagesBodySchema, c as conversationAttachmentParamsSchema, d as conversationDetailReportSchema, g as conversationFeedSchema, h as conversationFeedQuerySchema, i as archiveConversationResponseSchema, j as forkConversationResponseSchema, k as createConversationMessageBodySchema, m as conversationEventsQuerySchema, o as cancelConversationPendingMessagesResponseSchema, p as conversationEventPageSchema, r as archiveConversationBodySchema, t as acceptedConversationMessageSchema, u as conversationDetailQuerySchema, x as conversationPendingMessagesReportSchema } from "./conversation-CvBG57Io.js";
-import { n as hash, t as create } from "./profile-BevMNSlr.js";
+import { A as requireAutomationRevision, D as sameDefinitionValue, E as readAutomationVersion, O as AutomationConflictError, a as readScheduledAutomation, b as saveEventAutomation, g as getEventAutomation, jt as loadTurnProjection, k as automationRevision, m as eventAutomationBelongsToUser, mn as piMessageFromHistoryItem, o as saveScheduledAutomation, w as automationDefinition, x as setEventAutomationStatus } from "./tasks-DREdnhVP.js";
+import { C as WorkspaceValidationError, Ct as readConversationEventPage, It as lookupSlackUser, Kt as withSlackRetries, M as workspaceRepoCheckoutPath, Mt as listConversationAnnotations, Nt as listConversationAnnotationsById, O as SANDBOX_RUNTIME, S as updateWorkspace, St as readLatestConversationBrief, Vt as getSlackClient, _ as deleteWorkspace, _t as conversationHasParticipantUser, b as listWorkspaces, bt as viewerConversationMembership, dt as createPluginLogger, ft as readConversationAccessFromSql, g as createWorkspace, gt as conversationHasParticipantEmail, ht as conversationArchivedForUser, mt as conversationArchivedForEmail, pt as conversationArchiveTimes, u as getPlugins, v as getWorkspace, vt as conversationNotArchivedForEmail, wt as buildSentryConversationUrl, x as listWorkspacesByRepository, yt as conversationNotArchivedForUser } from "./agent-hooks-DWCHBPYw.js";
+import { A as forkConversationBodySchema, F as readMessageAttachments, I as INPUT_IMAGE_TYPES, O as createConversationBodySchema, T as conversationStatsReportSchema, _ as conversationParamsSchema, a as cancelConversationPendingMessagesBodySchema, c as conversationAttachmentParamsSchema, d as conversationDetailReportSchema, g as conversationFeedSchema, h as conversationFeedQuerySchema, i as archiveConversationResponseSchema, j as forkConversationResponseSchema, k as createConversationMessageBodySchema, m as conversationEventsQuerySchema, o as cancelConversationPendingMessagesResponseSchema, p as conversationEventPageSchema, r as archiveConversationBodySchema, t as acceptedConversationMessageSchema, u as conversationDetailQuerySchema, x as conversationPendingMessagesReportSchema } from "./conversation-Cjo9tHGm.js";
+import { n as hash, t as create } from "./profile-Dfg76pvk.js";
+import { l as getEventCatalog, v as automationEventCatalog } from "./session-stop-dyvsZDB0.js";
 import { t as getFirstRunAtMs } from "./cadence-D00SCzT1.js";
-import { t as getCachedSnapshot } from "./resolve-qPhrznTf.js";
-import { a as getVercelConversationWorkQueue } from "./job-queue-Cz3M7gg4.js";
+import { t as getCachedSnapshot } from "./resolve-LMCZhQVg.js";
+import { a as getVercelConversationWorkQueue } from "./job-queue-DyA2AEnY.js";
+import { a as cancelHumanFacingPendingMessages, h as getConversation } from "./store-OMQAFrJG.js";
 import { M as compileScheduleIntent, P as weekdaySchema, _ as automationSummarySchema, b as automationVersionListSchema, c as automationLifecycleSchema, d as automationParamsSchema, f as automationRunListSchema, g as automationSchedulePreviewSchema, h as automationScheduleIntentSchema, i as automationExecutionListSchema, j as ScheduleIntentError, l as automationListQuerySchema, n as automationEditSchema, r as automationEventCatalogSchema, t as automationEditErrorSchema, u as automationListSchema, v as automationUpdateSchema, x as automationVersionParamsSchema, y as automationVersionActivateSchema } from "./automation-gznOMaQ2.js";
 import { C as skillReportsSchema, a as fillUtcHours, b as pluginsSchema, c as sumUtcHoursIntoSixHours, d as trailingUtcSixHourWindow, f as utcDayKey, h as pluginOperationalReportFeedSchema, i as fillUtcDays, l as trailingUtcDayWindow, m as healthReportSchema, n as DAY_MS$1, o as fillUtcSixHours, p as utcHourKey, r as HOUR_MS$1, s as startOfUtcHour, u as trailingUtcHourWindow, x as runtimeInfoReportSchema } from "./web-message-id-xPI_EFSC.js";
-import { H as readHealthReport, N as legacyWebMailboxMetadataSchema, R as createVercelAttachmentStorage, _ as readViewerAutomationRuns, a as recordWebConversationActivity, b as readViewerAutomations, d as resolveSlackConversationContextFromThreadId, g as readViewerAutomationExecutions, h as readConversationSourceTask, i as createConversationId, j as stopConversationTurn, l as getProductionSlackAdapter, m as deleteViewerTask, o as webActorFromEmail, p as ViewerTaskNotFoundError, r as createAndEnqueueConversation, t as appendAndEnqueueWebMessage, u as formatSlackConversationRedactedLabel, v as readViewerAutomationSummary, w as clearSlackPendingReactions, x as resolveViewerTaskCandidate, y as readViewerAutomationVersions } from "./web-input-0sorYVLh.js";
-import { A as conversationActiveDaysColumn, M as conversationRangeColumns, j as conversationAggregateColumns } from "./task-runner-T51kll0U.js";
-import { r as getWebAuthorization } from "./web-authorization-DCxixz5S.js";
-import { t as decodeInputImages } from "./images-DZliDtSH.js";
-import { C as locationParamsSchema, E as activitySixHours$1, L as conversationChildAgentsReportSchema, M as codePersonReportSchema, N as codeRepositoryParamsSchema, P as codeRepositoryReportSchema, R as stopConversationTurnResponseSchema, S as locationDirectoryReportSchema, T as activityHours$1, _ as actorProfileReportSchema, a as workspaceBodySchema, d as createdPersonalTokenSchema, f as personalTokenListSchema, g as actorDirectoryReportSchema, h as revokePersonalTokenResponseSchema, i as deleteWorkspaceResponseSchema, j as codeOverviewReportSchema, l as workspaceSchema, m as personalTokenParamsSchema, n as statsReportSchema, o as workspaceListSchema, s as workspaceParamsSchema, u as createPersonalTokenBodySchema, v as personParamsSchema, w as activityDays$1, x as locationDetailReportSchema, y as personalSpendReportSchema, z as apiErrorSchema } from "./schema-BWMRg8JS.js";
+import { B as readHealthReport, I as createVercelAttachmentStorage, _ as readViewerAutomationRuns, a as recordWebConversationActivity, b as readViewerAutomations, d as resolveSlackConversationContextFromThreadId, g as readViewerAutomationExecutions, h as readConversationSourceTask, i as createConversationId, j as stopConversationTurn, l as getProductionSlackAdapter, m as deleteViewerTask, o as webActorFromEmail, p as ViewerTaskNotFoundError, r as createAndEnqueueConversation, t as appendAndEnqueueWebMessage, u as formatSlackConversationRedactedLabel, v as readViewerAutomationSummary, w as clearSlackPendingReactions, x as resolveViewerTaskCandidate, y as readViewerAutomationVersions } from "./web-input-Bn9HHZEo.js";
+import { A as conversationActiveDaysColumn, M as conversationRangeColumns, j as conversationAggregateColumns } from "./task-runner-BOxv7shv.js";
+import { d as legacyWebMailboxMetadataSchema } from "./result-C1ZCRPLx.js";
+import { r as getWebAuthorization } from "./web-authorization-rDLlKIS0.js";
+import { t as decodeInputImages } from "./images-Dzh3RBXY.js";
+import { C as locationParamsSchema, E as activitySixHours$1, L as conversationChildAgentsReportSchema, M as codePersonReportSchema, N as codeRepositoryParamsSchema, P as codeRepositoryReportSchema, R as stopConversationTurnResponseSchema, S as locationDirectoryReportSchema, T as activityHours$1, _ as actorProfileReportSchema, a as workspaceBodySchema, d as createdPersonalTokenSchema, f as personalTokenListSchema, g as actorDirectoryReportSchema, h as revokePersonalTokenResponseSchema, i as deleteWorkspaceResponseSchema, j as codeOverviewReportSchema, l as workspaceSchema, m as personalTokenParamsSchema, n as statsReportSchema, o as workspaceListSchema, s as workspaceParamsSchema, u as createPersonalTokenBodySchema, v as personParamsSchema, w as activityDays$1, x as locationDetailReportSchema, y as personalSpendReportSchema, z as apiErrorSchema } from "./schema-BRZsYL5-.js";
 import { Hono } from "hono";
 import path from "node:path";
 import { z } from "zod";
@@ -131,6 +134,39 @@ async function archiveConversation(viewer, conversationId, body) {
 	throwApiError(409, "Conversation received new activity.");
 }
 //#endregion
+//#region src/chat/conversations/sql/subtree.ts
+/** Columns of the `conversation_subtree` table that `conversationSubtree` returns. */
+const conversationSubtreeColumns = {
+	conversationId: sql`conversation_subtree.conversation_id`,
+	scopeConversationId: sql`conversation_subtree.scope_conversation_id`
+};
+/**
+* Return a joinable `conversation_subtree` table. It maps each selected
+* Conversation to itself and to each descendant child Conversation at any
+* depth. Reports use it so that a total for a Conversation always includes the
+* work of all its child agents.
+*
+* A descendant must have the same root as the selected Conversation. Thus a
+* Conversation that has no valid root gets only its own work.
+*/
+function conversationSubtree(conversationIds) {
+	const selectedIds = sql.join(conversationIds.map((conversationId) => sql`${conversationId}`), sql`, `);
+	return sql`(
+    with recursive tree(scope_conversation_id, conversation_id, root_conversation_id) as (
+      select selected.conversation_id, selected.conversation_id, selected.root_conversation_id
+      from junior_conversations selected
+      where selected.conversation_id in (${selectedIds})
+      union
+      select tree.scope_conversation_id, child.conversation_id, child.root_conversation_id
+      from junior_conversations child
+      join tree
+        on child.parent_conversation_id = tree.conversation_id
+        and child.root_conversation_id = tree.root_conversation_id
+    )
+    select scope_conversation_id, conversation_id from tree
+  ) conversation_subtree`;
+}
+//#endregion
 //#region src/chat/conversations/fork.ts
 /** Event key of the agent note that follows the copied events in a fork. */
 const FORK_NOTE_KEY = "fork:note";
@@ -282,7 +318,6 @@ function hasUnfinishedToolCalls(messages) {
 }
 //#endregion
 //#region src/api/conversations/auxiliary-costs.ts
-const auxiliaryRootConversation = alias(juniorConversations, "auxiliary_root_conversation");
 function eventCost() {
 	return sql`CASE
     WHEN ${juniorConversationEvents.type} = 'structured_event'
@@ -294,14 +329,17 @@ function eventCost() {
     ELSE NULL
   END`;
 }
-/** Aggregate additive event costs by namespaced operation for conversations. */
-async function readConversationAuxiliaryCostsFromSql(db, conversationIds, options) {
+function addCostUsd(left, right) {
+	return Math.round((left + right) * 0xe8d4a51000) / 0xe8d4a51000;
+}
+/**
+* Aggregate additive event costs by namespaced operation. The total for each
+* selected Conversation includes itself and all its child agents at any depth.
+*/
+async function readConversationAuxiliaryCostsFromSql(db, conversationIds) {
 	if (conversationIds.length === 0) return /* @__PURE__ */ new Map();
-	const selectedIds = [...conversationIds];
-	const conversationId = options.includeDescendants ? sql`coalesce(
-        ${auxiliaryRootConversation.conversationId},
-        ${juniorConversations.conversationId}
-      )` : sql`${juniorConversations.conversationId}`;
+	const scopeConversationId = conversationSubtreeColumns.scopeConversationId;
+	const isChildAgent = sql`(${conversationSubtreeColumns.conversationId} <> ${scopeConversationId})`;
 	const namespace = sql`CASE
     WHEN ${juniorConversationEvents.type} = 'structured_event'
       THEN ${juniorConversationEvents.payload}->>'namespace'
@@ -313,22 +351,23 @@ async function readConversationAuxiliaryCostsFromSql(db, conversationIds, option
     ELSE ${juniorConversationEvents.type}
   END`;
 	const cost = eventCost();
-	const selectedConversation = options.includeDescendants ? or(and(inArray(juniorConversations.rootConversationId, selectedIds), isNotNull(auxiliaryRootConversation.conversationId)), inArray(juniorConversations.conversationId, selectedIds)) : inArray(juniorConversations.conversationId, selectedIds);
 	const rows = await db.select({
-		conversationId,
+		conversationId: scopeConversationId,
+		childAgentCostUsd: sql`coalesce(round(sum(case when ${isChildAgent} then ${cost} end), 12), 0)::double precision`.mapWith(Number),
 		costUsd: sql`round(sum(${cost}), 12)::double precision`.mapWith(Number),
 		events: sql`count(*)::integer`.mapWith(Number),
 		name,
 		namespace
-	}).from(juniorConversationEvents).innerJoin(juniorConversations, eq(juniorConversations.conversationId, juniorConversationEvents.conversationId)).leftJoin(auxiliaryRootConversation, and(eq(auxiliaryRootConversation.conversationId, juniorConversations.rootConversationId), isNull(auxiliaryRootConversation.parentConversationId), eq(auxiliaryRootConversation.rootConversationId, auxiliaryRootConversation.conversationId))).where(and(selectedConversation, or(eq(juniorConversationEvents.type, "structured_event"), inArray(juniorConversationEvents.type, ["guardian_action_reviewed", "turn_routed"])), sql`${cost} >= 0`, notCopiedByFork())).groupBy(conversationId, namespace, name).orderBy(conversationId, namespace, name);
+	}).from(juniorConversationEvents).innerJoin(conversationSubtree(conversationIds), eq(conversationSubtreeColumns.conversationId, juniorConversationEvents.conversationId)).where(and(or(eq(juniorConversationEvents.type, "structured_event"), inArray(juniorConversationEvents.type, ["guardian_action_reviewed", "turn_routed"])), sql`${cost} >= 0`, notCopiedByFork())).groupBy(scopeConversationId, namespace, name).orderBy(scopeConversationId, namespace, name);
 	const result = /* @__PURE__ */ new Map();
 	for (const row of rows) {
-		const current = result.get(row.conversationId) ?? {
+		const current = result.get(row.conversationId) ?? { total: {
 			costUsd: 0,
 			operations: []
-		};
-		current.costUsd = Math.round((current.costUsd + row.costUsd) * 0xe8d4a51000) / 0xe8d4a51000;
-		current.operations.push({
+		} };
+		current.total.costUsd = addCostUsd(current.total.costUsd, row.costUsd);
+		if (row.childAgentCostUsd > 0) current.childAgentCostUsd = addCostUsd(current.childAgentCostUsd ?? 0, row.childAgentCostUsd);
+		current.total.operations.push({
 			costUsd: row.costUsd,
 			events: row.events,
 			name: row.name,
@@ -339,20 +378,119 @@ async function readConversationAuxiliaryCostsFromSql(db, conversationIds, option
 	return result;
 }
 //#endregion
-//#region src/api/conversations/child-agents.ts
-/** Read the runtime and usage saved on each child Conversation row. */
-async function readChildConversationMetrics(db, conversationIds) {
-	const rows = conversationIds.length === 0 ? [] : await db.select({
-		conversationId: juniorConversations.conversationId,
-		durationMs: juniorConversations.durationMs,
-		usage: juniorConversations.usage
-	}).from(juniorConversations).where(inArray(juniorConversations.conversationId, [...conversationIds]));
-	return new Map(rows.map((row) => [row.conversationId, {
-		cumulativeDurationMs: row.durationMs,
-		...row.usage ? { cumulativeUsage: row.usage } : void 0
-	}]));
+//#region src/api/conversations/usage.ts
+const usage$1 = juniorConversations.usage;
+const componentFields = [
+	"inputTokens",
+	"outputTokens",
+	"cachedInputTokens",
+	"cacheCreationTokens"
+];
+function summedUsageNumber(field) {
+	return sql`sum((${usage$1}->>${field})::double precision)::double precision`;
+}
+function summedCostNumber(field) {
+	return sql`round(
+    sum((${usage$1}->'cost'->>${field})::numeric),
+    12
+  )::double precision`;
+}
+function usageFromAggregate(row) {
+	const components = {};
+	let componentTotal = 0;
+	for (const field of componentFields) {
+		const value = row[field];
+		if (value === null) continue;
+		components[field] = value;
+		componentTotal += value;
+	}
+	const cost = {
+		...row.costInput === null ? void 0 : { input: row.costInput },
+		...row.costOutput === null ? void 0 : { output: row.costOutput },
+		...row.costCacheRead === null ? void 0 : { cacheRead: row.costCacheRead },
+		...row.costCacheWrite === null ? void 0 : { cacheWrite: row.costCacheWrite },
+		...row.costTotal === null ? void 0 : { total: row.costTotal }
+	};
+	const result = {
+		...row.totalOnlyTokens === null ? components : { totalTokens: row.totalOnlyTokens + componentTotal },
+		...row.reasoningTokens === null ? void 0 : { reasoningTokens: row.reasoningTokens },
+		...Object.keys(cost).length === 0 ? void 0 : { cost }
+	};
+	return hasAgentTurnUsage(result) ? result : void 0;
+}
+/**
+* Aggregate saved runtime and usage in PostgreSQL. The total for each selected
+* Conversation includes itself and all its child agents at any depth.
+*/
+async function readConversationTreeMetricsFromSql(db, conversationIds) {
+	if (conversationIds.length === 0) return /* @__PURE__ */ new Map();
+	const hasComponents = sql`coalesce(
+    ${usage$1}->>'inputTokens',
+    ${usage$1}->>'outputTokens',
+    ${usage$1}->>'cachedInputTokens',
+    ${usage$1}->>'cacheCreationTokens'
+  ) is not null`;
+	const isChildAgent = sql`(${conversationSubtreeColumns.conversationId} <> ${conversationSubtreeColumns.scopeConversationId})`;
+	const rows = await db.select({
+		scopeConversationId: conversationSubtreeColumns.scopeConversationId,
+		isChildAgent,
+		conversations: sql`count(*)::integer`.mapWith(Number),
+		durationMs: sql`coalesce(sum(${juniorConversations.durationMs}), 0)::double precision`,
+		inputTokens: summedUsageNumber("inputTokens"),
+		outputTokens: summedUsageNumber("outputTokens"),
+		cachedInputTokens: summedUsageNumber("cachedInputTokens"),
+		cacheCreationTokens: summedUsageNumber("cacheCreationTokens"),
+		totalOnlyTokens: sql`sum(
+        case
+          when not (${hasComponents})
+          then (${usage$1}->>'totalTokens')::double precision
+        end
+      )::double precision`,
+		reasoningTokens: summedUsageNumber("reasoningTokens"),
+		costInput: summedCostNumber("input"),
+		costOutput: summedCostNumber("output"),
+		costCacheRead: summedCostNumber("cacheRead"),
+		costCacheWrite: summedCostNumber("cacheWrite"),
+		costTotal: summedCostNumber("total")
+	}).from(juniorConversations).innerJoin(conversationSubtree(conversationIds), eq(conversationSubtreeColumns.conversationId, juniorConversations.conversationId)).groupBy(conversationSubtreeColumns.scopeConversationId, isChildAgent);
+	const ownRows = /* @__PURE__ */ new Map();
+	const childRows = /* @__PURE__ */ new Map();
+	for (const row of rows) (row.isChildAgent ? childRows : ownRows).set(row.scopeConversationId, row);
+	const result = /* @__PURE__ */ new Map();
+	for (const [conversationId, own] of ownRows) {
+		const ownUsage = usageFromAggregate(own);
+		const child = childRows.get(conversationId);
+		const childUsage = child ? usageFromAggregate(child) : void 0;
+		const usage = addAgentTurnUsage(ownUsage, childUsage);
+		result.set(conversationId, {
+			durationMs: own.durationMs + (child?.durationMs ?? 0),
+			...usage ? { usage } : void 0,
+			...child ? { childAgents: {
+				count: child.conversations,
+				durationMs: child.durationMs,
+				...childUsage ? { usage: childUsage } : void 0
+			} } : void 0
+		});
+	}
+	return result;
 }
 /**
+* Project the child agent part of tree metrics into the API shape. Return
+* nothing when the Conversation has no child agents.
+*/
+function childAgentTotalsReport(metrics, auxiliaryCosts) {
+	const childAgents = metrics?.childAgents;
+	if (!childAgents) return void 0;
+	return {
+		...auxiliaryCosts?.childAgentCostUsd === void 0 ? void 0 : { auxiliaryCostUsd: auxiliaryCosts.childAgentCostUsd },
+		count: childAgents.count,
+		cumulativeDurationMs: childAgents.durationMs,
+		...childAgents.usage ? { cumulativeUsage: childAgents.usage } : void 0
+	};
+}
+//#endregion
+//#region src/api/conversations/child-agents.ts
+/**
 * Load the direct child agents of one Conversation, or throw a standard API
 * not-found error. Viewers who cannot see private content get only the status,
 * time, and usage of each child agent.
@@ -363,14 +501,17 @@ async function requireConversationChildAgents(conversationId, options = {}) {
 	const [accessByConversation, children] = await Promise.all([readConversationAccessFromSql(db, [conversationId], options.viewer), listChildAgents(conversationId)]);
 	const canExposePayload = accessByConversation.get(conversationId)?.canViewPrivateContent ?? false;
 	const childIds = children.map((agent) => agent.childConversationId);
-	const [metricsByChild, auxiliaryCostsByChild] = await Promise.all([readChildConversationMetrics(db, childIds), readConversationAuxiliaryCostsFromSql(db, childIds, { includeDescendants: false })]);
+	const [metricsByChild, auxiliaryCostsByChild] = await Promise.all([readConversationTreeMetricsFromSql(db, childIds), readConversationAuxiliaryCostsFromSql(db, childIds)]);
 	const agents = children.map((agent) => {
+		const metrics = metricsByChild.get(agent.childConversationId);
 		const auxiliaryCosts = auxiliaryCostsByChild.get(agent.childConversationId);
+		const childAgentTotals = childAgentTotalsReport(metrics, auxiliaryCosts);
 		return {
 			conversationId: agent.childConversationId,
-			cumulativeDurationMs: 0,
-			...metricsByChild.get(agent.childConversationId),
-			...auxiliaryCosts ? { auxiliaryCosts } : void 0,
+			cumulativeDurationMs: metrics?.durationMs ?? 0,
+			...metrics?.usage ? { cumulativeUsage: metrics.usage } : void 0,
+			...auxiliaryCosts ? { auxiliaryCosts: auxiliaryCosts.total } : void 0,
+			...childAgentTotals ? { childAgentTotals } : void 0,
 			status: agent.status,
 			updatedAt: new Date(agent.updatedAtMs).toISOString(),
 			...canExposePayload ? {
@@ -642,8 +783,8 @@ async function resolveSlackTeamDomains(teamIds) {
 //#region src/chat/pi/sql-model-usage.ts
 /** SQL reporting adapter for usage stored on assistant history events. */
 const message = sql`${juniorConversationEvents.payload}`;
-const usage$1 = sql`${message}->'usage'`;
-const cost = sql`${usage$1}->'cost'`;
+const usage = sql`${message}->'usage'`;
+const cost = sql`${usage}->'cost'`;
 function nonnegativeNumber(source, field, fallbackField, floor = false) {
 	const value = (name) => sql`case
       when jsonb_typeof(${source}->${name}) = 'number'
@@ -654,7 +795,7 @@ function nonnegativeNumber(source, field, fallbackField, floor = false) {
 	return fallbackField ? sql`coalesce(${primary}, ${value(fallbackField)})` : sql`${primary}`;
 }
 function token(field, fallbackField) {
-	return nonnegativeNumber(usage$1, field, fallbackField, true);
+	return nonnegativeNumber(usage, field, fallbackField, true);
 }
 function summed(value) {
 	return sql`sum(${value})::double precision`;
@@ -703,8 +844,9 @@ function usageFromRow(row) {
 	return hasAgentTurnUsage(result) ? agentTurnUsageSchema.parse(result) : void 0;
 }
 /**
-* Aggregate real assistant calls by provider/model in SQL. Replayed history is
-* not another call; its tokens appear in the next call's input usage.
+* Aggregate real assistant calls by provider/model in SQL, for one
+* Conversation and all its child agents at any depth. Replayed history is not
+* another call; its tokens appear in the next call's input usage.
 */
 async function readConversationModelUsageFromSql(executor, options) {
 	const modelId = sql`case
@@ -734,7 +876,7 @@ async function readConversationModelUsageFromSql(executor, options) {
 		costCacheRead: summedCost(nonnegativeNumber(cost, "cacheRead")),
 		costCacheWrite: summedCost(nonnegativeNumber(cost, "cacheWrite")),
 		costTotal: summedCost(nonnegativeNumber(cost, "total"))
-	}).from(juniorConversationEvents).innerJoin(juniorConversations, eq(juniorConversations.conversationId, juniorConversationEvents.conversationId)).where(and(options.includeDescendants ? eq(juniorConversations.rootConversationId, options.conversationId) : eq(juniorConversationEvents.conversationId, options.conversationId), eq(juniorConversationEvents.type, "assistant_message"), notCopiedByFork(), sql`jsonb_typeof(${message}->'provider') = 'string'`, sql`jsonb_typeof(${message}->'model') = 'string'`, sql`coalesce(${message}->>'provider', '') <> ''`, sql`coalesce(${message}->>'model', '') <> ''`)).groupBy(modelId).orderBy(modelId)).flatMap((row) => {
+	}).from(juniorConversationEvents).innerJoin(conversationSubtree([options.conversationId]), eq(conversationSubtreeColumns.conversationId, juniorConversationEvents.conversationId)).where(and(eq(juniorConversationEvents.type, "assistant_message"), notCopiedByFork(), sql`jsonb_typeof(${message}->'provider') = 'string'`, sql`jsonb_typeof(${message}->'model') = 'string'`, sql`coalesce(${message}->>'provider', '') <> ''`, sql`coalesce(${message}->>'model', '') <> ''`)).groupBy(modelId).orderBy(modelId)).flatMap((row) => {
 		const modelUsage = usageFromRow(row);
 		return modelUsage ? [{
 			modelId: row.modelId,
@@ -925,6 +1067,7 @@ function conversationSummaryFromStoredConversation(args) {
 		surface,
 		...args.auxiliaryCosts ? { auxiliaryCosts: args.auxiliaryCosts } : void 0,
 		...usage ? { cumulativeUsage: usage } : void 0,
+		...args.childAgentTotals ? { childAgentTotals: args.childAgentTotals } : void 0,
 		...actorIdentity ? { actorIdentity } : void 0,
 		...locationUrl ? { locationUrl } : void 0,
 		archivedAt: args.archivedAtMs === void 0 ? null : new Date(args.archivedAtMs).toISOString(),
@@ -935,86 +1078,6 @@ function conversationSummaryFromStoredConversation(args) {
 	};
 }
 //#endregion
-//#region src/api/conversations/usage.ts
-const usage = juniorConversations.usage;
-const metricRootConversation = alias(juniorConversations, "metric_root_conversation");
-const componentFields = [
-	"inputTokens",
-	"outputTokens",
-	"cachedInputTokens",
-	"cacheCreationTokens"
-];
-function summedUsageNumber(field) {
-	return sql`sum((${usage}->>${field})::double precision)::double precision`;
-}
-function summedCostNumber(field) {
-	return sql`round(
-    sum((${usage}->'cost'->>${field})::numeric),
-    12
-  )::double precision`;
-}
-function usageFromAggregate(row) {
-	const components = {};
-	let componentTotal = 0;
-	for (const field of componentFields) {
-		const value = row[field];
-		if (value === null) continue;
-		components[field] = value;
-		componentTotal += value;
-	}
-	const cost = {
-		...row.costInput === null ? void 0 : { input: row.costInput },
-		...row.costOutput === null ? void 0 : { output: row.costOutput },
-		...row.costCacheRead === null ? void 0 : { cacheRead: row.costCacheRead },
-		...row.costCacheWrite === null ? void 0 : { cacheWrite: row.costCacheWrite },
-		...row.costTotal === null ? void 0 : { total: row.costTotal }
-	};
-	const result = {
-		...row.totalOnlyTokens === null ? components : { totalTokens: row.totalOnlyTokens + componentTotal },
-		...row.reasoningTokens === null ? void 0 : { reasoningTokens: row.reasoningTokens },
-		...Object.keys(cost).length === 0 ? void 0 : { cost }
-	};
-	return hasAgentTurnUsage(result) ? result : void 0;
-}
-/** Aggregate persisted metrics in PostgreSQL for selected conversation trees. */
-async function readRootConversationMetricsFromSql(db, rootConversationIds) {
-	if (rootConversationIds.length === 0) return /* @__PURE__ */ new Map();
-	const hasComponents = sql`coalesce(
-    ${usage}->>'inputTokens',
-    ${usage}->>'outputTokens',
-    ${usage}->>'cachedInputTokens',
-    ${usage}->>'cacheCreationTokens'
-  ) is not null`;
-	const rows = await db.select({
-		rootConversationId: juniorConversations.rootConversationId,
-		durationMs: sql`coalesce(sum(${juniorConversations.durationMs}), 0)::double precision`,
-		inputTokens: summedUsageNumber("inputTokens"),
-		outputTokens: summedUsageNumber("outputTokens"),
-		cachedInputTokens: summedUsageNumber("cachedInputTokens"),
-		cacheCreationTokens: summedUsageNumber("cacheCreationTokens"),
-		totalOnlyTokens: sql`sum(
-        case
-          when not (${hasComponents})
-          then (${usage}->>'totalTokens')::double precision
-        end
-      )::double precision`,
-		reasoningTokens: summedUsageNumber("reasoningTokens"),
-		costInput: summedCostNumber("input"),
-		costOutput: summedCostNumber("output"),
-		costCacheRead: summedCostNumber("cacheRead"),
-		costCacheWrite: summedCostNumber("cacheWrite"),
-		costTotal: summedCostNumber("total")
-	}).from(juniorConversations).innerJoin(metricRootConversation, and(eq(metricRootConversation.conversationId, juniorConversations.rootConversationId), isNull(metricRootConversation.parentConversationId), eq(metricRootConversation.rootConversationId, metricRootConversation.conversationId))).where(inArray(juniorConversations.rootConversationId, [...rootConversationIds])).groupBy(juniorConversations.rootConversationId);
-	return new Map(rows.flatMap((row) => {
-		if (!row.rootConversationId) return [];
-		const usage = usageFromAggregate(row);
-		return [[row.rootConversationId, {
-			durationMs: row.durationMs,
-			...usage ? { usage } : void 0
-		}]];
-	}));
-}
-//#endregion
 //#region src/chat/plugins/unfinished-work.ts
 /**
 * Return assigned and unfinished plugin work for the candidate conversations.
@@ -1333,8 +1396,8 @@ async function readConversationFeedFromSql(options = {}) {
 		readConversationAccessFromSql(db, conversationIds, options.viewer),
 		conversationArchiveTimes(db, conversationIds, filter?.kind === "viewer" ? { userId: filter.userId } : filter?.kind === "actorEmail" ? { email: filter.email } : void 0),
 		listConversationAnnotationsById(db, conversationIds),
-		readConversationAuxiliaryCostsFromSql(db, conversationIds, { includeDescendants: true }),
-		readRootConversationMetricsFromSql(db, conversationIds),
+		readConversationAuxiliaryCostsFromSql(db, conversationIds),
+		readConversationTreeMetricsFromSql(db, conversationIds),
 		readConversationParticipants(db, conversationIds),
 		resolveSlackTeamDomains(conversations.flatMap((conversation) => conversation.location?.provider === "slack" ? [conversation.location.teamId] : [])),
 		listConversationWork(conversationIds),
@@ -1349,12 +1412,15 @@ async function readConversationFeedFromSql(options = {}) {
 			const row = rows[index];
 			const access = accessByConversation.get(conversation.conversationId);
 			const metrics = metricsByRoot.get(conversation.conversationId);
+			const auxiliaryCosts = auxiliaryCostsByRoot.get(conversation.conversationId);
+			const childAgentTotals = childAgentTotalsReport(metrics, auxiliaryCosts);
 			const archivedAtMs = archiveTimesByConversation.get(conversation.conversationId);
 			const summary = conversationSummaryFromStoredConversation({
 				...archivedAtMs === void 0 ? void 0 : { archivedAtMs },
 				conversation,
 				access,
-				auxiliaryCosts: auxiliaryCostsByRoot.get(conversation.conversationId),
+				auxiliaryCosts: auxiliaryCosts?.total,
+				...childAgentTotals ? { childAgentTotals } : void 0,
 				durationMs: metrics?.durationMs ?? row.conversation.durationMs,
 				teamDomainByTeamId,
 				...row.location?.visibility === "public" ? { locationId: row.location.id } : void 0,
@@ -1507,6 +1573,7 @@ function projectConversationDetail(args) {
 			access: args.access,
 			...args.archivedAtMs === void 0 ? void 0 : { archivedAtMs: args.archivedAtMs },
 			auxiliaryCosts: args.auxiliaryCosts,
+			...args.childAgentTotals ? { childAgentTotals: args.childAgentTotals } : void 0,
 			conversation,
 			durationMs: args.durationMs,
 			...args.locationId ? { locationId: args.locationId } : void 0,
@@ -1537,17 +1604,13 @@ async function readConversationDetailFromSql(conversationId, options) {
 	if (!record) return void 0;
 	const archivedAtMs = options.viewer ? await readConversationArchivedAt(options.viewer, conversationId) : void 0;
 	const executor = getSqlExecutor();
-	const includeDescendantMetrics = record.rootConversationId === conversationId;
-	const [accessByConversation, annotations, auxiliaryCostsByConversation, briefVersion, modelUsage, metricsByRoot, participantsByConversation, sourceTask, teamDomainByTeamId] = await Promise.all([
+	const [accessByConversation, annotations, auxiliaryCostsByConversation, briefVersion, modelUsage, metricsByConversation, participantsByConversation, sourceTask, teamDomainByTeamId] = await Promise.all([
 		readConversationAccessFromSql(getDb(), [conversationId], options.viewer),
 		listConversationAnnotations(getDb(), conversationId),
-		readConversationAuxiliaryCostsFromSql(getDb(), [conversationId], { includeDescendants: includeDescendantMetrics }),
+		readConversationAuxiliaryCostsFromSql(getDb(), [conversationId]),
 		readLatestConversationBrief(getDb(), conversationId),
-		record.conversation.transcriptPurgedAtMs === void 0 ? readConversationModelUsageFromSql(executor, {
-			conversationId,
-			includeDescendants: includeDescendantMetrics
-		}) : Promise.resolve([]),
-		readRootConversationMetricsFromSql(getDb(), includeDescendantMetrics ? [conversationId] : []),
+		record.conversation.transcriptPurgedAtMs === void 0 ? readConversationModelUsageFromSql(executor, { conversationId }) : Promise.resolve([]),
+		readConversationTreeMetricsFromSql(getDb(), [conversationId]),
 		readConversationParticipants(getDb(), [conversationId]),
 		readConversationSourceTask({
 			conversationId,
@@ -1562,14 +1625,17 @@ async function readConversationDetailFromSql(conversationId, options) {
 		conversationId,
 		limit: options.limit
 	}) : { events: [] };
-	const metrics = metricsByRoot.get(conversationId);
+	const metrics = metricsByConversation.get(conversationId);
+	const auxiliaryCosts = auxiliaryCostsByConversation.get(conversationId);
+	const childAgentTotals = childAgentTotalsReport(metrics, auxiliaryCosts);
 	return projectConversationDetail({
 		...record,
 		access,
 		...archivedAtMs === void 0 ? void 0 : { archivedAtMs },
 		annotations,
 		sidebarAnnotations,
-		auxiliaryCosts: auxiliaryCostsByConversation.get(conversationId),
+		auxiliaryCosts: auxiliaryCosts?.total,
+		...childAgentTotals ? { childAgentTotals } : void 0,
 		...briefVersion ? { brief: {
 			content: briefVersion.content,
 			updatedAt: briefVersion.createdAt.toISOString(),
@@ -3118,7 +3184,7 @@ async function readLocationDetailFromSql(locationId, options = {}) {
 	const activity = activityDays$1(days, nowMs, ACTIVITY_DAYS$1);
 	const hourlyActivity = activityHours$1(hours, nowMs);
 	const recentConversationIds = recentRows.map((row) => row.conversationId);
-	const [accessByConversation, metricsByRoot] = await Promise.all([readConversationAccessFromSql(getDb(), recentConversationIds, options.viewer), readRootConversationMetricsFromSql(getDb(), recentConversationIds)]);
+	const [accessByConversation, metricsByRoot] = await Promise.all([readConversationAccessFromSql(getDb(), recentConversationIds, options.viewer), readConversationTreeMetricsFromSql(getDb(), recentConversationIds)]);
 	return {
 		...location,
 		activityDays: activity,
@@ -3515,7 +3581,7 @@ async function readPeoplePluginReports(args) {
 		reports: [],
 		source: "plugins"
 	});
-	const { getPluginProfileReports } = await import("./agent-hooks-DpklSWZg.js").then((n) => n.t);
+	const { getPluginProfileReports } = await import("./agent-hooks-DWCHBPYw.js").then((n) => n.t);
 	return pluginOperationalReportFeedSchema.parse({
 		generatedAt: new Date(nowMs).toISOString(),
 		reports: await getPluginProfileReports({
@@ -3666,7 +3732,7 @@ async function readPeopleProfileFromSql(email, options = {}) {
 	const surfaces = /* @__PURE__ */ new Map();
 	for (const row of surfaceRows) addAggregate(surfaces, surfaceLabel(row.surface), row);
 	const recentConversationIds = recentRows.map((row) => row.conversationId);
-	const [accessByConversation, metricsByRoot] = await Promise.all([readConversationAccessFromSql(getDb(), recentConversationIds, options.viewer), readRootConversationMetricsFromSql(getDb(), recentConversationIds)]);
+	const [accessByConversation, metricsByRoot] = await Promise.all([readConversationAccessFromSql(getDb(), recentConversationIds, options.viewer), readConversationTreeMetricsFromSql(getDb(), recentConversationIds)]);
 	return {
 		activityDays: activityDays(days, nowMs),
 		activityHours: activityHours(hours, nowMs),
@@ -4483,7 +4549,7 @@ function readDescriptionText(home) {
 }
 /** Read discovered skill names for authenticated runtime diagnostics. */
 async function readSkillReports() {
-	const { discoverSkills } = await import("./skills-C6zJbudq.js").then((n) => n.o);
+	const { discoverSkills } = await import("./skills-BgGiQt5Y.js").then((n) => n.o);
 	const skills = await discoverSkills();
 	return skillReportsSchema.parse(skills.map((skill) => ({
 		name: skill.name,
@@ -4492,7 +4558,7 @@ async function readSkillReports() {
 }
 /** Read safe configured plugin metadata for authenticated runtime diagnostics. */
 async function readPlugins() {
-	const { pluginCatalogRuntime } = await import("./catalog-runtime-CTaQXYqS.js").then((n) => n.t);
+	const { pluginCatalogRuntime } = await import("./catalog-runtime-CTBsdSam.js").then((n) => n.t);
 	return pluginsSchema.parse(pluginCatalogRuntime.getProviders().map((plugin) => ({
 		configKeys: plugin.manifest.configKeys ?? [],
 		description: plugin.manifest.description,
@@ -4504,7 +4570,7 @@ async function readPlugins() {
 async function readRuntimeInfoReport() {
 	const [{ homeDir }, { pluginCatalogRuntime }, plugins, skills] = await Promise.all([
 		import("./package-discovery-BVvSnQBB.js").then((n) => n.r),
-		import("./catalog-runtime-CTaQXYqS.js").then((n) => n.t),
+		import("./catalog-runtime-CTBsdSam.js").then((n) => n.t),
 		readPlugins(),
 		readSkillReports()
 	]);
@@ -4521,7 +4587,7 @@ async function readRuntimeInfoReport() {
 /** Read sanitized operational summaries contributed by plugins. */
 async function readPluginOperationalReportFeed() {
 	const nowMs = Date.now();
-	const { getPluginOperationalReports } = await import("./agent-hooks-DpklSWZg.js").then((n) => n.t);
+	const { getPluginOperationalReports } = await import("./agent-hooks-DWCHBPYw.js").then((n) => n.t);
 	return pluginOperationalReportFeedSchema.parse({
 		source: "plugins",
 		generatedAt: new Date(nowMs).toISOString(),

package/dist/{app-BYB7szGb.d.ts → app-B0gT1Slp.d.ts}

@@ -9,10 +9,10 @@ import { z } from "zod";
 import { Destination, OwnedObjectAnnotation, PluginRegistration, Source, User } from "@sentry/junior-plugin-api";
 import "@earendil-works/pi-agent-core";
 import "@earendil-works/pi-ai";
+import "@sinclair/typebox";
 import { Sandbox } from "@vercel/sandbox";
 import { Client } from "@modelcontextprotocol/sdk/client";
 import "@modelcontextprotocol/sdk/client/auth.js";
-import "@sinclair/typebox";
 import { Message, StateAdapter } from "chat";
 import "@chat-adapter/slack";
 //#region src/chat/reasoning-level.d.ts
@@ -67,6 +67,8 @@ interface RuntimeLimits {
   maxSlicesPerTurn?: number;
   /** Tool calls one turn may make. */
   maxToolCallsPerTurn?: number;
+  /** Model spend in whole USD one turn may use. */
+  maxTurnCostUsd?: number;
   /** Agent turn deadline in ms. The function duration still caps it. */
   turnTimeoutMs?: number;
 }
@@ -155,7 +157,14 @@ interface InboxAttempt {
   ack(): Promise<void>;
   conversationId: string;
   destination?: Destination;
-  drain(handle: (messages: InboundMessage[]) => Promise<readonly string[] | void>): Promise<InboundMessage[]>;
+  /**
+   * Give pending mailbox messages to the active Turn. By default only
+   * `interrupt` messages for this attempt are offered. With `deferred`, every
+   * pending message is offered, and the handler owns Actor and Source scoping.
+   */
+  drain(handle: (messages: InboundMessage[]) => Promise<readonly string[] | void>, options?: {
+    deferred?: boolean;
+  }): Promise<InboundMessage[]>;
   isFinalAttempt: boolean;
   messages: InboundMessage[];
 }

package/dist/app.d.ts

@@ -1,4 +1,4 @@
-import { i as ModelProfileInput, n as createApp, r as JuniorDashboardOptions, t as JuniorAppOptions } from "./app-BYB7szGb.js";
+import { i as ModelProfileInput, n as createApp, r as JuniorDashboardOptions, t as JuniorAppOptions } from "./app-B0gT1Slp.js";
 import { i as defineJuniorPlugins, n as JuniorPluginSet, r as JuniorPluginSetOptions, t as JuniorPluginInput } from "./plugins-CjfUP5gJ.js";
 import { t as JUNIOR_VERSION } from "./version-CnXZ614E.js";
 export { JUNIOR_VERSION, JuniorAppOptions, type JuniorDashboardOptions, type JuniorPluginInput, type JuniorPluginSet, type JuniorPluginSetOptions, type ModelProfileInput, createApp, defineJuniorPlugins };