@sentry/junior 0.251.0 → 0.253.0

package/dist/{task-runner-B3g16wjr.js → task-runner-DwD-i2ta.js}

@@ -1,20 +1,20 @@
 import { t as __exportAll } from "./rolldown-runtime-B4FMCO8f.js";
-import { h as runBestEffort, p as logWarn } from "./logging-BkI10z0D.js";
+import { h as runBestEffort, p as logWarn } from "./logging-B0QxCh3D.js";
 import { g as parseSlackMessageTs } from "./actor-BTtLaeWy.js";
-import { C as agentTurnTotalTokens, S as agentTurnCostUsd, d as getDb, r as readActorIdentity, u as getConversationStore } from "./viewer-C8u1HAdN.js";
+import { C as agentTurnTotalTokens, S as agentTurnCostUsd, d as getDb, r as readActorIdentity, u as getConversationStore } from "./viewer-CPxNfHWa.js";
 import { s as juniorConversations } from "./agent-invocations-D_YoNnAn.js";
-import { c as juniorAutomationExecutions, o as juniorSchedulerTasks, u as juniorEventAutomations } from "./executor-BeH9LDKI.js";
+import { o as juniorAutomationRuns, s as juniorAutomations } from "./executor-YL577nNt.js";
 import { m as sameActorIdentity } from "./history-9pO1Zd4Y.js";
-import { p as credentialSubjectSchema } from "./registry-CN2Nie72.js";
-import { Gt as hydrateConversationMessages, M as formatSlackLink, Q as getTurnRecord, V as postSlackMessage, Zt as fallbackShortTitle, _t as isToolResultError, a as readScheduledAutomation, g as getEventAutomation, j as escapeSlackMrkdwnText, mt as instructionTextForProjection, u as blockEventAutomation, ut as getPiMessageRole, vt as isToolResultMessage, xt as stripRuntimeTurnContext, yt as normalizeToolNameFromResult, z as openSlackDirectMessage } from "./tasks-DDzBxMio.js";
-import { St as createPluginConversationEvents, dt as createPluginModel, ft as createPluginLogger, it as JUNIOR_THREAD_STATE_TTL_MS, lt as createPluginState, p as coreTaskRegistrations, st as getDashboardTaskLink, u as getPlugins, ut as createPluginEmbedder } from "./agent-hooks-Ctw_jKaS.js";
-import { w as getStateAdapter } from "./profile-AsD2uz0m.js";
-import { r as getPersistedThreadState, s as coerceThreadConversationState } from "./thread-state-BlD6loX7.js";
-import { t as resolveConversationRouting } from "./turn-session-routing-DLb6eQMT.js";
-import { i as pluginTaskParamsSchema, o as sendVercelPluginTask, r as pluginTaskId } from "./task-queue-Bj2hFpjr.js";
+import { p as credentialSubjectSchema } from "./registry-BO2LM2oW.js";
+import { Gt as hydrateConversationMessages, M as formatSlackLink, Q as getTurnRecord, V as postSlackMessage, Zt as fallbackShortTitle, _t as isToolResultError, a as readScheduledAutomation, g as getEventAutomation, j as escapeSlackMrkdwnText, mt as instructionTextForProjection, u as blockEventAutomation, ut as getPiMessageRole, vt as isToolResultMessage, xt as stripRuntimeTurnContext, yt as normalizeToolNameFromResult, z as openSlackDirectMessage } from "./tasks-DThIG7F-.js";
+import { St as createPluginConversationEvents, dt as createPluginModel, ft as createPluginLogger, it as JUNIOR_THREAD_STATE_TTL_MS, lt as createPluginState, p as coreTaskRegistrations, st as getDashboardTaskLink, u as getPlugins, ut as createPluginEmbedder } from "./agent-hooks-CvcbAtJH.js";
+import { w as getStateAdapter } from "./profile-p1oiViVs.js";
+import { r as getPersistedThreadState, s as coerceThreadConversationState } from "./thread-state-BQxkL7Xm.js";
+import { t as resolveConversationRouting } from "./turn-session-routing-F5s728f0.js";
+import { i as pluginTaskParamsSchema, o as sendVercelPluginTask, r as pluginTaskId } from "./task-queue-UAeJGLYM.js";
 import { z } from "zod";
 import { createHash } from "node:crypto";
