@sentry/junior 0.265.0 → 0.267.0

package/dist/{db-BnRqQ7G5.d.ts → db-Bg-zC3r5.d.ts}

@@ -1,4 +1,4 @@
-import "./store-CG0VJyye.js";
+import "./store-B8CABbmR.js";
 import { z } from "zod";
 import "drizzle-orm/pg-core";
 import "drizzle-orm/migrator";

package/dist/{executor-CAr7xQr2.js → executor-VYrx_K4w.js}

@@ -1,5 +1,5 @@
-import "./config-BayQ9hHH.js";
-import { f as logException } from "./logging-D2QBriUo.js";
+import "./config-CdB6yJj5.js";
+import { p as logException } from "./logging-DuZ1A4ab.js";
 import { a as juniorAgentInvocations, c as juniorIdentities, d as juniorDestinations, f as timestamptz, i as juniorAgentBindings, l as juniorUsers, s as juniorConversations } from "./agent-invocations-CxKldAeB.js";
 import { AsyncLocalStorage } from "node:async_hooks";
 import { sql } from "drizzle-orm";
@@ -292,7 +292,10 @@ const juniorStats = pgTable("junior_stats", {
 * One row per Automation of either kind. `record` holds the fields that have
 * no column. Each write also copies the nested fields that queries filter or
 * search on into columns: `team_id`, `channel_id`, `creator_slack_user_id`,
-* `instruction`, and the event trigger `namespace` and `identifier`.
+* `instruction`, and the event trigger `namespace` and `identifier`. An event
+* trigger with no identifier runs for every resource of its namespace, so its
+* `identifier` is null. The match index finds those rows with
+* `identifier is null`.
 */
 const juniorAutomations = pgTable("junior_automations", {
 	id: text("id").primaryKey(),
@@ -317,7 +320,7 @@ const juniorAutomations = pgTable("junior_automations", {
 	check("junior_automations_kind_check", sql`${table.kind} in ('scheduled', 'event')`),
 	check("junior_automations_status_check", sql`${table.status} in ('active', 'blocked', 'paused', 'completed', 'deleted')`),
 	check("junior_automations_record_check", sql`jsonb_typeof(${table.record}) = 'object'`),
-	check("junior_automations_trigger_check", sql`(${table.kind} = 'scheduled' and ${table.namespace} is null and ${table.identifier} is null) or (${table.kind} = 'event' and ${table.namespace} is not null and ${table.identifier} is not null and ${table.nextRunAtMs} is null and ${table.runNowAtMs} is null and ${table.status} <> 'completed')`),
+	check("junior_automations_trigger_check", sql`(${table.kind} = 'scheduled' and ${table.namespace} is null and ${table.identifier} is null) or (${table.kind} = 'event' and ${table.namespace} is not null and ${table.nextRunAtMs} is null and ${table.runNowAtMs} is null and ${table.status} <> 'completed')`),
 	index("junior_automations_team_idx").on(table.teamId, table.createdAtMs, table.id).where(sql`${table.status} <> 'deleted'`),
 	index("junior_automations_creator_identity_idx").on(table.creatorIdentityId, table.createdAtMs, table.id),
 	index("junior_automations_run_now_due_idx").on(table.runNowAtMs, table.createdAtMs, table.id).where(sql`${table.status} = 'active' AND ${table.runNowAtMs} IS NOT NULL`),

package/dist/{history-AY8rs-FR.js → history-C84mlAwO.js}

@@ -366,7 +366,8 @@ const turnCompletedEventDataSchema = z.object({
 	outcome: z.enum([
 		"success",
 		"no_reply",
-		"cancelled"
+		"cancelled",
+		"blocked"
 	])
 }).strict();
 const turnFailedEventDataSchema = z.object({

package/dist/{images-B2yA3HWE.js → images-CecjXAAz.js}

@@ -1,7 +1,7 @@
 import { t as __exportAll } from "./rolldown-runtime-nwUcYXjP.js";
-import { p as getSqlExecutor } from "./viewer-B2wXNspU.js";
-import { S as readLiveAttachment, w as storeAttachment } from "./agent-runner-C6MwHJEs.js";
-import { H as detectImageMediaType } from "./conversation-B0baEwoA.js";
+import { m as getSqlExecutor } from "./viewer-DrN3oC2X.js";
+import { S as readLiveAttachment, w as storeAttachment } from "./agent-runner-DgNATN4D.js";
+import { K as detectImageMediaType } from "./conversation-DSo310Ps.js";
 // src/chat/attachments/images.ts
 var images_exports = /* @__PURE__ */ __exportAll({
 	decodeInputImages: () => decodeInputImages,

package/dist/instrumentation.js

@@ -1,6 +1,6 @@
-import { F as getDeploymentTelemetryAttributes, P as getDeploymentServiceVersion } from "./logging-D2QBriUo.js";
+import { F as getDeploymentServiceVersion, I as getDeploymentTelemetryAttributes } from "./logging-DuZ1A4ab.js";
 import { a as getClient, c as init, o as getGlobalScope } from "./sentry-MDkYAVPV.js";
-import { n as getCurrentConversationPrivacy } from "./conversation-privacy-frjQCJa9.js";
+import { n as getCurrentConversationPrivacy } from "./conversation-privacy-BzgJC5k0.js";
 import { t as consumePrivateTraceResultMarker } from "./private-trace-result-CE7_lEdq.js";
 // src/chat/sentry-payload-filter.ts
 const PAYLOAD_ATTRIBUTE_KEYS = /* @__PURE__ */ new Set([
@@ -164,6 +164,10 @@ function initSentry() {
 		environment: process.env.SENTRY_ENVIRONMENT ?? process.env.VERCEL_ENV ?? process.env.NODE_ENV,
 		release: serviceVersion,
 		tracesSampleRate: getSampleRate(process.env.SENTRY_TRACES_SAMPLE_RATE, 1),
+		ignoreSpans: [{
+			op: "http.server",
+			attributes: { "url.path": "/_vercel/ping" }
+		}],
 		dataCollection: {
 			httpBodies: ["incomingRequest"],
 			databaseQueryData: false

package/dist/{job-queue-Cjo6Yg_b.js → job-queue-C0BZSa7r.js}

@@ -1,5 +1,5 @@
-import { i as getChatConfig } from "./config-BayQ9hHH.js";
-import { T as withSpan } from "./logging-D2QBriUo.js";
+import { i as getChatConfig } from "./config-CdB6yJj5.js";
+import { E as withSpan, m as logInfo, p as logException } from "./logging-DuZ1A4ab.js";
 import { AsyncLocalStorage } from "node:async_hooks";
 import { z } from "zod";
 import { createHash, createHmac, timingSafeEqual } from "node:crypto";
@@ -40,6 +40,131 @@ function runWithTurnRequestDeadline(callback, startedAtMs = Date.now()) {
 	if (requestDeadlineStorage.getStore()) return callback();
 	return requestDeadlineStorage.run(createTurnRequestDeadline(startedAtMs), callback);
 }
+// src/chat/queue/bullmq.ts
+const MAX_ATTEMPTS = 50;
+const MAX_BACKOFF_MS = 3e4;
+const COMPLETED_JOB_AGE_SECONDS = 3600;
+const FAILED_JOB_AGE_SECONDS = 86400;
+/**
+* Import a module by a name held in a variable.
+*
+* Bundlers follow a literal `import("bullmq")` and put BullMQ into the
+* production server, even though production never selects this provider.
+* Node resolves this import when the app runs instead.
+*/
+function importAtRuntime(specifier) {
+	return import(
+		/* @vite-ignore */
+		specifier
+);
+}
+function bullmqConfig() {
+	const config = getChatConfig().queue;
+	if (config.provider !== "bullmq") throw new Error("The BullMQ queue provider is not configured");
+	return config;
+}
+/** Load BullMQ and open a Redis client that the caller must close. */
+async function connect() {
+	const [bullmq, redis] = await Promise.all([importAtRuntime("bullmq"), importAtRuntime("redis")]).catch((error) => {
+		throw new Error("JUNIOR_QUEUE_PROVIDER=bullmq needs the bullmq and redis packages installed", { cause: error });
+	});
+	const client = redis.createClient({ url: bullmqConfig().redisUrl });
+	try {
+		await client.connect();
+		return {
+			bullmq,
+			connection: bullmq.createNodeRedisClient(client)
+		};
+	} catch (error) {
+		client.destroy();
+		throw error;
+	}
+}
+/** BullMQ job ids must not contain ":", and Junior's keys do. */
+function toJobId(idempotencyKey) {
+	return `k-${createHash("sha256").update(idempotencyKey).digest("base64url")}`;
+}
+function metadataFor(job, consumer) {
+	return {
+		consumerGroup: consumer.consumerGroup,
+		createdAt: new Date(job.timestamp),
+		deliveryCount: job.attemptsMade + 1,
+		messageId: job.id ?? "",
+		topicName: consumer.topic
+	};
+}
+async function processJob(job, consumer) {
+	const { payload, retentionSeconds } = job.data;
+	if (retentionSeconds !== void 0 && Date.now() - job.timestamp > retentionSeconds * 1e3) return;
+	const metadata = metadataFor(job, consumer);
+	try {
+		await consumer.handler(payload, metadata);
+	} catch (error) {
+		if (consumer.retry(error, metadata)?.acknowledge) return;
+		throw error;
+	}
+}
+/** Start one BullMQ worker for each consumer, on a Redis client it owns. */
+async function startWorker(consumers) {
+	const { bullmq, connection } = await connect();
+	const concurrency = bullmqConfig().workerConcurrency;
+	const workers = consumers.map((consumer) => {
+		const worker = new bullmq.Worker(consumer.topic, (job) => processJob(job, consumer), {
+			concurrency,
+			connection,
+			...consumer.visibilityTimeoutSeconds !== void 0 && { lockDuration: consumer.visibilityTimeoutSeconds * 1e3 },
+			settings: { backoffStrategy: (attemptsMade) => Math.min(1e3 * 2 ** (attemptsMade - 1), MAX_BACKOFF_MS) }
+		});
+		worker.on("error", (error) => {
+			logException(error, "queue.bullmq.worker.exception", { "messaging.destination.name": consumer.topic });
+		});
+		return worker;
+	});
+	logInfo("queue.bullmq.worker.started", {
+		"app.queue.worker_concurrency": concurrency,
+		"messaging.destination.names": consumers.map((consumer) => consumer.topic)
+	});
+	return { close: async () => {
+		try {
+			const failures = (await Promise.allSettled(workers.map((worker) => worker.close()))).flatMap((result) => result.status === "rejected" ? [result.reason] : []);
+			if (failures.length > 0) throw new AggregateError(failures, "BullMQ workers did not close");
+		} finally {
+			await connection.quit();
+		}
+	} };
+}
+/** Add one job on a Redis client that is open only for this send. */
+async function send$1(topic, payload, options = {}) {
+	const { bullmq, connection } = await connect();
+	const queue = new bullmq.Queue(topic, { connection });
+	try {
+		const job = await queue.add(topic, {
+			payload,
+			retentionSeconds: options.retentionSeconds
+		}, {
+			attempts: MAX_ATTEMPTS,
+			backoff: { type: "custom" },
+			delay: options.delaySeconds ? options.delaySeconds * 1e3 : void 0,
+			jobId: options.idempotencyKey ? toJobId(options.idempotencyKey) : void 0,
+			removeOnComplete: { age: COMPLETED_JOB_AGE_SECONDS },
+			removeOnFail: { age: FAILED_JOB_AGE_SECONDS }
+		});
+		return job.id ? { messageId: job.id } : {};
+	} finally {
+		try {
+			await queue.close();
+		} finally {
+			await connection.quit();
+		}
+	}
+}
+/** Queue provider backed by BullMQ, for local development only. */
+const bullmqQueueProvider = {
+	messagingSystem: "bullmq",
+	send: send$1,
+	createCallback: () => async () => new Response("This queue provider does not push messages", { status: 404 }),
+	startWorker
+};
 // src/chat/queue/vercel.ts
 function defaultQueueClientOptions() {
 	if (process.env.VERCEL_DEPLOYMENT_ID?.trim()) return {};
@@ -76,7 +201,7 @@ const vercelQueueProvider = {
 // src/chat/queue/provider.ts
 /** Return the queue provider for this deployment. */
 function getQueueProvider() {
-	return vercelQueueProvider;
+	return getChatConfig().queue.provider === "bullmq" ? bullmqQueueProvider : vercelQueueProvider;
 }
 // src/chat/queue/sign.ts
 /** Sign and check queue messages before public callbacks run them. */