@sentry/junior 0.132.0 → 0.133.0

package/dist/{chunk-GPXVDJML.js → chunk-ECUILEUX.js}

@@ -7,6 +7,7 @@ import {
 } from "./chunk-HX236W2U.js";
 import {
   agentHistoryItemSchema,
+  bindProviderConversation,
   contextProvenance,
   createSqlConversationEventStore,
   getConversationEventStore,
@@ -16,17 +17,17 @@ import {
   instructionProvenanceFor,
   sanitizePostgresJson,
   withConversationEventLock
-} from "./chunk-WYQP7QSB.js";
+} from "./chunk-LNYNTR27.js";
 import {
   getStateAdapter,
   sleep
-} from "./chunk-ODIP5CEM.js";
+} from "./chunk-TLN54TOQ.js";
 import {
   botConfig,
   escapeXml,
   resolveGatewayModel,
   unwrapCurrentInstruction
-} from "./chunk-NNHUGGO4.js";
+} from "./chunk-LDRO4OQ4.js";
 import {
   toStoredSlackActor
 } from "./chunk-HZF5P5UN.js";
@@ -41,7 +42,7 @@ import {
   setSpanAttributes,
   toOptionalNumber,
   toOptionalString
-} from "./chunk-GOEZU33G.js";
+} from "./chunk-EJRJWBKG.js";
 
 // src/chat/turn-context-tag.ts
 var TURN_CONTEXT_TAG = "runtime-turn-context";
@@ -997,17 +998,19 @@ async function commitAcceptedReply(args) {
     executor,
     args.conversationId,
     async () => executor.transaction(async () => {
-      const agentMessage = normalizeDurableMessage(args.agentMessage);
-      await createSqlConversationEventStore(executor).append(
-        args.conversationId,
-        [
-          {
-            idempotencyKey: `message:${args.conversationMessageId}:agent`,
-            data: historyItemFromPiMessage(agentMessage, contextProvenance),
-            createdAtMs: messageTimestamp(agentMessage)
-          }
-        ]
-      );
+      if (args.agentMessage) {
+        const agentMessage = normalizeDurableMessage(args.agentMessage);
+        await createSqlConversationEventStore(executor).append(
+          args.conversationId,
+          [
+            {
+              idempotencyKey: `message:${args.conversationMessageId}:agent`,
+              data: historyItemFromPiMessage(agentMessage, contextProvenance),
+              createdAtMs: messageTimestamp(agentMessage)
+            }
+          ]
+        );
+      }
       await appendConversationMessages(
         createSqlConversationEventStore(executor),
         {
@@ -1016,6 +1019,12 @@ async function commitAcceptedReply(args) {
           ...args.repliedAtMs === void 0 ? {} : { repliedAtMs: args.repliedAtMs }
         }
       );
+      for (const binding of args.providerConversationBindings ?? []) {
+        await bindProviderConversation(executor, {
+          conversationId: args.conversationId,
+          ...binding
+        });
+      }
     })
   );
 }

package/dist/{chunk-GOEZU33G.js → chunk-EJRJWBKG.js}

@@ -9,7 +9,7 @@ import {
 } from "./chunk-6GWA276C.js";
 import {
   getDeploymentTelemetryAttributes
-} from "./chunk-WEJIS7OC.js";
+} from "./chunk-FX6BLEDP.js";
 
 // src/chat/logging.ts
 import path from "path";

package/dist/{chunk-WEJIS7OC.js → chunk-FX6BLEDP.js}

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

package/dist/{chunk-V44FFBO3.js → chunk-HJ4KDO4N.js}

