@sentry/junior 0.115.0 → 0.116.0

package/dist/api.js

@@ -14,16 +14,21 @@ import {
   conversationParamsSchema,
   conversationReportEventSchema,
   conversationStatsReportSchema,
+  createPersonalTokenBodySchema,
+  createdPersonalTokenSchema,
   locationDetailReportSchema,
   locationDirectoryReportSchema,
   locationParamsSchema,
-  personParamsSchema
-} from "./chunk-G36V2YGB.js";
+  personParamsSchema,
+  personalTokenListSchema,
+  personalTokenParamsSchema,
+  revokePersonalTokenResponseSchema
+} from "./chunk-TC4ZEM2D.js";
 import {
   formatSlackConversationRedactedLabel,
   readHealthReport,
   resolveSlackConversationContextFromThreadId
-} from "./chunk-G5SX4UPR.js";
+} from "./chunk-4DD6AOCG.js";
 import {
   buildSentryConversationUrl
 } from "./chunk-4CODA7P5.js";
@@ -33,26 +38,29 @@ import {
   pluginsSchema,
   runtimeInfoReportSchema,
   skillReportsSchema
-} from "./chunk-6OPTF4BQ.js";
+} from "./chunk-PE44LDDQ.js";
 import {
   agentTurnUsageSchema,
   hasAgentTurnUsage
 } from "./chunk-MU6HHZEN.js";
 import "./chunk-PDO5BLNM.js";
-import "./chunk-CWEZEPD4.js";
+import {
+  listConversationAnnotations
+} from "./chunk-CI3VK7X5.js";
 import {
   decodeStoredConversationEvent,
   getDb,
   getSqlExecutor
-} from "./chunk-HWCQRGLL.js";
+} from "./chunk-KBNDFU6J.js";
 import {
+  juniorApiTokens,
   juniorConversationEvents,
   juniorConversations,
   juniorIdentities,
   juniorUsers
-} from "./chunk-JQFJO5WH.js";
+} from "./chunk-RXRQJF7Y.js";
 import "./chunk-4ZNGQH7C.js";
-import "./chunk-SYJT7AKB.js";
+import "./chunk-PZGPCOSD.js";
 import {
   juniorDestinations
 } from "./chunk-VFUK3X5B.js";
@@ -60,16 +68,16 @@ import {
   canExposeConversationPayload,
   parseSlackThreadId
 } from "./chunk-FXOYURO4.js";
-import "./chunk-NVUQSFWX.js";
+import "./chunk-3JOGUT46.js";
 import "./chunk-OB42YVAE.js";
 import "./chunk-F3B2YJ76.js";
 import "./chunk-6GWA276C.js";
-import "./chunk-TVE25LPW.js";
-import "./chunk-FHC4JUSF.js";
+import "./chunk-N7TMYLF2.js";
+import "./chunk-MGH5ADQS.js";
 import "./chunk-MLKGABMK.js";
 
 // src/api.ts
-import { Hono as Hono4 } from "hono";
+import { Hono as Hono5 } from "hono";
 
 // src/api/conversations/routes.ts
 import { Hono } from "hono";
