@sentry/junior 0.268.0 → 0.269.0

package/dist/{validation--JsAGLwc.js → validation-DHR1ivfh.js}

@@ -1,5 +1,5 @@
 import { t as __exportAll } from "./rolldown-runtime-nwUcYXjP.js";
-import { n as pluginCatalogRuntime } from "./catalog-runtime-BD9GSpc6.js";
+import { n as pluginCatalogRuntime } from "./catalog-runtime-BsoSmTM0.js";
 import { isDeepStrictEqual } from "node:util";
 // src/chat/plugins/validation.ts
 var validation_exports = /* @__PURE__ */ __exportAll({

package/dist/{version-jHwJp4hC.js → version-CXCHLgWm.js}

@@ -1,5 +1,5 @@
 // package.json
-var version = "0.268.0";
+var version = "0.269.0";
 // src/version.ts
 /** Installed Junior package version, or `unknown` when package metadata is unavailable. */
 const JUNIOR_VERSION = typeof version === "string" && version.trim() ? version : "unknown";

package/dist/version.js

@@ -1 +1 @@
-export { t as JUNIOR_VERSION } from "./version-jHwJp4hC.js";
+export { t as JUNIOR_VERSION } from "./version-CXCHLgWm.js";

package/dist/{viewer-CpXTGlep.js → viewer-DSbD6DF6.js}

@@ -1,12 +1,13 @@
 import { t as __exportAll } from "./rolldown-runtime-nwUcYXjP.js";
-import { i as getChatConfig } from "./config-DrTeF80T.js";
-import { L as GOOGLE_IDENTITY_PROVIDER, z as normalizeIdentityEmail } from "./logging-DLSpkSSr.js";
+import { i as getChatConfig } from "./config-CPsE4T5L.js";
+import { L as GOOGLE_IDENTITY_PROVIDER, h as logWarn, z as normalizeIdentityEmail } from "./logging-n7knse-O.js";
 import { a as isSlackUserId, d as parseSlackChannelReferenceId, f as parseSlackTeamId, s as parseActorUserId } from "./actor-CP9K2Idu.js";
 import { c as juniorIdentities, d as juniorDestinations, l as juniorUsers, o as conversationReadColumns, s as juniorConversations } from "./agent-invocations-C1RNOCs8.js";
-import { _ as CONVERSATION_METRICS, h as juniorConversationBindings, m as juniorConversationParticipants, t as createJuniorSqlExecutor, v as juniorConversationMetrics, x as juniorConversationAnnotations, y as juniorConversationEvents } from "./executor-4vhvsMZJ.js";
-import { c as newConversationEventSchema, h as usageSchema, l as encodeHistoryPayload, o as decodeStoredConversationEvent, r as conversationEventDataSchema, s as historyReplacementSchema } from "./history-C84mlAwO.js";
-import { randomUUID } from "node:crypto";
-import { and, asc, desc, eq, gt, gte, inArray, isNull, lt, lte, ne, or, sql } from "drizzle-orm";
+import { _ as CONVERSATION_METRICS, h as juniorConversationBindings, m as juniorConversationParticipants, t as createJuniorSqlExecutor, v as juniorConversationMetrics, x as juniorConversationAnnotations, y as juniorConversationEvents } from "./executor-CNS7ONt-.js";
+import { d as newConversationEventSchema, f as encodeHistoryPayload, l as decodeStoredConversationEvent, n as detectImageMediaType, o as conversationEventDataSchema, u as historyReplacementSchema, v as usageSchema } from "./media-85PDJxO_.js";
+import { a as withLock } from "./locks-D-0h111u.js";
+import { createHash, randomUUID } from "node:crypto";
+import { and, asc, desc, eq, gt, gte, inArray, isNotNull, isNull, lt, lte, ne, or, sql } from "drizzle-orm";
 import { destinationSchema, identitySchema, locationSchema, sourceSchema, userSchema } from "@sentry/junior-plugin-api";
 // src/chat/destination.ts
 /** Build Junior's canonical destination from Slack workspace and channel ids. */
@@ -381,7 +382,7 @@ async function upsertIdentityRecord(executor, identity, linkedUserId, nowMs) {
 		email: email ?? null,
 		emailNormalized: emailNormalized ?? null,
 		emailVerified: Boolean(identity.emailVerified && emailNormalized),
-		avatarUrl: null,
+		avatarUrl: identity.avatarUrl ?? null,
 		metadata: identity.metadata ?? null,
 		createdAt: dateFromMs$1(nowMs),
 		updatedAt: dateFromMs$1(nowMs)
@@ -399,7 +400,7 @@ async function upsertIdentityRecord(executor, identity, linkedUserId, nowMs) {
 			email: sql`case when ${juniorIdentities.emailVerified} then coalesce(${juniorIdentities.email}, excluded.email) when excluded.email_verified then excluded.email else coalesce(${juniorIdentities.email}, excluded.email) end`,
 			emailNormalized: sql`case when ${juniorIdentities.emailVerified} then coalesce(${juniorIdentities.emailNormalized}, excluded.email_normalized) when excluded.email_verified then excluded.email_normalized else coalesce(${juniorIdentities.emailNormalized}, excluded.email_normalized) end`,
 			emailVerified: sql`${juniorIdentities.emailVerified} OR excluded.email_verified`,
-			avatarUrl: sql`coalesce(${juniorIdentities.avatarUrl}, excluded.avatar_url)`,
+			avatarUrl: identity.avatarUrl === void 0 ? sql`${juniorIdentities.avatarUrl}` : sql`excluded.avatar_url`,
 			metadata: sql`coalesce(${juniorIdentities.metadata}, excluded.metadata_json)`,
 			updatedAt: sql`excluded.updated_at`
 		},
@@ -475,7 +476,8 @@ async function recordGoogleSignIn(executor, account, nowMs = Date.now()) {
 		providerSubjectId: account.subject,
 		email: account.email,
 		emailVerified: true,
-		displayName: account.displayName
+		displayName: account.displayName,
+		avatarUrl: account.avatarUrl ?? null
 	}, nowMs);
 	await executor.db().update(juniorIdentities).set({ signedInAt: dateFromMs$1(nowMs) }).where(eq(juniorIdentities.id, stored.id));
 	return stored;
@@ -488,20 +490,22 @@ async function recordGoogleSignIn(executor, account, nowMs = Date.now()) {
 * module, so they agree on one Identity per person. The key for each Actor
 * stays private here, so it can change without changing callers.
 */
-/** The one Identity for work that Junior does on its own. */
-const SYSTEM_IDENTITY = {
-	kind: "system",
-	provider: "junior",
-	providerSubjectId: "system",
-	displayName: "System"
-};
 /**
-* Return the Identity key for one Actor.
+* The fixed id of the one system Identity: kind `system`, provider `junior`,
+* an empty tenant, and subject `system`. A migration creates the row, so
+* callers use this id without a database read.
+*/
+const SYSTEM_IDENTITY_ID = "system";
+/**
+* Return whether an Actor uses the system Identity.
 *
-* Every SystemActor uses the one system Identity. `SystemActor.name` is
-* provenance, not part of the key. A LocalActor uses the system Identity too,
-* because the local runner has no per-person user id.
+* `SystemActor.name` is provenance, not part of the Identity. A LocalActor
+* uses the system Identity because the local runner has no per-person user id.
 */
+function usesSystemIdentity(actor) {
+	return actor.platform === "local" || actor.platform === "system";
+}
+/** Return the Identity key for one Slack or web Actor. */
 function identityKey(actor) {
 	switch (actor.platform) {
 		case "slack": return {
@@ -530,20 +534,28 @@ function identityKey(actor) {
 				metadata: { platform: "web" }
 			};
 		}
-		case "local":
-		case "system": return SYSTEM_IDENTITY;
 	}
 }
 /**
-* Save the Identity for one Actor and return its id.
+* Return the Identity id for one Actor. Save a Slack or web Identity first.
 * Return undefined only for a web Actor without a verified email.
 */
 async function resolveActorIdentityId(executor, actor, nowMs = Date.now()) {
+	if (usesSystemIdentity(actor)) return SYSTEM_IDENTITY_ID;
 	const key = identityKey(actor);
 	return key ? (await upsertIdentity(executor, key, nowMs)).id : void 0;
 }
+/** Save the profile photo on the Identity of one Slack Actor. Null clears it. */
+async function saveActorAvatar(executor, actor, avatarUrl, nowMs = Date.now()) {
+	const key = identityKey(actor);
+	if (key) await upsertIdentity(executor, {
+		...key,
+		avatarUrl
+	}, nowMs);
+}
 /** Find the stored Identity id for one Actor without writing. */
 async function findActorIdentityId(db, actor) {
+	if (usesSystemIdentity(actor)) return SYSTEM_IDENTITY_ID;
 	const key = identityKey(actor);
 	if (!key) return;
 	return (await db.select({ id: juniorIdentities.id }).from(juniorIdentities).where(and(eq(juniorIdentities.provider, key.provider), eq(juniorIdentities.providerTenantId, key.providerTenantId ?? ""), eq(juniorIdentities.providerSubjectId, key.providerSubjectId))).limit(1))[0]?.id;
@@ -1068,7 +1080,7 @@ var SqlStore = class {
 				sessionSource: sql`coalesce(${juniorConversations.sessionSource}, excluded.source_json)`,
 				location: sql`coalesce(excluded.location_json, ${juniorConversations.location})`,
 				destinationId: sql`coalesce(excluded.destination_id, ${juniorConversations.destinationId})`,
-				actorIdentityId: sql`coalesce(excluded.actor_identity_id, ${juniorConversations.actorIdentityId})`,
+				actorIdentityId: sql`coalesce(${juniorConversations.actorIdentityId}, excluded.actor_identity_id)`,
 				creatorIdentityId: sql`coalesce(excluded.creator_identity_id, ${juniorConversations.creatorIdentityId})`,
 				credentialSubjectIdentityId: sql`coalesce(excluded.credential_subject_identity_id, ${juniorConversations.credentialSubjectIdentityId})`,
 				channelName: sql`coalesce(excluded.channel_name, ${juniorConversations.channelName})`,
@@ -1223,14 +1235,15 @@ async function findJuniorIdentityIdByDashboardAuthorId(executor, dashboardAuthor
 }
 /**
 * Resolve the durable actor identity for one event payload.
-* Human user messages get an identity when author data is enough; other events
-* keep a null actor.
+* Ingress sets `authorIdentityId` on new user Messages. Legacy writes without
+* it still guess the author from its data, and a new Message logs the guess.
 */
 async function resolveEventActorIdentityId(executor, args) {
 	const data = args.data;
 	if (data.type !== "message" && data.type !== "message_updated") return;
 	if (typeof data.authorIdentityId === "string" && data.authorIdentityId) return data.authorIdentityId;
 	if (data.role !== "user") return;
+	if (data.type === "message") logWarn("conversation.message.author_identity.missing", { "app.message.id": data.messageId });
 	const author = readAuthor(data.meta);
 	if (author.isBot === true) return;
 	const userId = parseActorUserId(author.userId);
@@ -1653,6 +1666,163 @@ async function closeDb() {
 	current = void 0;
 	await previous?.db.close();
 }
+// src/chat/state/cache.ts
+const MAX_CACHE_KEY_LENGTH = 512;
+const LOAD_WAIT_MS = 1e4;
+/**
+* Create a cache in the state adapter under `junior:cache:{namespace}:`.
+* Entries are wrapped, so `null` and `false` values are cache hits.
+*/
+function createCache(state, namespace) {
+	return { async getOrLoad(key, load, options) {
+		if (!key.trim()) throw new Error("Cache key is required");
+		if (key.length > MAX_CACHE_KEY_LENGTH) throw new Error("Cache key exceeds the maximum length");
+		const cacheKey = `junior:cache:${namespace}:${key}`;
+		const cached = async () => options?.refresh ? void 0 : await state.get(cacheKey) ?? void 0;
+		await state.connect();
+		const hit = await cached();
+		if (hit) return hit.value;
+		const attempt = await withLock(state, `${cacheKey}:load`, async () => {
+			const loadedMeanwhile = await cached();
+			if (loadedMeanwhile) return loadedMeanwhile.value;
+			const entry = await load();
+			if (entry.ttlMs !== void 0) {
+				if (!(entry.ttlMs > 0)) throw new Error("Cache ttlMs must be positive");
+				await state.set(cacheKey, { value: entry.value }, entry.ttlMs);
+			}
+			return entry.value;
+		}, {
+			keepAlive: true,
+			waitMs: LOAD_WAIT_MS
+		});
+		if (attempt.acquired) return attempt.value;
+		return (await load()).value;
+	} };
+}
+// src/chat/identities/avatar.ts
+/**
+* Profile photos of people, saved on their native Slack and Google
+* identities. Junior serves each photo from its own API, so browsers never
+* load a photo from Slack or Google.
+*/
+const AVATAR_HOSTS = {
+	slack: ["avatars.slack-edge.com"],
+	[GOOGLE_IDENTITY_PROVIDER]: ["googleusercontent.com"]
+};
+const AVATAR_PROVIDERS = Object.keys(AVATAR_HOSTS);
+const AVATAR_CACHE_TTL_MS = 864e5;
+const AVATAR_FAILURE_TTL_MS = 3e5;
+const AVATAR_FETCH_TIMEOUT_MS = 5e3;
+const MAX_AVATAR_BYTES = 1048576;
+/**
+* Return the URL when it is HTTPS on a photo host of the provider or a
+* subdomain. Junior fetches only these URLs.
+*/
+function parseAvatarUrl(value, provider) {
+	const hosts = AVATAR_HOSTS[provider];
+	if (!hosts || !value || !URL.canParse(value)) return void 0;
+	const url = new URL(value);
+	if (url.protocol !== "https:" || url.username || url.password) return;
+	const host = url.hostname.toLowerCase();
+	return hosts.some((allowed) => host === allowed || host.endsWith(`.${allowed}`)) ? url.href : void 0;
+}
+function avatarPath(identityId) {
+	return `/api/people/avatars/${encodeURIComponent(identityId)}`;
+}
+/**
+* Read the photo path of each user: the Slack photo, then the Google photo.
+* Users without a photo are not in the map.
+*/
+async function readUserAvatarUrls(db, userIds) {
+	if (userIds.length === 0) return /* @__PURE__ */ new Map();
+	const rows = await db.select({
+		identityId: juniorIdentities.id,
+		provider: juniorIdentities.provider,
+		updatedAt: juniorIdentities.updatedAt,
+		userId: juniorIdentities.userId
+	}).from(juniorIdentities).where(and(inArray(juniorIdentities.userId, [...new Set(userIds)]), eq(juniorIdentities.kind, "user"), inArray(juniorIdentities.provider, AVATAR_PROVIDERS), isNotNull(juniorIdentities.avatarUrl)));
+	const rank = (row) => AVATAR_PROVIDERS.indexOf(row.provider);
+	rows.sort((left, right) => rank(left) - rank(right) || right.updatedAt.getTime() - left.updatedAt.getTime());
+	const avatars = /* @__PURE__ */ new Map();
+	for (const row of rows) if (row.userId && !avatars.has(row.userId)) avatars.set(row.userId, avatarPath(row.identityId));
+	return avatars;
+}
+/**
+* Return the photo path for one Identity row. A linked Identity uses the
+* photo of its user. An Identity without a user uses its own photo.
+*/
+function identityAvatarUrl(row, userAvatarUrls) {
+	if (row.userId) return userAvatarUrls.get(row.userId);
+	return row.avatarUrl ? avatarPath(row.identityId) : void 0;
+}
+async function readBoundedBody(response, maxBytes) {
+	if (!response.body) return /* @__PURE__ */ new Uint8Array();
+	const reader = response.body.getReader();
+	const chunks = [];
+	let total = 0;
+	while (true) {
+		const { done, value } = await reader.read();
+		if (done) return Buffer.concat(chunks);
+		total += value.byteLength;
+		if (total > maxBytes) {
+			await reader.cancel();
+			return;
+		}
+		chunks.push(value);
+	}
+}
+function avatarFetchFailed(host, attributes) {
+	logWarn("avatar.fetch.failed", {
+		"server.address": host,
+		...attributes
+	});
+	return null;
+}
+async function fetchAvatarImage(url) {
+	const host = new URL(url).hostname;
+	let data;
+	try {
+		const response = await fetch(url, {
+			redirect: "error",
+			signal: AbortSignal.timeout(AVATAR_FETCH_TIMEOUT_MS)
+		});
+		if (!response.ok) {
+			await response.body?.cancel();
+			return avatarFetchFailed(host, { "http.response.status_code": response.status });
+		}
+		data = await readBoundedBody(response, MAX_AVATAR_BYTES);
+	} catch (error) {
+		return avatarFetchFailed(host, { "exception.message": error instanceof Error ? error.message : String(error) });
+	}
+	if (!data) return avatarFetchFailed(host, { "app.reason": "too_large" });
+	const contentType = detectImageMediaType(data);
+	if (!contentType) return avatarFetchFailed(host, { "app.reason": "not_an_image" });
+	return {
+		contentType,
+		data: Buffer.from(data).toString("base64")
+	};
+}
+/**
+* Read the saved photo of one Identity. Junior fetches it from the provider
+* once and keeps it in the state cache for a day. Return undefined when the
+* Identity has no photo or the provider does not return one.
+*/
+async function readAvatarImage(db, state, identityId) {
+	const [row] = await db.select({
+		avatarUrl: juniorIdentities.avatarUrl,
+		provider: juniorIdentities.provider
+	}).from(juniorIdentities).where(and(eq(juniorIdentities.id, identityId), eq(juniorIdentities.kind, "user"))).limit(1);
+	const url = row ? parseAvatarUrl(row.avatarUrl, row.provider) : void 0;
+	if (!url) return void 0;
+	const key = `avatar:${createHash("sha256").update(url).digest("hex")}`;
+	return await createCache(state, "core").getOrLoad(key, async () => {
+		const loaded = await fetchAvatarImage(url);
+		return {
+			value: loaded,
+			ttlMs: loaded ? AVATAR_CACHE_TTL_MS : AVATAR_FAILURE_TTL_MS
+		};
+	}) ?? void 0;
+}
 // src/chat/plugins/viewer.ts
 function identityFromRow(row) {
 	return identitySchema.parse({
@@ -1712,6 +1882,10 @@ async function updateViewerDisplayNameFromSql(db, userId, displayName) {
 	}).where(eq(juniorUsers.id, userId)).returning())[0];
 	return userRow ? await readUserById(db, userRow) : void 0;
 }
+/** Read the photo path of one canonical user: Slack, then Google. */
+async function readViewerAvatarUrl(userId) {
+	return (await readUserAvatarUrls(getDb(), [userId])).get(userId);
+}
 /** Update one canonical user's display name. */
 async function updateViewerDisplayName(userId, displayName) {
 	return await updateViewerDisplayNameFromSql(getDb(), userId, displayName);
@@ -1761,4 +1935,4 @@ async function readIdentityByIdFromSql(db, identityId) {
 async function readIdentityById(identityId) {
 	return await readIdentityByIdFromSql(getDb(), identityId);
 }
-export { upsertLinkedIdentity as A, parseDestination as B, resolveActorIdentityId as C, readUserTimezone as D, findUserByVerifiedEmails as E, agentTurnTotalTokens as F, sameDestination as H, agentTurnUsageSchema as I, hasAgentTurnUsage as L, parseSessionSource as M, addAgentTurnUsage as N, recordGoogleSignIn as O, agentTurnCostUsd as P, resolveRootConversationId as R, startLocationThread as S, deleteProviderIdentityForUser as T, requireSlackDestination as V, withConversationEventLock as _, readIdentityById as a, withConversationMutationLock as b, updateViewerDisplayName as c, getConversationEventStore as d, getConversationMessageSearchStore as f, createSqlConversationEventStore as g, getSqlExecutor as h, readActorIdentity as i, bindProviderConversation as j, saveUserTimezone as k, closeDb as l, getDb as m, findUserByEmailFromSql as n, resolveViewerUser as o, getConversationStore as p, listAdminUsersFromSql as r, setUserAdminFromSql as s, findUserByEmail as t, db_exports as u, loadConversationSlackTenantIds as v, deleteProviderIdentityForSlackUser as w, locationFromRow as x, createSqlStore as y, createSlackDestination as z };
+export { startLocationThread as A, upsertLinkedIdentity as B, getSqlExecutor as C, createSqlStore as D, loadConversationSlackTenantIds as E, deleteProviderIdentityForUser as F, agentTurnTotalTokens as G, parseSessionSource as H, findUserByVerifiedEmails as I, resolveRootConversationId as J, agentTurnUsageSchema as K, readUserTimezone as L, resolveActorIdentityId as M, saveActorAvatar as N, withConversationMutationLock as O, deleteProviderIdentityForSlackUser as P, sameDestination as Q, recordGoogleSignIn as R, getDb as S, withConversationEventLock as T, addAgentTurnUsage as U, bindProviderConversation as V, agentTurnCostUsd as W, parseDestination as X, createSlackDestination as Y, requireSlackDestination as Z, closeDb as _, readActorIdentityFromSql as a, getConversationMessageSearchStore as b, readViewerAvatarUrl as c, updateViewerDisplayName as d, identityAvatarUrl as f, createCache as g, readUserAvatarUrls as h, readActorIdentity as i, SYSTEM_IDENTITY_ID as j, locationFromRow as k, resolveViewerUser as l, readAvatarImage as m, findUserByEmailFromSql as n, readIdentityById as o, parseAvatarUrl as p, hasAgentTurnUsage as q, listAdminUsersFromSql as r, readIdentityByIdFromSql as s, findUserByEmail as t, setUserAdminFromSql as u, db_exports as v, createSqlConversationEventStore as w, getConversationStore as x, getConversationEventStore as y, saveUserTimezone as z };

package/dist/{work-3N-GHY9m.js → work-BE_qTYGi.js}

@@ -1,15 +1,14 @@
-import { t as __exportAll } from "./rolldown-runtime-nwUcYXjP.js";
-import { Fn as isTurnExecutionLimitExceededError, Gt as saveTurnCheckpoint, It as AuthorizationFlowDisabledError, Jt as failTurnRecord, Kt as abandonTurnRecord, Mt as PluginCredentialFailureError, Yt as getTurnRecord, et as openConversationProjection, zn as getTerminalAssistantMessages } from "./tasks-SB9z-VTU.js";
-import { n as botConfig } from "./config-DrTeF80T.js";
-import { d as getConversationEventStore, p as getConversationStore } from "./viewer-CpXTGlep.js";
-import { m as sameActorIdentity, u as agentInstructionProvenance } from "./history-C84mlAwO.js";
-import { Dt as recordSubagentEnded, Ft as buildSteeringPiMessage, Ht as readBlockedReport, It as withoutSavedSteeringMessages, Ot as recordSubagentStarted, Tt as stopChildAgentsOf } from "./agent-runner-CAYfFmU7.js";
-import { E as markAgentInvocationSteered, H as TurnInputCommitLostError, K as isTurnInputCommitLostError, L as agentTypeInstructions, O as reportReplacedAgentInvocation, R as agentTypeStartsWithParentHistory, S as markAgentInvocationMailboxAppended, T as markAgentInvocationRunning, W as getConversationTurnBoundaryError, _ as getLatestAgentInvocationForConversation, c as getAgentInvocation, f as getAgentInvocationMessageId, m as getAgentInvocationTurnId, n as completeAgentInvocation, r as createAgentInvocation, s as getActiveAgentInvocationForConversation, w as markAgentInvocationPaused, y as isTerminalAgentInvocation } from "./store-C5PN02QO.js";
-import { r as getAssistantReplyText } from "./interruption-marker-CkncDT8d.js";
-import { C as maybePostAutomatedTurnLimitNotice, D as recordFinishedTurnForAutomatedLimit, O as resetAutomatedTurnLimit } from "./session-stop-Dam1EI7B.js";
-import { r as appendAndEnqueueInboundMessage } from "./store-zPEoJPBB.js";
-import { t as ConversationTurnLifecycleService } from "./turn-lifecycle-oP0kVeGz.js";
-import { a as persistThreadStateById, n as getPersistedSandboxState, r as getPersistedThreadState } from "./thread-state-BbbPh0Sn.js";
+import { Dn as failTurnRecord, Nt as openConversationProjection, On as getTurnRecord, Tn as abandonTurnRecord, dn as PluginCredentialFailureError, hn as AuthorizationFlowDisabledError, mr as isTurnExecutionLimitExceededError, vr as getTerminalAssistantMessages, wn as saveTurnCheckpoint } from "./turn-session-routing-BqO0qXLk.js";
+import { n as botConfig } from "./config-CPsE4T5L.js";
+import { j as SYSTEM_IDENTITY_ID, x as getConversationStore, y as getConversationEventStore } from "./viewer-DSbD6DF6.js";
+import { _ as sameActorIdentity, p as agentInstructionProvenance } from "./media-85PDJxO_.js";
+import { Et as withoutSavedSteeringMessages, Mt as readBlockedReport, Tt as buildSteeringPiMessage, _t as recordSubagentEnded, ht as stopChildAgentsOf, vt as recordSubagentStarted } from "./agent-runner-CrDrPUtY.js";
+import { E as markAgentInvocationSteered, H as TurnInputCommitLostError, K as isTurnInputCommitLostError, L as agentTypeInstructions, O as reportReplacedAgentInvocation, R as agentTypeStartsWithParentHistory, S as markAgentInvocationMailboxAppended, T as markAgentInvocationRunning, W as getConversationTurnBoundaryError, _ as getLatestAgentInvocationForConversation, c as getAgentInvocation, f as getAgentInvocationMessageId, m as getAgentInvocationTurnId, n as completeAgentInvocation, r as createAgentInvocation, s as getActiveAgentInvocationForConversation, w as markAgentInvocationPaused, y as isTerminalAgentInvocation } from "./store-1DVhoKOL.js";
+import { r as getAssistantReplyText } from "./interruption-marker-g6Xup3Fk.js";
+import { C as maybePostAutomatedTurnLimitNotice, D as recordFinishedTurnForAutomatedLimit, O as resetAutomatedTurnLimit } from "./session-stop-BQW_iFcd.js";
+import { r as appendAndEnqueueInboundMessage } from "./store-DCo2n5iJ.js";
+import { t as ConversationTurnLifecycleService } from "./turn-lifecycle-bf2fIYi_.js";
+import { a as persistThreadStateById, n as getPersistedSandboxState, r as getPersistedThreadState } from "./thread-state-CHy8LS0C.js";
 import { isDeepStrictEqual } from "node:util";
 import { z } from "zod";
 // src/chat/runtime/turn-execution.ts
@@ -86,16 +85,6 @@ async function loadForkHistory(invocation) {
 	return forkHistoryFrom((await openConversationProjection({ conversationId: invocation.parentConversationId })).messages, invocation.parentToolCallId);
 }
 // src/chat/agent-invocations/work.ts
-var work_exports = /* @__PURE__ */ __exportAll({
-	agentInvocationInputText: () => agentInvocationInputText,
-	agentInvocationRunPolicy: () => agentInvocationRunPolicy,
-	buildAgentInvocationInboundMessage: () => buildAgentInvocationInboundMessage,
-	createAgentInvocationWorker: () => createAgentInvocationWorker,
-	createAndEnqueueAgentInvocation: () => createAndEnqueueAgentInvocation,
-	enqueueAgentInvocation: () => enqueueAgentInvocation,
-	resolveAgentInvocationId: () => resolveAgentInvocationId,
-	routeAgentInvocationWork: () => routeAgentInvocationWork
-});
 const agentInvocationMailboxMetadataSchema = z.object({
 	agentInvocationId: z.string().min(1),
 	kind: z.literal("agent_invocation")
@@ -121,6 +110,7 @@ function buildAgentInvocationInboundMessage(invocation, nowMs = Date.now()) {
 		inboundMessageId: getAgentInvocationMessageId(invocation.invocationId),
 		input: {
 			authorId: invocation.invocationId,
+			authorIdentityId: SYSTEM_IDENTITY_ID,
 			text: "[agent invocation]",
 			metadata: {
 				agentInvocationId: invocation.invocationId,
@@ -188,8 +178,7 @@ async function resolveAgentInvocationId(context) {
 	if (context.attempt.messages.length > 0) return;
 	const active = await getActiveAgentInvocationForConversation(context.conversationId);
 	if (active) return active.invocationId;
-	const latest = await getLatestAgentInvocationForConversation(context.conversationId);
-	return latest?.status === "stopped" ? latest.invocationId : void 0;
+	return (await getLatestAgentInvocationForConversation(context.conversationId))?.invocationId;
 }
 /**
 * Give queued parent messages to the running agent invocation of a child as
@@ -267,9 +256,9 @@ function agentInvocationTurnEnd(terminal) {
 /** Project the terminal invocation into the idempotent turn lifecycle. */
 async function persistTerminalLifecycle(terminal) {
 	const turnId = getAgentInvocationTurnId(terminal.invocationId);
-	if (terminal.status === "stopped") await abandonTurnRecord({
+	if (terminal.status !== "completed") await abandonTurnRecord({
 		conversationId: terminal.childConversationId,
-		errorMessage: "Turn cancelled",
+		errorMessage: terminal.status === "stopped" ? "Turn cancelled" : terminal.errorMessage,
 		turnId
 	});
 	await finishTurn(terminal.childConversationId, turnId, agentInvocationTurnEnd(terminal));
@@ -506,8 +495,7 @@ function createAgentInvocationWorker(agentRunner, options = {}) {
 				turnId
 			}));
 		} catch (error) {
-			if (!(error instanceof AgentRunError)) throw error;
-			const runError = error.cause;
+			const runError = error instanceof AgentRunError ? error.cause : error;
 			if (isInvocationInputCommitLost(runError)) return { status: "lost_lease" };
 			if (stopSignal?.aborted) return await finishStopped();
 			const blocking = blockingInvocationError(runError);
@@ -553,11 +541,4 @@ function createAgentInvocationWorker(agentRunner, options = {}) {
 		return { status: "completed" };
 	};
 }
-/** Route invocation-backed work before falling through to existing consumers. */
-function routeAgentInvocationWork(options) {
-	return async (context) => {
-		const invocationId = await resolveAgentInvocationId(context);
-		return invocationId ? await options.invocationWorker(context, invocationId) : await options.fallbackWorker(context);
-	};
-}
-export { work_exports as a, resolveAgentInvocationId as i, createAndEnqueueAgentInvocation as n, AgentRunError as o, enqueueAgentInvocation as r, executeTurn as s, createAgentInvocationWorker as t };
+export { AgentRunError as a, resolveAgentInvocationId as i, createAndEnqueueAgentInvocation as n, executeTurn as o, enqueueAgentInvocation as r, createAgentInvocationWorker as t };

package/dist/{worker-CCdbcItd.js → worker-Cm9_sWXg.js}

@@ -1,10 +1,10 @@
 import { t as __exportAll } from "./rolldown-runtime-nwUcYXjP.js";
-import { _n as isInvalidConversationRecordError, gn as isFinalAttempt, mn as hasConversationStop } from "./tasks-SB9z-VTU.js";
-import { y as isProviderRetryError } from "./client-C1yDYjoS.js";
-import { i as getChatConfig } from "./config-DrTeF80T.js";
-import { T as withLogContext, b as setSpanAttributes, h as logWarn, m as logInfo, p as logException } from "./logging-DLSpkSSr.js";
-import { f as getTurnRequestDeadline, m as ConversationQueueMessageRejectedError } from "./job-queue-In9QKz-I.js";
-import { C as requestAnotherSlice, T as startConversationWork, b as recordConversationRetry, d as countPendingConversationMessages, f as deadLetterAttempt, g as getConversationWorkState, i as beginConversationResume, l as completeConversationStop, m as ensureConversationWake, o as checkInConversationWork, p as drainConversationMailbox, s as clearConsumedConversationWake, t as ackMessages, u as completeConversationWork, x as releaseConversationWork, y as recordAttemptFailure } from "./store-zPEoJPBB.js";
+import { Xn as isInvalidConversationRecordError, Yn as isFinalAttempt, qn as hasConversationStop } from "./turn-session-routing-BqO0qXLk.js";
+import { y as isProviderRetryError } from "./client-Cqf4TboL.js";
+import { i as getChatConfig } from "./config-CPsE4T5L.js";
+import { T as withLogContext, b as setSpanAttributes, h as logWarn, m as logInfo, p as logException } from "./logging-n7knse-O.js";
+import { f as getTurnRequestDeadline, m as ConversationQueueMessageRejectedError } from "./job-queue-DI-k-Bbk.js";
+import { C as requestAnotherSlice, T as startConversationWork, b as recordConversationRetry, d as countPendingConversationMessages, f as deadLetterAttempt, g as getConversationWorkState, i as beginConversationResume, l as completeConversationStop, m as ensureConversationWake, o as checkInConversationWork, p as drainConversationMailbox, s as clearConsumedConversationWake, t as ackMessages, u as completeConversationWork, x as releaseConversationWork, y as recordAttemptFailure } from "./store-DCo2n5iJ.js";
 // src/chat/task-execution/attempt-selection.ts
 function selectContiguousTurnBatch(messages) {
 	const first = messages[0];
@@ -116,6 +116,14 @@ async function recordFailedDeliveryAttempt(args) {
 function isTerminalFailure(failure) {
 	return failure.status === "recorded" && failure.deadLetteredMessages.length > 0 && failure.pendingCount === 0;
 }
+/**
+* Return whether a failure of this attempt can end the conversation work. The
+* retry limit applies to every attempt, also one with no messages, such as a
+* resume. A message also ends it at its own delivery limit.
+*/
+function isLastConversationAttempt(work, messages) {
+	return (work.execution.retryCount ?? 0) + 1 >= 5 || messages.some((message) => isFinalAttempt(message));
+}
 function logRetryExhausted(args) {
 	logException(args.error, "conversation.work.retry.exhausted", {
 		"app.run.id": args.work.execution.runId ?? "unknown",
@@ -403,7 +411,7 @@ async function processConversationWorkInContext(message, options) {
 					conversationId,
 					destination,
 					drain,
-					isFinalAttempt: attemptMessages.some((message) => isFinalAttempt(message)),
+					isFinalAttempt: isLastConversationAttempt(leasedWork, attemptMessages),
 					messages: attemptMessages
 				},
 				conversationId,

package/migrations/0069_system_identity.sql

@@ -0,0 +1,25 @@
+-- Create the one system Identity with the fixed id `system`. Code writes this
+-- id without a read, and Message and Conversation rows reference it through
+-- foreign keys, so the row must exist. ON CONFLICT DO NOTHING makes a second
+-- run do nothing.
+INSERT INTO "junior_identities" (
+	"id",
+	"kind",
+	"provider",
+	"provider_tenant_id",
+	"provider_subject_id",
+	"display_name",
+	"created_at",
+	"updated_at"
+)
+VALUES (
+	'system',
+	'system',
+	'junior',
+	'',
+	'system',
+	'System',
+	CURRENT_TIMESTAMP,
+	CURRENT_TIMESTAMP
+)
+ON CONFLICT DO NOTHING;

package/migrations/0070_review_item_foreign_keys.sql

@@ -0,0 +1,5 @@
+ALTER TABLE "junior_review_items" DROP CONSTRAINT "junior_review_items_closed_by_user_id_junior_users_id_fk";
+--> statement-breakpoint
+ALTER TABLE "junior_review_item_slack_cards" ADD CONSTRAINT "junior_review_item_slack_cards_conversation_id_junior_conversations_conversation_id_fk" FOREIGN KEY ("conversation_id") REFERENCES "public"."junior_conversations"("conversation_id") ON DELETE cascade ON UPDATE no action;--> statement-breakpoint
+ALTER TABLE "junior_review_items" ADD CONSTRAINT "junior_review_items_added_by_conversation_id_junior_conversations_conversation_id_fk" FOREIGN KEY ("added_by_conversation_id") REFERENCES "public"."junior_conversations"("conversation_id") ON DELETE cascade ON UPDATE no action;--> statement-breakpoint
+ALTER TABLE "junior_review_items" ADD CONSTRAINT "junior_review_items_closed_by_user_id_junior_users_id_fk" FOREIGN KEY ("closed_by_user_id") REFERENCES "public"."junior_users"("id") ON DELETE set null ON UPDATE no action;

package/migrations/AGENTS.md

@@ -0,0 +1,17 @@
+# SQL Migrations
+
+`src/db/schema.ts` is the Drizzle schema entry point. This directory is the
+append-only history that brings an existing database to that schema.
+`src/chat/conversations/sql/migrations.ts` owns loading, locking, and the
+bridge-version guard.
+
+## Rules
+
+- Never edit, rename, reorder, or delete an applied migration or its
+  metadata. Add a new migration to correct it.
+- Change the table under `src/db/schema/`, then run
+  `pnpm --filter @sentry/junior db:generate --name <name>`. Commit the SQL,
+  `meta/_journal.json`, and the snapshot together.
+- Put fixed row transformations in the migration that needs them.
+- A schema without the core Drizzle journal must first upgrade through
+  `@sentry/junior@0.107.1`. Do not remove that guard.