@@ -5,7 +5,7 @@ import {
   logInfo,
   logWarn,
   setSpanAttributes
-} from "./chunk-GOEZU33G.js";
+} from "./chunk-EJRJWBKG.js";
 import {
   discoverInstalledPluginPackageContent,
   normalizePluginPackageNames

package/dist/{chunk-SKWIIUS7.js → chunk-HTGXUNEC.js}

@@ -6,25 +6,25 @@ import {
   isDmChannel,
   normalizeSlackConversationId,
   withSlackRetries
-} from "./chunk-ALDPUN3Z.js";
+} from "./chunk-WHEMUEXT.js";
 import {
   getDb,
   parseDestination
-} from "./chunk-WYQP7QSB.js";
+} from "./chunk-LNYNTR27.js";
 import {
   acquireActiveLock,
   getStateAdapter,
   sleep
-} from "./chunk-ODIP5CEM.js";
+} from "./chunk-TLN54TOQ.js";
 import {
   normalizeSlackEmojiName
-} from "./chunk-NNHUGGO4.js";
+} from "./chunk-LDRO4OQ4.js";
 import {
   pluginCatalogRuntime
-} from "./chunk-B7IY6SVJ.js";
+} from "./chunk-JLN4XSPR.js";
 import {
   fetchWithBoundedOAuthErrorBodies
-} from "./chunk-V44FFBO3.js";
+} from "./chunk-HJ4KDO4N.js";
 import {
   parseSlackMessageTs,
   parseSlackUserId
@@ -33,7 +33,7 @@ import {
   isRecord,
   logInfo,
   logWarn
-} from "./chunk-GOEZU33G.js";
+} from "./chunk-EJRJWBKG.js";
 
 // src/chat/capabilities/router.ts
 var ProviderCredentialRouter = class {

package/dist/{chunk-2425Q4OR.js → chunk-IKO5LFIU.js}

@@ -1,7 +1,7 @@
 // package.json
 var package_default = {
   name: "@sentry/junior",
-  version: "0.132.0",
+  version: "0.133.0",
   private: false,
   publishConfig: {
     access: "public"

package/dist/{chunk-BKE47OOW.js → chunk-IVTHTAVK.js}

@@ -1,9 +1,9 @@
 import {
   pluginCatalogRuntime
-} from "./chunk-B7IY6SVJ.js";
+} from "./chunk-JLN4XSPR.js";
 import {
   logWarn
-} from "./chunk-GOEZU33G.js";
+} from "./chunk-EJRJWBKG.js";
 import {
   skillRoots
 } from "./chunk-H4HBKISO.js";

package/dist/{chunk-B7IY6SVJ.js → chunk-JLN4XSPR.js}

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

package/dist/{chunk-NNHUGGO4.js → chunk-LDRO4OQ4.js}

@@ -3,7 +3,7 @@ import {
   toCanonicalInputMessage,
   toCanonicalOutputMessage,
   toGenAiMessagesTraceAttributes
-} from "./chunk-ISNRPCPG.js";
+} from "./chunk-VL7OYSHD.js";
 import {
   extractGenAiUsageAttributes,
   logException,
@@ -11,7 +11,7 @@ import {
   normalizeGenAiFinishReason,
   serializeGenAiAttribute,
   withSpan
-} from "./chunk-GOEZU33G.js";
+} from "./chunk-EJRJWBKG.js";
 
 // src/chat/config.ts
 import { getModel as getModel2 } from "@earendil-works/pi-ai/compat";
@@ -675,6 +675,7 @@ var DEFAULT_SLACK_SLASH_COMMAND = "/jr";
 var DEFAULT_PROCESSING_REACTION_EMOJI = "eyes";
 var DEFAULT_COMPLETED_REACTION_EMOJI = "white_check_mark";
 var DEFAULT_MODEL_CONTEXT_WINDOW_TOKENS = 4e5;
+var DEFAULT_SQL_STATEMENT_TIMEOUT_MS = 3e4;
 var FUNCTION_TIMEOUT_BUFFER_SECONDS = 20;
 var CONVERSATION_WORK_SOFT_YIELD_BUFFER_SECONDS = 40;
 var DEFAULT_ASSISTANT_LOADING_MESSAGES = [
@@ -904,6 +905,19 @@ function readSqlDriver(env, databaseUrl) {
   }
   throw new Error("JUNIOR_DATABASE_DRIVER must be postgres or neon");
 }
