@sentry/junior 0.185.0 → 0.186.0

package/dist/{chunk-WLKWN4CD.js → chunk-H7X2G2KS.js}

@@ -9,18 +9,18 @@ import {
   getSqlExecutor,
   sanitizePostgresJson,
   withConversationEventLock
-} from "./chunk-ABAX75GG.js";
+} from "./chunk-43LODHJM.js";
 import {
   SANDBOX_REPOS_ROOT,
   SANDBOX_WORKSPACE_ROOT,
   sleep
-} from "./chunk-EJYP3NQ4.js";
+} from "./chunk-HWXP6RHG.js";
 import {
   MUTATION_LOCK_TTL_MS,
   fenceLock,
   getStateAdapter,
   withLock
-} from "./chunk-PNYJOEVV.js";
+} from "./chunk-DOP3FIQC.js";
 import {
   agentHistoryItemSchema,
   contextProvenance,
@@ -33,7 +33,7 @@ import {
   escapeXml,
   resolveGatewayModel,
   unwrapCurrentInstruction
-} from "./chunk-LRI5IRGY.js";
+} from "./chunk-AD64YMEC.js";
 import {
   parseSlackMessageTs,
   toStoredSlackActor
@@ -43,7 +43,7 @@ import {
   logException,
   logWarn,
   setSpanAttributes
-} from "./chunk-OMQ2J6F6.js";
+} from "./chunk-3CVEE6LA.js";
 
 // src/chat/turn-context-tag.ts
 var TURN_CONTEXT_TAG = "runtime-turn-context";
@@ -2308,6 +2308,9 @@ async function recordConversationActivityMetadata(args) {
   });
   const isChild = Boolean(conversation?.lineage);
   const destination = isChild ? void 0 : args.destination;
+  if (!isChild && !destination && !conversation) {
+    return;
+  }
   const activitySource = isChild ? "internal" : args.source?.platform === "web" ? "web" : destination?.platform === "local" ? "local" : destination ? args.summary.surface : void 0;
   await conversationStore.recordActivity({
     activityAtMs: args.summary.updatedAtMs,

package/dist/{chunk-ATUWN6Z3.js → chunk-HKFLRIBD.js}

@@ -1,12 +1,12 @@
 import {
   pluginCatalogRuntime
-} from "./chunk-GJTIZQGJ.js";
+} from "./chunk-NRMAOGRS.js";
 import {
   skillRoots
 } from "./chunk-TXKUKMVO.js";
 import {
   logWarn
-} from "./chunk-OMQ2J6F6.js";
+} from "./chunk-3CVEE6LA.js";
 
 // src/chat/skills.ts
 import fs from "fs/promises";

package/dist/{chunk-EJYP3NQ4.js → chunk-HWXP6RHG.js}

