@sentry/junior 0.87.0 → 0.89.0

package/dist/app.js

@@ -75,7 +75,7 @@ import {
   updateConversationStats,
   uploadFilesToThread,
   upsertConversationMessage
-} from "./chunk-B6FQPS7A.js";
+} from "./chunk-NYJLQI42.js";
 import {
   CONVERSATION_WORK_CHECK_IN_INTERVAL_MS,
   CONVERSATION_WORK_STALE_ENQUEUE_MS,
@@ -99,17 +99,17 @@ import {
   requestConversationContinuation,
   requestConversationWork,
   startConversationWork
-} from "./chunk-ENPSU7L7.js";
+} from "./chunk-2DPZRS3B.js";
 import {
   JUNIOR_THREAD_STATE_TTL_MS,
   coerceThreadConversationState
 } from "./chunk-66NX7MNW.js";
-import "./chunk-RIB3M6YA.js";
+import "./chunk-V6XDCS3X.js";
 import {
   getVercelConversationWorkQueue,
   resolveConversationWorkQueueTopic,
   verifyConversationQueueMessage
-} from "./chunk-6O5UI3RG.js";
+} from "./chunk-F22AM3OW.js";
 import {
   PLUGIN_TASK_QUEUE_TOPIC,
   createVercelQueueClient,
@@ -123,7 +123,7 @@ import {
   resolveSlackChannelTypeFromMessage,
   resolveSlackConversationContext,
   setConversationTitle
-} from "./chunk-JRXCSSSU.js";
+} from "./chunk-6UPQ5GTJ.js";
 import {
   abandonAgentTurnSessionRecord,
   buildSlackOutputMessage,
@@ -137,11 +137,11 @@ import {
   recordAuthorizationCompleted,
   splitSlackReplyText,
   truncateStatusText
-} from "./chunk-ACJJJEGG.js";
+} from "./chunk-KBSLCOGE.js";
 import {
   validatePluginEgressCredentialHooks,
   validatePluginRegistrations
-} from "./chunk-2TAIGJPQ.js";
+} from "./chunk-C5NCV3OB.js";
 import {
   defineJuniorPlugins,
   pluginCatalogConfigFromEnv,
@@ -154,23 +154,24 @@ import {
   getPluginRoutes,
   getPluginSlackConversationLink,
   getPlugins,
+  parseSlackMessageTs,
   setPlugins,
   validatePlugins,
   verifySlackDirectCredentialSubject
-} from "./chunk-2NFV5FMB.js";
+} from "./chunk-XS6NLQPA.js";
 import {
   createPluginLogger,
   createPluginState
-} from "./chunk-BRSQQRG6.js";
-import {
-  getConversationStore,
-  getDb
-} from "./chunk-6I6HBOQM.js";
+} from "./chunk-IATAYWFU.js";
 import "./chunk-G3E7SCME.js";
 import {
   acquireActiveLock,
   getStateAdapter
-} from "./chunk-GB5DFM4D.js";
+} from "./chunk-YPAE5RH3.js";
+import {
+  getConversationStore,
+  getDb
+} from "./chunk-4IXHIV37.js";
 import {
   SlackActionError,
   createSlackDestination,
@@ -186,7 +187,7 @@ import {
   runWithSlackInstallationToken,
   runWithWorkspaceTeamId,
   sameDestination
-} from "./chunk-GGD6WK6V.js";
+} from "./chunk-AHLSXMOU.js";
 import {
   FUNCTION_TIMEOUT_BUFFER_SECONDS,
   botConfig,
@@ -206,7 +207,7 @@ import {
   stripRuntimeTurnContext,
   trimTrailingAssistantMessages,
   unwrapCurrentInstruction
-} from "./chunk-ZU2ALUVQ.js";
+} from "./chunk-S35CPNPT.js";
 import {
   parseSlackThreadId,
   resolveSlackChannelIdFromMessage,
@@ -214,13 +215,13 @@ import {
 } from "./chunk-L7OHKDOX.js";
 import {
   discoverSkills
-} from "./chunk-64ACM6AP.js";
+} from "./chunk-7ES37H6U.js";
 import {
   buildOAuthTokenRequest,
   hasRequiredOAuthScope,
   parseOAuthTokenResponse,
   pluginCatalogRuntime
-} from "./chunk-BQ3ITJA6.js";
+} from "./chunk-KBFQXJL4.js";
 import {
   createRequester,
   createSlackRequester,
@@ -228,7 +229,7 @@ import {
   isActorUserId,
   parseActorUserId,
   toStoredSlackRequester
-} from "./chunk-IXTBFABZ.js";
+} from "./chunk-KQKIA4CU.js";
 import {
   homeDir
 } from "./chunk-6APU57E6.js";
