Merge remote-tracking branch 'origin/pr/32'

Author: mvanhorn

src/commands.ts

@@ -1354,14 +1354,25 @@ async function handleEscalationButton(
   actor: string,
   _baseUrl: string,
 ): Promise<unknown> {
+  // Button custom_id format: esc_{action}_{companyId}_{escalationId}
+  // Legacy format (pre-fix): esc_{action}_{escalationId}
+  // CompanyId is a UUID (contains hyphens), escalationId starts with "esc_".
+  // We split on "_" to get the action, then look for a UUID-shaped segment.
   const parts = customId.split("_");
   const action = parts[1];
-  const escalationId = parts.slice(2).join("_");
+  const remaining = parts.slice(2).join("_");
 
-  ctx.logger.info("Escalation button clicked", { escalationId, action, actor });
+  // Try to extract embedded companyId: UUID pattern before the escalation ID
+  const uuidEscMatch = remaining.match(
+    /^([0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12})_(esc_.+)$/i,
+  );
+  const embeddedCompanyId = uuidEscMatch ? uuidEscMatch[1] : null;
+  const escalationId = uuidEscMatch ? uuidEscMatch[2] : remaining;
+
+  ctx.logger.info("Escalation button clicked", { escalationId, action, actor, embeddedCompanyId });
 
-  const resolvedCompanyId = await resolveCompanyId(ctx);
-  const record = await getEscalation(ctx, escalationId, resolvedCompanyId) as {
+  const companyIdForLookup = embeddedCompanyId ?? await resolveCompanyId(ctx);
+  const record = await getEscalation(ctx, escalationId, companyIdForLookup) as {
     escalationId: string; companyId: string; agentName: string;
     reason: string; suggestedReply?: string; status: string;
   } | null;

src/worker.ts

@@ -612,20 +612,21 @@ const plugin = definePlugin({
       ];
 
       const buttons: DiscordComponent[] = [];
+      const cid = payload.companyId || "default";
 
       if (payload.suggestedReply) {
         buttons.push({
           type: 2,
           style: 3,
           label: "Use Suggested Reply",
-          custom_id: `esc_suggest_${payload.escalationId}`,
+          custom_id: `esc_suggest_${cid}_${payload.escalationId}`,
         });
       }
 
       buttons.push(
-        { type: 2, style: 1, label: "Reply to Customer", custom_id: `esc_reply_${payload.escalationId}` },
-        { type: 2, style: 2, label: "Override Agent", custom_id: `esc_override_${payload.escalationId}` },
-        { type: 2, style: 4, label: "Dismiss", custom_id: `esc_dismiss_${payload.escalationId}` },
+        { type: 2, style: 1, label: "Reply to Customer", custom_id: `esc_reply_${cid}_${payload.escalationId}` },
+        { type: 2, style: 2, label: "Override Agent", custom_id: `esc_override_${cid}_${payload.escalationId}` },
+        { type: 2, style: 4, label: "Dismiss", custom_id: `esc_dismiss_${cid}_${payload.escalationId}` },
       );
 
       const components: DiscordComponent[] = [{ type: 1, components: buttons }];