@sentry/junior 0.146.0 → 0.148.0

package/dist/{chunk-37EVZP66.js → chunk-VRHTNBA6.js}

@@ -5,12 +5,12 @@ import {
   juniorConversations,
   juniorIdentities,
   juniorUsers
-} from "./chunk-MCFIXAV5.js";
+} from "./chunk-D3WPMGEX.js";
 import {
   TURN_REASONING_LEVELS,
   getChatConfig,
   modelProfileSchema
-} from "./chunk-MKRIZ4VG.js";
+} from "./chunk-4GXJUYJV.js";
 import {
   juniorDestinations
 } from "./chunk-VFUK3X5B.js";
@@ -20,7 +20,7 @@ import {
 } from "./chunk-F3B2YJ76.js";
 import {
   normalizeIdentityEmail
-} from "./chunk-B63BF443.js";
+} from "./chunk-EAI67NTM.js";
 
 // src/chat/conversations/sql/store.ts
 import { randomUUID as randomUUID2 } from "crypto";
@@ -104,7 +104,7 @@ async function existingIdentity(executor, identity) {
   );
   return rows[0];
 }
-async function upsertIdentity(executor, identity, nowMs = Date.now()) {
+async function upsertIdentityRecord(executor, identity, linkedUserId, nowMs) {
   const emailNormalized = normalizeIdentityEmail(identity.email);
   const email = emailNormalized ? identity.email?.trim() || emailNormalized : void 0;
   const existing = await existingIdentity(executor, identity);
@@ -119,7 +119,13 @@ async function upsertIdentity(executor, identity, nowMs = Date.now()) {
   if (existing?.userId && verifiedUserId && existing.userId !== verifiedUserId) {
     throw new Error("Identity verified email conflicts with linked user");
   }
-  const userId = existing?.userId ?? verifiedUserId;
+  if (linkedUserId && verifiedUserId && linkedUserId !== verifiedUserId) {
+    throw new Error("Linked identity conflicts with verified email user");
+  }
+  if (existing?.userId && linkedUserId && existing.userId !== linkedUserId) {
+    throw new Error("Identity conflicts with linked user");
+  }
+  const userId = existing?.userId ?? linkedUserId ?? verifiedUserId;
   const rows = await executor.db().insert(juniorIdentities).values({
     id: randomUUID(),
     userId: userId ?? null,
@@ -145,21 +151,27 @@ async function upsertIdentity(executor, identity, nowMs = Date.now()) {
     set: {
       kind: sql`excluded.kind`,
       userId: sql`coalesce(${juniorIdentities.userId}, excluded.user_id)`,
-      displayName: sql`coalesce(${juniorIdentities.displayName}, excluded.display_name)`,
-      handle: sql`coalesce(${juniorIdentities.handle}, excluded.handle)`,
+      displayName: linkedUserId ? sql`coalesce(excluded.display_name, ${juniorIdentities.displayName})` : sql`coalesce(${juniorIdentities.displayName}, excluded.display_name)`,
+      handle: linkedUserId ? sql`coalesce(excluded.handle, ${juniorIdentities.handle})` : sql`coalesce(${juniorIdentities.handle}, excluded.handle)`,
       email: sql`case when ${juniorIdentities.emailVerified} then coalesce(${juniorIdentities.email}, excluded.email) when excluded.email_verified then excluded.email else coalesce(${juniorIdentities.email}, excluded.email) end`,
       emailNormalized: sql`case when ${juniorIdentities.emailVerified} then coalesce(${juniorIdentities.emailNormalized}, excluded.email_normalized) when excluded.email_verified then excluded.email_normalized else coalesce(${juniorIdentities.emailNormalized}, excluded.email_normalized) end`,
       emailVerified: sql`${juniorIdentities.emailVerified} OR excluded.email_verified`,
       avatarUrl: sql`coalesce(${juniorIdentities.avatarUrl}, excluded.avatar_url)`,
       metadata: sql`coalesce(${juniorIdentities.metadata}, excluded.metadata_json)`,
       updatedAt: sql`excluded.updated_at`
-    }
+    },
+    ...linkedUserId ? {
+      setWhere: sql`${juniorIdentities.userId} IS NULL OR ${juniorIdentities.userId} = excluded.user_id`
+    } : {}
   }).returning({
     id: juniorIdentities.id,
     userId: juniorIdentities.userId
   });
   const row = rows[0];
   if (!row) {
+    if (linkedUserId) {
+      throw new Error("Identity conflicts with linked user");
+    }
     throw new Error("Identity upsert returned no row");
   }
   return {
@@ -167,6 +179,32 @@ async function upsertIdentity(executor, identity, nowMs = Date.now()) {
     ...row.userId ? { userId: row.userId } : {}
   };
 }
+async function upsertIdentity(executor, identity, nowMs = Date.now()) {
+  return await upsertIdentityRecord(executor, identity, void 0, nowMs);
+}
+async function upsertLinkedIdentity(executor, userId, identity, nowMs = Date.now()) {
+  return await upsertIdentityRecord(executor, identity, userId, nowMs);
+}
+async function deleteProviderIdentityForSlackUser(executor, slackTeamId, slackUserId, provider, providerSubjectId) {
+  const slackRows = await executor.db().select({ userId: juniorIdentities.userId }).from(juniorIdentities).where(
+    and(
+      eq(juniorIdentities.kind, "user"),
+      eq(juniorIdentities.provider, "slack"),
+      eq(juniorIdentities.providerTenantId, slackTeamId),
+      eq(juniorIdentities.providerSubjectId, slackUserId)
+    )
+  ).limit(1);
+  const userId = slackRows[0]?.userId;
+  if (!userId) return;
+  await executor.db().delete(juniorIdentities).where(
+    and(
+      eq(juniorIdentities.userId, userId),
+      eq(juniorIdentities.provider, provider),
+      eq(juniorIdentities.providerTenantId, ""),
+      eq(juniorIdentities.providerSubjectId, providerSubjectId)
+    )
+  );
+}
 
 // src/chat/source.ts
 import { sourceSchema } from "@sentry/junior-plugin-api";
@@ -177,7 +215,14 @@ function normalizeSessionSource(value) {
   if (value.platform === "local") {
     return {
       platform: "local",
-      visibility: "private",
+      visibility: value.visibility,
+      conversationId: value.conversationId
+    };
+  }
+  if (value.platform === "web") {
+    return {
+      platform: "web",
+      visibility: value.visibility,
       conversationId: value.conversationId
     };
   }
@@ -224,6 +269,109 @@ async function bindProviderConversation(executor, args) {
   }
 }
 
+// src/chat/conversations/sql/actor-identity.ts
+function identityFromActor(actor) {
+  if (actor?.slackUserId) {
+    return {
+      kind: "user",
+      provider: "slack",
+      providerTenantId: actor.teamId,
+      providerSubjectId: actor.slackUserId,
+      ...actor.fullName ? { displayName: actor.fullName } : {},
+      ...actor.slackUserName ? { handle: actor.slackUserName } : {},
+      ...actor.email ? { email: actor.email, emailVerified: true } : {},
+      metadata: { platform: "slack" }
+    };
+  }
+  const email = actor?.email?.trim().toLowerCase();
+  if (!email) {
+    return void 0;
+  }
+  return {
+    kind: "user",
+    provider: "junior",
+    providerSubjectId: email,
+    email,
+    emailVerified: true,
+    ...actor?.fullName ? { displayName: actor.fullName } : {},
+    metadata: { platform: "web" }
+  };
+}
+function systemIdentityFromSource(source) {
+  if (source === "scheduler") {
+    return {
+      kind: "system",
+      provider: "junior",
+      providerSubjectId: "scheduler",
+      displayName: "Junior Scheduler"
+    };
+  }
+  if (source === "local") {
+    return {
+      kind: "system",
+      provider: "junior",
+      providerSubjectId: "local-cli",
+      displayName: "Local CLI"
+    };
+  }
+  if (source === "resource_event") {
+    return {
+      kind: "system",
+      provider: "junior",
+      providerSubjectId: "resource-event",
+      displayName: "Resource Event"
+    };
+  }
+  return void 0;
+}
+function actorIdentityForConversation(conversation) {
+  return identityFromActor(conversation.actor) ?? systemIdentityFromSource(conversation.source);
+}
+function actorFromIdentityRow(identity, userDisplayName) {
+  if (!identity) {
+    return void 0;
+  }
+  const fullName = userDisplayName?.trim() ? userDisplayName : identity.displayName;
+  const email = identity.emailNormalized ?? identity.email ?? void 0;
+  if (identity.provider === "slack") {
+    return {
+      ...email ? { email } : {},
+      ...fullName ? { fullName } : {},
+      platform: "slack",
+      slackUserId: identity.providerSubjectId,
+      ...identity.handle ? { slackUserName: identity.handle } : {},
+      ...identity.providerTenantId ? { teamId: identity.providerTenantId } : {}
+    };
+  }
+  if (identity.provider === "junior" && email) {
+    return {
+      email,
+      ...fullName ? { fullName } : {}
+    };
+  }
+  return void 0;
+}
+function mergeActor(current2, next) {
+  if (!current2) {
+    return next;
+  }
+  if (!next) {
+    return current2;
+  }
+  if (current2.slackUserId && next.slackUserId && current2.slackUserId !== next.slackUserId) {
+    return current2;
+  }
+  return {
+    ...current2,
+    ...current2.email ?? next.email ? { email: current2.email ?? next.email } : {},
+    ...current2.fullName ?? next.fullName ? { fullName: current2.fullName ?? next.fullName } : {},
+    ...current2.platform ?? next.platform ? { platform: current2.platform ?? next.platform } : {},
+    ...current2.slackUserId ?? next.slackUserId ? { slackUserId: current2.slackUserId ?? next.slackUserId } : {},
+    ...current2.slackUserName ?? next.slackUserName ? { slackUserName: current2.slackUserName ?? next.slackUserName } : {},
+    ...current2.teamId ?? next.teamId ? { teamId: current2.teamId ?? next.teamId } : {}
+  };
+}
+
 // src/chat/conversations/location.ts
 import { nonBlankStringSchema } from "@sentry/junior-plugin-api";
 import { z } from "zod";
@@ -289,56 +437,11 @@ function tenantId2(value) {
   return value ?? "";
 }
 function sourceFromValue(value) {
-  if (value === "api" || value === "internal" || value === "local" || value === "plugin" || value === "resource_event" || value === "scheduler" || value === "slack") {
+  if (value === "api" || value === "internal" || value === "local" || value === "plugin" || value === "resource_event" || value === "scheduler" || value === "slack" || value === "web") {
     return value;
   }
   return void 0;
 }
-function identityFromActor(actor) {
-  if (!actor?.slackUserId) {
-    return void 0;
-  }
-  return {
-    kind: "user",
-    provider: "slack",
-    providerTenantId: actor.teamId,
-    providerSubjectId: actor.slackUserId,
-    ...actor.fullName ? { displayName: actor.fullName } : {},
-    ...actor.slackUserName ? { handle: actor.slackUserName } : {},
-    ...actor.email ? { email: actor.email, emailVerified: true } : {},
-    metadata: { platform: "slack" }
-  };
-}
-function systemIdentityFromSource(source) {
-  if (source === "scheduler") {
-    return {
-      kind: "system",
-      provider: "junior",
-      providerSubjectId: "scheduler",
-      displayName: "Junior Scheduler"
-    };
-  }
-  if (source === "local") {
-    return {
-      kind: "system",
-      provider: "junior",
-      providerSubjectId: "local-cli",
-      displayName: "Local CLI"
-    };
-  }
-  if (source === "resource_event") {
-    return {
-      kind: "system",
-      provider: "junior",
-      providerSubjectId: "resource-event",
-      displayName: "Resource Event"
-    };
-  }
-  return void 0;
-}
-function actorIdentityForConversation(conversation) {
-  return identityFromActor(conversation.actor) ?? systemIdentityFromSource(conversation.source);
-}
 function originTypeFromSource(source) {
   return source;
 }
@@ -370,8 +473,10 @@ function destinationUpsertFromDestination(args) {
     provider: "local",
     providerTenantId: localWorkspaceFromConversationId(destination.conversationId) ?? localWorkspaceFromConversationId(args.conversationId ?? ""),
     providerDestinationId: destination.conversationId,
-    refreshVisibility: true,
-    visibility: "direct",
+    // Match Slack: only refresh when a live visibility signal is present so
+    // execution-metadata writes cannot clobber public dashboard roots.
+    refreshVisibility: args.visibility !== void 0,
+    visibility: args.visibility ?? "direct",
     metadata: { platform: "local" }
   };
 }
@@ -385,20 +490,6 @@ function executionStatusFromValue(value) {
 function executionStatusToSql(status) {
   return status === "paused" ? "awaiting_resume" : status;
 }
-function actorFromIdentityRow(identity, userDisplayName) {
-  if (!identity || identity.provider !== "slack") {
-    return void 0;
-  }
-  const fullName = userDisplayName?.trim() ? userDisplayName : identity.displayName;
-  return {
-    ...identity.emailNormalized ? { email: identity.emailNormalized } : identity.email ? { email: identity.email } : {},
-    ...fullName ? { fullName } : {},
-    platform: "slack",
-    slackUserId: identity.providerSubjectId,
-    ...identity.handle ? { slackUserName: identity.handle } : {},
-    ...identity.providerTenantId ? { teamId: identity.providerTenantId } : {}
-  };
-}
 function destinationFromRow(destination) {
   const value = destination?.provider === "slack" ? {
     platform: "slack",
@@ -499,26 +590,6 @@ function assertSameConversationDestination(args) {
     `Conversation destination changed for ${args.conversationId}`
   );
 }
-function mergeActor(current2, next) {
-  if (!current2) {
-    return next;
-  }
-  if (!next) {
-    return current2;
-  }
-  if (current2.slackUserId && next.slackUserId && current2.slackUserId !== next.slackUserId) {
-    return current2;
-  }
-  return {
-    ...current2,
-    ...current2.email ?? next.email ? { email: current2.email ?? next.email } : {},
-    ...current2.fullName ?? next.fullName ? { fullName: current2.fullName ?? next.fullName } : {},
-    ...current2.platform ?? next.platform ? { platform: current2.platform ?? next.platform } : {},
-    ...current2.slackUserId ?? next.slackUserId ? { slackUserId: current2.slackUserId ?? next.slackUserId } : {},
-    ...current2.slackUserName ?? next.slackUserName ? { slackUserName: current2.slackUserName ?? next.slackUserName } : {},
-    ...current2.teamId ?? next.teamId ? { teamId: current2.teamId ?? next.teamId } : {}
-  };
-}
 function tokenTotal(usage) {
   if (!usage) return 0;
   if (usage.totalTokens !== void 0) return usage.totalTokens;
@@ -826,7 +897,8 @@ var SqlStore = class {
     }).onConflictDoUpdate({
       target: juniorConversations.conversationId,
       set: {
-        source: sql2`coalesce(excluded.source, ${juniorConversations.source})`,
+        // Origin source is set-once so dashboard continues cannot rewrite a Slack root.
+        source: sql2`coalesce(${juniorConversations.source}, excluded.source)`,
         sessionSource: sql2`coalesce(${juniorConversations.sessionSource}, excluded.source_json)`,
         originType: sql2`coalesce(excluded.origin_type, ${juniorConversations.originType})`,
         originId: sql2`coalesce(excluded.origin_id, ${juniorConversations.originId})`,
@@ -1120,6 +1192,7 @@ var turnRoutedEventDataSchema = z3.object({
   turnId: z3.string().min(1),
   modelProfile: modelProfileSchema,
   modelId: z3.string().min(1),
+  costUsd: z3.number().finite().nonnegative().optional(),
   reasoningLevel: z3.enum(TURN_REASONING_LEVELS),
   confidence: z3.number().min(0).max(1).optional(),
   source: z3.enum(["configured", "inherited", "router"])
@@ -1742,6 +1815,8 @@ export {
   requireSlackDestination,
   sameDestination,
   upsertIdentity,
+  upsertLinkedIdentity,
+  deleteProviderIdentityForSlackUser,
   parseSessionSource,
   bindProviderConversation,
   locationFromRow,

package/dist/{chunk-FXDDDSPL.js → chunk-VY6W3T43.js}

@@ -4,18 +4,18 @@ import {
 } from "./chunk-EM225ITJ.js";
 import {
   getStateAdapter
-} from "./chunk-GYEKOX7N.js";
+} from "./chunk-2B3PT3V2.js";
 import {
   toOptionalTrimmed
-} from "./chunk-MKRIZ4VG.js";
+} from "./chunk-4GXJUYJV.js";
 import {
   pluginCatalogRuntime
-} from "./chunk-PB222GIA.js";
+} from "./chunk-HWQGBIH7.js";
 import {
   setSpanAttributes,
   setSpanStatus,
   withSpan
-} from "./chunk-B63BF443.js";
+} from "./chunk-EAI67NTM.js";
 
 // src/chat/sandbox/resources.ts
 var configuredResources;

package/dist/{chunk-ZDGHGY74.js → chunk-WCN4YSH7.js}

@@ -4,19 +4,19 @@ import {
   isDmChannel,
   normalizeSlackConversationId,
   withSlackRetries
-} from "./chunk-V6SRLKUB.js";
+} from "./chunk-V2FXMOEA.js";
 import {
   parseDestination
-} from "./chunk-37EVZP66.js";
+} from "./chunk-VRHTNBA6.js";
 import {
   getStateAdapter
-} from "./chunk-GYEKOX7N.js";
+} from "./chunk-2B3PT3V2.js";
 import {
   normalizeSlackEmojiName
-} from "./chunk-MKRIZ4VG.js";
+} from "./chunk-4GXJUYJV.js";
 import {
   pluginCatalogRuntime
-} from "./chunk-PB222GIA.js";
+} from "./chunk-HWQGBIH7.js";
 import {
   parseSlackMessageTs,
   parseSlackUserId
@@ -25,7 +25,7 @@ import {
   isRecord,
   logInfo,
   logWarn
-} from "./chunk-B63BF443.js";
+} from "./chunk-EAI67NTM.js";
 
 // src/chat/slack/outbound.ts
 var MAX_SLACK_MESSAGE_TEXT_CHARS = 4e4;
@@ -289,6 +289,7 @@ async function removeReactionFromMessage(input) {
 // src/chat/oauth-flow.ts
 import { randomBytes } from "crypto";
 import {
+  actorSchema,
   sourceSchema
 } from "@sentry/junior-plugin-api";
 
@@ -517,6 +518,10 @@ function parseOAuthStatePayload(value) {
   if (typeof value.userId !== "string" || typeof value.provider !== "string") {
     return void 0;
   }
+  const actor = value.actor === void 0 ? void 0 : actorSchema.safeParse(value.actor);
+  if (value.actor !== void 0 && (!actor || !actor.success)) {
+    return void 0;
+  }
   const destination = parseDestination(value.destination);
   if (value.destination !== void 0 && !destination) {
     return void 0;
@@ -528,6 +533,7 @@ function parseOAuthStatePayload(value) {
   return {
     userId: value.userId,
     provider: value.provider,
+    ...actor?.success ? { actor: actor.data } : {},
     ...optionalString(value.channelId) ? { channelId: optionalString(value.channelId) } : {},
     ...destination ? { destination } : {},
     ...source?.success ? { source: source.data } : {},
@@ -650,6 +656,7 @@ async function startOAuthFlow(provider, input) {
     {
       userId: input.actorId,
       provider,
+      ...input.actor ? { actor: input.actor } : {},
       ...input.channelId ? { channelId: input.channelId } : {},
       ...input.destination ? { destination: input.destination } : {},
       ...input.source ? { source: input.source } : {},

package/dist/{chunk-PH4Q3A6W.js → chunk-WOONT5ZP.js}

@@ -5,7 +5,7 @@ import {
 } from "./chunk-F3B2YJ76.js";
 import {
   toOptionalString
-} from "./chunk-B63BF443.js";
+} from "./chunk-EAI67NTM.js";
 
 // src/chat/slack/context.ts
 import { z } from "zod";