@sentry/junior 0.115.0 → 0.116.1

package/dist/{chunk-HWCQRGLL.js → chunk-BFYVIOTS.js}

@@ -4,18 +4,18 @@ import {
   juniorConversations,
   juniorIdentities,
   juniorUsers
-} from "./chunk-JQFJO5WH.js";
+} from "./chunk-RXRQJF7Y.js";
 import {
   TURN_REASONING_LEVELS,
   getChatConfig,
   modelProfileSchema
-} from "./chunk-SYJT7AKB.js";
+} from "./chunk-CY7NXM32.js";
 import {
   juniorDestinations
 } from "./chunk-VFUK3X5B.js";
 import {
   normalizeIdentityEmail
-} from "./chunk-NVUQSFWX.js";
+} from "./chunk-F3SWGSPG.js";
 import {
   parseSlackChannelReferenceId,
   parseSlackTeamId
@@ -59,12 +59,6 @@ function sameDestination(left, right) {
   }
   return false;
 }
-function destinationKey(destination) {
-  if (destination.platform === "local") {
-    return destination.conversationId;
-  }
-  return `slack:${destination.teamId}:${destination.channelId}`;
-}
 
 // src/chat/identities/sql.ts
 import { randomUUID } from "crypto";
@@ -741,9 +735,11 @@ import {
   asc as asc2,
   desc as desc2,
   eq as eq3,
+  gt,
   gte,
   inArray,
   isNotNull,
+  lt,
   lte,
   sql as sql4
 } from "drizzle-orm";
@@ -796,20 +792,31 @@ var handoffModelProfileSchema = modelProfileSchema.refine(
   (profile) => profile !== "standard",
   "handoff profile must not be standard"
 );
-var conversationAgentStepPayloadSchema = z2.object({ role: z2.string() }).passthrough().transform((value) => value);
-var conversationMessageDataSchema = z2.object({
-  message: conversationAgentStepPayloadSchema,
-  provenance: conversationMessageProvenanceSchema.optional()
-}).strict();
-var agentStepEventDataSchema = conversationMessageDataSchema.extend({
-  type: z2.literal("agent_step")
-});
-var replacementHistoryMessageSchema = conversationMessageDataSchema.extend({
-  // Preserve the copied message's position when a turn resumes. Synthetic
-  // summary and handoff messages have no source event.
+var userMessageEventDataSchema = z2.object({
+  type: z2.literal("user_message"),
+  role: z2.never().optional(),
+  provenance: conversationMessageProvenanceSchema
+}).passthrough();
+var assistantMessageEventDataSchema = z2.object({
+  type: z2.literal("assistant_message"),
+  role: z2.never().optional()
+}).passthrough();
+var toolResultEventDataSchema = z2.object({
+  type: z2.literal("tool_result"),
+  role: z2.never().optional()
+}).passthrough();
+var agentHistoryItemSchema = z2.discriminatedUnion("type", [
+  userMessageEventDataSchema,
+  assistantMessageEventDataSchema,
+  toolResultEventDataSchema
+]);
+var nativeReplacementHistoryItemSchema = z2.object({
+  item: agentHistoryItemSchema,
+  // Preserve the copied item's position when a turn resumes. Synthetic
+  // summary and handoff items have no source event.
   sourceEventSeq: z2.number().int().nonnegative().optional()
-});
-var replacementHistorySchema = z2.array(replacementHistoryMessageSchema);
+}).strict();
+var replacementHistorySchema = z2.array(nativeReplacementHistoryItemSchema);
 var compactionDetailsSchema = z2.object({
   reason: z2.literal("capacity"),
   estimatedInputTokens: z2.number().int().nonnegative(),
@@ -839,12 +846,6 @@ var historyReplacementEventDataSchema = z2.discriminatedUnion("type", [
     replacementHistory: replacementHistorySchema
   }).strict()
 ]);
