@sentry/junior 0.210.2 → 0.212.0

package/dist/{agent-hooks-BYZAFpgB.js → agent-hooks-B2Yt2b88.js}

@@ -1,16 +1,16 @@
 import { t as __exportAll } from "./rolldown-runtime-B4FMCO8f.js";
-import { a as embedTexts, r as completeObject } from "./client-Dstl8V7v.js";
-import { C as withSpan, P as normalizeIdentityEmail, _ as setSpanAttributes, d as logInfo, f as logWarn, u as logException, v as setSpanStatus } from "./logging-CKkKExae.js";
+import { a as embedTexts, r as completeObject } from "./client-C1KycWNq.js";
+import { C as withSpan, P as normalizeIdentityEmail, _ as setSpanAttributes, d as logInfo, f as logWarn, u as logException, v as setSpanStatus } from "./logging-B5-PLvDo.js";
 import { a as getClient$1 } from "./sentry-CgWZM_kV.js";
-import { t as canExposeConversationPayload } from "./conversation-privacy-BIClFm9b.js";
-import { a as getChatConfig, n as botConfig, s as getSlackBotToken } from "./config-QWyCRQ8L.js";
+import { t as canExposeConversationPayload } from "./conversation-privacy-BFzYxnTS.js";
+import { a as getChatConfig, n as botConfig, s as getSlackBotToken } from "./config-C0-PnQoF.js";
 import { n as defaultModelId } from "./model-profile-CZmVoGdX.js";
 import { _ as parseSlackMessageTs, c as isActorUserId, h as parseSlackTeamId, m as parseSlackChannelReferenceId, u as parseActorUserId } from "./context-Bplcgypl.js";
 import { n as juniorDestinations } from "./destinations-BeBiJeEM.js";
-import { C as conversationReadColumns, E as juniorUsers, T as juniorIdentities, _ as juniorConversationEvents, b as juniorCodeChanges, g as juniorConversationBriefs, h as juniorConversationBindings, i as juniorWorkspaces, m as juniorConversationParticipants, n as juniorSnapshots, r as juniorWorkspaceRepos, t as createJuniorSqlExecutor, w as juniorConversations, x as juniorCodeRepositories, y as juniorConversationAnnotations } from "./executor-C5onDgaC.js";
-import { B as decodeStoredConversationEvent, C as conversationReportEventSchema, H as newConversationEventSchema, L as conversationEventDataSchema, M as conversationBriefSchema, N as parseBriefInput, V as historyReplacementSchema } from "./conversation-AA4R1VUn.js";
-import { A as sleep$1, P as SANDBOX_WORKSPACE_ROOT, l as isSandboxMissingError, n as hash, v as getVercelSandboxCredentials, w as getStateAdapter, x as runNonInteractiveCommand } from "./profile-DU-tdAeS.js";
-import { n as briefEntriesFromReportEvents, s as generateBrief, t as BRIEF_PROMPT } from "./prompt-C1IA4qkj.js";
+import { C as juniorCodeRepositories, D as juniorIdentities, E as juniorConversations, O as juniorUsers, S as juniorCodeChanges, T as conversationReadColumns, _ as CONVERSATION_METRICS, g as juniorConversationBriefs, h as juniorConversationBindings, i as juniorWorkspaces, m as juniorConversationParticipants, n as juniorSnapshots, r as juniorWorkspaceRepos, t as createJuniorSqlExecutor, v as juniorConversationMetrics, x as juniorConversationAnnotations, y as juniorConversationEvents } from "./executor-CaVeGYeA.js";
+import { B as historyReplacementSchema, C as conversationReportEventSchema, I as conversationEventDataSchema, K as usageSchema, M as conversationBriefSchema, N as parseBriefInput, V as newConversationEventSchema, z as decodeStoredConversationEvent } from "./conversation-CRWntH-A.js";
+import { A as sleep$1, P as SANDBOX_WORKSPACE_ROOT, l as isSandboxMissingError, n as hash, v as getVercelSandboxCredentials, w as getStateAdapter, x as runNonInteractiveCommand } from "./profile-BcZ6EBQ4.js";
+import { n as briefEntriesFromReportEvents, s as generateBrief, t as BRIEF_PROMPT } from "./prompt-kRlibHYT.js";
 import { AsyncLocalStorage } from "node:async_hooks";
 import { z } from "zod";
 import { createHash, createHmac, randomUUID, timingSafeEqual } from "node:crypto";
@@ -191,6 +191,190 @@ async function recordConversationParticipant(executor, args) {
 	});
 }
 //#endregion