@@ -1,13 +1,13 @@
 import {
   toOptionalTrimmed
-} from "./chunk-LRI5IRGY.js";
+} from "./chunk-AD64YMEC.js";
 import {
   pluginCatalogRuntime
-} from "./chunk-GJTIZQGJ.js";
+} from "./chunk-NRMAOGRS.js";
 import {
   setSpanAttributes,
   setSpanStatus
-} from "./chunk-OMQ2J6F6.js";
+} from "./chunk-3CVEE6LA.js";
 
 // src/chat/sandbox/paths.ts
 function normalizeWorkspaceRoot(input) {
@@ -399,6 +399,32 @@ function getVercelSandboxCredentials() {
   return void 0;
 }
 
+// src/chat/sandbox/snapshot/not-ready-error.ts
+var WorkspaceSnapshotNotReadyError = class extends Error {
+  workspaceName;
+  constructor(workspaceName) {
+    super(`Workspace ${workspaceName} snapshot is not ready`);
+    this.name = "WorkspaceSnapshotNotReadyError";
+    this.workspaceName = workspaceName;
+  }
+};
+function getWorkspaceSnapshotNotReadyError(error) {
+  const seen = /* @__PURE__ */ new Set();
+  let current = error;
+  while (current instanceof Error && !seen.has(current)) {
+    if (current instanceof WorkspaceSnapshotNotReadyError) return current;
+    seen.add(current);
+    current = current.cause;
+  }
+  return void 0;
+}
+function isWorkspaceSnapshotNotReadyError(error) {
+  return getWorkspaceSnapshotNotReadyError(error) !== void 0;
+}
+function workspaceSnapshotNotReadyUserMessage(error) {
+  return `The ${error.workspaceName} workspace is still preparing its sandbox. Wait for that preparation to finish, then try again.`;
+}
+
 // src/chat/sandbox/http-error-details.ts
 var DEFAULT_PREVIEW_LIMIT = 512;
 function toTrimmedString(value, maxChars) {
@@ -615,6 +641,10 @@ function isSandboxCommandStreamInterruptedError(error) {
   });
 }
 function wrapSandboxSetupError(error) {
+  const notReady = getWorkspaceSnapshotNotReadyError(error);
+  if (notReady) {
+    return notReady;
+  }
   try {
     const details = getSandboxErrorDetails(error);
     if (details.summary) {
@@ -667,6 +697,10 @@ export {
   buildNonInteractiveShellScript,
   runNonInteractiveCommand,
   getVercelSandboxCredentials,
+  WorkspaceSnapshotNotReadyError,
+  getWorkspaceSnapshotNotReadyError,
+  isWorkspaceSnapshotNotReadyError,
+  workspaceSnapshotNotReadyUserMessage,
   isAlreadyExistsError,
   isSandboxUnavailableError,
   isSandboxMissingError,

package/dist/{chunk-VH4IU3UC.js → chunk-JFPY6XFF.js}

@@ -5,7 +5,7 @@ import {
   getConversationEventStore,
   getDb,
   getSqlExecutor
-} from "./chunk-ABAX75GG.js";
+} from "./chunk-43LODHJM.js";
 import {
   juniorCodeChanges,
   juniorCodeRepositories,
@@ -16,7 +16,7 @@ import {
   juniorUsers,
   juniorWorkspaceRepos,
   juniorWorkspaces
-} from "./chunk-LVK4WJKM.js";
+} from "./chunk-VXL2LBPK.js";
 import {
   SANDBOX_WORKSPACE_ROOT,
   getVercelSandboxCredentials,
@@ -24,16 +24,16 @@ import {
   isSandboxMissingError,
   runNonInteractiveCommand,
   sleep
-} from "./chunk-EJYP3NQ4.js";
+} from "./chunk-HWXP6RHG.js";
 import {
   getStateAdapter
-} from "./chunk-PNYJOEVV.js";
+} from "./chunk-DOP3FIQC.js";
 import {
   botConfig,
   completeObject,
   embedTexts,
   getSlackBotToken
-} from "./chunk-LRI5IRGY.js";
+} from "./chunk-AD64YMEC.js";
 import {
   defaultModelId
 } from "./chunk-D4YV5TDV.js";
@@ -52,7 +52,7 @@ import {
   setSpanAttributes,
   setSpanStatus,
   withSpan
-} from "./chunk-OMQ2J6F6.js";
+} from "./chunk-3CVEE6LA.js";
 
 // src/chat/plugins/agent-hooks.ts
 import {
@@ -473,14 +473,13 @@ function getDashboardTaskLink(taskId) {
 // src/chat/resource-events/store.ts
 import { createHash as createHash2 } from "crypto";
 import {
-  destinationSchema,
   resourceEventMatchSchema,
   resourceEventMatches,
   resourceEventTypeSchema,
   stableResourceEventMatchKey
 } from "@sentry/junior-plugin-api";
 import { z as z2 } from "zod";
-var RESOURCE_EVENT_PREFIX = "junior:resource_event_subscription:v3";
+var RESOURCE_EVENT_PREFIX = "junior:resource_event_subscription:v5";
 var INDEX_LOCK_TTL_MS = 1e4;
 var SUBSCRIPTION_LOCK_TTL_MS = 1e4;
 var SUBSCRIPTION_LOCK_WAIT_MS = 1e4;
@@ -491,7 +490,6 @@ var subscriptionIdIndexSchema = z2.array(z2.string().min(1));
 var subscriptionSchema = z2.object({
   conversationId: z2.string().min(1),
   createdAtMs: z2.number().finite(),
-  destination: destinationSchema,
   events: z2.array(resourceEventTypeSchema).min(1),
   expiresAtMs: z2.number().finite(),
   id: z2.string().min(1),
@@ -513,14 +511,8 @@ function subscriptionKey(id) {
 function subscriptionLockKey(id) {
   return `${RESOURCE_EVENT_PREFIX}:lock:${id}`;
 }
-function resourceIndexKey(teamId, namespace, identifier) {
-  return `${RESOURCE_EVENT_PREFIX}:resource:${digest(`${teamId}\0${namespace}\0${identifier}`)}`;
-}
-function subscriptionTeamId(destination) {
-  if (destination.platform !== "slack") {
-    throw new Error("Resource event subscriptions require a Slack destination");
-  }
-  return destination.teamId;
+function resourceIndexKey(namespace, identifier) {
+  return `${RESOURCE_EVENT_PREFIX}:resource:${digest(`${namespace}\0${identifier}`)}`;
 }
 function conversationIndexKey(conversationId) {
   return `${RESOURCE_EVENT_PREFIX}:conversation:${digest(conversationId)}`;
@@ -606,7 +598,7 @@ async function readSubscriptionIdIndex(state, key) {
 function buildSubscriptionId(input) {
   const eventKey = [...new Set(input.events)].sort().join("\0");
   const matchKey = stableResourceEventMatchKey(input.match);
-  const material = matchKey ? `${input.teamId}\0${input.namespace}\0${input.identifier}\0${input.conversationId}\0${eventKey}\0${matchKey}` : `${input.teamId}\0${input.namespace}\0${input.identifier}\0${input.conversationId}\0${eventKey}`;
+  const material = matchKey ? `${input.namespace}\0${input.identifier}\0${input.conversationId}\0${eventKey}\0${matchKey}` : `${input.namespace}\0${input.identifier}\0${input.conversationId}\0${eventKey}`;
   return `resub_${digest(material)}`;
 }
 async function withIndexLock(state, key, callback) {
@@ -658,7 +650,7 @@ function activeAt(subscription, nowMs) {
   return subscription.status === "active" && subscription.expiresAtMs > nowMs;
 }
 function matchesEvent(subscription, input) {
-  return subscription.namespace === input.namespace && subscription.identifier === input.identifier && subscriptionTeamId(subscription.destination) === input.teamId && subscription.events.includes(input.eventType) && activeAt(subscription, input.nowMs) && resourceEventMatches(subscription.match, input.data);
+  return subscription.namespace === input.namespace && subscription.identifier === input.identifier && subscription.events.includes(input.eventType) && activeAt(subscription, input.nowMs) && resourceEventMatches(subscription.match, input.data);
 }
 async function createResourceEventSubscription(input, options = {}) {
   const state = options.state ?? getStateAdapter();
@@ -679,13 +671,11 @@ async function createResourceEventSubscription(input, options = {}) {
     events,
     match,
     namespace: input.namespace,
-    identifier: input.identifier,
-    teamId: subscriptionTeamId(input.destination)
+    identifier: input.identifier
   });
   const record = {
     conversationId: input.conversationId,
     createdAtMs: nowMs,
-    destination: input.destination,
     events,
     expiresAtMs: input.expiresAtMs,
     id,
@@ -706,11 +696,7 @@ async function createResourceEventSubscription(input, options = {}) {
   );
   await addToIndex(
     state,
-    resourceIndexKey(
-      subscriptionTeamId(parsed.destination),
-      input.namespace,
-      input.identifier
-    ),
+    resourceIndexKey(input.namespace, input.identifier),
     id,
     nowMs
   );
@@ -762,11 +748,7 @@ async function cancelResourceEventSubscription(input) {
     );
     await removeFromIndex(
       state,
-      resourceIndexKey(
-        subscriptionTeamId(current.destination),
-        current.namespace,
-        current.identifier
-      ),
+      resourceIndexKey(current.namespace, current.identifier),
       input.id,
       nowMs
     );
@@ -805,7 +787,7 @@ async function collectResourceEventMatchKeys(input) {
   for (const identifier of identifiers) {
     const ids = await readSubscriptionIdIndex(
       state,
-      resourceIndexKey(input.teamId, input.namespace, identifier)
+      resourceIndexKey(input.namespace, identifier)
     );
     const records = await Promise.all(
       ids.map(
@@ -816,7 +798,6 @@ async function collectResourceEventMatchKeys(input) {
       if (!record) continue;
       if (record.namespace !== input.namespace) continue;
       if (record.identifier !== identifier) continue;
-      if (subscriptionTeamId(record.destination) !== input.teamId) continue;
       if (!activeAt(record, nowMs)) continue;
       if (!record.events.some((eventType) => eventTypes.has(eventType))) continue;
       for (const key of Object.keys(record.match ?? {})) {
@@ -832,7 +813,7 @@ async function findMatchingResourceEventSubscriptions(input) {
   const nowMs = input.nowMs ?? Date.now();
   const ids = await readSubscriptionIdIndex(
     state,
-    resourceIndexKey(input.teamId, input.namespace, input.identifier)
+    resourceIndexKey(input.namespace, input.identifier)
   );
   const records = await Promise.all(
     ids.map(
@@ -845,8 +826,7 @@ async function findMatchingResourceEventSubscriptions(input) {
       eventType: input.eventType,
       nowMs,
       namespace: input.namespace,
-      identifier: input.identifier,
-      teamId: input.teamId
+      identifier: input.identifier
     })
   );
 }
@@ -866,8 +846,7 @@ async function deliverResourceEventSubscription(input) {
         eventType: input.eventType,
         nowMs,
         namespace: input.namespace,
-        identifier: input.identifier,
-        teamId: input.teamId
+        identifier: input.identifier
       })) {
         return false;
       }
@@ -891,11 +870,7 @@ async function deliverResourceEventSubscription(input) {
         );
         await removeFromIndex(
           state,
-          resourceIndexKey(
-            subscriptionTeamId(current.destination),
-            current.namespace,
-            current.identifier
-          ),
+          resourceIndexKey(current.namespace, current.identifier),
           current.id,
           nowMs
         );
@@ -2711,7 +2686,6 @@ function getPluginTools(context, sandbox = createSandboxCapability(context.works
         }
         const subscription = await createResourceEventSubscription({
           conversationId: context.conversationId,
-          destination: context.destination,
           events: input.events,
           expiresAtMs: Date.now() + RESOURCE_SUBSCRIPTION_DEFAULT_TTL_MS,
           intent: input.intent,

package/dist/{chunk-FFHXG2FX.js → chunk-MCLWOBPN.js}

@@ -1,12 +1,12 @@
 import {
   coerceThreadConversationState,
   getPersistedThreadState
-} from "./chunk-Y5G23T2D.js";
+} from "./chunk-CM6RTYSO.js";
 import {
   pluginTaskId,
   pluginTaskParamsSchema,
   sendVercelPluginTask
-} from "./chunk-4S47VHJR.js";
+} from "./chunk-ACGWTJ74.js";
 import {
   getPiMessageRole,
   getTurnRecord,
@@ -16,7 +16,7 @@ import {
   isToolResultMessage,
   normalizeToolNameFromResult,
   stripRuntimeTurnContext
-} from "./chunk-WLKWN4CD.js";
+} from "./chunk-H7X2G2KS.js";
 import {
   createPluginConversationEvents,
   createPluginEmbedder,
@@ -25,21 +25,21 @@ import {
   createPluginState,
   getPlugins,
   readActorIdentity
-} from "./chunk-VH4IU3UC.js";
+} from "./chunk-JFPY6XFF.js";
 import {
   JUNIOR_THREAD_STATE_TTL_MS
 } from "./chunk-3Y47VMHV.js";
 import {
   getConversationStore,
   getDb
-} from "./chunk-ABAX75GG.js";
+} from "./chunk-43LODHJM.js";
 import {
   juniorConversations,
   juniorTaskExecutions
-} from "./chunk-LVK4WJKM.js";
+} from "./chunk-VXL2LBPK.js";
 import {
   getStateAdapter
-} from "./chunk-PNYJOEVV.js";
+} from "./chunk-DOP3FIQC.js";
 import {
   sameActorIdentity
 } from "./chunk-GFBR4S3Q.js";
@@ -51,26 +51,85 @@ import {
 } from "./chunk-N7TMSOZH.js";
 import {
   logWarn
-} from "./chunk-OMQ2J6F6.js";
+} from "./chunk-3CVEE6LA.js";
 
 // src/chat/plugins/task-runner.ts
 import { pluginRunContextSchema } from "@sentry/junior-plugin-api";
 
 // src/chat/services/turn-session-routing.ts
+async function loadConversationChain(conversationId, conversationStore) {
+  const chain = [];
+  const seen = /* @__PURE__ */ new Set();
+  let cursor = conversationId;
+  while (cursor && !seen.has(cursor)) {
+    seen.add(cursor);
+    const conversation = await conversationStore.get({ conversationId: cursor });
+    if (!conversation) {
+      break;
+    }
+    chain.push(conversation);
+    cursor = conversation.lineage?.parentConversationId;
+  }
+  return chain;
+}
+function slackSourceForDestination(args) {
+  if (args.source?.platform !== "slack" || args.source.channelId !== args.destination.channelId) {
+    return void 0;
+  }
+  const threadTs = args.source.threadTs?.trim();
+  return {
+    platform: "slack",
+    visibility: args.source.visibility ?? "public",
+    teamId: args.source.teamId?.trim() || args.destination.teamId,
+    channelId: args.source.channelId,
+    ...threadTs ? { threadTs } : void 0
+  };
+}
+async function resolveConversationRouting(args) {
+  const conversationStore = args.conversationStore ?? (await import("./db-7XL4UPAE.js")).getConversationStore();
+  const chain = await loadConversationChain(
+    args.conversationId,
+    conversationStore
+  );
+  let destination;
+  let source;
+  let locationId;
+  for (const conversation of chain) {
+    destination ??= conversation.destination;
+    source ??= conversation.sessionSource;
+    locationId ??= conversation.location?.id;
+    if (destination && source) {
+      break;
+    }
+  }
+  if (!destination) {
+    return void 0;
+  }
+  if (destination.platform === "slack") {
+    const slackSource = slackSourceForDestination({ destination, source });
+    return {
+      destination,
+      ...locationId ? { locationId } : void 0,
+      ...slackSource ? { source: slackSource } : void 0
+    };
+  }
+  return {
+    destination,
+    ...locationId ? { locationId } : void 0,
+    ...source ? { source } : void 0
+  };
+}
 async function resolveTurnSessionRouting(args) {
-  const conversationStore = args.conversationStore ?? (await import("./db-TRJ77FAU.js")).getConversationStore();
-  const conversation = await conversationStore.get({
-    conversationId: args.conversationId
-  });
-  if (!conversation?.destination || !conversation.sessionSource) {
+  const routing = await resolveConversationRouting(args);
+  if (!routing?.destination || !routing.source) {
     throw new Error(
       `Conversation ${args.conversationId} is missing durable routing metadata`
     );
   }
   return {
-    destination: conversation.destination,
-    ...conversation.location ? { locationId: conversation.location.id } : void 0,
-    source: conversation.sessionSource
+    destination: routing.destination,
+    source: routing.source,
+    ...routing.locationId ? { locationId: routing.locationId } : void 0
   };
 }
 
@@ -1023,6 +1082,7 @@ export {
   listPendingDispatchMailboxAppends,
   claimDispatchMailboxAppend,
   getPluginDispatchProjection,
+  resolveConversationRouting,
   resolveTurnSessionRouting,
   scheduleSessionCompletedPluginTasks,
   processPluginTask

package/dist/{chunk-GJTIZQGJ.js → chunk-NRMAOGRS.js}

@@ -1,6 +1,6 @@
 import {
   createPluginCatalogRuntime
-} from "./chunk-7MHNIGHP.js";
+} from "./chunk-64WF2GQ3.js";
 
 // src/chat/plugins/catalog-runtime.ts
 var pluginCatalogRuntime = createPluginCatalogRuntime();