-import { and, asc, count, desc, eq, gte, inArray, lte, max, or, sql } from "drizzle-orm";
+import { and, asc, count, desc, eq, gte, inArray, isNotNull, lte, max, sql } from "drizzle-orm";
 import { destinationSchema, destinationVisibilitySchema, isSlackDestination, pluginRunContextSchema, replyAttributionSchema, sourceSchema, taskOutcomeSchema } from "@sentry/junior-plugin-api";
 //#region src/api/conversations/aggregate.ts
 function usageTokenValue(source, field) {
@@ -100,12 +100,15 @@ function conversationActiveDaysColumn() {
 }
 //#endregion
 //#region src/chat/automations/execution-stats.ts
-const AUTOMATION_EXECUTION_TYPES = ["scheduled", "event"];
 const AUTOMATION_EXECUTION_STATUSES = [
 	"blocked",
 	"completed",
 	"failed"
 ];
+/** An execution is a run with an outcome. Skipped runs are not executions. */
+function isExecution() {
+	return and(inArray(juniorAutomationRuns.status, [...AUTOMATION_EXECUTION_STATUSES]), isNotNull(juniorAutomationRuns.completedAtMs));
+}
 function addUsd(current, next) {
 	return Math.round((current + next) * 0xe8d4a51000) / 0xe8d4a51000;
 }
@@ -138,60 +141,76 @@ function emptyStatusDay(date) {
 		failed: 0
 	};
 }