+function readSqlStatementTimeoutMs(env) {
+  const rawValue = toOptionalTrimmed(env.JUNIOR_SQL_STATEMENT_TIMEOUT_MS);
+  if (rawValue === void 0) {
+    return DEFAULT_SQL_STATEMENT_TIMEOUT_MS;
+  }
+  const value = Number.parseInt(rawValue, 10);
+  if (!Number.isSafeInteger(value) || value < 0 || String(value) !== rawValue) {
+    throw new Error(
+      "JUNIOR_SQL_STATEMENT_TIMEOUT_MS must be a non-negative integer"
+    );
+  }
+  return value === 0 ? false : value;
+}
 function readChatConfig(env = process.env, functionMaxDurationSeconds = DEFAULT_FUNCTION_MAX_DURATION_SECONDS) {
   const databaseUrl = readDatabaseUrl(env);
   const resolvedFunctionMaxDurationSeconds = resolveFunctionMaxDurationSeconds(
@@ -917,7 +931,8 @@ function readChatConfig(env = process.env, functionMaxDurationSeconds = DEFAULT_
     ),
     sql: {
       databaseUrl,
-      driver: readSqlDriver(env, databaseUrl)
+      driver: readSqlDriver(env, databaseUrl),
+      statementTimeoutMs: readSqlStatementTimeoutMs(env)
     },
     slack: {
       botToken: toOptionalTrimmed(env.SLACK_BOT_TOKEN) ?? toOptionalTrimmed(env.SLACK_BOT_USER_TOKEN),
@@ -1027,6 +1042,7 @@ export {
   modelIdForProfile,
   standardModelId,
   profileConfig,
+  DEFAULT_SQL_STATEMENT_TIMEOUT_MS,
   FUNCTION_TIMEOUT_BUFFER_SECONDS,
   configureFunctionMaxDurationSeconds,
   getChatConfig,

package/dist/{chunk-WYQP7QSB.js → chunk-LNYNTR27.js}

@@ -1,15 +1,16 @@
 import {
   createJuniorSqlExecutor,
+  juniorConversationBindings,
   juniorConversationEvents,
   juniorConversations,
   juniorIdentities,
   juniorUsers
-} from "./chunk-KB2M27DL.js";
+} from "./chunk-QWGZ273D.js";
 import {
   TURN_REASONING_LEVELS,
   getChatConfig,
   modelProfileSchema
-} from "./chunk-NNHUGGO4.js";
+} from "./chunk-LDRO4OQ4.js";
 import {
   juniorDestinations
 } from "./chunk-VFUK3X5B.js";
@@ -19,11 +20,11 @@ import {
 } from "./chunk-F3B2YJ76.js";
 import {
   normalizeIdentityEmail
-} from "./chunk-GOEZU33G.js";
+} from "./chunk-EJRJWBKG.js";
 
 // src/chat/conversations/sql/store.ts
 import { randomUUID as randomUUID2 } from "crypto";
-import { and as and2, asc, desc, eq as eq2, isNull, sql as sql2 } from "drizzle-orm";
+import { and as and3, asc, desc, eq as eq3, isNull, sql as sql2 } from "drizzle-orm";
 
 // src/chat/destination.ts
 import {
@@ -197,6 +198,35 @@ function parseSessionSource(value) {
   return parsed.success ? normalizeSessionSource(parsed.data) : void 0;
 }
 
+// src/chat/conversations/sql/bindings.ts
+import { and as and2, eq as eq2 } from "drizzle-orm";
+async function getConversationIdByProviderConversation(executor, args) {
+  const rows = await executor.db().select({ conversationId: juniorConversationBindings.conversationId }).from(juniorConversationBindings).where(
+    and2(
+      eq2(juniorConversationBindings.provider, args.provider),
+      eq2(juniorConversationBindings.providerTenantId, args.providerTenantId),
+      eq2(
+        juniorConversationBindings.providerDestinationId,
+        args.providerDestinationId
+      ),
+      eq2(
+        juniorConversationBindings.providerConversationId,
+        args.providerConversationId
+      )
+    )
+  ).limit(1);
+  return rows[0]?.conversationId;
+}
+async function bindProviderConversation(executor, args) {
+  const rows = await executor.db().insert(juniorConversationBindings).values({ ...args, createdAt: /* @__PURE__ */ new Date() }).onConflictDoNothing().returning({ conversationId: juniorConversationBindings.conversationId });
+  const boundConversationId = rows[0]?.conversationId ?? await getConversationIdByProviderConversation(executor, args);
+  if (boundConversationId !== args.conversationId) {
+    throw new Error(
+      "Provider conversation is already bound to another conversation"
+    );
+  }
+}
+
 // src/chat/conversations/location.ts
 import { nonBlankStringSchema } from "@sentry/junior-plugin-api";
 import { z } from "zod";
@@ -516,6 +546,12 @@ var SqlStore = class {
     this.executor = executor;
   }
   executor;
+  async getConversationIdByProviderConversation(args) {
+    return await getConversationIdByProviderConversation(this.executor, args);
+  }
+  async bindProviderConversation(args) {
+    await bindProviderConversation(this.executor, args);
+  }
   async get(args) {
     const row = await this.readConversationRow(args.conversationId);
     if (!row) {
@@ -609,7 +645,7 @@ var SqlStore = class {
           metricRunId: args.execution.runId ?? null,
           executionDurationMs: args.metrics.durationMs,
           executionUsage: args.metrics.usage ?? (sameRun ? row?.executionUsage ?? null : null)
-        }).where(eq2(juniorConversations.conversationId, args.conversationId));
+        }).where(eq3(juniorConversations.conversationId, args.conversationId));
       }
     });
   }
