@sentry/junior 0.115.0 → 0.116.0

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

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

package/dist/{chunk-MIAKQNYX.js → chunk-6ZK6FZIV.js}

@@ -1,6 +1,6 @@
 import {
   createVercelQueueClient
-} from "./chunk-KNFROR7R.js";
+} from "./chunk-5I6ORJUY.js";
 
 // src/chat/task-execution/queue-signing.ts
 import { createHmac, timingSafeEqual } from "crypto";

package/dist/{chunk-6V762AB4.js → chunk-BXLS3I4W.js}

@@ -1,6 +1,6 @@
 import {
   pluginCatalogRuntime
-} from "./chunk-6FKLPVF3.js";
+} from "./chunk-25GU5B5E.js";
 
 // src/chat/plugins/validation.ts
 import { isDeepStrictEqual } from "util";

package/dist/{chunk-CWEZEPD4.js → chunk-CI3VK7X5.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-PZGPCOSD.js";
 import {
   logWarn,
   setSpanAttributes,
   setSpanStatus,
   withSpan
-} from "./chunk-NVUQSFWX.js";
+} from "./chunk-3JOGUT46.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,

package/dist/{chunk-EW5MLKT5.js → chunk-JZPQ5K4V.js}

@@ -5,7 +5,7 @@ import {
   logInfo,
   logWarn,
   setSpanAttributes
-} from "./chunk-NVUQSFWX.js";
+} from "./chunk-3JOGUT46.js";
 import {
   discoverInstalledPluginPackageContent,
   normalizePluginPackageNames
@@ -105,11 +105,6 @@ function inlineManifestSource(manifest) {
   setDefined(result, "name", manifest.name);
   setDefined(result, "display-name", manifest.displayName);
   setDefined(result, "description", manifest.description);
-  setDefined(
-    result,
-    "capabilities",
-    inlineTokenListSource(manifest.name, manifest.capabilities)
-  );
   setDefined(
     result,
     "config-keys",
@@ -138,7 +133,6 @@ function inlineManifestSource(manifest) {
 
 // src/chat/plugins/manifest.ts
 var PLUGIN_NAME_RE = /^[a-z][a-z0-9-]*$/;
-var SHORT_CAPABILITY_RE = /^[a-z0-9-]+(\.[a-z0-9-]+)*$/;
 var SHORT_CONFIG_KEY_RE = /^[a-z0-9]+(\.[a-z0-9-]+)*$/;
 var TARGET_FLAG_RE = /^-{1,2}[A-Za-z0-9][A-Za-z0-9-]*$/;
 var AUTH_TOKEN_ENV_RE = /^[A-Z][A-Z0-9_]*$/;
@@ -321,9 +315,6 @@ var manifestSourceSchema = z.object({
   }),
   "display-name": nonEmptyTrimmedString,
   description: nonEmptyTrimmedString,
-  capabilities: z.array(z.string(), {
-    error: "must be an array when provided"
-  }).optional(),
   "config-keys": z.array(z.string(), {
     error: "must be an array when provided"
   }).optional(),
@@ -361,7 +352,6 @@ function manifestConfigPatch(config) {
   const result = {};
   setDefined2(result, "display-name", config.displayName);
   setDefined2(result, "description", config.description);
-  setDefined2(result, "capabilities", config.capabilities);
   setDefined2(result, "config-keys", config.configKeys);
   setDefined2(result, "domains", config.domains);
   setDefined2(result, "api-headers", config.apiHeaders);
@@ -854,11 +844,6 @@ function parseManifestSource(parsedSource, dir, config, options) {
     if (path2 === "description") {
       throw new Error(`Invalid plugin description in ${dir}`);
     }
-    if (path2 === "capabilities") {
-      throw new Error(
-        `Plugin ${String(parsedSource.name ?? "unknown")} capabilities must be an array when provided`
-      );
-    }
     if (path2 === "config-keys") {
       throw new Error(
         `Plugin ${String(parsedSource.name ?? "unknown")} config-keys must be an array when provided`
@@ -917,14 +902,6 @@ function parseManifestSource(parsedSource, dir, config, options) {
     throw new Error(issue?.message ?? `Invalid plugin manifest in ${dir}`);
   }
   const data = sourceResult.data;
-  const capabilities = (data.capabilities ?? []).map((cap) => {
-    if (!SHORT_CAPABILITY_RE.test(cap)) {
-      throw new Error(
-        `Invalid capability token "${cap}" in plugin ${data.name}`
-      );
-    }
-    return `${data.name}.${cap}`;
-  });
   const configKeys = (data["config-keys"] ?? []).map((key) => {
     if (!SHORT_CONFIG_KEY_RE.test(key)) {
       throw new Error(`Invalid config key "${key}" in plugin ${data.name}`);
@@ -959,7 +936,6 @@ function parseManifestSource(parsedSource, dir, config, options) {
     name: data.name,
     displayName: data["display-name"],
     description: data.description,
-    capabilities,
     configKeys,
     ...domains ? { domains } : {},
     ...apiHeaders ? { apiHeaders } : {},
@@ -1550,7 +1526,6 @@ function createLoadedPluginState(signature) {
     signature,
     pluginDefinitions: [],
     pluginMigrationRoots: /* @__PURE__ */ new Map(),
-    capabilityToPlugin: /* @__PURE__ */ new Map(),
     domainToPlugin: /* @__PURE__ */ new Map(),
     pluginConfigKeys: /* @__PURE__ */ new Set(),
     pluginsByName: /* @__PURE__ */ new Map(),
@@ -1569,13 +1544,6 @@ function registerPluginManifest(state, manifest, pluginDir, skillsDir, migration
   if (state.pluginsByName.has(manifest.name)) {
     throw new Error(`Duplicate plugin name "${manifest.name}"`);
   }
-  for (const cap of manifest.capabilities) {
-    if (state.capabilityToPlugin.has(cap)) {
-      throw new Error(
-        `Duplicate capability "${cap}" in plugin "${manifest.name}"`
-      );
-    }
-  }
   for (const domain of providerDomains(manifest)) {
     const owner = state.domainToPlugin.get(domain);
     if (owner) {
@@ -1595,9 +1563,6 @@ function registerPluginManifest(state, manifest, pluginDir, skillsDir, migration
   if (definition.migrationsDir) {
     state.pluginMigrationRoots.set(manifest.name, definition.migrationsDir);
   }
-  for (const cap of manifest.capabilities) {
-    state.capabilityToPlugin.set(cap, definition);
-  }
   for (const key of manifest.configKeys) {
     state.pluginConfigKeys.add(key);
   }
@@ -1817,7 +1782,6 @@ function logLoadedPlugins(state) {
       {},
       {
         "app.plugin.name": plugin.manifest.name,
-        "app.plugin.capability_count": plugin.manifest.capabilities.length,
         "app.plugin.config_key_count": plugin.manifest.configKeys.length,
         "app.plugin.has_mcp": Boolean(plugin.manifest.mcp),
         "file.directory": plugin.dir,
@@ -1854,20 +1818,6 @@ function createPluginCatalogRuntime() {
     getSignature() {
       return ensurePluginsLoaded(runtime).signature;
     },
-    getCapabilityProviders() {
-      const state = ensurePluginsLoaded(runtime);
-      return state.pluginDefinitions.map((plugin) => ({
-        provider: plugin.manifest.name,
-        capabilities: [...plugin.manifest.capabilities],
-        configKeys: [...plugin.manifest.configKeys],
-        ...plugin.manifest.target ? {
-          target: {
-            ...plugin.manifest.target,
-            ...plugin.manifest.target.commandFlags ? { commandFlags: [...plugin.manifest.target.commandFlags] } : {}
-          }
-        } : {}
-      }));
-    },
     getProviders() {
       return [...ensurePluginsLoaded(runtime).pluginDefinitions];
     },
@@ -1971,9 +1921,6 @@ function createPluginCatalogRuntime() {
     isProvider(provider) {
       return ensurePluginsLoaded(runtime).pluginsByName.has(provider);
     },
-    isCapability(capability) {
-      return ensurePluginsLoaded(runtime).capabilityToPlugin.has(capability);
-    },
     isConfigKey(key) {
       return ensurePluginsLoaded(runtime).pluginConfigKeys.has(key);
     },
@@ -1996,7 +1943,6 @@ function createPluginCatalogRuntime() {
       }
       setSpanAttributes({
         "app.plugin.name": name,
-        "app.plugin.capabilities": plugin.manifest.capabilities,
         "app.plugin.has_oauth": Boolean(plugin.manifest.oauth)
       });
       return broker;

package/dist/{chunk-HWCQRGLL.js → chunk-KBNDFU6J.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-PZGPCOSD.js";
 import {
   juniorDestinations
 } from "./chunk-VFUK3X5B.js";
 import {
   normalizeIdentityEmail
-} from "./chunk-NVUQSFWX.js";
+} from "./chunk-3JOGUT46.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-FHC4JUSF.js → chunk-MGH5ADQS.js}

@@ -1,7 +1,7 @@
 // package.json
 var package_default = {
   name: "@sentry/junior",
-  version: "0.115.0",
+  version: "0.116.0",
   private: false,
   publishConfig: {
     access: "public"
@@ -82,7 +82,6 @@ var package_default = {
     "@vercel/queue": "^0.2.0",
     "@vercel/sandbox": "2.8.0",
     ai: "^6.0.190",
-    "bash-tool": "^1.3.16",
     chat: "4.29.0",
     commander: "^14.0.3",
     "drizzle-orm": "catalog:",

package/dist/{chunk-TVE25LPW.js → chunk-N7TMYLF2.js}

@@ -1,6 +1,6 @@
 import {
   JUNIOR_VERSION
-} from "./chunk-FHC4JUSF.js";
+} from "./chunk-MGH5ADQS.js";
 
 // src/deployment.ts
 var JUNIOR_HEARTBEAT_ROUTE = "/api/internal/heartbeat";