-/** Record one terminal automation execution and its durable conversation when present. */
-async function recordAutomationExecution(type, automationId, options) {
-	const namespace = options.namespace ?? "junior";
+/**
+* Return the Conversation id when that Conversation exists, else null. A
+* dispatch can end before it creates its Conversation, and the run's
+* `conversation_id` is a foreign key.
+*/
+function existingConversationId(conversationId) {
+	return sql`(select ${juniorConversations.conversationId} from ${juniorConversations} where ${juniorConversations.conversationId} = ${conversationId})`;
+}
+/**
+* Record the outcome of one Automation run. A run that already has an outcome
+* keeps it. A failed write is logged, and the heartbeat settles a started
+* event run later.
+*/
+async function recordAutomationExecution(automationId, options) {
 	const nowMs = options.nowMs ?? Date.now();
 	const status = options.status ?? "completed";
+	const outcome = {
+		completedAtMs: nowMs,
+		errorMessage: options.errorMessage ?? null,
+		status
+	};
 	try {
-		await getDb().insert(juniorAutomationExecutions).values({
-			...options.conversationId ? { conversationId: options.conversationId } : void 0,
-			executedAtMs: nowMs,
-			executionId: options.executionId,
-			kind: type,
-			namespace,
-			status,
-			automationId
-		}).onConflictDoNothing({ target: [
-			juniorAutomationExecutions.kind,
-			juniorAutomationExecutions.namespace,
-			juniorAutomationExecutions.executionId
-		] });
+		await getDb().insert(juniorAutomationRuns).values({
+			id: options.executionId,
+			automationId,
+			conversationId: options.conversationId ? existingConversationId(options.conversationId) : null,
+			...outcome
+		}).onConflictDoUpdate({
+			target: juniorAutomationRuns.id,
+			set: {
+				...outcome,
+				conversationId: sql`coalesce(${juniorAutomationRuns.conversationId}, excluded.conversation_id)`
+			},
+			setWhere: inArray(juniorAutomationRuns.status, ["pending", "running"])
+		});
 	} catch (error) {
 		logWarn("task.execution.stat_failed", {
 			error,
 			"app.task.execution.id": options.executionId,
-			"app.task.execution.namespace": namespace,
 			"app.task.execution.status": status,
-			"app.task.execution.task_id": automationId,
-			"app.task.execution.type": type
+			"app.task.execution.task_id": automationId
 		});
 	}
 }
-/** Load usage analytics for all automations of one type and namespace. */
-async function readAutomationExecutionSummaries(type, namespace, options = {}) {
+/** Load usage analytics for the given automations. */
+async function readAutomationExecutionSummaries(automationIds, options = {}) {
+	if (automationIds.length === 0) return /* @__PURE__ */ new Map();
 	const nowMs = options.nowMs ?? Date.now();
 	const oneDayAgoMs = nowMs - 864e5;
 	const sevenDaysAgoMs = nowMs - 6048e5;
 	const thirtyDaysAgoMs = nowMs - 2592e6;
 	const ninetyDaysAgoMs = nowMs - 7776e6;
 	const db = getDb();
-	const latest = db.selectDistinctOn([juniorAutomationExecutions.automationId], {
-		status: juniorAutomationExecutions.status,
-		conversationId: juniorAutomationExecutions.conversationId,
-		automationId: juniorAutomationExecutions.automationId
-	}).from(juniorAutomationExecutions).where(and(eq(juniorAutomationExecutions.kind, type), eq(juniorAutomationExecutions.namespace, namespace), options.automationIds ? inArray(juniorAutomationExecutions.automationId, options.automationIds) : void 0)).orderBy(juniorAutomationExecutions.automationId, desc(juniorAutomationExecutions.executedAtMs), desc(juniorAutomationExecutions.executionId)).as("latest_task_execution");
+	const selected = and(isExecution(), inArray(juniorAutomationRuns.automationId, automationIds));
+	const latest = db.selectDistinctOn([juniorAutomationRuns.automationId], {
+		status: juniorAutomationRuns.status,
+		conversationId: juniorAutomationRuns.conversationId,
+		automationId: juniorAutomationRuns.automationId
+	}).from(juniorAutomationRuns).where(selected).orderBy(juniorAutomationRuns.automationId, desc(juniorAutomationRuns.completedAtMs), desc(juniorAutomationRuns.id)).as("latest_task_execution");
 	const rows = await db.select({
 		lastRunStatus: latest.status,
 		lastConversationId: latest.conversationId,
-		lastExecutedAtMs: max(juniorAutomationExecutions.executedAtMs),
-		runsLast1Day: sql`count(*) filter (where ${juniorAutomationExecutions.executedAtMs} >= ${oneDayAgoMs})::int`,
-		runsLast7Days: sql`count(*) filter (where ${juniorAutomationExecutions.executedAtMs} >= ${sevenDaysAgoMs})::int`,
-		runsLast30Days: sql`count(*) filter (where ${juniorAutomationExecutions.executedAtMs} >= ${thirtyDaysAgoMs})::int`,
-		runsLast90Days: sql`count(*) filter (where ${juniorAutomationExecutions.executedAtMs} >= ${ninetyDaysAgoMs})::int`,
-		automationId: juniorAutomationExecutions.automationId,
+		lastExecutedAtMs: max(juniorAutomationRuns.completedAtMs),
+		runsLast1Day: sql`count(*) filter (where ${juniorAutomationRuns.completedAtMs} >= ${oneDayAgoMs})::int`,
+		runsLast7Days: sql`count(*) filter (where ${juniorAutomationRuns.completedAtMs} >= ${sevenDaysAgoMs})::int`,
+		runsLast30Days: sql`count(*) filter (where ${juniorAutomationRuns.completedAtMs} >= ${thirtyDaysAgoMs})::int`,
+		runsLast90Days: sql`count(*) filter (where ${juniorAutomationRuns.completedAtMs} >= ${ninetyDaysAgoMs})::int`,
+		automationId: juniorAutomationRuns.automationId,
 		totalRuns: sql`count(*)::int`
-	}).from(juniorAutomationExecutions).innerJoin(latest, eq(latest.automationId, juniorAutomationExecutions.automationId)).where(and(eq(juniorAutomationExecutions.kind, type), eq(juniorAutomationExecutions.namespace, namespace), options.automationIds ? inArray(juniorAutomationExecutions.automationId, options.automationIds) : void 0)).groupBy(juniorAutomationExecutions.automationId, latest.conversationId, latest.status);
+	}).from(juniorAutomationRuns).innerJoin(latest, eq(latest.automationId, juniorAutomationRuns.automationId)).where(selected).groupBy(juniorAutomationRuns.automationId, latest.conversationId, latest.status);
 	return new Map(rows.map((row) => [row.automationId, {
 		lastRunStatus: row.lastRunStatus,
 		...row.lastConversationId ? { lastConversationId: row.lastConversationId } : void 0,
@@ -210,14 +229,13 @@ async function readAutomationExecutionDays(dayCount = 90, options = {}) {
 	const end = utcDate(options.nowMs ?? Date.now());
 	const endMs = Date.parse(`${end}T23:59:59.999Z`);
 	const startMs = Date.parse(`${end}T00:00:00.000Z`) - (dayCount - 1) * 864e5;
-	const executionDate = sql`to_char(to_timestamp(${juniorAutomationExecutions.executedAtMs} / 1000.0) at time zone 'UTC', 'YYYY-MM-DD')`;
-	const conversationCost = conversationUsageCostExpr(juniorConversations.usage);
-	const rows = await getDb().select({
-		count: count(),
-		costUsd: sql`SUM(${conversationCost})::double precision`,
-		date: executionDate,
-		kind: juniorAutomationExecutions.kind
-	}).from(juniorAutomationExecutions).leftJoin(juniorConversations, eq(juniorConversations.conversationId, juniorAutomationExecutions.conversationId)).where(and(gte(juniorAutomationExecutions.executedAtMs, startMs), lte(juniorAutomationExecutions.executedAtMs, endMs), eq(juniorAutomationExecutions.status, "completed"), options.access)).groupBy(executionDate, juniorAutomationExecutions.kind).orderBy(asc(executionDate), asc(juniorAutomationExecutions.kind));
+	const executionDate = sql`to_char(to_timestamp(${juniorAutomationRuns.completedAtMs} / 1000.0) at time zone 'UTC', 'YYYY-MM-DD')`;
+	const rows = await readCompletedExecutionBuckets({
+		access: options.access,
+		bucket: executionDate,
+		endMs,
+		startMs
+	});
 	const byDate = /* @__PURE__ */ new Map();
 	for (let offset = 0; offset < dayCount; offset += 1) {
 		const date = utcDate(startMs + offset * 864e5);
@@ -239,14 +257,13 @@ async function readAutomationExecutionHours(hourCount = 168, options = {}) {
 	end.setUTCMinutes(0, 0, 0);
 	const endMs = end.getTime() + 3599999;
 	const startMs = end.getTime() - (hourCount - 1) * 36e5;
-	const executionHour = sql`to_char(to_timestamp(${juniorAutomationExecutions.executedAtMs} / 1000.0) at time zone 'UTC', 'YYYY-MM-DD"T"HH24')`;
-	const conversationCost = conversationUsageCostExpr(juniorConversations.usage);
-	const rows = await getDb().select({
-		count: count(),
-		costUsd: sql`SUM(${conversationCost})::double precision`,
-		date: executionHour,
-		kind: juniorAutomationExecutions.kind
-	}).from(juniorAutomationExecutions).leftJoin(juniorConversations, eq(juniorConversations.conversationId, juniorAutomationExecutions.conversationId)).where(and(gte(juniorAutomationExecutions.executedAtMs, startMs), lte(juniorAutomationExecutions.executedAtMs, endMs), eq(juniorAutomationExecutions.status, "completed"), options.access)).groupBy(executionHour, juniorAutomationExecutions.kind).orderBy(asc(executionHour), asc(juniorAutomationExecutions.kind));
+	const executionHour = sql`to_char(to_timestamp(${juniorAutomationRuns.completedAtMs} / 1000.0) at time zone 'UTC', 'YYYY-MM-DD"T"HH24')`;
+	const rows = await readCompletedExecutionBuckets({
+		access: options.access,
+		bucket: executionHour,
+		endMs,
+		startMs
+	});
 	const byHour = /* @__PURE__ */ new Map();
 	for (let offset = 0; offset < hourCount; offset += 1) {
 		const date = new Date(startMs + offset * 36e5).toISOString().slice(0, 13);
@@ -261,84 +278,75 @@ async function readAutomationExecutionHours(hourCount = 168, options = {}) {
 	}
 	return [...byHour.values()];
 }
-/** Load the newest terminal automation execution linked to one conversation, if any. */
+/** Count completed executions and their cost per time bucket and kind. */
+async function readCompletedExecutionBuckets(args) {
+	const conversationCost = conversationUsageCostExpr(juniorConversations.usage);
+	return await getDb().select({
+		count: count(),
+		costUsd: sql`SUM(${conversationCost})::double precision`,
+		date: args.bucket,
+		kind: juniorAutomations.kind
+	}).from(juniorAutomationRuns).innerJoin(juniorAutomations, eq(juniorAutomations.id, juniorAutomationRuns.automationId)).leftJoin(juniorConversations, eq(juniorConversations.conversationId, juniorAutomationRuns.conversationId)).where(and(gte(juniorAutomationRuns.completedAtMs, args.startMs), lte(juniorAutomationRuns.completedAtMs, args.endMs), eq(juniorAutomationRuns.status, "completed"), args.access)).groupBy(args.bucket, juniorAutomations.kind).orderBy(asc(args.bucket), asc(juniorAutomations.kind));
+}
+/** Load the Automation run linked to one conversation, if any. */
 async function readAutomationExecutionByConversationId(args) {
-	const namespace = args.namespace ?? "junior";
-	const row = (await getDb().select({
-		kind: juniorAutomationExecutions.kind,
-		automationId: juniorAutomationExecutions.automationId
-	}).from(juniorAutomationExecutions).where(and(eq(juniorAutomationExecutions.conversationId, args.conversationId), eq(juniorAutomationExecutions.namespace, namespace), inArray(juniorAutomationExecutions.kind, [...AUTOMATION_EXECUTION_TYPES]))).orderBy(desc(juniorAutomationExecutions.executedAtMs), desc(juniorAutomationExecutions.executionId)).limit(1))[0];
-	if (!row) return void 0;
-	if (row.kind !== "scheduled" && row.kind !== "event") return void 0;
-	return {
-		kind: row.kind,
-		automationId: row.automationId
-	};
+	const [row] = await getDb().select({
+		kind: juniorAutomations.kind,
+		automationId: juniorAutomationRuns.automationId
+	}).from(juniorAutomationRuns).innerJoin(juniorAutomations, eq(juniorAutomations.id, juniorAutomationRuns.automationId)).where(eq(juniorAutomationRuns.conversationId, args.conversationId)).limit(1);
+	return row;
 }
 /**
 * Load the display name of the Automation linked to each untitled
-* conversation. The newest execution wins. Like the Automation list, the name
-* falls back to the first line of the instruction. Titled conversations and
-* conversations without a linked Automation are absent from the result.
+* conversation. Like the Automation list, the name falls back to the first
+* line of the instruction. Titled conversations and conversations without a
+* linked Automation are absent from the result.
 */
 async function readAutomationTitlesByConversationId(conversations) {
 	const titles = /* @__PURE__ */ new Map();
 	const untitledIds = conversations.flatMap((conversation) => conversation.title ? [] : [conversation.conversationId]);
 	if (untitledIds.length === 0) return titles;
 	const rows = await getDb().select({
-		conversationId: juniorAutomationExecutions.conversationId,
-		eventInstruction: sql`${juniorEventAutomations.task}->'task'->>'text'`,
-		eventTitle: juniorEventAutomations.title,
-		scheduledInstruction: sql`${juniorSchedulerTasks.record}->'task'->>'text'`,
-		scheduledTitle: juniorSchedulerTasks.title
-	}).from(juniorAutomationExecutions).leftJoin(juniorSchedulerTasks, and(eq(juniorAutomationExecutions.kind, "scheduled"), eq(juniorSchedulerTasks.id, juniorAutomationExecutions.automationId))).leftJoin(juniorEventAutomations, and(eq(juniorAutomationExecutions.kind, "event"), eq(juniorEventAutomations.id, juniorAutomationExecutions.automationId))).where(and(inArray(juniorAutomationExecutions.conversationId, untitledIds), eq(juniorAutomationExecutions.namespace, "junior"))).orderBy(desc(juniorAutomationExecutions.executedAtMs), desc(juniorAutomationExecutions.executionId));
-	const seen = /* @__PURE__ */ new Set();
+		conversationId: juniorAutomationRuns.conversationId,
+		instruction: juniorAutomations.instruction,
+		title: juniorAutomations.title
+	}).from(juniorAutomationRuns).innerJoin(juniorAutomations, eq(juniorAutomations.id, juniorAutomationRuns.automationId)).where(inArray(juniorAutomationRuns.conversationId, untitledIds));
 	for (const row of rows) {
-		if (!row.conversationId || seen.has(row.conversationId)) continue;
-		seen.add(row.conversationId);
-		const title = (row.scheduledTitle ?? row.eventTitle)?.trim() || fallbackShortTitle(row.scheduledInstruction ?? row.eventInstruction ?? "", "");
-		if (title) titles.set(row.conversationId, title);
+		const title = row.title?.trim() || fallbackShortTitle(row.instruction, "");
+		if (row.conversationId && title) titles.set(row.conversationId, title);
 	}
 	return titles;
 }
 /** Load newest-first executions for one automation, with conversation titles when present. */
 async function readAutomationExecutions(args) {
-	const namespace = args.namespace ?? "junior";
 	return (await getDb().select({
-		conversationId: juniorAutomationExecutions.conversationId,
+		conversationId: juniorAutomationRuns.conversationId,
 		durationMs: juniorConversations.durationMs,
-		executedAtMs: juniorAutomationExecutions.executedAtMs,
-		executionId: juniorAutomationExecutions.executionId,
-		status: juniorAutomationExecutions.status,
+		executedAtMs: juniorAutomationRuns.completedAtMs,
+		executionId: juniorAutomationRuns.id,
+		status: juniorAutomationRuns.status,
 		title: juniorConversations.title,
 		usage: juniorConversations.usage
-	}).from(juniorAutomationExecutions).leftJoin(juniorConversations, eq(juniorConversations.conversationId, juniorAutomationExecutions.conversationId)).where(and(eq(juniorAutomationExecutions.kind, args.kind), eq(juniorAutomationExecutions.namespace, namespace), eq(juniorAutomationExecutions.automationId, args.automationId))).orderBy(desc(juniorAutomationExecutions.executedAtMs), desc(juniorAutomationExecutions.executionId)).limit(args.limit)).map((row) => mapAutomationExecutionRecord(row));
+	}).from(juniorAutomationRuns).leftJoin(juniorConversations, eq(juniorConversations.conversationId, juniorAutomationRuns.conversationId)).where(and(isExecution(), eq(juniorAutomationRuns.automationId, args.automationId))).orderBy(desc(juniorAutomationRuns.completedAtMs), desc(juniorAutomationRuns.id)).limit(args.limit)).map((row) => mapAutomationExecutionRecord(row));
 }
-/** Load newest-first executions for the supplied viewer-visible tasks. */
+/** Load newest-first executions for the supplied viewer-visible automations. */
 async function readAutomationRuns(args) {
-	const automations = args.automations ?? [];
-	const conversationIds = [...new Set((args.conversationIds ?? []).filter((conversationId) => conversationId.trim().length > 0))];
-	if (automations.length === 0 && conversationIds.length === 0) return [];
-	const namespace = args.namespace ?? "junior";
-	const selectors = [...automations.map((task) => and(eq(juniorAutomationExecutions.kind, task.kind), eq(juniorAutomationExecutions.automationId, task.automationId))), ...conversationIds.length > 0 ? [inArray(juniorAutomationExecutions.conversationId, conversationIds)] : []];
+	if (args.automationIds.length === 0) return [];
 	return (await getDb().select({
-		conversationId: juniorAutomationExecutions.conversationId,
+		conversationId: juniorAutomationRuns.conversationId,
 		durationMs: juniorConversations.durationMs,
-		executedAtMs: juniorAutomationExecutions.executedAtMs,
-		executionId: juniorAutomationExecutions.executionId,
-		kind: juniorAutomationExecutions.kind,
-		status: juniorAutomationExecutions.status,
-		automationId: juniorAutomationExecutions.automationId,
+		executedAtMs: juniorAutomationRuns.completedAtMs,
+		executionId: juniorAutomationRuns.id,
+		kind: juniorAutomations.kind,
+		status: juniorAutomationRuns.status,
+		automationId: juniorAutomationRuns.automationId,
 		title: juniorConversations.title,
 		usage: juniorConversations.usage
-	}).from(juniorAutomationExecutions).leftJoin(juniorConversations, eq(juniorConversations.conversationId, juniorAutomationExecutions.conversationId)).where(and(eq(juniorAutomationExecutions.namespace, namespace), or(...selectors))).orderBy(desc(juniorAutomationExecutions.executedAtMs), desc(juniorAutomationExecutions.executionId)).limit(args.limit)).flatMap((row) => {
-		if (row.kind !== "scheduled" && row.kind !== "event") return [];
-		return [{
-			...mapAutomationExecutionRecord(row),
-			kind: row.kind,
-			automationId: row.automationId
-		}];
-	});
+	}).from(juniorAutomationRuns).innerJoin(juniorAutomations, eq(juniorAutomations.id, juniorAutomationRuns.automationId)).leftJoin(juniorConversations, eq(juniorConversations.conversationId, juniorAutomationRuns.conversationId)).where(and(isExecution(), inArray(juniorAutomationRuns.automationId, args.automationIds))).orderBy(desc(juniorAutomationRuns.completedAtMs), desc(juniorAutomationRuns.id)).limit(args.limit)).map((row) => ({
+		...mapAutomationExecutionRecord(row),
+		kind: row.kind,
+		automationId: row.automationId
+	}));
 }
 function mapAutomationExecutionRecord(row) {
 	const title = row.title?.trim();
@@ -359,16 +367,16 @@ function mapAutomationExecutionRecord(row) {
 /** Load a fixed trailing window of terminal executions for one automation by status. */
 async function readAutomationExecutionStatusDays(args) {
 	const dayCount = args.dayCount ?? 90;
-	const namespace = args.namespace ?? "junior";
 	const end = utcDate(args.nowMs ?? Date.now());
 	const endMs = Date.parse(`${end}T23:59:59.999Z`);
 	const startMs = Date.parse(`${end}T00:00:00.000Z`) - (dayCount - 1) * 864e5;
-	const executionDate = sql`to_char(to_timestamp(${juniorAutomationExecutions.executedAtMs} / 1000.0) at time zone 'UTC', 'YYYY-MM-DD')`;
-	const rows = await getDb().select({
-		count: count(),
-		date: executionDate,
-		status: juniorAutomationExecutions.status
-	}).from(juniorAutomationExecutions).where(and(eq(juniorAutomationExecutions.kind, args.kind), eq(juniorAutomationExecutions.namespace, namespace), eq(juniorAutomationExecutions.automationId, args.automationId), gte(juniorAutomationExecutions.executedAtMs, startMs), lte(juniorAutomationExecutions.executedAtMs, endMs), inArray(juniorAutomationExecutions.status, [...AUTOMATION_EXECUTION_STATUSES]))).groupBy(executionDate, juniorAutomationExecutions.status).orderBy(asc(executionDate), asc(juniorAutomationExecutions.status));
+	const executionDate = sql`to_char(to_timestamp(${juniorAutomationRuns.completedAtMs} / 1000.0) at time zone 'UTC', 'YYYY-MM-DD')`;
+	const rows = await readExecutionStatusBuckets({
+		automationId: args.automationId,
+		bucket: executionDate,
+		endMs,
+		startMs
+	});
 	const byDate = /* @__PURE__ */ new Map();
 	for (let offset = 0; offset < dayCount; offset += 1) {
 		const date = utcDate(startMs + offset * 864e5);
@@ -386,18 +394,18 @@ async function readAutomationExecutionStatusDays(args) {
 /** Load a fixed trailing window of terminal executions for one automation by hour. */
 async function readAutomationExecutionStatusHours(args) {
 	const hourCount = args.hourCount ?? 168;
-	const namespace = args.namespace ?? "junior";
 	const nowMs = args.nowMs ?? Date.now();
 	const end = new Date(nowMs);
 	end.setUTCMinutes(0, 0, 0);
 	const endMs = end.getTime() + 3599999;
 	const startMs = end.getTime() - (hourCount - 1) * 36e5;
-	const executionHour = sql`to_char(to_timestamp(${juniorAutomationExecutions.executedAtMs} / 1000.0) at time zone 'UTC', 'YYYY-MM-DD"T"HH24')`;
-	const rows = await getDb().select({
-		count: count(),
-		date: executionHour,
-		status: juniorAutomationExecutions.status
-	}).from(juniorAutomationExecutions).where(and(eq(juniorAutomationExecutions.kind, args.kind), eq(juniorAutomationExecutions.namespace, namespace), eq(juniorAutomationExecutions.automationId, args.automationId), gte(juniorAutomationExecutions.executedAtMs, startMs), lte(juniorAutomationExecutions.executedAtMs, endMs), inArray(juniorAutomationExecutions.status, [...AUTOMATION_EXECUTION_STATUSES]))).groupBy(executionHour, juniorAutomationExecutions.status).orderBy(asc(executionHour), asc(juniorAutomationExecutions.status));
+	const executionHour = sql`to_char(to_timestamp(${juniorAutomationRuns.completedAtMs} / 1000.0) at time zone 'UTC', 'YYYY-MM-DD"T"HH24')`;
+	const rows = await readExecutionStatusBuckets({
+		automationId: args.automationId,
+		bucket: executionHour,
+		endMs,
+		startMs
+	});
 	const byHour = /* @__PURE__ */ new Map();
 	for (let offset = 0; offset < hourCount; offset += 1) {
 		const date = new Date(startMs + offset * 36e5).toISOString().slice(0, 13);
@@ -412,6 +420,14 @@ async function readAutomationExecutionStatusHours(args) {
 	}
 	return [...byHour.values()];
 }
+/** Count one automation's executions per time bucket and status. */
+async function readExecutionStatusBuckets(args) {
+	return await getDb().select({
+		count: count(),
+		date: args.bucket,
+		status: juniorAutomationRuns.status
+	}).from(juniorAutomationRuns).where(and(isExecution(), eq(juniorAutomationRuns.automationId, args.automationId), gte(juniorAutomationRuns.completedAtMs, args.startMs), lte(juniorAutomationRuns.completedAtMs, args.endMs))).groupBy(args.bucket, juniorAutomationRuns.status).orderBy(asc(args.bucket), asc(juniorAutomationRuns.status));
+}
 //#endregion
 //#region src/chat/automations/blocked-notice.ts
 function buildBlockedNoticeText(automationId, title, reason) {
@@ -688,9 +704,9 @@ async function recordEventAutomationExecution(previous, next, status) {
 	if (next.plugin !== "junior") return;
 	const eventAutomationId = next.metadata?.eventAutomationId;
 	if (!eventAutomationId) return;
-	const conversationId = getDispatchConversationId(next);
-	await recordAutomationExecution("event", eventAutomationId, {
-		...await getConversationStore().get({ conversationId }) ? { conversationId } : void 0,
+	await recordAutomationExecution(eventAutomationId, {
+		conversationId: getDispatchConversationId(next),
+		errorMessage: next.errorMessage,
 		executionId: next.id,
 		nowMs: next.updatedAtMs,
 		status
@@ -1021,4 +1037,4 @@ async function processPluginTask(message, options = {}) {
 	});
 }
 //#endregion
-export { readAutomationTitlesByConversationId as A, readAutomationExecutionDays as C, readAutomationExecutionSummaries as D, readAutomationExecutionStatusHours as E, conversationActiveDaysColumn as M, conversationAggregateColumns as N, readAutomationExecutions as O, conversationRangeColumns as P, readAutomationExecutionByConversationId as S, readAutomationExecutionStatusDays as T, markDispatchCompleted as _, confirmDispatchMailboxAppend as a, notifyAutomationBlocked as b, getDispatchIdForConversation as c, getDispatchTurnId as d, getPluginDispatchProjection as f, markDispatchBlocked as g, markDispatchAwaitingResume as h, claimDispatchMailboxAppend as i, recordAutomationExecution as j, readAutomationRuns as k, getDispatchInputMessageId as l, listPendingDispatchMailboxAppends as m, scheduleSessionCompletedPluginTasks as n, createOrGetDispatch as o, isTerminalDispatchStatus as p, task_runner_exports as r, getDispatchConversationId as s, processPluginTask as t, getDispatchRecord as u, markDispatchFailed as v, readAutomationExecutionHours as w, emptyAutomationRunWindows as x, markDispatchRunning as y };
+export { readAutomationRuns as A, readAutomationExecutionByConversationId as C, readAutomationExecutionStatusHours as D, readAutomationExecutionStatusDays as E, conversationRangeColumns as F, recordAutomationExecution as M, conversationActiveDaysColumn as N, readAutomationExecutionSummaries as O, conversationAggregateColumns as P, existingConversationId as S, readAutomationExecutionHours as T, markDispatchCompleted as _, confirmDispatchMailboxAppend as a, notifyAutomationBlocked as b, getDispatchIdForConversation as c, getDispatchTurnId as d, getPluginDispatchProjection as f, markDispatchBlocked as g, markDispatchAwaitingResume as h, claimDispatchMailboxAppend as i, readAutomationTitlesByConversationId as j, readAutomationExecutions as k, getDispatchInputMessageId as l, listPendingDispatchMailboxAppends as m, scheduleSessionCompletedPluginTasks as n, createOrGetDispatch as o, isTerminalDispatchStatus as p, task_runner_exports as r, getDispatchConversationId as s, processPluginTask as t, getDispatchRecord as u, markDispatchFailed as v, readAutomationExecutionDays as w, emptyAutomationRunWindows as x, markDispatchRunning as y };