@@ -621,11 +657,11 @@ var SqlStore = class {
       actorUserDisplayName: juniorUsers.displayName
     }).from(juniorConversations).leftJoin(
       juniorDestinations,
-      eq2(juniorDestinations.id, juniorConversations.destinationId)
+      eq3(juniorDestinations.id, juniorConversations.destinationId)
     ).leftJoin(
       juniorIdentities,
-      eq2(juniorIdentities.id, juniorConversations.actorIdentityId)
-    ).leftJoin(juniorUsers, eq2(juniorUsers.id, juniorIdentities.userId)).where(isNull(juniorConversations.parentConversationId)).orderBy(
+      eq3(juniorIdentities.id, juniorConversations.actorIdentityId)
+    ).leftJoin(juniorUsers, eq3(juniorUsers.id, juniorIdentities.userId)).where(isNull(juniorConversations.parentConversationId)).orderBy(
       desc(juniorConversations.lastActivityAt),
       asc(juniorConversations.conversationId)
     ).limit(Math.max(0, args.limit ?? 1e4)).offset(Math.max(0, args.offset ?? 0));
@@ -639,13 +675,13 @@ var SqlStore = class {
     const rows = await this.executor.db().select({
       visibility: juniorDestinations.visibility
     }).from(juniorDestinations).where(
-      and2(
-        eq2(juniorDestinations.provider, args.provider),
-        eq2(
+      and3(
+        eq3(juniorDestinations.provider, args.provider),
+        eq3(
           juniorDestinations.providerTenantId,
           tenantId2(args.providerTenantId)
         ),
-        eq2(
+        eq3(
           juniorDestinations.providerDestinationId,
           args.providerDestinationId
         )
@@ -675,11 +711,11 @@ var SqlStore = class {
       actorUserDisplayName: juniorUsers.displayName
     }).from(juniorConversations).leftJoin(
       juniorDestinations,
-      eq2(juniorDestinations.id, juniorConversations.destinationId)
+      eq3(juniorDestinations.id, juniorConversations.destinationId)
     ).leftJoin(
       juniorIdentities,
-      eq2(juniorIdentities.id, juniorConversations.actorIdentityId)
-    ).leftJoin(juniorUsers, eq2(juniorUsers.id, juniorIdentities.userId)).where(eq2(juniorConversations.conversationId, conversationId));
+      eq3(juniorIdentities.id, juniorConversations.actorIdentityId)
+    ).leftJoin(juniorUsers, eq3(juniorUsers.id, juniorIdentities.userId)).where(eq3(juniorConversations.conversationId, conversationId));
     return rows[0];
   }
   /** Upsert the conversation row while preserving previously discovered nullable metadata fields. */
@@ -808,10 +844,10 @@ function createSqlStore(executor) {
 
 // src/chat/conversations/sql/history.ts
 import {
-  and as and3,
+  and as and4,
   asc as asc2,
   desc as desc2,
-  eq as eq3,
+  eq as eq4,
   gt,
   gte,
   inArray,
@@ -1287,8 +1323,8 @@ var SqlConversationEventStore = class {
       const existingKeys = parsed.map((event) => event.idempotencyKey).filter((key) => key !== void 0);
       const persistedKeys = existingKeys.length === 0 ? /* @__PURE__ */ new Set() : new Set(
         (await this.executor.db().select({ key: juniorConversationEvents.idempotencyKey }).from(juniorConversationEvents).where(
-          and3(
-            eq3(
+          and4(
+            eq4(
               juniorConversationEvents.conversationId,
               conversationId
             ),
@@ -1320,8 +1356,8 @@ var SqlConversationEventStore = class {
       );
       if (options.activity !== "preserve") {
         await this.executor.db().update(juniorConversations).set({ archivedAt: null }).where(
-          and3(
-            eq3(juniorConversations.conversationId, conversationId),
+          and4(
+            eq4(juniorConversations.conversationId, conversationId),
             isNotNull(juniorConversations.archivedAt)
           )
         );
@@ -1340,8 +1376,8 @@ var SqlConversationEventStore = class {
     await withConversationEventLock(this.executor, conversationId, async () => {
       await ensureConversationRow(this.executor, conversationId, Date.now());
       await this.executor.db().update(juniorConversations).set({ archivedAt: null }).where(
-        and3(
-          eq3(juniorConversations.conversationId, conversationId),
+        and4(
+          eq4(juniorConversations.conversationId, conversationId),
           isNotNull(juniorConversations.archivedAt)
         )
       );
@@ -1363,34 +1399,34 @@ var SqlConversationEventStore = class {
       return [];
     }
     const rows = await this.executor.db().select().from(juniorConversationEvents).where(
-      and3(
-        eq3(juniorConversationEvents.conversationId, conversationId),
-        eq3(juniorConversationEvents.historyVersion, cursor.maxHistoryVersion)
+      and4(
+        eq4(juniorConversationEvents.conversationId, conversationId),
+        eq4(juniorConversationEvents.historyVersion, cursor.maxHistoryVersion)
       )
     ).orderBy(asc2(juniorConversationEvents.seq));
     return rows.map(eventFromRow);
   }
   async loadByIdempotencyKey(conversationId, idempotencyKey) {
     const [row] = await this.executor.db().select().from(juniorConversationEvents).where(
-      and3(
-        eq3(juniorConversationEvents.conversationId, conversationId),
-        eq3(juniorConversationEvents.idempotencyKey, idempotencyKey)
+      and4(
+        eq4(juniorConversationEvents.conversationId, conversationId),
+        eq4(juniorConversationEvents.idempotencyKey, idempotencyKey)
       )
     ).limit(1);
     return row ? eventFromRow(row) : void 0;
   }
   async loadHistoryContaining(conversationId, seq, throughSeq) {
     const [boundary] = await this.executor.db().select({ historyVersion: juniorConversationEvents.historyVersion }).from(juniorConversationEvents).where(
-      and3(
-        eq3(juniorConversationEvents.conversationId, conversationId),
-        eq3(juniorConversationEvents.seq, seq)
+      and4(
+        eq4(juniorConversationEvents.conversationId, conversationId),
+        eq4(juniorConversationEvents.seq, seq)
       )
     ).limit(1);
     if (!boundary) return void 0;
     const rows = await this.executor.db().select().from(juniorConversationEvents).where(
-      and3(
-        eq3(juniorConversationEvents.conversationId, conversationId),
-        eq3(juniorConversationEvents.historyVersion, boundary.historyVersion),
+      and4(
+        eq4(juniorConversationEvents.conversationId, conversationId),
+        eq4(juniorConversationEvents.historyVersion, boundary.historyVersion),
         throughSeq === void 0 ? void 0 : lte(juniorConversationEvents.seq, throughSeq)
       )
     ).orderBy(asc2(juniorConversationEvents.seq));
@@ -1398,9 +1434,9 @@ var SqlConversationEventStore = class {
   }
   async loadLatestInstruction(conversationId) {
     const [row] = await this.executor.db().select().from(juniorConversationEvents).where(
-      and3(
-        eq3(juniorConversationEvents.conversationId, conversationId),
-        eq3(juniorConversationEvents.type, "user_message"),
+      and4(
+        eq4(juniorConversationEvents.conversationId, conversationId),
+        eq4(juniorConversationEvents.type, "user_message"),
         sql4`${juniorConversationEvents.payload}->'provenance'->>'authority' = 'instruction'`
       )
     ).orderBy(desc2(juniorConversationEvents.seq)).limit(1);
@@ -1408,16 +1444,16 @@ var SqlConversationEventStore = class {
   }
   async loadMessageHistory(conversationId) {
     const [compactionRow] = await this.executor.db().select().from(juniorConversationEvents).where(
-      and3(
-        eq3(juniorConversationEvents.conversationId, conversationId),
-        eq3(juniorConversationEvents.type, "messages_summarized")
+      and4(
+        eq4(juniorConversationEvents.conversationId, conversationId),
+        eq4(juniorConversationEvents.type, "messages_summarized")
       )
     ).orderBy(desc2(juniorConversationEvents.seq)).limit(1);
     const compaction = compactionRow ? messagesSummarizedEventFromRow(compactionRow) : void 0;
     const historyFromSeq = compaction?.data.historyFromSeq ?? 0;
     const rows = await this.executor.db().select().from(juniorConversationEvents).where(
-      and3(
-        eq3(juniorConversationEvents.conversationId, conversationId),
+      and4(
+        eq4(juniorConversationEvents.conversationId, conversationId),
         inArray(juniorConversationEvents.type, messageHistoryEventTypes),
         gte(juniorConversationEvents.seq, historyFromSeq)
       )
@@ -1425,7 +1461,7 @@ var SqlConversationEventStore = class {
     return { events: rows.map(eventFromRow), compaction, historyFromSeq };
   }
   async loadHistory(conversationId) {
-    const rows = await this.executor.db().select().from(juniorConversationEvents).where(eq3(juniorConversationEvents.conversationId, conversationId)).orderBy(asc2(juniorConversationEvents.seq));
+    const rows = await this.executor.db().select().from(juniorConversationEvents).where(eq4(juniorConversationEvents.conversationId, conversationId)).orderBy(asc2(juniorConversationEvents.seq));
     return rows.map(eventFromRow);
   }
   async query(conversationId, query) {
@@ -1436,8 +1472,8 @@ var SqlConversationEventStore = class {
       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),
+    const bounds = and4(
+      eq4(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
@@ -1474,8 +1510,8 @@ var SqlConversationEventStore = class {
       return false;
     }
     const [row] = await this.executor.db().select({ seq: juniorConversationEvents.seq }).from(juniorConversationEvents).where(
-      and3(
-        eq3(juniorConversationEvents.conversationId, args.conversationId),
+      and4(
+        eq4(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
@@ -1488,7 +1524,7 @@ var SqlConversationEventStore = class {
     const rows = await this.executor.db().select({
       maxSeq: sql4`max(${juniorConversationEvents.seq})`,
       maxHistoryVersion: sql4`max(${juniorConversationEvents.historyVersion})`
-    }).from(juniorConversationEvents).where(eq3(juniorConversationEvents.conversationId, conversationId));
+    }).from(juniorConversationEvents).where(eq4(juniorConversationEvents.conversationId, conversationId));
     const maxSeq = rows[0]?.maxSeq;
     const maxHistoryVersion = rows[0]?.maxHistoryVersion;
     return {
@@ -1502,7 +1538,7 @@ function createSqlConversationEventStore(executor) {
 }
 
 // src/chat/conversations/sql/search.ts
-import { and as and4, desc as desc3, eq as eq4, isNull as isNull2, ne, sql as sql5 } from "drizzle-orm";
+import { and as and5, desc as desc3, eq as eq5, isNull as isNull2, ne, sql as sql5 } from "drizzle-orm";
 var SqlConversationSearchStore = class {
   constructor(executor) {
     this.executor = executor;
@@ -1527,23 +1563,23 @@ var SqlConversationSearchStore = class {
       role: role.as("role")
     }).from(juniorConversationEvents).innerJoin(
       juniorConversations,
-      eq4(
+      eq5(
         juniorConversations.conversationId,
         juniorConversationEvents.conversationId
       )
     ).innerJoin(
       juniorDestinations,
-      eq4(juniorDestinations.id, juniorConversations.destinationId)
+      eq5(juniorDestinations.id, juniorConversations.destinationId)
     ).where(
-      and4(
-        eq4(juniorConversations.source, "slack"),
+      and5(
+        eq5(juniorConversations.source, "slack"),
         isNull2(juniorConversations.parentConversationId),
         isNull2(juniorConversations.transcriptPurgedAt),
         ne(juniorConversations.conversationId, args.currentConversationId),
-        eq4(juniorDestinations.provider, args.scope.provider),
-        eq4(juniorDestinations.providerTenantId, args.scope.providerTenantId),
-        eq4(juniorDestinations.visibility, "public"),
-        eq4(juniorConversationEvents.type, "message"),
+        eq5(juniorDestinations.provider, args.scope.provider),
+        eq5(juniorDestinations.providerTenantId, args.scope.providerTenantId),
+        eq5(juniorDestinations.visibility, "public"),
+        eq5(juniorConversationEvents.type, "message"),
         sql5`${role} in ('user', 'assistant')`,
         sql5`to_tsvector('english', ${text}) @@ ${tsquery}`
       )
@@ -1575,12 +1611,13 @@ var current;
 function createDb(args) {
   return createJuniorSqlExecutor({
     connectionString: args.databaseUrl,
-    driver: args.driver
+    driver: args.driver,
+    statementTimeoutMs: args.statementTimeoutMs
   });
 }
 function getSqlExecutor() {
   const { sql: sql6 } = getChatConfig();
-  if (current?.databaseUrl !== sql6.databaseUrl || current.driver !== sql6.driver) {
+  if (current?.databaseUrl !== sql6.databaseUrl || current.driver !== sql6.driver || current.statementTimeoutMs !== sql6.statementTimeoutMs) {
     if (current) {
       const previous = current;
       current = void 0;
@@ -1588,11 +1625,13 @@ function getSqlExecutor() {
     }
     const db = createDb({
       databaseUrl: sql6.databaseUrl,
-      driver: sql6.driver
+      driver: sql6.driver,
+      statementTimeoutMs: sql6.statementTimeoutMs
     });
     current = {
       databaseUrl: sql6.databaseUrl,
       driver: sql6.driver,
+      statementTimeoutMs: sql6.statementTimeoutMs,
       db,
       store: createSqlStore(db),
       eventStore: createSqlConversationEventStore(db),
@@ -1628,6 +1667,7 @@ export {
   requireSlackDestination,
   sameDestination,
   parseSessionSource,
+  bindProviderConversation,
   locationFromRow,
   instructionProvenanceFor,
   contextProvenance,