@sentry/junior 0.181.1 → 0.183.0

package/dist/{chunk-WDNA4LML.js → chunk-AHMWPFIW.js}

@@ -5,8 +5,10 @@ import {
   getConversationEventStore,
   getDb,
   getSqlExecutor
-} from "./chunk-YCW6RZGX.js";
+} from "./chunk-AX3UDIMA.js";
 import {
+  juniorCodeChanges,
+  juniorCodeRepositories,
   juniorConversationAnnotations,
   juniorConversationEvents,
   juniorIdentities,
@@ -14,7 +16,7 @@ import {
   juniorUsers,
   juniorWorkspaceRepos,
   juniorWorkspaces
-} from "./chunk-ULM7P4EQ.js";
+} from "./chunk-6UXDTPEN.js";
 import {
   SANDBOX_WORKSPACE_ROOT,
   getVercelSandboxCredentials,
@@ -22,17 +24,17 @@ import {
   isSandboxMissingError,
   runNonInteractiveCommand,
   sleep
-} from "./chunk-QA6RE6IB.js";
+} from "./chunk-X52ESOBP.js";
 import {
   getStateAdapter
-} from "./chunk-H6MPFFBE.js";
+} from "./chunk-G2B2XZQW.js";
 import {
   botConfig,
   completeObject,
   defaultModelId,
   embedTexts,
   getSlackBotToken
-} from "./chunk-S63LNPIV.js";
+} from "./chunk-LMNMMESF.js";
 import {
   isActorUserId,
   parseActorUserId,
@@ -48,7 +50,7 @@ import {
   setSpanAttributes,
   setSpanStatus,
   withSpan
-} from "./chunk-2CZ63QCL.js";
+} from "./chunk-LZBPGX5A.js";
 
 // src/chat/plugins/agent-hooks.ts
 import {
@@ -902,7 +904,10 @@ function createResourceEventTeamIdResolver() {
 import { createHash as createHash2 } from "crypto";
 import {
   destinationSchema,
-  resourceEventTypeSchema
+  resourceEventMatchSchema,
+  resourceEventMatches,
+  resourceEventTypeSchema,
+  stableResourceEventMatchKey
 } from "@sentry/junior-plugin-api";
 import { z as z2 } from "zod";
 var RESOURCE_EVENT_PREFIX = "junior:resource_event_subscription:v3";
@@ -922,6 +927,7 @@ var subscriptionSchema = z2.object({
   id: z2.string().min(1),
   intent: z2.string().min(1),
   label: z2.string().min(1),
+  match: resourceEventMatchSchema.optional(),
   namespace: z2.string().min(1),
   identifier: z2.string().min(1),
   resourceType: z2.string().min(1),
@@ -1029,9 +1035,9 @@ async function readSubscriptionIdIndex(state, key) {
 }
 function buildSubscriptionId(input) {
   const eventKey = [...new Set(input.events)].sort().join("\0");
-  return `resub_${digest(
-    `${input.teamId}\0${input.namespace}\0${input.identifier}\0${input.conversationId}\0${eventKey}`
-  )}`;
+  const matchKey = stableResourceEventMatchKey(input.match);
+  const material = matchKey ? `${input.teamId}\0${input.namespace}\0${input.identifier}\0${input.conversationId}\0${eventKey}\0${matchKey}` : `${input.teamId}\0${input.namespace}\0${input.identifier}\0${input.conversationId}\0${eventKey}`;
+  return `resub_${digest(material)}`;
 }
 async function withIndexLock(state, key, callback) {
   const lock = await state.acquireLock(indexLockKey(key), INDEX_LOCK_TTL_MS);
@@ -1082,7 +1088,7 @@ function activeAt(subscription, nowMs) {
   return subscription.status === "active" && subscription.expiresAtMs > nowMs;
 }
 function matchesEvent(subscription, input) {
-  return subscription.namespace === input.namespace && subscription.identifier === input.identifier && subscriptionTeamId(subscription.destination) === input.teamId && subscription.events.includes(input.eventType) && activeAt(subscription, input.nowMs);
+  return subscription.namespace === input.namespace && subscription.identifier === input.identifier && subscriptionTeamId(subscription.destination) === input.teamId && subscription.events.includes(input.eventType) && activeAt(subscription, input.nowMs) && resourceEventMatches(subscription.match, input.data);
 }
 async function createResourceEventSubscription(input, options = {}) {
   const state = options.state ?? getStateAdapter();
@@ -1097,9 +1103,11 @@ async function createResourceEventSubscription(input, options = {}) {
   if (input.expiresAtMs <= nowMs) {
     throw new Error("Resource event subscription expiry must be in the future");
   }
+  const match = input.match && Object.keys(input.match).length > 0 ? input.match : void 0;
   const id = buildSubscriptionId({
     conversationId: input.conversationId,
     events,
+    match,
     namespace: input.namespace,
     identifier: input.identifier,
     teamId: subscriptionTeamId(input.destination)
@@ -1113,6 +1121,7 @@ async function createResourceEventSubscription(input, options = {}) {
     id,
     intent: input.intent,
     label: input.label,
+    ...match ? { match } : void 0,
     namespace: input.namespace,
     identifier: input.identifier,
     resourceType: input.resourceType,
@@ -1211,6 +1220,42 @@ async function cancelSubscriptions(input) {
     });
   }
 }
+async function collectResourceEventMatchKeys(input) {
+  const state = input.state ?? getStateAdapter();
+  await state.connect();
+  const nowMs = input.nowMs ?? Date.now();
+  const eventTypes = new Set(
+    input.eventTypes.map((eventType) => eventType.trim()).filter(Boolean)
+  );
+  if (eventTypes.size === 0) return [];
+  const keys = /* @__PURE__ */ new Set();
+  const identifiers = new Set(
+    input.identifiers.map((value) => value.trim()).filter(Boolean)
+  );
+  for (const identifier of identifiers) {
+    const ids = await readSubscriptionIdIndex(
+      state,
+      resourceIndexKey(input.teamId, input.namespace, identifier)
+    );
+    const records = await Promise.all(
+      ids.map(
+        async (id) => parseSubscription(await state.get(subscriptionKey(id)))
+      )
+    );
+    for (const record of records) {
+      if (!record) continue;
+      if (record.namespace !== input.namespace) continue;
+      if (record.identifier !== identifier) continue;
+      if (subscriptionTeamId(record.destination) !== input.teamId) continue;
+      if (!activeAt(record, nowMs)) continue;
+      if (!record.events.some((eventType) => eventTypes.has(eventType))) continue;
+      for (const key of Object.keys(record.match ?? {})) {
+        keys.add(key);
+      }
+    }
+  }
+  return [...keys].sort();
+}
 async function findMatchingResourceEventSubscriptions(input) {
   const state = input.state ?? getStateAdapter();
   await state.connect();
@@ -1226,6 +1271,7 @@ async function findMatchingResourceEventSubscriptions(input) {
   );
   return records.filter(
     (record) => record !== void 0 && matchesEvent(record, {
+      data: input.data,
       eventType: input.eventType,
       nowMs,
       namespace: input.namespace,
@@ -1246,6 +1292,7 @@ async function deliverResourceEventSubscription(input) {
         await state.get(subscriptionKey(input.subscription.id))
       );
       if (!current || !matchesEvent(current, {
+        data: input.data,
         eventType: input.eventType,
         nowMs,
         namespace: input.namespace,
@@ -2169,6 +2216,113 @@ async function deleteWorkspace(id) {
   return result.deleted;
 }
 
+// src/chat/code/store.ts
+import { randomUUID as randomUUID3 } from "crypto";
+import { and as and6, eq as eq6, lte, sql as sql3 } from "drizzle-orm";
+import {
+  codeChangeInputSchema
+} from "@sentry/junior-plugin-api";
+async function recordCodeChange(db, provider, input) {
+  const change = codeChangeInputSchema.parse(input);
+  const repositories = await db.insert(juniorCodeRepositories).values({
+    id: randomUUID3(),
+    name: change.repository.name,
+    provider,
+    providerId: change.repository.providerId,
+    url: change.repository.url,
+    updatedAt: change.updatedAt
+  }).onConflictDoUpdate({
+    target: [
+      juniorCodeRepositories.provider,
+      juniorCodeRepositories.providerId
+    ],
+    set: {
+      name: change.repository.name,
+      ...change.repository.url ? { url: change.repository.url } : void 0,
+      updatedAt: change.updatedAt
+    },
+    where: lte(juniorCodeRepositories.updatedAt, change.updatedAt)
+  }).returning({ id: juniorCodeRepositories.id });
+  const existingRepositories = repositories[0] ? [] : await db.select({ id: juniorCodeRepositories.id }).from(juniorCodeRepositories).where(
+    and6(
+      eq6(juniorCodeRepositories.provider, provider),
+      eq6(juniorCodeRepositories.providerId, change.repository.providerId)
+    )
+  ).limit(1);
+  const repositoryId = repositories[0]?.id ?? existingRepositories[0]?.id;
+  if (!repositoryId) {
+    throw new Error("Code repository upsert returned no row");
+  }
+  const conversationIds = sql3.join(
+    change.conversationIds.map((conversationId) => sql3`${conversationId}`),
+    sql3`, `
+  );
+  const values = {
+    closedAt: change.closedAt ?? null,
+    conversationIds: change.conversationIds.length > 0 ? sql3`ARRAY(
+            SELECT DISTINCT value
+            FROM unnest(
+              ${juniorCodeChanges.conversationIds}
+              || ARRAY[${conversationIds}]::text[]
+            ) AS value
+            ORDER BY value
+          )` : juniorCodeChanges.conversationIds,
+    mergedAt: change.mergedAt ?? null,
+    number: change.number,
+    openedAt: change.openedAt,
+    repositoryId,
+    state: change.state,
+    ...change.title ? { title: change.title } : void 0,
+    updatedAt: change.updatedAt,
+    url: change.url ?? null
+  };
+  await db.insert(juniorCodeChanges).values({
+    ...values,
+    conversationIds: change.conversationIds,
+    id: randomUUID3(),
+    provider,
+    providerId: change.providerId
+  }).onConflictDoUpdate({
+    target: [juniorCodeChanges.provider, juniorCodeChanges.providerId],
+    set: values,
+    where: lte(juniorCodeChanges.updatedAt, change.updatedAt)
+  });
+}
+async function associateCodeChangeConversations(db, provider, input) {
+  if (input.conversationIds.length === 0) return;
+  const conversationIds = sql3.join(
+    input.conversationIds.map((conversationId) => sql3`${conversationId}`),
+    sql3`, `
+  );
+  await db.update(juniorCodeChanges).set({
+    conversationIds: sql3`ARRAY(
+        SELECT DISTINCT value
+        FROM unnest(
+          ${juniorCodeChanges.conversationIds}
+          || ARRAY[${conversationIds}]::text[]
+        ) AS value
+        ORDER BY value
+      )`
+  }).where(
+    and6(
+      eq6(juniorCodeChanges.provider, provider),
+      eq6(juniorCodeChanges.providerId, input.providerId)
+    )
+  );
+}
+
+// src/chat/code/publisher.ts
+function createCodeChangePublisher(provider) {
+  return {
+    async associateConversations(input) {
+      await associateCodeChangeConversations(getDb(), provider, input);
+    },
+    async record(input) {
+      await recordCodeChange(getDb(), provider, input);
+    }
+  };
+}
+
 // src/chat/plugins/agent-hooks.ts
 var PluginHookDeniedError = class extends Error {
   constructor(message) {
@@ -2781,7 +2935,29 @@ function getPluginRoutes(options) {
           plugin: pluginName
         })
       },
+      codeChanges: createCodeChangePublisher(pluginName),
       resourceEvents: {
+        async neededMatchKeys(input) {
+          if (!options.resourceEvents.neededMatchKeys) return [];
+          const identifiers = [
+            ...new Set(
+              input.identifiers.map(
+                (identifier) => normalizeResourceEventIdentifier(
+                  plugin.resourceEvents,
+                  identifier
+                )
+              ).filter(Boolean)
+            )
+          ];
+          if (identifiers.length === 0 || input.eventTypes.length === 0) {
+            return [];
+          }
+          return await options.resourceEvents.neededMatchKeys({
+            eventTypes: input.eventTypes,
+            identifiers,
+            namespace: pluginName
+          });
+        },
         async publish(event) {
           const parsed = resourceEventInputSchema.parse(event);
           requirePublishedResourceEvent(plugin, parsed.eventType);
@@ -3429,6 +3605,7 @@ export {
   listResourceEventSubscriptions,
   cancelResourceEventSubscription,
   cancelSubscriptions,
+  collectResourceEventMatchKeys,
   findMatchingResourceEventSubscriptions,
   deliverResourceEventSubscription,
   RESOURCE_SUBSCRIPTION_DEFAULT_TTL_MS,

package/dist/{chunk-YCW6RZGX.js → chunk-AX3UDIMA.js}

@@ -8,7 +8,7 @@ import {
   juniorConversations,
   juniorIdentities,
   juniorUsers
-} from "./chunk-ULM7P4EQ.js";
+} from "./chunk-6UXDTPEN.js";
 import {
   juniorDestinations
 } from "./chunk-VFUK3X5B.js";
@@ -16,7 +16,7 @@ import {
   TURN_REASONING_LEVELS,
   getChatConfig,
   modelProfileSchema
-} from "./chunk-S63LNPIV.js";
+} from "./chunk-LMNMMESF.js";
 import {
   parseActorUserId,
   parseSlackChannelReferenceId,
@@ -24,7 +24,7 @@ import {
 } from "./chunk-N7TMSOZH.js";
 import {
   normalizeIdentityEmail
-} from "./chunk-2CZ63QCL.js";
+} from "./chunk-LZBPGX5A.js";
 
 // src/chat/conversations/sql/store.ts
 import { randomUUID as randomUUID2 } from "crypto";