@@ -247,7 +248,7 @@ import {
   setTags,
   withContext,
   withSpan
-} from "./chunk-KF7522P3.js";
+} from "./chunk-VMBZFPZM.js";
 import {
   JUNIOR_PLUGIN_TASK_CALLBACK_ROUTE,
   toOptionalString
@@ -1826,7 +1827,6 @@ function slackSerializedResourceEventMessage(input) {
       channel: input.channelId,
       event_type: "resource_event",
       thread_ts: input.threadTs,
-      ts: input.id,
       type: "message",
       user: "UJRNEVENT"
     },
@@ -3095,10 +3095,6 @@ async function GET2(request, waitUntil, options = {}) {
 import { THREAD_STATE_TTL_MS } from "chat";
 
 // src/chat/runtime/turn-user-message.ts
-function normalizeSlackMessageTs(value) {
-  const trimmed = value?.trim();
-  return trimmed && /^\d+(?:\.\d+)?$/.test(trimmed) ? trimmed : void 0;
-}
 function getTurnUserMessage(conversation, sessionId) {
   for (let index = conversation.messages.length - 1; index >= 0; index -= 1) {
     const message = conversation.messages[index];
@@ -3115,7 +3111,7 @@ function getTurnUserMessageId(conversation, sessionId) {
   return getTurnUserMessage(conversation, sessionId)?.id;
 }
 function getTurnUserSlackMessageTs(message) {
-  return normalizeSlackMessageTs(message?.meta?.slackTs) ?? normalizeSlackMessageTs(message?.id);
+  return parseSlackMessageTs(message?.meta?.slackTs);
 }
 function getTurnUserReplyAttachmentContext(message) {
   const inboundAttachmentCount = message?.meta?.attachmentCount ?? 0;
@@ -3595,15 +3591,26 @@ function getMessageTs(message) {
   const directTs = toOptionalString(
     message.ts
   );
-  if (directTs) {
-    return directTs;
+  const parsedDirectTs = parseSlackMessageTs(directTs);
+  if (parsedDirectTs) {
+    return parsedDirectTs;
   }
   const raw = message.raw;
   if (!raw || typeof raw !== "object") {
     return void 0;
   }
   const rawRecord = raw;
-  return toOptionalString(rawRecord.ts) ?? toOptionalString(rawRecord.event_ts) ?? toOptionalString(rawRecord.message?.ts);
+  const candidates = [
+    rawRecord.ts,
+    rawRecord.message?.ts
+  ];
+  for (const candidate of candidates) {
+    const ts = parseSlackMessageTs(candidate);
+    if (ts) {
+      return ts;
+    }
+  }
+  return void 0;
 }
 
 // src/chat/runtime/processing-reaction.ts
@@ -9164,20 +9171,15 @@ import { THREAD_STATE_TTL_MS as THREAD_STATE_TTL_MS4 } from "chat";
 import { createSlackSource } from "@sentry/junior-plugin-api";
 
 // src/chat/slack/message.ts
-function isSlackMessageTs(value) {
-  return /^\d+(?:\.\d+)?$/.test(value.trim());
-}
 function getSlackMessageTs(message) {
-  if (isSlackMessageTs(message.id)) {
-    return message.id;
+  const idTs = parseSlackMessageTs(message.id);
+  if (idTs) {
+    return idTs;
   }
   if (message.raw && typeof message.raw === "object") {
-    const ts = message.raw.ts;
-    if (typeof ts === "string" && ts.length > 0) {
-      return ts;
-    }
+    return parseSlackMessageTs(message.raw.ts);
   }
-  return message.id;
+  return void 0;
 }
 
 // src/chat/slack/assistant-thread/title.ts
@@ -10488,6 +10490,7 @@ function resolveMessageText(args) {
 }
 function toConversationMessage(args) {
   const actor = getMessageActorIdentity(args.entry);
+  const slackTs = getSlackMessageTs(args.entry);
   const messageHasPotentialImageAttachment = hasPotentialImageAttachment(
     args.entry.attachments
   );
@@ -10508,7 +10511,7 @@ function toConversationMessage(args) {
       explicitMention: args.explicitMention,
       imageAttachmentCount: imageAttachmentCount > 0 ? imageAttachmentCount : void 0,
       imagesHydrated: !messageHasPotentialImageAttachment,
-      slackTs: getSlackMessageTs(args.entry)
+      ...slackTs ? { slackTs } : {}
     }
   };
 }

package/dist/{catalog-runtime-XOD7YPRS.js → catalog-runtime-MW7XERSU.js}

@@ -1,9 +1,9 @@
 import {
   pluginCatalogRuntime
-} from "./chunk-BQ3ITJA6.js";
-import "./chunk-IXTBFABZ.js";
+} from "./chunk-KBFQXJL4.js";
+import "./chunk-KQKIA4CU.js";
 import "./chunk-6APU57E6.js";
-import "./chunk-KF7522P3.js";
+import "./chunk-VMBZFPZM.js";
 import "./chunk-FTMXFBDC.js";
 import "./chunk-3DA7X2U3.js";
 import "./chunk-MLKGABMK.js";

package/dist/chat/conversations/sql/migrations.d.ts

@@ -5,7 +5,7 @@ export interface Migration {
     id: string;
     statements: readonly string[];
 }
-export declare const migrations: readonly [Migration, Migration];
+export declare const migrations: readonly [Migration, Migration, Migration];
 export { schema };
 /** Apply pending SQL schema migrations for queryable conversation records. */
 export declare function migrateSchema(executor: JuniorSqlMigrationExecutor, migrationList?: readonly Migration[]): Promise<void>;

package/dist/chat/conversations/sql/schema/identities.d.ts

@@ -1,4 +1,4 @@
-export type JuniorIdentityKind = "service" | "system" | "user";
+import type { IdentityKind } from "@/chat/identities/identity";
 export declare const juniorIdentities: import("drizzle-orm/pg-core").PgTableWithColumns<{
     name: "junior_identities";
     schema: undefined;
@@ -25,7 +25,7 @@ export declare const juniorIdentities: import("drizzle-orm/pg-core").PgTableWith
             tableName: "junior_identities";
             dataType: "string";
             columnType: "PgText";
-            data: JuniorIdentityKind;
+            data: IdentityKind;
             driverParam: string;
             notNull: true;
             hasDefault: false;
@@ -37,7 +37,7 @@ export declare const juniorIdentities: import("drizzle-orm/pg-core").PgTableWith
             identity: undefined;
             generated: undefined;
         }, {}, {
-            $type: JuniorIdentityKind;
+            $type: IdentityKind;
         }>;
         provider: import("drizzle-orm/pg-core").PgColumn<{
             name: "provider";
@@ -209,6 +209,57 @@ export declare const juniorIdentities: import("drizzle-orm/pg-core").PgTableWith
             identity: undefined;
             generated: undefined;
         }, {}, {}>;
+        userId: import("drizzle-orm/pg-core").PgColumn<{
+            name: "user_id";
+            tableName: "junior_identities";
+            dataType: "string";
+            columnType: "PgText";
+            data: string;
+            driverParam: string;
+            notNull: false;
+            hasDefault: false;
+            isPrimaryKey: false;
+            isAutoincrement: false;
+            hasRuntimeDefault: false;
+            enumValues: [string, ...string[]];
+            baseColumn: never;
+            identity: undefined;
+            generated: undefined;
+        }, {}, {}>;
+        emailNormalized: import("drizzle-orm/pg-core").PgColumn<{
+            name: "email_normalized";
+            tableName: "junior_identities";
+            dataType: "string";
+            columnType: "PgText";
+            data: string;
+            driverParam: string;
+            notNull: false;
+            hasDefault: false;
+            isPrimaryKey: false;
+            isAutoincrement: false;
+            hasRuntimeDefault: false;
+            enumValues: [string, ...string[]];
+            baseColumn: never;
+            identity: undefined;
+            generated: undefined;
+        }, {}, {}>;
+        emailVerified: import("drizzle-orm/pg-core").PgColumn<{
+            name: "email_verified";
+            tableName: "junior_identities";
+            dataType: "boolean";
+            columnType: "PgBoolean";
+            data: boolean;
+            driverParam: boolean;
+            notNull: true;
+            hasDefault: true;
+            isPrimaryKey: false;
+            isAutoincrement: false;
+            hasRuntimeDefault: false;
+            enumValues: undefined;
+            baseColumn: never;
+            identity: undefined;
+            generated: undefined;
+        }, {}, {}>;
     };
     dialect: "pg";
 }>;

package/dist/chat/conversations/sql/schema/users.d.ts

@@ -0,0 +1,109 @@
+export declare const juniorUsers: import("drizzle-orm/pg-core").PgTableWithColumns<{
+    name: "junior_users";
+    schema: undefined;
+    columns: {
+        id: import("drizzle-orm/pg-core").PgColumn<{
+            name: "id";
+            tableName: "junior_users";
+            dataType: "string";
+            columnType: "PgText";
+            data: string;
+            driverParam: string;
+            notNull: true;
+            hasDefault: false;
+            isPrimaryKey: true;
+            isAutoincrement: false;
+            hasRuntimeDefault: false;
+            enumValues: [string, ...string[]];
+            baseColumn: never;
+            identity: undefined;
+            generated: undefined;
+        }, {}, {}>;
+        primaryEmail: import("drizzle-orm/pg-core").PgColumn<{
+            name: "primary_email";
+            tableName: "junior_users";
+            dataType: "string";
+            columnType: "PgText";
+            data: string;
+            driverParam: string;
+            notNull: true;
+            hasDefault: false;
+            isPrimaryKey: false;
+            isAutoincrement: false;
+            hasRuntimeDefault: false;
+            enumValues: [string, ...string[]];
+            baseColumn: never;
+            identity: undefined;
+            generated: undefined;
+        }, {}, {}>;
+        primaryEmailNormalized: import("drizzle-orm/pg-core").PgColumn<{
+            name: "primary_email_normalized";
+            tableName: "junior_users";
+            dataType: "string";
+            columnType: "PgText";
+            data: string;
+            driverParam: string;
+            notNull: true;
+            hasDefault: false;
+            isPrimaryKey: false;
+            isAutoincrement: false;
+            hasRuntimeDefault: false;
+            enumValues: [string, ...string[]];
+            baseColumn: never;
+            identity: undefined;
+            generated: undefined;
+        }, {}, {}>;
+        displayName: import("drizzle-orm/pg-core").PgColumn<{
+            name: "display_name";
+            tableName: "junior_users";
+            dataType: "string";
+            columnType: "PgText";
+            data: string;
+            driverParam: string;
+            notNull: false;
+            hasDefault: false;
+            isPrimaryKey: false;
+            isAutoincrement: false;
+            hasRuntimeDefault: false;
+            enumValues: [string, ...string[]];
+            baseColumn: never;
+            identity: undefined;
+            generated: undefined;
+        }, {}, {}>;
+        createdAt: import("drizzle-orm/pg-core").PgColumn<{
+            name: string;
+            tableName: "junior_users";
+            dataType: "date";
+            columnType: "PgTimestamp";
+            data: Date;
+            driverParam: string;
+            notNull: true;
+            hasDefault: false;
+            isPrimaryKey: false;
+            isAutoincrement: false;
+            hasRuntimeDefault: false;
+            enumValues: undefined;
+            baseColumn: never;
+            identity: undefined;
+            generated: undefined;
+        }, {}, {}>;
+        updatedAt: import("drizzle-orm/pg-core").PgColumn<{
+            name: string;
+            tableName: "junior_users";
+            dataType: "date";
+            columnType: "PgTimestamp";
+            data: Date;
+            driverParam: string;
+            notNull: true;
+            hasDefault: false;
+            isPrimaryKey: false;
+            isAutoincrement: false;
+            hasRuntimeDefault: false;
+            enumValues: undefined;
+            baseColumn: never;
+            identity: undefined;
+            generated: undefined;
+        }, {}, {}>;
+    };
+    dialect: "pg";
+}>;

package/dist/chat/conversations/sql/schema.d.ts

@@ -2,7 +2,8 @@ import { juniorConversations } from "./schema/conversations";
 import { juniorDestinations } from "./schema/destinations";
 import { juniorIdentities } from "./schema/identities";
 import { juniorSchemaMigrations } from "./schema/migrations";
-export { juniorConversations, juniorDestinations, juniorIdentities, juniorSchemaMigrations, };
+import { juniorUsers } from "./schema/users";
+export { juniorConversations, juniorDestinations, juniorIdentities, juniorSchemaMigrations, juniorUsers, };
 export declare const schema: {
     juniorConversations: import("drizzle-orm/pg-core").PgTableWithColumns<{
         name: "junior_conversations";
@@ -662,7 +663,7 @@ export declare const schema: {
                 tableName: "junior_identities";
                 dataType: "string";
                 columnType: "PgText";
-                data: import("./schema/identities").JuniorIdentityKind;
+                data: import("../../identities/identity").IdentityKind;
                 driverParam: string;
                 notNull: true;
                 hasDefault: false;
@@ -674,7 +675,7 @@ export declare const schema: {
                 identity: undefined;
                 generated: undefined;
             }, {}, {
-                $type: import("./schema/identities").JuniorIdentityKind;
+                $type: import("../../identities/identity").IdentityKind;
             }>;
             provider: import("drizzle-orm/pg-core").PgColumn<{
                 name: "provider";
@@ -846,6 +847,57 @@ export declare const schema: {
                 identity: undefined;
                 generated: undefined;
             }, {}, {}>;
+            userId: import("drizzle-orm/pg-core").PgColumn<{
+                name: "user_id";
+                tableName: "junior_identities";
+                dataType: "string";
+                columnType: "PgText";
+                data: string;
+                driverParam: string;
+                notNull: false;
+                hasDefault: false;
+                isPrimaryKey: false;
+                isAutoincrement: false;
+                hasRuntimeDefault: false;
+                enumValues: [string, ...string[]];
+                baseColumn: never;
+                identity: undefined;
+                generated: undefined;
+            }, {}, {}>;
+            emailNormalized: import("drizzle-orm/pg-core").PgColumn<{
+                name: "email_normalized";
+                tableName: "junior_identities";
+                dataType: "string";
+                columnType: "PgText";
+                data: string;
+                driverParam: string;
+                notNull: false;
+                hasDefault: false;
+                isPrimaryKey: false;
+                isAutoincrement: false;
+                hasRuntimeDefault: false;
+                enumValues: [string, ...string[]];
+                baseColumn: never;
+                identity: undefined;
+                generated: undefined;
+            }, {}, {}>;
+            emailVerified: import("drizzle-orm/pg-core").PgColumn<{
+                name: "email_verified";
+                tableName: "junior_identities";
+                dataType: "boolean";
+                columnType: "PgBoolean";
+                data: boolean;
+                driverParam: boolean;
+                notNull: true;
+                hasDefault: true;
+                isPrimaryKey: false;
+                isAutoincrement: false;
+                hasRuntimeDefault: false;
+                enumValues: undefined;
+                baseColumn: never;
+                identity: undefined;
+                generated: undefined;
+            }, {}, {}>;
         };
         dialect: "pg";
     }>;
@@ -907,4 +959,113 @@ export declare const schema: {
         };
         dialect: "pg";
     }>;
+    juniorUsers: import("drizzle-orm/pg-core").PgTableWithColumns<{
+        name: "junior_users";
+        schema: undefined;
+        columns: {
+            id: import("drizzle-orm/pg-core").PgColumn<{
+                name: "id";
+                tableName: "junior_users";
+                dataType: "string";
+                columnType: "PgText";
+                data: string;
+                driverParam: string;
+                notNull: true;
+                hasDefault: false;
+                isPrimaryKey: true;
+                isAutoincrement: false;
+                hasRuntimeDefault: false;
+                enumValues: [string, ...string[]];
+                baseColumn: never;
+                identity: undefined;
+                generated: undefined;
+            }, {}, {}>;
+            primaryEmail: import("drizzle-orm/pg-core").PgColumn<{
+                name: "primary_email";
+                tableName: "junior_users";
+                dataType: "string";
+                columnType: "PgText";
+                data: string;
+                driverParam: string;
+                notNull: true;
+                hasDefault: false;
+                isPrimaryKey: false;
+                isAutoincrement: false;
+                hasRuntimeDefault: false;
+                enumValues: [string, ...string[]];
+                baseColumn: never;
+                identity: undefined;
+                generated: undefined;
+            }, {}, {}>;
+            primaryEmailNormalized: import("drizzle-orm/pg-core").PgColumn<{
+                name: "primary_email_normalized";
+                tableName: "junior_users";
+                dataType: "string";
+                columnType: "PgText";
+                data: string;
+                driverParam: string;
+                notNull: true;
+                hasDefault: false;
+                isPrimaryKey: false;
+                isAutoincrement: false;
+                hasRuntimeDefault: false;
+                enumValues: [string, ...string[]];
+                baseColumn: never;
+                identity: undefined;
+                generated: undefined;
+            }, {}, {}>;
+            displayName: import("drizzle-orm/pg-core").PgColumn<{
+                name: "display_name";
+                tableName: "junior_users";
+                dataType: "string";
+                columnType: "PgText";
+                data: string;
+                driverParam: string;
+                notNull: false;
+                hasDefault: false;
+                isPrimaryKey: false;
+                isAutoincrement: false;
+                hasRuntimeDefault: false;
+                enumValues: [string, ...string[]];
+                baseColumn: never;
+                identity: undefined;
+                generated: undefined;
+            }, {}, {}>;
+            createdAt: import("drizzle-orm/pg-core").PgColumn<{
+                name: string;
+                tableName: "junior_users";
+                dataType: "date";
+                columnType: "PgTimestamp";
+                data: Date;
+                driverParam: string;
+                notNull: true;
+                hasDefault: false;
+                isPrimaryKey: false;
+                isAutoincrement: false;
+                hasRuntimeDefault: false;
+                enumValues: undefined;
+                baseColumn: never;
+                identity: undefined;
+                generated: undefined;
+            }, {}, {}>;
+            updatedAt: import("drizzle-orm/pg-core").PgColumn<{
+                name: string;
+                tableName: "junior_users";
+                dataType: "date";
+                columnType: "PgTimestamp";
+                data: Date;
+                driverParam: string;
+                notNull: true;
+                hasDefault: false;
+                isPrimaryKey: false;
+                isAutoincrement: false;
+                hasRuntimeDefault: false;
+                enumValues: undefined;
+                baseColumn: never;
+                identity: undefined;
+                generated: undefined;
+            }, {}, {}>;
+        };
+        dialect: "pg";
+    }>;
 };

package/dist/chat/conversations/sql/store.d.ts

@@ -53,7 +53,6 @@ export declare class SqlStore implements ConversationStore {
     private readConversationRow;
     /** Upsert the conversation row while preserving previously discovered nullable metadata fields. */
     private upsertConversation;
-    private upsertIdentity;
     private upsertDestination;
 }
 /** Create a SQL-backed conversation store. */

package/dist/chat/identities/identity.d.ts

@@ -0,0 +1,18 @@
+export type IdentityKind = "service" | "system" | "user";
+export interface IdentityUpsert {
+    displayName?: string;
+    email?: string;
+    emailVerified?: boolean;
+    handle?: string;
+    kind: IdentityKind;
+    metadata?: Record<string, unknown>;
+    provider: string;
+    providerSubjectId: string;
+    providerTenantId?: string;
+}
+export interface StoredIdentity {
+    id: string;
+    userId?: string;
+}
+/** Canonicalize email addresses for identity lookup and linking. */
+export declare function normalizeIdentityEmail(email: string | undefined): string | undefined;

package/dist/chat/identities/sql.d.ts

@@ -0,0 +1,4 @@
+import type { JuniorSqlDatabase } from "@/chat/sql/db";
+import { type IdentityUpsert, type StoredIdentity } from "./identity";
+/** Persist one provider identity observation and link verified emails to users. */
+export declare function upsertIdentity(executor: JuniorSqlDatabase, identity: IdentityUpsert, nowMs?: number): Promise<StoredIdentity>;