@sentry/junior 0.266.0 → 0.267.0

package/dist/{thread-state-cprEaxgl.js → thread-state-DRmdJ2QN.js}

@@ -1,8 +1,8 @@
-import { Z as persistConversationMessages, yn as createDurableLocationConfigurationService } from "./tasks-DDT-J3Rf.js";
-import { B as toOptionalNumber, V as toOptionalString, z as isRecord } from "./logging-Ce0mXZ8J.js";
-import { f as getDb } from "./viewer-BpE6Z3qf.js";
-import { ln as JUNIOR_THREAD_STATE_TTL_MS } from "./credentialed-enF5Bf3y.js";
-import { r as getStateAdapter } from "./adapter-eRFA_naf.js";
+import { dt as persistConversationMessages, ur as createDurableLocationConfigurationService } from "./tasks-0ilmuCux.js";
+import { B as isRecord, H as toOptionalString, V as toOptionalNumber } from "./logging-DuZ1A4ab.js";
+import { p as getDb } from "./viewer-DrN3oC2X.js";
+import { dn as JUNIOR_THREAD_STATE_TTL_MS } from "./credentialed-CIGwoLU2.js";
+import { i as getStateAdapter } from "./adapter-BybMEezj.js";
 // src/chat/state/conversation.ts
 function defaultConversationState() {
 	return {

package/dist/{turn-failure-response-C8sMdsdX.js → turn-failure-response-G11cs2gE.js}

@@ -1,12 +1,12 @@
-import { X as hydrateConversationMessages, cn as buildDeterministicTurnId, ut as markConversationMessage, wt as clearPendingAuth } from "./tasks-DDT-J3Rf.js";
-import { _ as getProviderErrorAttributes, g as findProviderError, m as ProviderError, v as getProviderErrorUserMessage } from "./client-B0YZfxNy.js";
-import { t as buildTurnFailureResponse, z as isRecord } from "./logging-Ce0mXZ8J.js";
-import { g as parseSlackMessageTs } from "./actor-tlxzqaRe.js";
-import { f as getDb, l as getConversationEventStore } from "./viewer-BpE6Z3qf.js";
-import { Zn as listConversationAnnotations } from "./credentialed-enF5Bf3y.js";
-import { F as readMessageCardRefs, I as removedCardSchema, L as resolveMessageCards } from "./conversation-DF4rUcjb.js";
-import { D as parseAgentInvocationResultMessageId, J as markTurnClosed, Y as markTurnCompleted, c as getAgentInvocation, m as getAgentInvocationTurnId } from "./store-DcKkzrdt.js";
-import { o as persistThreadStateById, r as getPersistedThreadState, s as coerceThreadConversationState } from "./thread-state-cprEaxgl.js";
+import { $n as buildDeterministicTurnId, Rt as clearPendingAuth, ut as hydrateConversationMessages, wt as markConversationMessage } from "./tasks-0ilmuCux.js";
+import { _ as getProviderErrorAttributes, g as findProviderError, m as ProviderError, v as getProviderErrorUserMessage } from "./client-BjgbMawj.js";
+import { B as isRecord, t as buildTurnFailureResponse } from "./logging-DuZ1A4ab.js";
+import { p as parseSlackMessageTs } from "./actor-DZSokpwj.js";
+import { p as getDb, u as getConversationEventStore } from "./viewer-DrN3oC2X.js";
+import { er as listConversationAnnotations } from "./credentialed-CIGwoLU2.js";
+import { B as removedCardSchema, V as resolveMessageCards, z as readMessageCardRefs } from "./conversation-DSo310Ps.js";
+import { D as parseAgentInvocationResultMessageId, J as markTurnClosed, Y as markTurnCompleted, c as getAgentInvocation, m as getAgentInvocationTurnId } from "./store-6EetVP-m.js";
+import { o as persistThreadStateById, r as getPersistedThreadState, s as coerceThreadConversationState } from "./thread-state-DRmdJ2QN.js";
 // src/chat/conversations/pending-cards.ts
 /**
 * Add the cards that tool results selected since the last visible assistant

package/dist/{turn-lifecycle-DaBVoz7h.js → turn-lifecycle-OzLIwvi1.js}

@@ -1,4 +1,4 @@
-import { l as getConversationEventStore } from "./viewer-BpE6Z3qf.js";
+import { u as getConversationEventStore } from "./viewer-DrN3oC2X.js";
 // src/chat/conversations/turn-lifecycle.ts
 /** Persist correlated turn lifecycle facts with retry-safe terminal exclusion. */
 var ConversationTurnLifecycleService = class {

package/dist/{turn-session-routing-a9CHX-w6.js → turn-session-routing-Dyut9l7Y.js}

@@ -34,7 +34,7 @@ function slackSourceForDestination(args) {
 * Reads parent Conversations when this Conversation has no Destination.
 */
 async function resolveConversationRouting(args) {
-	const conversationStore = args.conversationStore ?? (await import("./viewer-BpE6Z3qf.js").then((n) => n.c)).getConversationStore();
+	const conversationStore = args.conversationStore ?? (await import("./viewer-DrN3oC2X.js").then((n) => n.l)).getConversationStore();
 	const chain = await loadConversationChain(args.conversationId, conversationStore);
 	let destination;
 	let source;

package/dist/user-input-request-BDFBdF8r.js

@@ -0,0 +1,116 @@
+import { z } from "zod";
+// src/chat/tools/runtime/user-input-request.ts
+const USER_INPUT_LIMITS = {
+	maxButtonOptions: 5,
+	maxDescriptionChars: 200,
+	maxFields: 4,
+	maxLabelChars: 75,
+	maxOptions: 10,
+	maxTextChars: 3e3,
+	maxQuestionChars: 3e3,
+	minOptions: 2
+};
+const labelSchema = z.string().trim().min(1).max(USER_INPUT_LIMITS.maxLabelChars);
+const descriptionSchema = z.string().trim().min(1).max(USER_INPUT_LIMITS.maxDescriptionChars).optional();
+const optionSchema = z.object({
+	label: labelSchema.describe("Short choice text, such as `Accept` or `Decline`. The answer uses this exact text."),
+	description: descriptionSchema.describe("Optional short note about what this choice does.")
+});
+const fieldBase = {
+	id: z.string().regex(/^[a-z][a-z0-9_]{0,31}$/).describe("Stable key for this field, such as `approach`."),
+	label: labelSchema.describe("Short field name, such as `Approach`."),
+	description: descriptionSchema.describe("Optional short help text for this field.")
+};
+const optionsSchema = z.array(optionSchema).min(USER_INPUT_LIMITS.minOptions).max(USER_INPUT_LIMITS.maxOptions).describe("Choices in display order.");
+const userInputFieldSchema = z.discriminatedUnion("kind", [
+	z.object({
+		...fieldBase,
+		kind: z.literal("choice").describe("The person picks one option."),
+		options: optionsSchema
+	}),
+	z.object({
+		...fieldBase,
+		kind: z.literal("multi_choice").describe("The person picks any number of options."),
+		options: optionsSchema
+	}),
+	z.object({
+		...fieldBase,
+		kind: z.literal("text").describe("The person types a short answer.")
+	})
+]);
+const userInputRequestSchema = z.object({
+	question: z.string().trim().min(1).max(USER_INPUT_LIMITS.maxQuestionChars).describe("The question, in markdown. Include the facts the person needs to decide."),
+	fields: z.array(userInputFieldSchema).min(1).max(USER_INPUT_LIMITS.maxFields).describe("What to ask, in display order. Use one `choice` field for a simple decision.")
+}).superRefine((request, context) => {
+	const ids = /* @__PURE__ */ new Set();
+	for (const field of request.fields) {
+		if (ids.has(field.id)) context.addIssue({
+			code: "custom",
+			message: "Each field needs a different id."
+		});
+		ids.add(field.id);
+		if (field.kind === "text") continue;
+		const labels = field.options.map((option) => option.label.toLowerCase());
+		if (new Set(labels).size !== labels.length) context.addIssue({
+			code: "custom",
+			message: "Each choice of a field needs a different label."
+		});
+	}
+});
+/**
+* Return the single choice field of a request that a surface can show as
+* one row of buttons, where one click is the whole answer.
+*/
+function buttonUserInputField(request) {
+	const [field, ...rest] = request.fields;
+	if (rest.length || field?.kind !== "choice") return void 0;
+	return field.options.length <= USER_INPUT_LIMITS.maxButtonOptions ? field : void 0;
+}
+/**
+* Keep only answer values that match the request: known field ids, known
+* option labels, one value for a `choice` field, and trimmed text.
+*/
+function normalizeUserInputAnswer(request, answer) {
+	const values = {};
+	for (const field of request.fields) {
+		const raw = (answer.values[field.id] ?? []).map((value) => value.trim()).filter(Boolean);
+		if (field.kind === "text") {
+			const text = raw.join("\n").slice(0, USER_INPUT_LIMITS.maxTextChars);
+			if (text) values[field.id] = [text];
+			continue;
+		}
+		const picked = field.options.map((option) => option.label).filter((label) => raw.includes(label));
+		const kept = field.kind === "choice" ? picked.slice(0, 1) : picked;
+		if (kept.length) values[field.id] = kept;
+	}
+	const other = answer.other?.trim().slice(0, USER_INPUT_LIMITS.maxTextChars);
+	return {
+		requestId: answer.requestId,
+		values,
+		...other ? { other } : void 0
+	};
+}
+/** Return true when an answer has no value and no free text. */
+function isEmptyUserInputAnswer(answer) {
+	return !answer.other && Object.keys(answer.values).length === 0;
+}
+function answerLine(text) {
+	return text.split("\n").map((line) => line.trim()).filter(Boolean).join("\n");
+}
+/**
+* Write an answer as the text of the person's message. Slack and the web
+* dashboard both send this text, so the model reads one format. The first
+* line names the request, and each field starts its own line.
+*/
+function formatUserInputAnswer(request, answer) {
+	const normalized = normalizeUserInputAnswer(request, answer);
+	const lines = [`Answer to request ${normalized.requestId}:`];
+	for (const field of request.fields) {
+		const values = normalized.values[field.id];
+		const value = values?.length ? values.join(", ") : "(no answer)";
+		lines.push(answerLine(`${field.label} (${field.id}): ${value}`));
+	}
+	if (normalized.other) lines.push(answerLine(`Other: ${normalized.other}`));
+	return lines.join("\n");
+}
+export { normalizeUserInputAnswer as a, isEmptyUserInputAnswer as i, buttonUserInputField as n, userInputRequestSchema as o, formatUserInputAnswer as r, USER_INPUT_LIMITS as t };

package/dist/{validation-C2lllinq.js → validation-CxEmt1id.js}

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

package/dist/{version-oaLfxxnf.js → version-Bapedn4A.js}

@@ -1,5 +1,5 @@
 // package.json
-var version = "0.266.0";
+var version = "0.267.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-oaLfxxnf.js";
+export { t as JUNIOR_VERSION } from "./version-Bapedn4A.js";

package/dist/{viewer-BpE6Z3qf.js → viewer-DrN3oC2X.js}

@@ -1,9 +1,9 @@
 import { t as __exportAll } from "./rolldown-runtime-nwUcYXjP.js";
-import { i as getChatConfig } from "./config-C0UwYqDK.js";
-import { I as GOOGLE_IDENTITY_PROVIDER, R as normalizeIdentityEmail } from "./logging-Ce0mXZ8J.js";
-import { d as parseSlackTeamId, o as parseActorUserId, u as parseSlackChannelReferenceId } from "./actor-tlxzqaRe.js";
+import { i as getChatConfig } from "./config-CdB6yJj5.js";
+import { L as GOOGLE_IDENTITY_PROVIDER, z as normalizeIdentityEmail } from "./logging-DuZ1A4ab.js";
+import { c as toStoredSlackActor, d as parseSlackTeamId, o as parseActorUserId, u as parseSlackChannelReferenceId } from "./actor-DZSokpwj.js";
 import { c as juniorIdentities, d as juniorDestinations, l as juniorUsers, o as conversationReadColumns, s as juniorConversations } from "./agent-invocations-CxKldAeB.js";
-import { _ as juniorConversationAnnotations, d as juniorConversationBindings, h as juniorConversationEvents, m as juniorConversationMetrics, p as CONVERSATION_METRICS, t as createJuniorSqlExecutor, u as juniorConversationParticipants } from "./executor-TnWbvL09.js";
+import { _ as juniorConversationAnnotations, d as juniorConversationBindings, h as juniorConversationEvents, m as juniorConversationMetrics, p as CONVERSATION_METRICS, t as createJuniorSqlExecutor, u as juniorConversationParticipants } from "./executor-VYrx_K4w.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";
@@ -476,6 +476,15 @@ function identityFromActor(actor) {
 		metadata: { platform: "web" }
 	};
 }
+/**
+* Build the identity observation for one runtime actor with the same key the
+* Conversation write path stores. Local and system actors have no user
+* identity.
+*/
+function identityFromRuntimeActor(actor) {
+	if (actor.platform === "slack") return identityFromActor(toStoredSlackActor(actor));
+	if (actor.platform === "web") return identityFromActor(actor.email ? { email: actor.email } : void 0);
+}
 /** Build a system identity when a conversation has no user actor. */
 function systemIdentityFromSource(source) {
 	if (source === "scheduler") return {
@@ -817,6 +826,8 @@ var SqlStore = class {
 			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;
+			const actor = mergeActor(existing?.actor, args.actor);
+			const source = existing?.source ?? args.source;
 			await this.upsertConversation({ conversation: {
 				schemaVersion: 1,
 				conversationId: args.conversationId,
@@ -827,8 +838,8 @@ var SqlStore = class {
 				...existing?.location ? { location: existing.location } : void 0,
 				...args.channelName ? { channelName: args.channelName } : void 0,
 				...args.destination ? { destination: args.destination } : void 0,
-				...args.actor ? { actor: args.actor } : void 0,
-				...args.source ? { source: args.source } : void 0,
+				...actor ? { actor } : void 0,
+				...source ? { source } : void 0,
 				...args.title ? { title: args.title } : void 0,
 				...args.visibility ? { visibility: args.visibility } : void 0,
 				execution
@@ -1630,12 +1641,12 @@ async function listAdminUsersFromSql(db) {
 }
 /** Resolve the stored identity and linked user for one runtime actor. */
 async function readActorIdentityFromSql(db, actor) {
-	if (actor.platform === "system") return void 0;
-	const providerTenantId = actor.platform === "slack" ? actor.teamId : "";
+	const key = identityFromRuntimeActor(actor);
+	if (!key) return void 0;
 	const row = (await db.select({
 		identity: juniorIdentities,
 		user: juniorUsers
-	}).from(juniorIdentities).leftJoin(juniorUsers, eq(juniorUsers.id, juniorIdentities.userId)).where(and(eq(juniorIdentities.kind, "user"), eq(juniorIdentities.provider, actor.platform), eq(juniorIdentities.providerTenantId, providerTenantId), eq(juniorIdentities.providerSubjectId, actor.userId))).limit(1))[0];
+	}).from(juniorIdentities).leftJoin(juniorUsers, eq(juniorUsers.id, juniorIdentities.userId)).where(and(eq(juniorIdentities.kind, "user"), eq(juniorIdentities.provider, key.provider), eq(juniorIdentities.providerTenantId, key.providerTenantId ?? ""), eq(juniorIdentities.providerSubjectId, key.providerSubjectId))).limit(1))[0];
 	if (!row) return void 0;
 	return {
 		identity: identityFromRow(row.identity),
@@ -1662,4 +1673,4 @@ async function readIdentityByIdFromSql(db, identityId) {
 async function readIdentityById(identityId) {
 	return await readIdentityByIdFromSql(getDb(), identityId);
 }
-export { deleteProviderIdentityForSlackUser as A, requireSlackDestination as B, parseSessionSource as C, agentTurnUsageSchema as D, agentTurnTotalTokens as E, saveUserTimezone as F, upsertIdentity as I, upsertLinkedIdentity as L, findUserByVerifiedEmails as M, readUserTimezone as N, hasAgentTurnUsage as O, recordGoogleSignIn as P, createSlackDestination as R, bindProviderConversation as S, agentTurnCostUsd as T, sameDestination as V, createSqlStore as _, resolveViewerUser as a, startLocationThread as b, db_exports as c, getConversationStore as d, getDb as f, loadConversationSlackTenantIds as g, withConversationEventLock as h, readIdentityById as i, deleteProviderIdentityForUser as j, resolveRootConversationId as k, getConversationEventStore as l, createSqlConversationEventStore as m, listAdminUsersFromSql as n, setUserAdminFromSql as o, getSqlExecutor as p, readActorIdentity as r, updateViewerDisplayName as s, findUserByEmail as t, getConversationMessageSearchStore as u, withConversationMutationLock as v, addAgentTurnUsage as w, identityFromActor as x, locationFromRow as y, parseDestination as z };
+export { resolveRootConversationId as A, parseDestination as B, bindProviderConversation as C, agentTurnTotalTokens as D, agentTurnCostUsd as E, recordGoogleSignIn as F, sameDestination as H, saveUserTimezone as I, upsertIdentity as L, deleteProviderIdentityForUser as M, findUserByVerifiedEmails as N, agentTurnUsageSchema as O, readUserTimezone as P, upsertLinkedIdentity as R, identityFromActor as S, addAgentTurnUsage as T, requireSlackDestination as V, loadConversationSlackTenantIds as _, resolveViewerUser as a, locationFromRow as b, closeDb as c, getConversationMessageSearchStore as d, getConversationStore as f, withConversationEventLock as g, createSqlConversationEventStore as h, readIdentityById as i, deleteProviderIdentityForSlackUser as j, hasAgentTurnUsage as k, db_exports as l, getSqlExecutor as m, listAdminUsersFromSql as n, setUserAdminFromSql as o, getDb as p, readActorIdentity as r, updateViewerDisplayName as s, findUserByEmail as t, getConversationEventStore as u, createSqlStore as v, parseSessionSource as w, startLocationThread as x, withConversationMutationLock as y, createSlackDestination as z };

package/dist/{work-VX1SHWha.js → work-DUQoNcqP.js}

@@ -1,15 +1,15 @@
 import { t as __exportAll } from "./rolldown-runtime-nwUcYXjP.js";
-import { At as abandonTurnRecord, Ht as isTurnExecutionLimitExceededError, Kt as getTerminalAssistantMessages, Mt as failTurnRecord, Nt as getTurnRecord, R as openConversationProjection, bt as AuthorizationFlowDisabledError, gt as PluginCredentialFailureError, kt as saveTurnCheckpoint } from "./tasks-DDT-J3Rf.js";
-import { n as botConfig } from "./config-C0UwYqDK.js";
-import { d as getConversationStore, l as getConversationEventStore } from "./viewer-BpE6Z3qf.js";
+import { At as PluginCredentialFailureError, Kt as failTurnRecord, Ln as getTerminalAssistantMessages, Nn as isTurnExecutionLimitExceededError, Pt as AuthorizationFlowDisabledError, Q as openConversationProjection, Ut as saveTurnCheckpoint, Wt as abandonTurnRecord, qt as getTurnRecord } from "./tasks-0ilmuCux.js";
+import { n as botConfig } from "./config-CdB6yJj5.js";
+import { f as getConversationStore, u as getConversationEventStore } from "./viewer-DrN3oC2X.js";
 import { m as sameActorIdentity, u as agentInstructionProvenance } from "./history-C84mlAwO.js";
-import { B as stopChildAgentsOf, H as recordSubagentEnded, U as recordSubagentStarted, X as buildSteeringPiMessage, Z as withoutSavedSteeringMessages, tt as readBlockedReport } from "./agent-runner-BtYK7bht.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-DcKkzrdt.js";
-import { n as getAssistantReplyText } from "./assistant-reply-UyzAfZQo.js";
-import { F as recordFinishedTurnForAutomatedLimit, I as resetAutomatedTurnLimit, P as maybePostAutomatedTurnLimitNotice } from "./session-stop-tZOw9AJD.js";
-import { r as appendAndEnqueueInboundMessage } from "./store-FALy-JQb.js";
-import { t as ConversationTurnLifecycleService } from "./turn-lifecycle-DaBVoz7h.js";
-import { n as getPersistedSandboxState, o as persistThreadStateById, r as getPersistedThreadState } from "./thread-state-cprEaxgl.js";
+import { Q as stopChildAgentsOf, ct as buildSteeringPiMessage, et as recordSubagentEnded, lt as withoutSavedSteeringMessages, pt as readBlockedReport, tt as recordSubagentStarted } from "./agent-runner-DgNATN4D.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-6EetVP-m.js";
+import { n as getAssistantReplyText } from "./assistant-reply-CT7VcXQe.js";
+import { C as maybePostAutomatedTurnLimitNotice, T as resetAutomatedTurnLimit, w as recordFinishedTurnForAutomatedLimit } from "./session-stop-DkOjt46_.js";
+import { r as appendAndEnqueueInboundMessage } from "./store-DvNZIsCr.js";
+import { t as ConversationTurnLifecycleService } from "./turn-lifecycle-OzLIwvi1.js";
+import { n as getPersistedSandboxState, o as persistThreadStateById, r as getPersistedThreadState } from "./thread-state-DRmdJ2QN.js";
 import { isDeepStrictEqual } from "node:util";
 import { z } from "zod";
 // src/chat/runtime/turn-execution.ts

package/dist/{worker-hook-y_Y.js → worker-D1l4Ugk0.js}

@@ -1,34 +1,45 @@
 import { t as __exportAll } from "./rolldown-runtime-nwUcYXjP.js";
-import { y as isProviderRetryError } from "./client-B0YZfxNy.js";
-import { i as getChatConfig } from "./config-C0UwYqDK.js";
-import { f as logException, m as logWarn, p as logInfo, w as withLogContext, y as setSpanAttributes } from "./logging-Ce0mXZ8J.js";
-import { f as getTurnRequestDeadline, m as ConversationQueueMessageRejectedError } from "./job-queue-DBpHmKnd.js";
-import { C as requestAnotherSlice, M as isInvalidConversationRecordError, T as startConversationWork, b as recordConversationRetry, d as countPendingConversationMessages, f as deadLetterAttempt, g as getConversationWorkState, i as beginConversationResume, j as isFinalAttempt, k as hasConversationStop, 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-FALy-JQb.js";
-// src/chat/task-execution/worker.ts
-var worker_exports = /* @__PURE__ */ __exportAll({
-	CONVERSATION_WORK_DEFER_DELAY_MS: () => CONVERSATION_WORK_DEFER_DELAY_MS,
-	processConversationWork: () => processConversationWork
-});
-const CONVERSATION_WORK_DEFER_DELAY_MS = 15e3;
-const CONVERSATION_STOP_CHECK_INTERVAL_MS = 500;
-function now(options) {
-	return options.nowMs?.() ?? Date.now();
-}
+import { fn as hasConversationStop, hn as isInvalidConversationRecordError, mn as isFinalAttempt } from "./tasks-0ilmuCux.js";
+import { y as isProviderRetryError } from "./client-BjgbMawj.js";
+import { i as getChatConfig } from "./config-CdB6yJj5.js";
+import { T as withLogContext, b as setSpanAttributes, h as logWarn, m as logInfo, p as logException } from "./logging-DuZ1A4ab.js";
+import { f as getTurnRequestDeadline, m as ConversationQueueMessageRejectedError } from "./job-queue-C0BZSa7r.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-DvNZIsCr.js";
+// src/chat/task-execution/attempt-selection.ts
 function selectContiguousTurnBatch(messages) {
 	const first = messages[0];
 	if (!first) return [];
 	const nextTurnIndex = messages.findIndex((message) => message.input.authorId !== first.input.authorId || message.source !== first.source);
 	return messages.slice(0, nextTurnIndex === -1 ? messages.length : nextTurnIndex);
 }
+/**
+* True when an interrupt can start its own attempt.
+*
+* A steered web message must not start a second Turn while a yielded Turn
+* waits to resume. It stays pending for that Turn's drain or the next attempt.
+*/
+function isAttemptInterrupt(message, work) {
+	return message.delivery === "interrupt" && !(work.execution.status === "paused" && message.source === "web");
+}
 /** Prioritize interrupts while keeping each attempt to one Actor and Source. */
 function selectAttemptMessages(work) {
 	const messages = work.messages;
-	const interrupts = messages.filter((message) => message.delivery === "interrupt");
+	const interrupts = messages.filter((message) => isAttemptInterrupt(message, work));
 	if (interrupts.length > 0) return selectContiguousTurnBatch(interrupts);
 	if (work.execution.status === "paused") return [];
 	const nonEventMessages = messages.filter((message) => message.source !== "event");
 	return selectContiguousTurnBatch(nonEventMessages.length > 0 ? nonEventMessages : messages);
 }
+// src/chat/task-execution/worker.ts
+var worker_exports = /* @__PURE__ */ __exportAll({
+	CONVERSATION_WORK_DEFER_DELAY_MS: () => CONVERSATION_WORK_DEFER_DELAY_MS,
+	processConversationWork: () => processConversationWork
+});
+const CONVERSATION_WORK_DEFER_DELAY_MS = 15e3;
+const CONVERSATION_STOP_CHECK_INTERVAL_MS = 500;
+function now(options) {
+	return options.nowMs?.() ?? Date.now();
+}
 function nudgeIdempotencyKey(reason, conversationId, nowMs) {
 	return `${reason}:${conversationId}:${nowMs}`;
 }
@@ -248,7 +259,7 @@ async function processConversationWorkInContext(message, options) {
 	const softYieldDeadlineMs = startedAtMs + (options.softYieldAfterMs ?? getChatConfig().conversationWorkSoftYieldAfterMs);
 	let attemptMessageIds = [];
 	let attemptSelectedMessageIds = /* @__PURE__ */ new Set();
-	let attemptStartMessageIds = /* @__PURE__ */ new Set();
+	let attemptStartInterruptIds = /* @__PURE__ */ new Set();
 	let failedWithoutProgress = false;
 	let leaseLost = false;
 	const markLeaseLost = () => {
@@ -269,7 +280,7 @@ async function processConversationWorkInContext(message, options) {
 		leaseToken: lease.leaseToken,
 		conversationStore: options.conversationStore,
 		handle: async (messages) => {
-			const candidates = drainOptions?.deferred ? messages : messages.filter((message) => message.delivery === "interrupt" && (attemptSelectedMessageIds.has(message.inboundMessageId) || !attemptStartMessageIds.has(message.inboundMessageId)));
+			const candidates = drainOptions?.deferred ? messages : messages.filter((message) => message.delivery === "interrupt" && (attemptSelectedMessageIds.has(message.inboundMessageId) || !attemptStartInterruptIds.has(message.inboundMessageId)));
 			if (candidates.length === 0) return [];
 			return await handle(candidates) ?? candidates.map((message) => message.inboundMessageId);
 		},
@@ -337,7 +348,7 @@ async function processConversationWorkInContext(message, options) {
 			const attemptMessages = selectAttemptMessages(leasedWork);
 			const runId = leasedWork.execution.runId;
 			if (!runId) throw new Error(`Conversation run is missing for ${conversationId}`);
-			attemptStartMessageIds = new Set(leasedWork.messages.map((message) => message.inboundMessageId));
+			attemptStartInterruptIds = new Set(leasedWork.messages.filter((message) => isAttemptInterrupt(message, leasedWork)).map((message) => message.inboundMessageId));
 			if (hasRun && shouldYield()) {
 				if (resumePending) return await yieldWork();
 				break;

package/migrations/0064_any_resource_event_triggers.sql

@@ -0,0 +1,2 @@
+ALTER TABLE "junior_automations" DROP CONSTRAINT "junior_automations_trigger_check";--> statement-breakpoint
+ALTER TABLE "junior_automations" ADD CONSTRAINT "junior_automations_trigger_check" CHECK (("junior_automations"."kind" = 'scheduled' and "junior_automations"."namespace" is null and "junior_automations"."identifier" is null) or ("junior_automations"."kind" = 'event' and "junior_automations"."namespace" is not null and "junior_automations"."next_run_at_ms" is null and "junior_automations"."run_now_at_ms" is null and "junior_automations"."status" <> 'completed'));