-var legacyRollbackEventDataSchema = z2.object({
-  type: z2.literal("rollback"),
-  modelProfile: modelProfileSchema,
-  modelId: z2.string().min(1),
-  replacementHistory: replacementHistorySchema
-}).strict();
 var historyReplacementSchema = z2.object({
   data: historyReplacementEventDataSchema,
   createdAtMs: z2.number().finite()
@@ -975,7 +976,7 @@ var subagentEndedEventDataSchema = z2.object({
 var appendableConversationEventDataSchema = z2.union([
   messageEventDataSchema,
   messageUpdatedEventDataSchema,
-  agentStepEventDataSchema,
+  agentHistoryItemSchema,
   mcpProviderConnectedEventDataSchema,
   authorizationRequestedEventDataSchema,
   authorizationCompletedEventDataSchema,
@@ -991,13 +992,14 @@ var appendableConversationEventDataSchema = z2.union([
 ]);
 var conversationEventDataSchema = z2.union([
   appendableConversationEventDataSchema,
-  historyReplacementEventDataSchema,
-  legacyRollbackEventDataSchema
+  historyReplacementEventDataSchema
 ]);
-var knownConversationEventTypeSchema = z2.enum([
+var KNOWN_CONVERSATION_EVENT_TYPES = [
   "message",
   "message_updated",
-  "agent_step",
+  "user_message",
+  "assistant_message",
+  "tool_result",
   "mcp_provider_connected",
   "authorization_requested",
   "authorization_completed",
@@ -1011,9 +1013,9 @@ var knownConversationEventTypeSchema = z2.enum([
   "subagent_started",
   "subagent_ended",
   "handoff",
-  "compaction",
-  "rollback"
-]);
+  "compaction"
+];
+var knownConversationEventTypeSchema = z2.enum(KNOWN_CONVERSATION_EVENT_TYPES);
 var unknownConversationEventDataSchema = z2.object({
   type: z2.literal("unknown"),
   originalType: z2.string().min(1),
@@ -1270,6 +1272,16 @@ var SqlConversationEventStore = class {
     ).orderBy(asc2(juniorConversationEvents.seq));
     return rows.map(eventFromRow);
   }
+  async loadLatestInstruction(conversationId) {
+    const [row] = await this.executor.db().select().from(juniorConversationEvents).where(
+      and3(
+        eq3(juniorConversationEvents.conversationId, conversationId),
+        eq3(juniorConversationEvents.type, "user_message"),
+        sql4`${juniorConversationEvents.payload}->'provenance'->>'authority' = 'instruction'`
+      )
+    ).orderBy(desc2(juniorConversationEvents.seq)).limit(1);
+    return row ? eventFromRow(row) : void 0;
+  }
   async loadMessageHistory(conversationId) {
     const [compactionRow] = await this.executor.db().select().from(juniorConversationEvents).where(
       and3(
@@ -1292,6 +1304,61 @@ var SqlConversationEventStore = class {
     const rows = await this.executor.db().select().from(juniorConversationEvents).where(eq3(juniorConversationEvents.conversationId, conversationId)).orderBy(asc2(juniorConversationEvents.seq));
     return rows.map(eventFromRow);
   }
+  async query(conversationId, query) {
+    if (query.limit < 1) {
+      throw new Error("Conversation event query limit must be at least 1");
+    }
+    if (query.afterSeq !== void 0 && query.beforeSeq !== void 0 && query.afterSeq >= query.beforeSeq) {
+      return { events: [], hasOlder: false, hasNewer: false };
+    }
+    const typeFilter = query.types && query.types.length > 0 ? inArray(juniorConversationEvents.type, [...query.types]) : void 0;
+    const bounds = and3(
+      eq3(juniorConversationEvents.conversationId, conversationId),
+      query.afterSeq === void 0 ? void 0 : gt(juniorConversationEvents.seq, query.afterSeq),
+      query.beforeSeq === void 0 ? void 0 : lt(juniorConversationEvents.seq, query.beforeSeq),
+      typeFilter
+    );
+    const newestFirst = query.afterSeq === void 0;
+    const rows = await this.executor.db().select().from(juniorConversationEvents).where(bounds).orderBy(
+      newestFirst ? desc2(juniorConversationEvents.seq) : asc2(juniorConversationEvents.seq)
+    ).limit(query.limit + 1);
+    const overflow = rows.length > query.limit;
+    const pageRows = overflow ? rows.slice(0, query.limit) : rows;
+    const events = (newestFirst ? [...pageRows].reverse() : pageRows).map(
+      eventFromRow
+    );
+    if (events.length === 0) {
+      return { events, hasOlder: false, hasNewer: false };
+    }
+    const firstSeq = events[0].seq;
+    const lastSeq = events[events.length - 1].seq;
+    const hasOlder = newestFirst && overflow ? true : await this.hasMatchingEvent({
+      conversationId,
+      beforeSeq: firstSeq,
+      typeFilter
+    });
+    const hasNewer = !newestFirst && overflow ? true : await this.hasMatchingEvent({
+      conversationId,
+      afterSeq: lastSeq,
+      typeFilter
+    });
+    return { events, hasOlder, hasNewer };
+  }
+  /** Return whether any matching event exists inside the exclusive seq window. */
+  async hasMatchingEvent(args) {
+    if (args.afterSeq !== void 0 && args.beforeSeq !== void 0 && args.afterSeq >= args.beforeSeq) {
+      return false;
+    }
+    const [row] = await this.executor.db().select({ seq: juniorConversationEvents.seq }).from(juniorConversationEvents).where(
+      and3(
+        eq3(juniorConversationEvents.conversationId, args.conversationId),
+        args.afterSeq === void 0 ? void 0 : gt(juniorConversationEvents.seq, args.afterSeq),
+        args.beforeSeq === void 0 ? void 0 : lt(juniorConversationEvents.seq, args.beforeSeq),
+        args.typeFilter
+      )
+    ).limit(1);
+    return row !== void 0;
+  }
   /** Read the next sequence and active model-history version. */
   async readCursor(conversationId) {
     const rows = await this.executor.db().select({
@@ -1436,10 +1503,11 @@ export {
   parseDestination,
   requireSlackDestination,
   sameDestination,
-  destinationKey,
   instructionProvenanceFor,
   contextProvenance,
   instructionActors,
+  agentHistoryItemSchema,
+  KNOWN_CONVERSATION_EVENT_TYPES,
   decodeStoredConversationEvent,
   sanitizePostgresJson,
   withConversationEventLock,

package/dist/{chunk-LYA2AB5G.js → chunk-CGXLCMWI.js}

@@ -1,38 +1,38 @@
 import {
   getInterruptionMarker
-} from "./chunk-CEYOL62C.js";
+} from "./chunk-RYFAVWP3.js";
 import {
   createPluginLogger,
   getPlugins
-} from "./chunk-RAVKCKXA.js";
+} from "./chunk-ZYHLNTC2.js";
 import {
   acquireActiveLock,
   getStateAdapter
-} from "./chunk-67CVNDJ7.js";
+} from "./chunk-7CSVG54J.js";
 import {
   SlackActionError,
   getSlackClient,
   isDmChannel,
   normalizeSlackConversationId,
   withSlackRetries
-} from "./chunk-CWEZEPD4.js";
+} from "./chunk-FAEALXEH.js";
 import {
   getDb,
   parseDestination
-} from "./chunk-HWCQRGLL.js";
+} from "./chunk-BFYVIOTS.js";
 import {
   sleep
 } from "./chunk-4ZNGQH7C.js";
 import {
   normalizeSlackEmojiName
-} from "./chunk-SYJT7AKB.js";
+} from "./chunk-CY7NXM32.js";
 import {
   pluginCatalogRuntime
-} from "./chunk-6FKLPVF3.js";
+} from "./chunk-OY2PQQ4P.js";
 import {
   logInfo,
   logWarn
-} from "./chunk-NVUQSFWX.js";
+} from "./chunk-F3SWGSPG.js";
 import {
   isRecord
 } from "./chunk-OB42YVAE.js";
@@ -41,49 +41,6 @@ import {
   parseSlackUserId
 } from "./chunk-F3B2YJ76.js";
 
-// src/chat/capabilities/catalog.ts
-var cachedCatalog;
-function getCapabilityCatalog() {
-  const signature = pluginCatalogRuntime.getSignature();
-  if (cachedCatalog?.signature === signature) return cachedCatalog;
-  const providers = pluginCatalogRuntime.getCapabilityProviders();
-  const capabilityToProvider = /* @__PURE__ */ new Map();
-  for (const provider of providers) {
-    for (const capability of provider.capabilities) {
-      if (capabilityToProvider.has(capability)) {
-        throw new Error(
-          `Duplicate capability registration for "${capability}"`
-        );
-      }
-      capabilityToProvider.set(capability, provider);
-    }
-  }
-  cachedCatalog = { signature, providers, capabilityToProvider };
-  return cachedCatalog;
-}
-var catalogLogged = false;
-function logCapabilityCatalogLoadedOnce() {
-  if (catalogLogged) return;
-  catalogLogged = true;
-  const { providers } = getCapabilityCatalog();
-  const capabilityNames = providers.flatMap((p) => p.capabilities).sort();
-  const configKeys = [
-    ...new Set(providers.flatMap((p) => p.configKeys))
-  ].sort();
-  logInfo(
-    "capability_catalog_loaded",
-    {},
-    {
-      "app.capability.providers": providers.map((p) => p.provider),
-      "app.capability.count": capabilityNames.length,
-      "app.capability.names": capabilityNames,
-      "app.config.key_count": configKeys.length,
-      "app.config.keys": configKeys
-    },
-    "Loaded capability provider catalog"
-  );
-}
-
 // src/chat/capabilities/router.ts
 var ProviderCredentialRouter = class {
   brokersByProvider;
@@ -167,7 +124,6 @@ function createUserTokenStore() {
   return new StateAdapterTokenStore(getStateAdapter());
 }
 function createProviderCredentialRouter(userTokenStore) {
-  logCapabilityCatalogLoadedOnce();
   const brokersByProvider = {};
   for (const plugin of pluginCatalogRuntime.getProviders()) {
     const { name } = plugin.manifest;

package/dist/{chunk-SYJT7AKB.js → chunk-CY7NXM32.js}

@@ -12,7 +12,7 @@ import {
   normalizeGenAiFinishReason,
   serializeGenAiAttribute,
   withSpan
-} from "./chunk-NVUQSFWX.js";
+} from "./chunk-F3SWGSPG.js";
 
 // src/chat/config.ts
 import { getModel as getModel2 } from "@earendil-works/pi-ai/compat";

package/dist/{chunk-2QG4MZQ7.js → chunk-DLLW5ITL.js}

@@ -1,9 +1,9 @@
 import {
   pluginCatalogRuntime
-} from "./chunk-6FKLPVF3.js";
+} from "./chunk-OY2PQQ4P.js";
 import {
   logWarn
-} from "./chunk-NVUQSFWX.js";
+} from "./chunk-F3SWGSPG.js";
 import {
   skillRoots
 } from "./chunk-3V7OFJZC.js";

package/dist/{chunk-NVUQSFWX.js → chunk-F3SWGSPG.js}

@@ -13,7 +13,7 @@ import {
 } from "./chunk-6GWA276C.js";
 import {
   getDeploymentTelemetryAttributes
-} from "./chunk-TVE25LPW.js";
+} from "./chunk-WLT72MRP.js";
 
 // src/chat/logging.ts
 import path from "path";
@@ -186,11 +186,7 @@ var CONSOLE_ALWAYS_HIDDEN_KEYS = /* @__PURE__ */ new Set([
   "url.path",
   "user_agent.original"
 ]);
-var CONSOLE_DROP_WHEN_COUNTED_KEYS = /* @__PURE__ */ new Set([
-  "app.capability.names",
-  "app.capability.providers",
-  "app.config.keys"
-]);
+var CONSOLE_DROP_WHEN_COUNTED_KEYS = /* @__PURE__ */ new Set(["app.config.keys"]);
 var CONSOLE_PREVIEW_KEYS = /* @__PURE__ */ new Set([
   "gen_ai.input.messages",
   "gen_ai.output.messages",
@@ -677,7 +673,7 @@ function booleanConsoleToken(label, value) {
   return typeof value === "boolean" ? `${label}=${value ? "yes" : "no"}` : void 0;
 }
 function shouldShowPrettyCorrelation(eventName) {
-  return !(eventName === "plugin_loaded" || eventName === "startup_discovery_summary" || eventName === "capability_catalog_loaded" || eventName.endsWith("_loaded"));
+  return !(eventName === "plugin_loaded" || eventName === "startup_discovery_summary" || eventName.endsWith("_loaded"));
 }
 function getPrettyConsoleSummaryTokens(level, eventName, attributes) {
   const tokens = [];
@@ -689,10 +685,6 @@ function getPrettyConsoleSummaryTokens(level, eventName, attributes) {
     tokens,
     eventName.startsWith("plugin_heartbeat") ? stringConsoleToken("plugin", attributes["app.plugin.name"]) : toOptionalString(attributes["app.plugin.name"]) ?? void 0
   );
-  pushPrettyConsoleToken(
-    tokens,
-    numericConsoleToken("caps", attributes["app.plugin.capability_count"])
-  );
   pushPrettyConsoleToken(
     tokens,
     numericConsoleToken("config", attributes["app.plugin.config_key_count"])
@@ -713,10 +705,6 @@ function getPrettyConsoleSummaryTokens(level, eventName, attributes) {
     tokens,
     numericConsoleToken("skills", attributes["app.skill.count"])
   );
-  pushPrettyConsoleToken(
-    tokens,
-    numericConsoleToken("capabilities", attributes["app.capability.count"])
-  );
   pushPrettyConsoleToken(
     tokens,
     numericConsoleToken("config", attributes["app.config.key_count"])

package/dist/{chunk-CWEZEPD4.js → chunk-FAEALXEH.js}

@@ -1,19 +1,83 @@
+import {
+  juniorConversationAnnotations
+} from "./chunk-RXRQJF7Y.js";
 import {
   sleep
 } from "./chunk-4ZNGQH7C.js";
 import {
   getSlackBotToken
-} from "./chunk-SYJT7AKB.js";
+} from "./chunk-CY7NXM32.js";
 import {
   logWarn,
   setSpanAttributes,
   setSpanStatus,
   withSpan
-} from "./chunk-NVUQSFWX.js";
+} from "./chunk-F3SWGSPG.js";
 import {
   parseSlackChannelReferenceId
 } from "./chunk-F3B2YJ76.js";
 
+// src/chat/plugins/annotations.ts
+import { and, desc, eq } from "drizzle-orm";
+import {
+  conversationAnnotationInputSchema
+} from "@sentry/junior-plugin-api";
+function createPluginAnnotations(args) {
+  return {
+    async upsert(input) {
+      const annotation = conversationAnnotationInputSchema.parse(input);
+      const now = /* @__PURE__ */ new Date();
+      await args.db.insert(juniorConversationAnnotations).values({
+        annotation,
+        conversationId: args.conversationId,
+        createdAt: now,
+        key: annotation.key,
+        kind: annotation.kind,
+        plugin: args.plugin,
+        updatedAt: now
+      }).onConflictDoUpdate({
+        target: [
+          juniorConversationAnnotations.conversationId,
+          juniorConversationAnnotations.plugin,
+          juniorConversationAnnotations.kind,
+          juniorConversationAnnotations.key
+        ],
+        set: { annotation, updatedAt: now }
+      });
+    },
+    async remove(kind, key) {
+      await args.db.delete(juniorConversationAnnotations).where(
+        and(
+          eq(
+            juniorConversationAnnotations.conversationId,
+            args.conversationId
+          ),
+          eq(juniorConversationAnnotations.plugin, args.plugin),
+          eq(juniorConversationAnnotations.kind, kind),
+          eq(juniorConversationAnnotations.key, key)
+        )
+      );
+    },
+    async list() {
+      return (await listConversationAnnotations(args.db, args.conversationId)).filter((a) => a.plugin === args.plugin);
+    }
+  };
+}
+async function listConversationAnnotations(db, conversationId) {
+  const rows = await db.select().from(juniorConversationAnnotations).where(eq(juniorConversationAnnotations.conversationId, conversationId)).orderBy(desc(juniorConversationAnnotations.updatedAt));
+  return rows.flatMap((row) => {
+    const parsed = conversationAnnotationInputSchema.safeParse(row.annotation);
+    return parsed.success ? [
+      {
+        ...parsed.data,
+        plugin: row.plugin,
+        createdAt: row.createdAt.toISOString(),
+        updatedAt: row.updatedAt.toISOString()
+      }
+    ] : [];
+  });
+}
+
 // src/chat/slack/client.ts
 import { AsyncLocalStorage as AsyncLocalStorage2 } from "async_hooks";
 import { WebClient } from "@slack/web-api";
@@ -435,6 +499,8 @@ async function downloadPrivateSlackFile(url) {
 }
 
 export {
+  createPluginAnnotations,
+  listConversationAnnotations,
   runWithWorkspaceTeamId,
   getWorkspaceTeamId,
   SlackActionError,