@@ -106,8 +114,8 @@ function parseBody(schema, body) {
 function defineApiRoute(route) {
   return route;
 }
-function registerApiRoutes(app, routes5) {
-  for (const route of routes5) {
+function registerApiRoutes(app, routes6) {
+  for (const route of routes6) {
     app.on(
       route.method,
       route.path,
@@ -164,7 +172,7 @@ var archive_default = defineApiRoute({
 
 // src/chat/pi/sql-model-usage.ts
 import { and as and2, eq as eq2, sql } from "drizzle-orm";
-var message = sql`${juniorConversationEvents.payload}->'message'`;
+var message = sql`${juniorConversationEvents.payload}`;
 var usage = sql`${message}->'usage'`;
 var cost = sql`${usage}->'cost'`;
 function nonnegativeNumber(source, field, fallbackField, floor = false) {
@@ -264,8 +272,7 @@ async function readConversationModelUsageFromSql(executor, options) {
   ).where(
     and2(
       options.includeDescendants ? eq2(juniorConversations.rootConversationId, options.conversationId) : eq2(juniorConversationEvents.conversationId, options.conversationId),
-      eq2(juniorConversationEvents.type, "agent_step"),
-      sql`${message}->>'role' = 'assistant'`,
+      eq2(juniorConversationEvents.type, "assistant_message"),
       sql`jsonb_typeof(${message}->'provider') = 'string'`,
       sql`jsonb_typeof(${message}->'model') = 'string'`,
       sql`coalesce(${message}->>'provider', '') <> ''`,
@@ -342,7 +349,8 @@ import { z as z2 } from "zod";
 var conversationReportSourceEventTypes = [
   "message",
   "message_handled",
-  "agent_step",
+  "assistant_message",
+  "tool_result",
   "tool_execution_started",
   "turn_started",
   "turn_routed",
@@ -354,7 +362,7 @@ var conversationReportSourceEventTypes = [
   "subagent_ended"
 ];
 var reportingAssistantMessageSchema = z2.object({
-  role: z2.literal("assistant"),
+  type: z2.literal("assistant_message"),
   content: z2.array(z2.unknown())
 }).passthrough();
 var reportingToolCallPartSchema = z2.object({
@@ -364,7 +372,7 @@ var reportingToolCallPartSchema = z2.object({
   arguments: z2.unknown()
 }).passthrough();
 var reportingToolResultMessageSchema = z2.object({
-  role: z2.literal("toolResult"),
+  type: z2.literal("tool_result"),
   toolCallId: z2.string().min(1),
   toolName: z2.string().min(1).optional(),
   name: z2.string().min(1).optional(),
@@ -447,10 +455,7 @@ function conversationReportToolResultIds(events) {
   return [
     ...new Set(
       events.flatMap((event) => {
-        if (event.data.type !== "agent_step") return [];
-        const result = reportingToolResultMessageSchema.safeParse(
-          event.data.message
-        );
+        const result = reportingToolResultMessageSchema.safeParse(event.data);
         return result.success ? [result.data.toolCallId] : [];
       })
     )
@@ -540,20 +545,18 @@ function projectConversationReportEventPage(args) {
   const projected = [];
   for (const event of args.events) {
     let data;
-    if (event.data.type === "agent_step") {
+    if (event.data.type === "assistant_message" || event.data.type === "tool_result") {
       const reportArgs = {
         canExposePayload: args.canExposePayload,
         createdAtMs: event.createdAtMs,
-        message: event.data.message,
+        message: event.data,
         seq: event.seq
       };
-      const result = reportingToolResultMessageSchema.safeParse(
-        event.data.message
-      );
+      const result = reportingToolResultMessageSchema.safeParse(event.data);
       const start = result.success ? toolStarts.get(result.data.toolCallId) : void 0;
       data = reportToolCalls(reportArgs) ?? reportToolResult({
         canExposePayload: args.canExposePayload,
-        message: event.data.message,
+        message: event.data,
         ...start && start.seq < event.seq ? { start } : {}
       });
     } else if (event.data.type === "tool_execution_started") {
@@ -1211,6 +1214,7 @@ function projectConversationDetail(args) {
       ...args.locationId ? { locationId: args.locationId } : {},
       usage: args.usage
     }),
+    annotations: canExposePayload ? args.annotations : [],
     events: args.events,
     ...args.previousSeq !== void 0 ? {
       previousCursor: encodeConversationCursor({
@@ -1232,12 +1236,13 @@ async function readConversationDetailFromSql(conversationId, options) {
   if (!record) return void 0;
   const executor = getSqlExecutor();
   const includeDescendantMetrics = record.rootConversationId === conversationId;
-  const [accessByConversation, modelUsage, metricsByRoot] = await Promise.all([
+  const [accessByConversation, annotations, modelUsage, metricsByRoot] = await Promise.all([
     readConversationAccessFromSql(
       getDb(),
       [conversationId],
       options.verifiedViewerEmail
     ),
+    listConversationAnnotations(getDb(), conversationId),
     record.conversation.transcriptPurgedAtMs === void 0 ? readConversationModelUsageFromSql(executor, {
       conversationId,
       includeDescendants: includeDescendantMetrics
@@ -1257,6 +1262,7 @@ async function readConversationDetailFromSql(conversationId, options) {
   return projectConversationDetail({
     ...record,
     access,
+    annotations,
     durationMs: metrics?.durationMs ?? record.durationMs,
     events: page.events,
     modelUsage,
@@ -1671,7 +1677,7 @@ function readDescriptionText(home) {
   }
 }
 async function readSkillReports() {
-  const { discoverSkills } = await import("./skills-JJQIE3BT.js");
+  const { discoverSkills } = await import("./skills-UE2KXQMB.js");
   const skills = await discoverSkills();
   return skillReportsSchema.parse(
     skills.map((skill) => ({
@@ -1681,10 +1687,9 @@ async function readSkillReports() {
   );
 }
 async function readPlugins() {
-  const { pluginCatalogRuntime } = await import("./catalog-runtime-Y32UEQLB.js");
+  const { pluginCatalogRuntime } = await import("./catalog-runtime-CWZY6GTH.js");
   return pluginsSchema.parse(
     pluginCatalogRuntime.getProviders().map((plugin) => ({
-      capabilities: plugin.manifest.capabilities ?? [],
       configKeys: plugin.manifest.configKeys ?? [],
       description: plugin.manifest.description,
       displayName: plugin.manifest.displayName,
@@ -1695,7 +1700,7 @@ async function readPlugins() {
 async function readRuntimeInfoReport() {
   const [{ homeDir }, { pluginCatalogRuntime }, plugins, skills] = await Promise.all([
     import("./discovery-RMHYSRL7.js"),
-    import("./catalog-runtime-Y32UEQLB.js"),
+    import("./catalog-runtime-CWZY6GTH.js"),
     readPlugins(),
     readSkillReports()
   ]);
@@ -1711,7 +1716,7 @@ async function readRuntimeInfoReport() {
 }
 async function readPluginOperationalReportFeed() {
   const nowMs = Date.now();
-  const { getPluginOperationalReports } = await import("./agent-hooks-4EUUXP2F.js");
+  const { getPluginOperationalReports } = await import("./agent-hooks-67NFITDH.js");
   return pluginOperationalReportFeedSchema.parse({
     source: "plugins",
     generatedAt: new Date(nowMs).toISOString(),
@@ -2648,6 +2653,139 @@ var plugin_reports_default = defineApiRoute({
   handler: readPluginOperationalReportFeed
 });
 
+// src/api/personal-tokens/routes.ts
+import { Hono as Hono4 } from "hono";
+
+// src/personal-tokens/store.ts
+import { createHash, randomBytes, randomUUID } from "crypto";
+import { and as and11, desc as desc5, eq as eq12, gt, isNull as isNull6 } from "drizzle-orm";
+var TOKEN_PREFIX = "jr_pat_";
+var TOKEN_SUFFIX_LENGTH = 8;
+var DEFAULT_TOKEN_LIFETIME_MS = 90 * 24 * 60 * 60 * 1e3;
+function normalizeEmail2(email) {
+  return email.trim().toLowerCase();
+}
+function hashToken(token2) {
+  return createHash("sha256").update(token2, "utf8").digest("hex");
+}
+function metadata(row) {
+  return {
+    id: row.id,
+    name: row.name,
+    tokenSuffix: row.tokenSuffix,
+    createdAt: row.createdAt.toISOString(),
+    expiresAt: row.expiresAt.toISOString(),
+    lastUsedAt: row.lastUsedAt?.toISOString() ?? null
+  };
+}
+async function createPersonalToken(args) {
+  const now = args.now ?? /* @__PURE__ */ new Date();
+  const token2 = `${TOKEN_PREFIX}${randomBytes(32).toString("base64url")}`;
+  const row = {
+    id: randomUUID(),
+    ownerEmailNormalized: normalizeEmail2(args.email),
+    name: args.name.trim(),
+    tokenHash: hashToken(token2),
+    tokenSuffix: token2.slice(-TOKEN_SUFFIX_LENGTH),
+    createdAt: now,
+    expiresAt: new Date(now.getTime() + DEFAULT_TOKEN_LIFETIME_MS)
+  };
+  await getDb().insert(juniorApiTokens).values(row);
+  return { ...metadata({ ...row, lastUsedAt: null, revokedAt: null }), token: token2 };
+}
+async function listPersonalTokens(email, now = /* @__PURE__ */ new Date()) {
+  const rows = await getDb().select().from(juniorApiTokens).where(
+    and11(
+      eq12(juniorApiTokens.ownerEmailNormalized, normalizeEmail2(email)),
+      isNull6(juniorApiTokens.revokedAt),
+      gt(juniorApiTokens.expiresAt, now)
+    )
+  ).orderBy(desc5(juniorApiTokens.createdAt));
+  return rows.map(metadata);
+}
+async function revokePersonalToken(args) {
+  const rows = await getDb().update(juniorApiTokens).set({ revokedAt: args.now ?? /* @__PURE__ */ new Date() }).where(
+    and11(
+      eq12(juniorApiTokens.id, args.id),
+      eq12(juniorApiTokens.ownerEmailNormalized, normalizeEmail2(args.email)),
+      isNull6(juniorApiTokens.revokedAt)
+    )
+  ).returning({ id: juniorApiTokens.id });
+  return rows.length > 0;
+}
+async function authenticatePersonalToken(token2, now = /* @__PURE__ */ new Date()) {
+  if (!token2.startsWith(TOKEN_PREFIX)) return void 0;
+  const rows = await getDb().select({
+    id: juniorApiTokens.id,
+    ownerEmailNormalized: juniorApiTokens.ownerEmailNormalized
+  }).from(juniorApiTokens).where(
+    and11(
+      eq12(juniorApiTokens.tokenHash, hashToken(token2)),
+      isNull6(juniorApiTokens.revokedAt),
+      gt(juniorApiTokens.expiresAt, now)
+    )
+  ).limit(1);
+  const match = rows[0];
+  if (!match) return void 0;
+  await getDb().update(juniorApiTokens).set({ lastUsedAt: now }).where(eq12(juniorApiTokens.id, match.id));
+  return match.ownerEmailNormalized;
+}
+
+// src/api/personal-tokens/create.ts
+var create_default = defineApiRoute({
+  method: "post",
+  path: "/",
+  responseSchema: createdPersonalTokenSchema,
+  handler: async (c) => {
+    const email = c.get("verifiedViewerEmail");
+    if (!email) throwApiError(403, "Verified viewer email required.");
+    let input;
+    try {
+      input = await c.req.json();
+    } catch (error) {
+      throwApiError(400, "Invalid request body.", error);
+    }
+    const body = parseBody(createPersonalTokenBodySchema, input);
+    return createPersonalToken({ email, name: body.name });
+  }
+});
+
+// src/api/personal-tokens/list.ts
+var list_default4 = defineApiRoute({
+  method: "get",
+  path: "/",
+  responseSchema: personalTokenListSchema,
+  handler: async (c) => {
+    const email = c.get("verifiedViewerEmail");
+    if (!email) throwApiError(403, "Verified viewer email required.");
+    return { tokens: await listPersonalTokens(email) };
+  }
+});
+
+// src/api/personal-tokens/revoke.ts
+var revoke_default = defineApiRoute({
+  method: "delete",
+  path: "/:id",
+  responseSchema: revokePersonalTokenResponseSchema,
+  handler: async (c) => {
+    const email = c.get("verifiedViewerEmail");
+    if (!email) throwApiError(403, "Verified viewer email required.");
+    const { id } = parseParams(personalTokenParamsSchema, c.req.param());
+    if (!await revokePersonalToken({ email, id })) {
+      throwApiError(404, "Personal API token not found.");
+    }
+    return { revoked: true };
+  }
+});
+
+// src/api/personal-tokens/routes.ts
+var routes4 = [list_default4, create_default, revoke_default];
+function createPersonalTokenRoutes() {
+  const app = new Hono4();
+  registerApiRoutes(app, routes4);
+  return app;
+}
+
 // src/api/plugins.ts
 var plugins_default = defineApiRoute({
   method: "get",
@@ -2673,7 +2811,7 @@ var skills_default = defineApiRoute({
 });
 
 // src/api.ts
-var routes4 = [
+var routes5 = [
   health_default,
   runtime_default,
   plugins_default,
@@ -2681,9 +2819,10 @@ var routes4 = [
   plugin_reports_default
 ];
 function createJuniorApi() {
-  const app = new Hono4();
-  registerApiRoutes(app, routes4);
+  const app = new Hono5();
+  registerApiRoutes(app, routes5);
   app.route("/api/conversations", createConversationRoutes());
+  app.route("/api/personal-tokens", createPersonalTokenRoutes());
   app.route("/api/people", createPeopleRoutes());
   app.route("/api/locations", createLocationRoutes());
   app.notFound(
@@ -2698,6 +2837,7 @@ function createJuniorApi() {
   return app;
 }
 export {
+  authenticatePersonalToken,
   createJuniorApi,
   jsonResponse
 };