@sentry/junior 0.245.0 → 0.247.0

package/dist/{work-4QPqTd5_.js → work-CRBXkJoU.js}

@@ -1,10 +1,16 @@
 import { t as __exportAll } from "./rolldown-runtime-B4FMCO8f.js";
-import { G as completeAgentInvocation, H as stopChildAgentsOf, J as getActiveAgentInvocationForConversation, K as createAgentInvocation, Q as getAgentInvocationTurnId, U as recordSubagentEnded, W as recordSubagentStarted, X as getAgentInvocationMessageId, Y as getAgentInvocation, at as markAgentInvocationMailboxAppended, ct as markAgentInvocationRunning, et as getLatestAgentInvocationForConversation, lt as reportReplacedAgentInvocation, m as PluginCredentialFailureError, st as markAgentInvocationPaused, tt as isTerminalAgentInvocation, wt as appendAndEnqueueInboundMessage, xn as AuthorizationFlowDisabledError } from "./agent-runner-BEuPFbbv.js";
-import { c as getConversationEventStore, u as getConversationStore } from "./viewer-wCn8xneI.js";
-import { At as openConversationProjection, J as saveTurnCheckpoint, Q as getTurnRecord, Y as abandonTurnRecord, Z as failTurnRecord, ct as getTerminalAssistantMessages } from "./tasks-Ddd7OAkp.js";
-import { d as getConversationTurnBoundaryError, l as TurnInputCommitLostError, p as isTurnInputCommitLostError, r as getAssistantReplyText } from "./oauth-authorization-COzWmMjO.js";
-import { t as ConversationTurnLifecycleService } from "./turn-lifecycle-B5pzyD6W.js";
-import { n as getPersistedSandboxState, o as persistThreadStateById, r as getPersistedThreadState } from "./thread-state-DqErwbA8.js";
+import { $ as getAgentInvocation, G as recordSubagentStarted, H as stopChildAgentsOf, Ht as readBlockedReport, It as buildSteeringPiMessage, J as createAgentInvocation, Lt as withoutSavedSteeringMessages, Q as getActiveAgentInvocationForConversation, Vt as AuthorizationFlowDisabledError, W as recordSubagentEnded, at as getAgentInvocationTurnId, ct as isTerminalAgentInvocation, dt as markAgentInvocationMailboxAppended, gt as reportReplacedAgentInvocation, ht as markAgentInvocationSteered, m as PluginCredentialFailureError, mt as markAgentInvocationRunning, pt as markAgentInvocationPaused, q as completeAgentInvocation, rt as getAgentInvocationMessageId, st as getLatestAgentInvocationForConversation } from "./agent-runner-DsAFAKKs.js";
+import { n as botConfig } from "./config-CgWvImQL.js";
+import { c as getConversationEventStore, u as getConversationStore } from "./viewer-BlAozHer.js";
+import { f as instructionProvenanceFor, p as sameActorIdentity } from "./history-Nte1oVed.js";
+import { At as openConversationProjection, J as saveTurnCheckpoint, Q as getTurnRecord, Y as abandonTurnRecord, Z as failTurnRecord, ct as getTerminalAssistantMessages } from "./tasks-DMmRrIVl.js";
+import { c as isTurnInputCommitLostError, i as TurnInputCommitLostError, o as getConversationTurnBoundaryError } from "./oauth-authorization-BA4Dt6a7.js";
+import { n as getAssistantReplyText } from "./assistant-reply-ChOzcTBS.js";
+import { A as recordFinishedTurnForAutomatedLimit, j as resetAutomatedTurnLimit, k as maybePostAutomatedTurnLimitNotice } from "./session-stop-CAhBfBUT.js";
+import { r as appendAndEnqueueInboundMessage } from "./store-DjLA8GKs.js";
+import { t as ConversationTurnLifecycleService } from "./turn-lifecycle-Buswqs90.js";
+import { n as getPersistedSandboxState, o as persistThreadStateById, r as getPersistedThreadState } from "./thread-state-ehZYGpX9.js";
+import { isDeepStrictEqual } from "node:util";
 import { z } from "zod";
 //#region src/chat/runtime/turn-execution.ts
 /** An error thrown while the agent advances a Run. */