+//#region src/chat/usage.ts
+const agentTurnUsageSchema = usageSchema;
+const COMPONENT_USAGE_FIELDS = [
+	"inputTokens",
+	"outputTokens",
+	"cachedInputTokens",
+	"cacheCreationTokens"
+];
+const COST_COMPONENT_FIELDS = [
+	"input",
+	"output",
+	"cacheRead",
+	"cacheWrite"
+];
+/** Return whether any token counter is present on a usage record. */
+function hasAgentTurnUsage(usage) {
+	return Boolean(usage && (Object.entries(usage).some(([field, value]) => field !== "cost" && typeof value === "number" && Number.isFinite(value)) || Object.values(usage.cost ?? {}).some((value) => typeof value === "number" && Number.isFinite(value))));
+}
+function getFiniteCount(value) {
+	return typeof value === "number" && Number.isFinite(value) ? Math.max(0, Math.floor(value)) : void 0;
+}
+function getFiniteCost(value) {
+	return typeof value === "number" && Number.isFinite(value) ? Math.max(0, value) : void 0;
+}
+function addCost(left, right) {
+	return Math.round(((left ?? 0) + right) * 0xe8d4a51000) / 0xe8d4a51000;
+}
+function getComponentTotal(usage) {
+	let total;
+	for (const field of COMPONENT_USAGE_FIELDS) {
+		const value = getFiniteCount(usage[field]);
+		if (value === void 0) continue;
+		total = (total ?? 0) + value;
+	}
+	return total;
+}
+/** Estimated total USD cost from one usage record, when any cost field is present. */
+function agentTurnCostUsd(usage) {
+	if (!usage?.cost) return void 0;
+	const total = getFiniteCost(usage.cost.total);
+	if (total !== void 0) return total;
+	let componentTotal = 0;
+	let hasComponent = false;
+	for (const field of COST_COMPONENT_FIELDS) {
+		const value = getFiniteCost(usage.cost[field]);
+		if (value === void 0) continue;
+		hasComponent = true;
+		componentTotal = addCost(componentTotal, value);
+	}
+	return hasComponent ? componentTotal : void 0;
+}
+/** Total token count from one usage record, preferring component counters. */
+function agentTurnTotalTokens(usage) {
+	if (!usage) return void 0;
+	const componentTotal = getComponentTotal(usage);
+	if (componentTotal !== void 0) return componentTotal;
+	return getFiniteCount(usage.totalTokens);
+}
+/** Aggregate token usage across slices without double-counting provider totals. */
+function addAgentTurnUsage(...usages) {
+	const components = {};
+	let componentTotal;
+	let totalOnlyTokens;
+	let reasoningTokens;
+	const cost = {};
+	for (const usage of usages) {
+		if (!usage) continue;
+		const reasoning = getFiniteCount(usage.reasoningTokens);
+		if (reasoning !== void 0) reasoningTokens = (reasoningTokens ?? 0) + reasoning;
+		if (usage.cost) for (const field of [...COST_COMPONENT_FIELDS, "total"]) {
+			const value = getFiniteCost(usage.cost[field]);
+			if (value === void 0) continue;
+			cost[field] = addCost(cost[field], value);
+		}
+		const usageComponentTotal = getComponentTotal(usage);
+		if (usageComponentTotal !== void 0) {
+			componentTotal = (componentTotal ?? 0) + usageComponentTotal;
+			for (const field of COMPONENT_USAGE_FIELDS) {
+				const value = getFiniteCount(usage[field]);
+				if (value === void 0) continue;
+				components[field] = (components[field] ?? 0) + value;
+			}
+			continue;
+		}
+		const totalTokens = getFiniteCount(usage.totalTokens);
+		if (totalTokens !== void 0) totalOnlyTokens = (totalOnlyTokens ?? 0) + totalTokens;
+	}
+	if (totalOnlyTokens !== void 0) return {
+		totalTokens: totalOnlyTokens + (componentTotal ?? 0),
+		...reasoningTokens !== void 0 ? { reasoningTokens } : void 0,
+		...Object.keys(cost).length > 0 ? { cost } : void 0
+	};
+	const result = {
+		...components,
+		...reasoningTokens !== void 0 ? { reasoningTokens } : void 0,
+		...Object.keys(cost).length > 0 ? { cost } : void 0
+	};
+	return hasAgentTurnUsage(result) ? result : void 0;
+}
+//#endregion
+//#region src/chat/conversations/metrics.ts
+function finite(value) {
+	return value !== void 0 && Number.isFinite(value) && value >= 0 ? value : void 0;
+}
+/** Convert one Run summary to metric rows. */
+function conversationMetricValues(args) {
+	const usage = args.usage;
+	return {
+		duration_ms: Math.max(0, args.durationMs),
+		total_tokens: agentTurnTotalTokens(usage),
+		input_tokens: finite(usage?.inputTokens),
+		output_tokens: finite(usage?.outputTokens),
+		cached_input_tokens: finite(usage?.cachedInputTokens),
+		cache_creation_tokens: finite(usage?.cacheCreationTokens),
+		reasoning_tokens: finite(usage?.reasoningTokens),
+		cost_usd: agentTurnCostUsd(usage)
+	};
+}
+/** Replace one Run's metric rows and refresh its Conversation totals. */
+async function replaceConversationMetrics(executor, args) {
+	const [current] = await executor.db().select({ updatedAt: juniorConversationMetrics.updatedAt }).from(juniorConversationMetrics).where(and(eq(juniorConversationMetrics.conversationId, args.conversationId), eq(juniorConversationMetrics.runId, args.runId))).limit(1);
+	if (current && current.updatedAt.getTime() > args.updatedAtMs) return;
+	await executor.db().delete(juniorConversationMetrics).where(and(eq(juniorConversationMetrics.conversationId, args.conversationId), eq(juniorConversationMetrics.runId, args.runId)));
+	const metricValues = conversationMetricValues({
+		durationMs: args.durationMs,
+		usage: args.usage
+	});
+	const values = CONVERSATION_METRICS.flatMap((metric) => {
+		const value = metricValues[metric];
+		return value === void 0 ? [] : [{
+			conversationId: args.conversationId,
+			runId: args.runId,
+			metric,
+			value,
+			occurredAt: new Date(args.occurredAtMs),
+			updatedAt: new Date(args.updatedAtMs)
+		}];
+	});
+	if (values.length > 0) await executor.db().insert(juniorConversationMetrics).values(values);
+	const metric = (name) => sql`(
+    select sum(${juniorConversationMetrics.value})
+    from ${juniorConversationMetrics}
+    where ${juniorConversationMetrics.conversationId} = ${args.conversationId}
+      and ${juniorConversationMetrics.metric} = ${name}
+  )`;
+	const totalTokens = metric("total_tokens");
+	const componentTokens = sql`
+    coalesce(${metric("input_tokens")}, 0)
+      + coalesce(${metric("output_tokens")}, 0)
+      + coalesce(${metric("cached_input_tokens")}, 0)
+      + coalesce(${metric("cache_creation_tokens")}, 0)
+  `;
+	const hasComponents = sql`
+    ${metric("input_tokens")} is not null
+      or ${metric("output_tokens")} is not null
+      or ${metric("cached_input_tokens")} is not null
+      or ${metric("cache_creation_tokens")} is not null
+  `;
+	const cost = sql`case when ${metric("cost_usd")} is null then null
+    else jsonb_build_object('total', ${metric("cost_usd")}) end`;
+	await executor.db().update(juniorConversations).set({
+		durationMs: sql`coalesce(${metric("duration_ms")}, 0)`,
+		usage: sql`case
+        when ${totalTokens} is not null
+          and (${hasComponents})
+          and ${totalTokens} <> ${componentTokens}
+        then jsonb_strip_nulls(jsonb_build_object(
+          'totalTokens', ${totalTokens},
+          'reasoningTokens', ${metric("reasoning_tokens")},
+          'cost', ${cost}
+        ))
+        else jsonb_strip_nulls(jsonb_build_object(
+          'totalTokens', ${totalTokens},
+          'inputTokens', ${metric("input_tokens")},
+          'outputTokens', ${metric("output_tokens")},
+          'cachedInputTokens', ${metric("cached_input_tokens")},
+          'cacheCreationTokens', ${metric("cache_creation_tokens")},
+          'reasoningTokens', ${metric("reasoning_tokens")},
+          'cost', ${cost}
+        ))
+      end`
+	}).where(eq(juniorConversations.conversationId, args.conversationId));
+}
+//#endregion
 //#region src/chat/source.ts
 /**
 * Normalize a Turn Source into legacy provider fields stored on a Conversation.
@@ -522,29 +706,6 @@ function assertSameConversationDestination(args) {
 	if (!args.current || sameDestination(args.current, args.next)) return;
 	throw new Error(`Conversation destination changed for ${args.conversationId}`);
 }
-function tokenTotal(usage) {
-	if (!usage) return 0;
-	if (usage.totalTokens !== void 0) return usage.totalTokens;
-	return (usage.inputTokens ?? 0) + (usage.outputTokens ?? 0) + (usage.cachedInputTokens ?? 0) + (usage.cacheCreationTokens ?? 0);
-}
-function updateConversationUsage(args) {
-	const usage = { totalTokens: tokenTotal(args.current) - tokenTotal(args.previousExecution) + tokenTotal(args.nextExecution) };
-	if (args.current?.reasoningTokens !== void 0 || args.previousExecution?.reasoningTokens !== void 0 || args.nextExecution.reasoningTokens !== void 0) usage.reasoningTokens = (args.current?.reasoningTokens ?? 0) - (args.previousExecution?.reasoningTokens ?? 0) + (args.nextExecution.reasoningTokens ?? 0);
-	const costFields = [
-		"input",
-		"output",
-		"cacheRead",
-		"cacheWrite",
-		"total"
-	];
-	const cost = {};
-	for (const field of costFields) {
-		if (args.current?.cost?.[field] === void 0 && args.previousExecution?.cost?.[field] === void 0 && args.nextExecution.cost?.[field] === void 0) continue;
-		cost[field] = Math.round(((args.current?.cost?.[field] ?? 0) - (args.previousExecution?.cost?.[field] ?? 0) + (args.nextExecution.cost?.[field] ?? 0)) * 0xe8d4a51000) / 0xe8d4a51000;
-	}
-	if (Object.keys(cost).length > 0) usage.cost = cost;
-	return usage;
-}
 var SqlStore = class {
 	executor;
 	constructor(executor) {
@@ -623,13 +784,13 @@ var SqlStore = class {
 		});
 	}
 	async recordExecution(args) {
+		if (args.metrics && !args.execution.runId) throw new Error("Conversation Run metrics require a Run id");
 		await this.withConversationMutation(args.conversationId, async () => {
 			const existingRow = await this.readConversationRow(args.conversationId);
 			const existing = existingRow ? conversationFromRow(existingRow) : void 0;
 			if (!existing && !args.destination) return;
-			const incomingIsFresh = (args.execution.updatedAtMs ?? args.updatedAtMs) >= (existing?.execution.updatedAtMs ?? existing?.updatedAtMs ?? 0);
-			const metricRunId = existingRow?.conversation.metricRunId;
-			const sameRun = Boolean(metricRunId) && metricRunId === args.execution.runId;
+			const incomingExecutionAt = args.execution.updatedAtMs ?? args.updatedAtMs;
+			const incomingIsFresh = incomingExecutionAt >= (existing?.execution.updatedAtMs ?? existing?.updatedAtMs ?? 0);
 			const execution = incomingIsFresh ? args.execution : existing?.execution ?? args.execution;
 			await this.upsertConversation({ conversation: {
 				schemaVersion: 1,
@@ -647,19 +808,18 @@ var SqlStore = class {
 				...args.visibility ? { visibility: args.visibility } : void 0,
 				execution
 			} });
-			if (incomingIsFresh && args.metrics) {
-				const row = existingRow?.conversation;
-				const usage = args.metrics.usage ? updateConversationUsage({
-					current: row?.usage ?? void 0,
-					previousExecution: sameRun ? row?.executionUsage ?? void 0 : void 0,
-					nextExecution: args.metrics.usage
-				}) : row?.usage ?? void 0;
-				await this.executor.db().update(juniorConversations).set({
-					durationMs: (row?.durationMs ?? 0) - (sameRun ? row?.executionDurationMs ?? 0 : 0) + args.metrics.durationMs,
-					usage: usage ?? null,
-					metricRunId: args.execution.runId ?? null,
+			if (args.metrics && args.execution.runId) {
+				await replaceConversationMetrics(this.executor, {
+					conversationId: args.conversationId,
+					runId: args.execution.runId,
+					occurredAtMs: args.createdAtMs,
+					updatedAtMs: incomingExecutionAt,
+					...args.metrics
+				});
+				if (incomingIsFresh) await this.executor.db().update(juniorConversations).set({
+					metricRunId: args.execution.runId,
 					executionDurationMs: args.metrics.durationMs,
-					executionUsage: args.metrics.usage ?? (sameRun ? row?.executionUsage ?? null : null)
+					executionUsage: args.metrics.usage ?? null
 				}).where(eq(juniorConversations.conversationId, args.conversationId));
 			}
 		});
@@ -5232,4 +5392,4 @@ function createPluginHookRunner(input = {}) {
 	};
 }
 //#endregion
-export { resolveViewerUser as $, parseSessionSource as $t, tryWorkspaceRepoCheckoutPath as A, createPluginConversationEvents as At, downloadPrivateSlackFile as B, authenticationUnlinkedEvent as Bt, invalidateReadySnapshot as C, conversationArchivedForEmail as Ct, SANDBOX_RUNTIME as D, conversationNotArchivedForEmail as Dt, setWorkspaceSnapshotBuild as E, conversationHasParticipantUser as Et, bindSlackDirectCredentialSubject as F, listConversationAnnotations as Ft, isDmChannel as G, getDb as Gt, getHeaderString as H, getConversationEventStore as Ht, verifyEventAutomationCredentialSubject as I, listConversationAnnotationsById as It, withSlackRetries as J, withConversationEventLock as Jt, normalizeSlackConversationId as K, getSqlExecutor as Kt, verifyScheduledAutomationCredentialSubject as L, JUNIOR_NATIVE_EVENT_NAMESPACE as Lt, resolveChannelCapabilities as M, readConversationEventPage as Mt, bindEventAutomationCredentialSubject as N, buildSentryConversationUrl as Nt, deleteWorkspaceSnapshotBuilders as O, conversationNotArchivedForUser as Ot, bindScheduledAutomationCredentialSubject as P, resolveRootVisibility as Pt, readActorIdentity as Q, bindProviderConversation as Qt, verifySlackDirectCredentialSubject as R, agentsInstructionsUpdatedEvent as Rt, WorkspaceValidationError as S, conversationArchiveTimes as St, setWorkspaceSnapshot as T, conversationHasParticipantEmail as Tt, getSlackClient as U, getConversationMessageSearchStore as Ut, getFilePermalink as V, db_exports as Vt, isConversationScopedChannel as W, getConversationStore as Wt, runWithWorkspaceTeamId as X, withConversationMutationLock as Xt, getWorkspaceTeamId as Y, sanitizePostgresJson as Yt, findUserByEmail as Z, locationFromRow as Zt, deleteWorkspace as _, createPluginState as _t, getPluginRoutes as a, parseDestination as an, STOP_WATCHING_TOOL_NAME as at, listWorkspaces as b, createPluginLogger as bt, getPluginTools as c, collectEventMatchKeys as ct, setPlugins as d, findMatchingWatches as dt, resolveRootConversationId as en, updateViewerDisplayName as et, validatePlugins as f, listWatches as ft, createWorkspace as g, setDashboardConversationLinkOptions as gt, setBriefsConfig as h, getDashboardTaskLink as ht, getPluginApiRoutes as i, createSlackDestination as in, RESOURCE_WATCH_TOOL_SOURCE as it, workspaceRepoCheckoutPath as j, readLatestConversationBrief as jt, getWorkspaceSnapshotBuilder as k, viewerConversationMembership as kt, getPluginUserPromptContributions as l, createWatch as lt, registration_exports as m, getDashboardConversationLink as mt, applyPluginFormatMarkdown as n, upsertIdentity as nn, RESOURCE_SUBSCRIPTION_DEFAULT_TTL_MS as nt, getPluginSlackConversationLink as o, requireSlackDestination as on, cancelSubscriptions as ot, coreTaskRegistrations as p, JUNIOR_THREAD_STATE_TTL_MS as pt, runWithSlackInstallationToken as q, createSqlConversationEventStore as qt, createPluginHookRunner as r, upsertLinkedIdentity as rn, RESOURCE_SUBSCRIPTION_MAX_TTL_MS as rt, getPluginSystemPromptContributions as s, sameDestination as sn, cancelWatch as st, agent_hooks_exports as t, deleteProviderIdentityForSlackUser as tn, getSlackToolContext as tt, getPlugins as u, deliverWatch as ut, getWorkspace as v, createPluginEmbedder as vt, loadSnapshotsForProfile as w, conversationArchivedForUser as wt, updateWorkspace as x, readConversationAccessFromSql as xt, getWorkspaceByName as y, createPluginModel as yt, SlackActionError as z, authenticationLinkedEvent as zt };
+export { resolveViewerUser as $, parseSessionSource as $t, tryWorkspaceRepoCheckoutPath as A, createPluginConversationEvents as At, downloadPrivateSlackFile as B, authenticationUnlinkedEvent as Bt, invalidateReadySnapshot as C, conversationArchivedForEmail as Ct, SANDBOX_RUNTIME as D, conversationNotArchivedForEmail as Dt, setWorkspaceSnapshotBuild as E, conversationHasParticipantUser as Et, bindSlackDirectCredentialSubject as F, listConversationAnnotations as Ft, isDmChannel as G, getDb as Gt, getHeaderString as H, getConversationEventStore as Ht, verifyEventAutomationCredentialSubject as I, listConversationAnnotationsById as It, withSlackRetries as J, withConversationEventLock as Jt, normalizeSlackConversationId as K, getSqlExecutor as Kt, verifyScheduledAutomationCredentialSubject as L, JUNIOR_NATIVE_EVENT_NAMESPACE as Lt, resolveChannelCapabilities as M, readConversationEventPage as Mt, bindEventAutomationCredentialSubject as N, buildSentryConversationUrl as Nt, deleteWorkspaceSnapshotBuilders as O, conversationNotArchivedForUser as Ot, bindScheduledAutomationCredentialSubject as P, resolveRootVisibility as Pt, readActorIdentity as Q, bindProviderConversation as Qt, verifySlackDirectCredentialSubject as R, agentsInstructionsUpdatedEvent as Rt, WorkspaceValidationError as S, conversationArchiveTimes as St, setWorkspaceSnapshot as T, conversationHasParticipantEmail as Tt, getSlackClient as U, getConversationMessageSearchStore as Ut, getFilePermalink as V, db_exports as Vt, isConversationScopedChannel as W, getConversationStore as Wt, runWithWorkspaceTeamId as X, withConversationMutationLock as Xt, getWorkspaceTeamId as Y, sanitizePostgresJson as Yt, findUserByEmail as Z, locationFromRow as Zt, deleteWorkspace as _, createPluginState as _t, getPluginRoutes as a, resolveRootConversationId as an, STOP_WATCHING_TOOL_NAME as at, listWorkspaces as b, createPluginLogger as bt, getPluginTools as c, upsertLinkedIdentity as cn, collectEventMatchKeys as ct, setPlugins as d, requireSlackDestination as dn, findMatchingWatches as dt, addAgentTurnUsage as en, updateViewerDisplayName as et, validatePlugins as f, sameDestination as fn, listWatches as ft, createWorkspace as g, setDashboardConversationLinkOptions as gt, setBriefsConfig as h, getDashboardTaskLink as ht, getPluginApiRoutes as i, hasAgentTurnUsage as in, RESOURCE_WATCH_TOOL_SOURCE as it, workspaceRepoCheckoutPath as j, readLatestConversationBrief as jt, getWorkspaceSnapshotBuilder as k, viewerConversationMembership as kt, getPluginUserPromptContributions as l, createSlackDestination as ln, createWatch as lt, registration_exports as m, getDashboardConversationLink as mt, applyPluginFormatMarkdown as n, agentTurnTotalTokens as nn, RESOURCE_SUBSCRIPTION_DEFAULT_TTL_MS as nt, getPluginSlackConversationLink as o, deleteProviderIdentityForSlackUser as on, cancelSubscriptions as ot, coreTaskRegistrations as p, JUNIOR_THREAD_STATE_TTL_MS as pt, runWithSlackInstallationToken as q, createSqlConversationEventStore as qt, createPluginHookRunner as r, agentTurnUsageSchema as rn, RESOURCE_SUBSCRIPTION_MAX_TTL_MS as rt, getPluginSystemPromptContributions as s, upsertIdentity as sn, cancelWatch as st, agent_hooks_exports as t, agentTurnCostUsd as tn, getSlackToolContext as tt, getPlugins as u, parseDestination as un, deliverWatch as ut, getWorkspace as v, createPluginEmbedder as vt, loadSnapshotsForProfile as w, conversationArchivedForUser as wt, updateWorkspace as x, readConversationAccessFromSql as xt, getWorkspaceByName as y, createPluginModel as yt, SlackActionError as z, authenticationLinkedEvent as zt };

package/dist/{agent-runner-Be5K-k2o.js → agent-runner-CkNX-ynf.js}

@@ -1,9 +1,9 @@
-import { F as isRecord, d as logInfo, f as logWarn } from "./logging-CKkKExae.js";
-import { h as normalizeSlackEmojiName } from "./config-QWyCRQ8L.js";
+import { F as isRecord, d as logInfo, f as logWarn } from "./logging-B5-PLvDo.js";
+import { h as normalizeSlackEmojiName } from "./config-C0-PnQoF.js";
 import { _ as parseSlackMessageTs, g as parseSlackUserId } from "./context-Bplcgypl.js";
-import { G as isDmChannel, J as withSlackRetries, K as normalizeSlackConversationId, U as getSlackClient, an as parseDestination, n as applyPluginFormatMarkdown, z as SlackActionError } from "./agent-hooks-BYZAFpgB.js";
-import { n as pluginCatalogRuntime } from "./catalog-runtime-Ddk0rxU3.js";
-import { w as getStateAdapter } from "./profile-DU-tdAeS.js";
+import { G as isDmChannel, J as withSlackRetries, K as normalizeSlackConversationId, U as getSlackClient, n as applyPluginFormatMarkdown, un as parseDestination, z as SlackActionError } from "./agent-hooks-B2Yt2b88.js";
+import { n as pluginCatalogRuntime } from "./catalog-runtime-BvN_lNVo.js";
+import { w as getStateAdapter } from "./profile-BcZ6EBQ4.js";
 import { r as isExperimentalFeatureEnabled } from "./experimental-CIXf7Uye.js";
 import { randomBytes } from "node:crypto";
 import { actorSchema, sourceSchema } from "@sentry/junior-plugin-api";

package/dist/api/schema.js

@@ -1,4 +1,4 @@
-import { C as conversationReportEventSchema, D as createConversationBodySchema, E as conversationSummaryReportSchema, O as createConversationMessageBodySchema, R as conversationTurnFailureCodeSchema, S as conversationReportEventDataSchema, T as conversationStatsReportSchema, _ as conversationParamsSchema, a as cancelConversationPendingMessagesBodySchema, b as conversationPendingMessageSchema, d as conversationDetailReportSchema, f as conversationEventHistorySchema, g as conversationFeedSchema, h as conversationFeedQuerySchema, i as archiveConversationResponseSchema, l as conversationAuxiliaryCostsSchema, m as conversationEventsQuerySchema, o as cancelConversationPendingMessagesResponseSchema, p as conversationEventPageSchema, r as archiveConversationBodySchema, s as conversationActivityPreviewSchema, t as acceptedConversationMessageSchema, u as conversationDetailQuerySchema, v as conversationPendingAuthorizationSchema, x as conversationPendingMessagesReportSchema, y as conversationPendingMessageDeliverySchema, z as conversationTurnFailureReasonSchema } from "../conversation-AA4R1VUn.js";
+import { C as conversationReportEventSchema, D as createConversationBodySchema, E as conversationSummaryReportSchema, L as conversationTurnFailureCodeSchema, O as createConversationMessageBodySchema, R as conversationTurnFailureReasonSchema, S as conversationReportEventDataSchema, T as conversationStatsReportSchema, _ as conversationParamsSchema, a as cancelConversationPendingMessagesBodySchema, b as conversationPendingMessageSchema, d as conversationDetailReportSchema, f as conversationEventHistorySchema, g as conversationFeedSchema, h as conversationFeedQuerySchema, i as archiveConversationResponseSchema, l as conversationAuxiliaryCostsSchema, m as conversationEventsQuerySchema, o as cancelConversationPendingMessagesResponseSchema, p as conversationEventPageSchema, r as archiveConversationBodySchema, s as conversationActivityPreviewSchema, t as acceptedConversationMessageSchema, u as conversationDetailQuerySchema, v as conversationPendingAuthorizationSchema, x as conversationPendingMessagesReportSchema, y as conversationPendingMessageDeliverySchema } from "../conversation-CRWntH-A.js";
 import { a as pluginPackageContentReportSchema, c as runtimeInfoReportSchema, i as pluginPackageContentItemReportSchema, l as skillReportSchema, n as pluginOperationalReportFeedSchema, o as pluginSchema, r as pluginOperationalReportSchema, s as pluginsSchema, t as healthReportSchema, u as skillReportsSchema } from "../reporting-schema-DosTN__Q.js";
-import { A as actorProfileReportSchema, B as dailyConversationActivitySchema, C as createPersonalTokenBodySchema, D as personalTokenParamsSchema, E as personalTokenMetadataSchema, F as locationDirectoryReportSchema, G as codePersonReportSchema, H as codeChangeSummaryReportSchema, I as locationParamsSchema, K as codeRepositorySummarySchema, M as personalSpendReportSchema, N as locationActivityDayReportSchema, O as revokePersonalTokenResponseSchema, P as locationDetailReportSchema, S as scheduledAutomationSummarySchema, T as personalTokenListSchema, U as codeChangeSummarySchema, V as codeActivityDaySchema, W as codeOverviewReportSchema, _ as automationRunListSchema, a as workspaceBodySchema, at as apiErrorSchema, b as automationSummarySchema, c as workspaceRepoSchema, d as automationExecutionSchema, f as automationExecutionStatusDaySchema, g as automationParamsSchema, h as automationListSchema, i as deleteWorkspaceResponseSchema, j as personParamsSchema, k as actorDirectoryReportSchema, l as workspaceSchema, m as automationListQuerySchema, n as statsReportSchema, o as workspaceListSchema, p as automationExecutionStatusSchema, r as baselineSnapshotSchema, s as workspaceParamsSchema, t as statSchema, u as automationExecutionListSchema, v as automationRunSchema, w as createdPersonalTokenSchema, x as eventAutomationSummarySchema, y as automationRunWindowsSchema } from "../schema-CwTeb-BF.js";
+import { A as actorProfileReportSchema, B as dailyConversationActivitySchema, C as createPersonalTokenBodySchema, D as personalTokenParamsSchema, E as personalTokenMetadataSchema, F as locationDirectoryReportSchema, G as codePersonReportSchema, H as codeChangeSummaryReportSchema, I as locationParamsSchema, K as codeRepositorySummarySchema, M as personalSpendReportSchema, N as locationActivityDayReportSchema, O as revokePersonalTokenResponseSchema, P as locationDetailReportSchema, S as scheduledAutomationSummarySchema, T as personalTokenListSchema, U as codeChangeSummarySchema, V as codeActivityDaySchema, W as codeOverviewReportSchema, _ as automationRunListSchema, a as workspaceBodySchema, at as apiErrorSchema, b as automationSummarySchema, c as workspaceRepoSchema, d as automationExecutionSchema, f as automationExecutionStatusDaySchema, g as automationParamsSchema, h as automationListSchema, i as deleteWorkspaceResponseSchema, j as personParamsSchema, k as actorDirectoryReportSchema, l as workspaceSchema, m as automationListQuerySchema, n as statsReportSchema, o as workspaceListSchema, p as automationExecutionStatusSchema, r as baselineSnapshotSchema, s as workspaceParamsSchema, t as statSchema, u as automationExecutionListSchema, v as automationRunSchema, w as createdPersonalTokenSchema, x as eventAutomationSummarySchema, y as automationRunWindowsSchema } from "../schema-xHUgeh46.js";
 export { acceptedConversationMessageSchema, actorDirectoryReportSchema, actorProfileReportSchema, apiErrorSchema, archiveConversationBodySchema, archiveConversationResponseSchema, automationExecutionListSchema, automationExecutionSchema, automationExecutionStatusDaySchema, automationExecutionStatusSchema, automationListQuerySchema, automationListSchema, automationParamsSchema, automationRunListSchema, automationRunSchema, automationRunWindowsSchema, automationSummarySchema, baselineSnapshotSchema, cancelConversationPendingMessagesBodySchema, cancelConversationPendingMessagesResponseSchema, codeActivityDaySchema, codeChangeSummaryReportSchema, codeChangeSummarySchema, codeOverviewReportSchema, codePersonReportSchema, codeRepositorySummarySchema, conversationActivityPreviewSchema, conversationAuxiliaryCostsSchema, conversationDetailQuerySchema, conversationDetailReportSchema, conversationEventHistorySchema, conversationEventPageSchema, conversationEventsQuerySchema, conversationFeedQuerySchema, conversationFeedSchema, conversationParamsSchema, conversationPendingAuthorizationSchema, conversationPendingMessageDeliverySchema, conversationPendingMessageSchema, conversationPendingMessagesReportSchema, conversationReportEventDataSchema, conversationReportEventSchema, conversationStatsReportSchema, conversationSummaryReportSchema, conversationTurnFailureCodeSchema, conversationTurnFailureReasonSchema, createConversationBodySchema, createConversationMessageBodySchema, createPersonalTokenBodySchema, createdPersonalTokenSchema, dailyConversationActivitySchema, deleteWorkspaceResponseSchema, eventAutomationSummarySchema, healthReportSchema, locationActivityDayReportSchema, locationDetailReportSchema, locationDirectoryReportSchema, locationParamsSchema, personParamsSchema, personalSpendReportSchema, personalTokenListSchema, personalTokenMetadataSchema, personalTokenParamsSchema, pluginOperationalReportFeedSchema, pluginOperationalReportSchema, pluginPackageContentItemReportSchema, pluginPackageContentReportSchema, pluginSchema, pluginsSchema, revokePersonalTokenResponseSchema, runtimeInfoReportSchema, scheduledAutomationSummarySchema, skillReportSchema, skillReportsSchema, statSchema, statsReportSchema, workspaceBodySchema, workspaceListSchema, workspaceParamsSchema, workspaceRepoSchema, workspaceSchema };

package/dist/api.d.ts

@@ -1,4 +1,4 @@
-import "./db-D74z7BZH.js";
+import "./db-Ca9Nt5ci.js";
 import { Hono } from "hono";
 import { z } from "zod";
 import { User } from "@sentry/junior-plugin-api";

package/dist/api.js

@@ -1,19 +1,19 @@
-import { f as logWarn, u as logException } from "./logging-CKkKExae.js";
+import { f as logWarn, u as logException } from "./logging-B5-PLvDo.js";
 import { _ as parseSlackMessageTs, h as parseSlackTeamId, p as parseSlackChannelId } from "./context-Bplcgypl.js";
-import { $ as resolveViewerUser, $t as parseSessionSource, Ct as conversationArchivedForEmail, D as SANDBOX_RUNTIME, Dt as conversationNotArchivedForEmail, Et as conversationHasParticipantUser, Ft as listConversationAnnotations, Gt as getDb, It as listConversationAnnotationsById, J as withSlackRetries, Kt as getSqlExecutor, Mt as readConversationEventPage, Nt as buildSentryConversationUrl, Ot as conversationNotArchivedForUser, S as WorkspaceValidationError, St as conversationArchiveTimes, Tt as conversationHasParticipantEmail, U as getSlackClient, Wt as getConversationStore, Z as findUserByEmail, Zt as locationFromRow, _ as deleteWorkspace, b as listWorkspaces, bt as createPluginLogger, en as resolveRootConversationId, et as updateViewerDisplayName, g as createWorkspace, j as workspaceRepoCheckoutPath, jt as readLatestConversationBrief, kt as viewerConversationMembership, u as getPlugins, v as getWorkspace, wt as conversationArchivedForUser, x as updateWorkspace, xt as readConversationAccessFromSql } from "./agent-hooks-BYZAFpgB.js";
+import { $ as resolveViewerUser, $t as parseSessionSource, Ct as conversationArchivedForEmail, D as SANDBOX_RUNTIME, Dt as conversationNotArchivedForEmail, Et as conversationHasParticipantUser, Ft as listConversationAnnotations, Gt as getDb, It as listConversationAnnotationsById, J as withSlackRetries, Kt as getSqlExecutor, Mt as readConversationEventPage, Nt as buildSentryConversationUrl, Ot as conversationNotArchivedForUser, S as WorkspaceValidationError, St as conversationArchiveTimes, Tt as conversationHasParticipantEmail, U as getSlackClient, Wt as getConversationStore, Z as findUserByEmail, Zt as locationFromRow, _ as deleteWorkspace, an as resolveRootConversationId, b as listWorkspaces, bt as createPluginLogger, et as updateViewerDisplayName, g as createWorkspace, in as hasAgentTurnUsage, j as workspaceRepoCheckoutPath, jt as readLatestConversationBrief, kt as viewerConversationMembership, rn as agentTurnUsageSchema, u as getPlugins, v as getWorkspace, wt as conversationArchivedForUser, x as updateWorkspace, xt as readConversationAccessFromSql } from "./agent-hooks-B2Yt2b88.js";
 import { n as juniorDestinations } from "./destinations-BeBiJeEM.js";
-import { C as conversationReadColumns, E as juniorUsers, T as juniorIdentities, _ as juniorConversationEvents, b as juniorCodeChanges, g as juniorConversationBriefs, m as juniorConversationParticipants, o as juniorSchedulerTasks, v as juniorApiTokens, w as juniorConversations, x as juniorCodeRepositories } from "./executor-C5onDgaC.js";
-import { D as createConversationBodySchema, O as createConversationMessageBodySchema, T as conversationStatsReportSchema, _ as conversationParamsSchema, a as cancelConversationPendingMessagesBodySchema, c as conversationAttachmentParamsSchema, d as conversationDetailReportSchema, g as conversationFeedSchema, h as conversationFeedQuerySchema, i as archiveConversationResponseSchema, m as conversationEventsQuerySchema, o as cancelConversationPendingMessagesResponseSchema, p as conversationEventPageSchema, r as archiveConversationBodySchema, t as acceptedConversationMessageSchema, u as conversationDetailQuerySchema, x as conversationPendingMessagesReportSchema } from "./conversation-AA4R1VUn.js";
-import { a as hasAgentTurnUsage, i as agentTurnUsageSchema, s as fallbackShortTitle } from "./usage-BU5d5wmV.js";
-import { n as hash, t as create } from "./profile-DU-tdAeS.js";
-import { A as eventAutomationTriggerAvailable, F as effectiveTaskOutcomes, G as listDeletedEventAutomationsCreatedBy, H as eventAutomationBelongsToUser, J as listPublicEventAutomationsForTeams, K as listEventAutomationsCreatedBy, Tt as getConversation, V as deleteEventAutomation, W as getEventAutomation, X as getEventCatalog, _ as parseScheduledAutomationRow, c as parseSlackThreadId, ht as cancelHumanFacingPendingMessages, i as readLiveAttachment, m as listPublicScheduledAutomationsForTeams, n as readStats, p as isListedScheduledAutomation, v as readScheduledAutomation, y as saveScheduledAutomation } from "./stats-BvEUKgru.js";
-import { t as getCachedSnapshot } from "./resolve-B178kFFr.js";
+import { C as juniorCodeRepositories, D as juniorIdentities, E as juniorConversations, O as juniorUsers, S as juniorCodeChanges, T as conversationReadColumns, b as juniorApiTokens, g as juniorConversationBriefs, m as juniorConversationParticipants, o as juniorSchedulerTasks, v as juniorConversationMetrics, y as juniorConversationEvents } from "./executor-CaVeGYeA.js";
+import { D as createConversationBodySchema, O as createConversationMessageBodySchema, T as conversationStatsReportSchema, _ as conversationParamsSchema, a as cancelConversationPendingMessagesBodySchema, c as conversationAttachmentParamsSchema, d as conversationDetailReportSchema, g as conversationFeedSchema, h as conversationFeedQuerySchema, i as archiveConversationResponseSchema, m as conversationEventsQuerySchema, o as cancelConversationPendingMessagesResponseSchema, p as conversationEventPageSchema, r as archiveConversationBodySchema, t as acceptedConversationMessageSchema, u as conversationDetailQuerySchema, x as conversationPendingMessagesReportSchema } from "./conversation-CRWntH-A.js";
+import { t as fallbackShortTitle } from "./short-title-CxQHLU3_.js";
+import { n as hash, t as create } from "./profile-BcZ6EBQ4.js";
+import { A as eventAutomationTriggerAvailable, F as effectiveTaskOutcomes, G as listDeletedEventAutomationsCreatedBy, H as eventAutomationBelongsToUser, J as listPublicEventAutomationsForTeams, K as listEventAutomationsCreatedBy, Tt as getConversation, V as deleteEventAutomation, W as getEventAutomation, X as getEventCatalog, _ as parseScheduledAutomationRow, c as parseSlackThreadId, ht as cancelHumanFacingPendingMessages, i as readLiveAttachment, m as listPublicScheduledAutomationsForTeams, n as readStats, p as isListedScheduledAutomation, v as readScheduledAutomation, y as saveScheduledAutomation } from "./stats-D5OWazLs.js";
+import { t as getCachedSnapshot } from "./resolve-BgAZ4KxF.js";
 import { t as getVercelConversationWorkQueue } from "./vercel-queue-DIkVcfK4.js";
 import { c as runtimeInfoReportSchema, n as pluginOperationalReportFeedSchema, s as pluginsSchema, t as healthReportSchema, u as skillReportsSchema } from "./reporting-schema-DosTN__Q.js";
-import { a as webActorFromEmail, c as formatSlackConversationRedactedLabel, d as resolveSlackConversationContextFromThreadId, f as lookupSlackUser, g as readHealthReport, m as createVercelAttachmentStorage, p as legacyWebMailboxMetadataSchema, r as createAndEnqueueConversation, t as appendAndEnqueueWebMessage } from "./web-input-Bxb1i41z.js";
-import { a as readAutomationExecutionStatusDays, c as readAutomationExecutions, d as conversationActiveDaysColumn, f as conversationAggregateColumns, i as readAutomationExecutionHours, l as readAutomationRuns, n as readAutomationExecutionByConversationId, o as readAutomationExecutionStatusHours, p as conversationRangeColumns, r as readAutomationExecutionDays, s as readAutomationExecutionSummaries, t as emptyAutomationRunWindows } from "./execution-stats-BEax3h2o.js";
-import { r as getWebAuthorization } from "./web-authorization-D2ts7w_1.js";
-import { $ as sumUtcHoursIntoSixHours, A as actorProfileReportSchema, C as createPersonalTokenBodySchema, D as personalTokenParamsSchema, F as locationDirectoryReportSchema, G as codePersonReportSchema, I as locationParamsSchema, J as HOUR_MS$1, L as activityDays$1, M as personalSpendReportSchema, O as revokePersonalTokenResponseSchema, P as locationDetailReportSchema, Q as startOfUtcHour, R as activityHours$1, T as personalTokenListSchema, W as codeOverviewReportSchema, X as fillUtcHours, Y as fillUtcDays, Z as fillUtcSixHours, _ as automationRunListSchema, a as workspaceBodySchema, at as apiErrorSchema, et as trailingUtcDayWindow, g as automationParamsSchema, h as automationListSchema, i as deleteWorkspaceResponseSchema, it as utcHourKey, j as personParamsSchema, k as actorDirectoryReportSchema, l as workspaceSchema, m as automationListQuerySchema, n as statsReportSchema, nt as trailingUtcSixHourWindow, o as workspaceListSchema, q as DAY_MS$1, rt as utcDayKey, s as workspaceParamsSchema, tt as trailingUtcHourWindow, u as automationExecutionListSchema, w as createdPersonalTokenSchema, z as activitySixHours$1 } from "./schema-CwTeb-BF.js";
+import { a as webActorFromEmail, c as formatSlackConversationRedactedLabel, d as resolveSlackConversationContextFromThreadId, f as lookupSlackUser, g as readHealthReport, m as createVercelAttachmentStorage, p as legacyWebMailboxMetadataSchema, r as createAndEnqueueConversation, t as appendAndEnqueueWebMessage } from "./web-input-FJ7NNJDx.js";
+import { a as readAutomationExecutionStatusDays, c as readAutomationExecutions, d as conversationActiveDaysColumn, f as conversationAggregateColumns, i as readAutomationExecutionHours, l as readAutomationRuns, n as readAutomationExecutionByConversationId, o as readAutomationExecutionStatusHours, p as conversationRangeColumns, r as readAutomationExecutionDays, s as readAutomationExecutionSummaries, t as emptyAutomationRunWindows } from "./execution-stats-CoDjBQbE.js";
+import { r as getWebAuthorization } from "./web-authorization-BXrGezGm.js";
+import { $ as sumUtcHoursIntoSixHours, A as actorProfileReportSchema, C as createPersonalTokenBodySchema, D as personalTokenParamsSchema, F as locationDirectoryReportSchema, G as codePersonReportSchema, I as locationParamsSchema, J as HOUR_MS$1, L as activityDays$1, M as personalSpendReportSchema, O as revokePersonalTokenResponseSchema, P as locationDetailReportSchema, Q as startOfUtcHour, R as activityHours$1, T as personalTokenListSchema, W as codeOverviewReportSchema, X as fillUtcHours, Y as fillUtcDays, Z as fillUtcSixHours, _ as automationRunListSchema, a as workspaceBodySchema, at as apiErrorSchema, et as trailingUtcDayWindow, g as automationParamsSchema, h as automationListSchema, i as deleteWorkspaceResponseSchema, it as utcHourKey, j as personParamsSchema, k as actorDirectoryReportSchema, l as workspaceSchema, m as automationListQuerySchema, n as statsReportSchema, nt as trailingUtcSixHourWindow, o as workspaceListSchema, q as DAY_MS$1, rt as utcDayKey, s as workspaceParamsSchema, tt as trailingUtcHourWindow, u as automationExecutionListSchema, w as createdPersonalTokenSchema, z as activitySixHours$1 } from "./schema-xHUgeh46.js";
 import { Hono } from "hono";
 import path from "node:path";
 import { z } from "zod";
@@ -1851,6 +1851,17 @@ async function requireConversationPendingMessages(conversationId, options = {})
 	return report;
 }
 //#endregion
+//#region src/api/conversations/metric-buckets.ts
+/** Sum all Conversation metrics into UTC day or hour buckets. */
+async function readConversationMetricBuckets(db, options) {
+	const date = options.bucket === "day" ? sql`to_char(${juniorConversationMetrics.occurredAt} at time zone 'UTC', 'YYYY-MM-DD')` : sql`to_char(${juniorConversationMetrics.occurredAt} at time zone 'UTC', 'YYYY-MM-DD"T"HH24')`;
+	return await db.select({
+		date,
+		metric: juniorConversationMetrics.metric,
+		value: sql`sum(${juniorConversationMetrics.value})::double precision`
+	}).from(juniorConversationMetrics).where(and(gte(juniorConversationMetrics.occurredAt, options.start), lte(juniorConversationMetrics.occurredAt, options.end))).groupBy(date, juniorConversationMetrics.metric).orderBy(asc(date), asc(juniorConversationMetrics.metric));
+}
+//#endregion
 //#region src/api/conversations/stats.query.ts
 const treeConversation$1 = alias(juniorConversations, "stats_tree_conversation");
 const treeAggregateColumns$1 = conversationAggregateColumns({
@@ -1913,6 +1924,34 @@ function statsWindow(nowMs) {
 	};
 }
 const HOUR_MS = 36e5;
+function applyMetricBuckets(rows, metrics) {
+	const byDate = new Map(rows.map((row) => [row.date, {
+		...row,
+		cachedInputTokens: null,
+		costUsd: null,
+		durationMs: 0,
+		inputTokens: null,
+		tokens: null
+	}]));
+	for (const metric of metrics) {
+		const row = byDate.get(metric.date) ?? {
+			cachedInputTokens: null,
+			conversations: 0,
+			costUsd: null,
+			date: metric.date,
+			durationMs: 0,
+			inputTokens: null,
+			tokens: null
+		};
+		if (metric.metric === "cached_input_tokens") row.cachedInputTokens = metric.value;
+		else if (metric.metric === "cost_usd") row.costUsd = metric.value;
+		else if (metric.metric === "duration_ms") row.durationMs = metric.value;
+		else if (metric.metric === "input_tokens") row.inputTokens = metric.value;
+		else if (metric.metric === "total_tokens") row.tokens = metric.value;
+		byDate.set(metric.date, row);
+	}
+	return [...byDate.values()];
+}
 function metricPoint(date, row) {
 	return {
 		conversations: row?.conversations ?? 0,
@@ -2039,7 +2078,7 @@ async function aggregateStats(db, start, end) {
     ${juniorConversations.lastActivityAt} AT TIME ZONE 'UTC',
     'YYYY-MM-DD"T"HH24'
   )`;
-	const [totalsRows, actorRows, locationRows, metricRows, metricHourRows] = await Promise.all([
+	const [totalsRows, actorRows, locationRows, metricRows, metricHourRows, dayMetrics, hourMetrics] = await Promise.all([
 		db.select(treeAggregateColumns$1).from(juniorConversations).innerJoin(treeConversation$1, eq(treeConversation$1.rootConversationId, juniorConversations.conversationId)).where(where),
 		db.select({
 			identityDisplayName: juniorIdentities.displayName,
@@ -2060,29 +2099,29 @@ async function aggregateStats(db, start, end) {
 			...treeAggregateColumns$1
 		}).from(juniorConversations).innerJoin(treeConversation$1, eq(treeConversation$1.rootConversationId, juniorConversations.conversationId)).leftJoin(juniorDestinations, eq(juniorDestinations.id, juniorConversations.destinationId)).where(where).groupBy(juniorConversations.channelName, juniorConversations.source, juniorDestinations.displayName, juniorDestinations.kind, juniorDestinations.provider, juniorDestinations.visibility),
 		db.select({
-			cachedInputTokens: treeAggregateColumns$1.cachedInputTokens,
 			conversations: treeAggregateColumns$1.conversations,
-			costUsd: treeAggregateColumns$1.costUsd,
-			date: activityDate,
-			durationMs: treeAggregateColumns$1.durationMs,
-			inputTokens: treeAggregateColumns$1.inputTokens,
-			tokens: treeAggregateColumns$1.tokens
+			date: activityDate
 		}).from(juniorConversations).innerJoin(treeConversation$1, eq(treeConversation$1.rootConversationId, juniorConversations.conversationId)).where(where).groupBy(activityDate),
 		db.select({
-			cachedInputTokens: treeAggregateColumns$1.cachedInputTokens,
 			conversations: treeAggregateColumns$1.conversations,
-			costUsd: treeAggregateColumns$1.costUsd,
-			date: activityHour,
-			durationMs: treeAggregateColumns$1.durationMs,
-			inputTokens: treeAggregateColumns$1.inputTokens,
-			tokens: treeAggregateColumns$1.tokens
-		}).from(juniorConversations).innerJoin(treeConversation$1, eq(treeConversation$1.rootConversationId, juniorConversations.conversationId)).where(where).groupBy(activityHour)
+			date: activityHour
+		}).from(juniorConversations).innerJoin(treeConversation$1, eq(treeConversation$1.rootConversationId, juniorConversations.conversationId)).where(where).groupBy(activityHour),
+		readConversationMetricBuckets(db, {
+			bucket: "day",
+			start,
+			end
+		}),
+		readConversationMetricBuckets(db, {
+			bucket: "hour",
+			start,
+			end
+		})
 	]);
 	return {
 		actorRows,
 		locationRows,
-		metricHourRows,
-		metricRows,
+		metricHourRows: applyMetricBuckets(metricHourRows, hourMetrics),
+		metricRows: applyMetricBuckets(metricRows, dayMetrics),
 		totals: totalsRows[0]
 	};
 }
@@ -3409,7 +3448,7 @@ async function readPeoplePluginReports(args) {
 		reports: [],
 		source: "plugins"
 	});
-	const { getPluginProfileReports } = await import("./agent-hooks-BYZAFpgB.js").then((n) => n.t);
+	const { getPluginProfileReports } = await import("./agent-hooks-B2Yt2b88.js").then((n) => n.t);
 	return pluginOperationalReportFeedSchema.parse({
 		generatedAt: new Date(nowMs).toISOString(),
 		reports: await getPluginProfileReports({
@@ -4018,7 +4057,7 @@ function readDescriptionText(home) {
 }
 /** Read discovered skill names for authenticated runtime diagnostics. */
 async function readSkillReports() {
-	const { discoverSkills } = await import("./skills-DNxkkZnA.js").then((n) => n.o);
+	const { discoverSkills } = await import("./skills-DlrAH1on.js").then((n) => n.o);
 	const skills = await discoverSkills();
 	return skillReportsSchema.parse(skills.map((skill) => ({
 		name: skill.name,
@@ -4027,7 +4066,7 @@ async function readSkillReports() {
 }
 /** Read safe configured plugin metadata for authenticated runtime diagnostics. */
 async function readPlugins() {
-	const { pluginCatalogRuntime } = await import("./catalog-runtime-Ddk0rxU3.js").then((n) => n.t);
+	const { pluginCatalogRuntime } = await import("./catalog-runtime-BvN_lNVo.js").then((n) => n.t);
 	return pluginsSchema.parse(pluginCatalogRuntime.getProviders().map((plugin) => ({
 		configKeys: plugin.manifest.configKeys ?? [],
 		description: plugin.manifest.description,
@@ -4039,7 +4078,7 @@ async function readPlugins() {
 async function readRuntimeInfoReport() {
 	const [{ homeDir }, { pluginCatalogRuntime }, plugins, skills] = await Promise.all([
 		import("./package-discovery-7a9YqLhE.js").then((n) => n.r),
-		import("./catalog-runtime-Ddk0rxU3.js").then((n) => n.t),
+		import("./catalog-runtime-BvN_lNVo.js").then((n) => n.t),
 		readPlugins(),
 		readSkillReports()
 	]);
@@ -4056,7 +4095,7 @@ async function readRuntimeInfoReport() {
 /** Read sanitized operational summaries contributed by plugins. */
 async function readPluginOperationalReportFeed() {
 	const nowMs = Date.now();
-	const { getPluginOperationalReports } = await import("./agent-hooks-BYZAFpgB.js").then((n) => n.t);
+	const { getPluginOperationalReports } = await import("./agent-hooks-B2Yt2b88.js").then((n) => n.t);
 	return pluginOperationalReportFeedSchema.parse({
 		source: "plugins",
 		generatedAt: new Date(nowMs).toISOString(),

package/dist/{app-gyu3D9Gn.d.ts → app-D4nNdzPG.d.ts}

@@ -1,4 +1,4 @@
-import { t as ConversationStore } from "./store-Det8MQ9g.js";
+import { t as ConversationStore } from "./store-DoewL5mG.js";
 import "./history-ClE4toxe.js";
 import { n as JuniorPluginSet } from "./plugins-BI9A1vKA.js";
 import { Hono } from "hono";

package/dist/app.d.ts

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