@@ -50,6 +56,7 @@ async function executeTurn(agentRunner, run, saveResult) {
 //#endregion
 //#region src/chat/agent-invocations/work.ts
 var work_exports = /* @__PURE__ */ __exportAll({
+	agentInvocationRunPolicy: () => agentInvocationRunPolicy,
 	buildAgentInvocationInboundMessage: () => buildAgentInvocationInboundMessage,
 	createAgentInvocationWorker: () => createAgentInvocationWorker,
 	createAndEnqueueAgentInvocation: () => createAndEnqueueAgentInvocation,
@@ -61,6 +68,18 @@ const agentInvocationMailboxMetadataSchema = z.object({
 	agentInvocationId: z.string().min(1),
 	kind: z.literal("agent_invocation")
 }).strict();
+/** Map a durable invocation's model settings and depth to the child Run policy. */
+function agentInvocationRunPolicy(invocation, canSpawn) {
+	return {
+		disabledFeatures: canSpawn ? ["handoff", "interactive-auth"] : [
+			"handoff",
+			"interactive-auth",
+			"subagents"
+		],
+		...invocation.modelProfile ? { modelProfile: invocation.modelProfile } : void 0,
+		...invocation.reasoningLevel ? { reasoning: invocation.reasoningLevel } : void 0
+	};
+}
 /** Build destinationless mailbox work that references one durable invocation. */
 function buildAgentInvocationInboundMessage(invocation, nowMs = Date.now()) {
 	return {
@@ -123,6 +142,53 @@ async function resolveAgentInvocationId(context) {
 	const latest = await getLatestAgentInvocationForConversation(context.conversationId);
 	return latest?.status === "stopped" ? latest.invocationId : void 0;
 }
+/**
+* Give queued parent messages to the running agent invocation of a child as
+* steering messages. A message joins only with the Actor and credentials of
+* the running Turn. The first message that does not match stops the scan, so
+* it and every later message wait for the current work. Each message that
+* joins ends as `steered`, and the running agent invocation reports for it.
+*/
+function createAgentMessageSteeringDrain(context, running) {
+	const turnId = getAgentInvocationTurnId(running.invocationId);
+	return async (accept) => {
+		const accepted = [];
+		await context.attempt.drain(async (pending) => {
+			const readIds = [];
+			const joining = [];
+			for (const message of pending) {
+				const metadata = agentInvocationMailboxMetadataSchema.safeParse(message.input.metadata);
+				if (!metadata.success) continue;
+				const candidate = await getAgentInvocation(metadata.data.agentInvocationId);
+				if (!candidate?.parentToolCallId || candidate.invocationId === running.invocationId) continue;
+				if (isTerminalAgentInvocation(candidate)) {
+					if (candidate.parentMailboxStatus === "steered") readIds.push(message.inboundMessageId);
+					continue;
+				}
+				if (!sameActorIdentity(candidate.actor, running.actor) || !isDeepStrictEqual(candidate.credentialContext, running.credentialContext)) break;
+				joining.push(candidate);
+				readIds.push(message.inboundMessageId);
+			}
+			if (joining.length === 0) return readIds;
+			const saved = (await getTurnRecord(running.childConversationId, turnId))?.piMessages ?? [];
+			const messages = withoutSavedSteeringMessages(saved, joining.map((candidate) => ({
+				provenance: instructionProvenanceFor(candidate.actor),
+				text: candidate.input,
+				timestampMs: candidate.createdAtMs
+			})), buildSteeringPiMessage);
+			if (messages.length > 0) {
+				await accept(messages);
+				accepted.push(...messages);
+			}
+			for (const candidate of joining) {
+				const terminal = await markAgentInvocationSteered(candidate.invocationId);
+				if (terminal && isTerminalAgentInvocation(terminal)) await recordSubagentEnded(terminal);
+			}
+			return readIds;
+		}, { deferred: true });
+		return accepted;
+	};
+}
 /** Project the terminal invocation into the idempotent turn lifecycle. */
 async function persistTerminalLifecycle(invocation) {
 	const lifecycle = new ConversationTurnLifecycleService(getConversationEventStore());
@@ -166,11 +232,15 @@ async function projectTerminalTurn(invocation) {
 	if (turn.state === "paused") return;
 	const result = getTerminalAssistantMessages(turn.piMessages).map(getAssistantReplyText).filter((text) => text !== void 0).join("\n\n");
 	const failed = turn.state !== "completed" || Boolean(turn.errorMessage);
+	const blocked = turn.turnStartMessageIndex === void 0 ? void 0 : readBlockedReport(turn.piMessages.slice(turn.turnStartMessageIndex));
 	return await completeAgentInvocation({
 		invocationId: invocation.invocationId,
 		...failed ? {
 			errorMessage: turn.errorMessage ?? "Agent invocation failed",
 			status: "failed"
+		} : blocked ? {
+			errorMessage: blocked.missing,
+			status: "blocked"
 		} : {
 			result,
 			status: "completed"
@@ -203,11 +273,27 @@ async function saveAgentInvocationResult(args) {
 		source: args.invocation.source,
 		surface: "internal"
 	});
+	if (args.invocation.parentToolCallId) await resetAutomatedTurnLimit({ conversationId: args.invocation.childConversationId });
+	else if (args.invocation.source.kind !== "agent_invocation") {
+		const maxTurns = botConfig.maxConsecutiveAutomatedTurns;
+		await maybePostAutomatedTurnLimitNotice({
+			conversationId: args.invocation.childConversationId,
+			maxTurns,
+			update: await recordFinishedTurnForAutomatedLimit({
+				conversationId: args.invocation.childConversationId,
+				maxTurns,
+				source: args.invocation.source
+			})
+		});
+	}
 	const terminal = await completeAgentInvocation({
 		invocationId: args.invocation.invocationId,
 		...failed ? {
 			errorMessage: args.result.diagnostics.errorMessage ?? "Agent invocation failed",
 			status: "failed"
+		} : args.result.blocked ? {
+			errorMessage: args.result.blocked.missing,
+			status: "blocked"
 		} : {
 			result: args.result.text,
 			status: "completed"
@@ -263,7 +349,7 @@ function createAgentInvocationWorker(agentRunner, options = {}) {
 		};
 		const finish = async (terminal) => {
 			if (!terminal || !isTerminalAgentInvocation(terminal)) return;
-			await persistTerminalLifecycle(terminal);
+			if (terminal.parentMailboxStatus !== "steered") await persistTerminalLifecycle(terminal);
 			await report(terminal);
 		};
 		let acknowledged = context.attempt.messages.length === 0;
@@ -344,6 +430,7 @@ function createAgentInvocationWorker(agentRunner, options = {}) {
 		try {
 			outcome = await executeTurn(agentRunner, {
 				conversationId: invocation.childConversationId,
+				parentConversationId: invocation.parentConversationId,
 				turnId,
 				runId: invocation.invocationId,
 				instruction: { text: invocation.input },
@@ -355,14 +442,10 @@ function createAgentInvocationWorker(agentRunner, options = {}) {
 				...location ? { location } : void 0,
 				surface: "internal",
 				...stopSignal ? { signal: stopSignal } : void 0,
-				disabledFeatures: canSpawn ? ["handoff", "interactive-auth"] : [
-					"handoff",
-					"interactive-auth",
-					"subagents"
-				],
-				reasoning: invocation.reasoningLevel,
+				...agentInvocationRunPolicy(invocation, canSpawn),
 				state: { sandboxRef },
 				durability: {
+					drainSteeringMessages: createAgentMessageSteeringDrain(context, invocation),
 					onInputCommitted: acknowledge,
 					shouldYield: context.shouldYield,
 					onSandboxRefChanged: async (nextSandboxRef) => {

package/dist/{worker-mc62tybz.js → worker-BVJKM9Ja.js}

@@ -1,9 +1,9 @@
 import { t as __exportAll } from "./rolldown-runtime-B4FMCO8f.js";
-import { $t as isInvalidConversationRecordError, At as completeConversationStop, Bt as recordAttemptFailure, Dt as checkInConversationWork, Ft as ensureConversationWake, Ht as releaseConversationWork, Kt as startConversationWork, Lt as getConversationWorkState, Mt as countPendingConversationMessages, Nt as deadLetterAttempt, Ot as clearConsumedConversationWake, Pt as drainConversationMailbox, Qt as isFinalAttempt, St as ackMessages, Tt as beginConversationResume, Vt as recordConversationRetry, Wt as requestAnotherSlice, Xt as hasConversationStop, jt as completeConversationWork } from "./agent-runner-BEuPFbbv.js";
-import { v as isProviderRetryError } from "./client-Bn9SRFCi.js";
-import { C as withLogContext, d as logException, f as logInfo, p as logWarn } from "./logging-Bs3dV81s.js";
-import { i as getChatConfig } from "./config-_XAINZMN.js";
-import { f as getTurnRequestDeadline, m as ConversationQueueMessageRejectedError } from "./job-queue-CGicV7x6.js";
+import { v as isProviderRetryError } from "./client-BVnfNd3D.js";
+import { C as withLogContext, d as logException, f as logInfo, p as logWarn } from "./logging-CZEc8_v4.js";
+import { i as getChatConfig } from "./config-CgWvImQL.js";
+import { f as getTurnRequestDeadline, m as ConversationQueueMessageRejectedError } from "./job-queue-BEUqRhjC.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-DjLA8GKs.js";
 //#region src/chat/task-execution/worker.ts
 var worker_exports = /* @__PURE__ */ __exportAll({
 	CONVERSATION_WORK_DEFER_DELAY_MS: () => CONVERSATION_WORK_DEFER_DELAY_MS,
@@ -262,12 +262,12 @@ async function processConversationWorkInContext(message, options) {
 		"app.lease.expires_at_ms": lease.leaseExpiresAtMs,
 		"app.worker.soft_yield_deadline_ms": softYieldDeadlineMs
 	});
-	const drain = (handle) => drainConversationMailbox({
+	const drain = (handle, drainOptions) => drainConversationMailbox({
 		conversationId,
 		leaseToken: lease.leaseToken,
 		conversationStore: options.conversationStore,
 		handle: async (messages) => {
-			const candidates = 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) || !attemptStartMessageIds.has(message.inboundMessageId)));
 			if (candidates.length === 0) return [];
 			return await handle(candidates) ?? candidates.map((message) => message.inboundMessageId);
 		},

package/migrations/0053_conversation_stopped_at.sql

@@ -0,0 +1 @@
+ALTER TABLE "junior_conversations" ADD COLUMN "stopped_at" timestamp with time zone;

package/migrations/0054_flowery_rage.sql

@@ -0,0 +1 @@
+ALTER TABLE "junior_agent_invocations" ADD COLUMN "model_profile" text;