@sjawhar/pi-legion-envoy 1.51.2 → 1.52.0

package/dist/envoy.js

@@ -29726,6 +29726,24 @@ var AskEditedEventPayloadSchema = object({
   }),
   edited_by: object({ kind: string2(), id: string2() }).passthrough()
 });
+var CommentMentionSchema = object({
+  target: string2(),
+  delivery: _enum2(DELIVERY_CAPABILITIES),
+  session_id: string2().nullable()
+});
+var CommentDeliverySchema = object({
+  comment_id: string2(),
+  target: string2(),
+  attempt: number2().int().positive(),
+  delivery: _enum2(DELIVERY_CAPABILITIES),
+  session_id: string2().nullable(),
+  envelope_id: string2().nullable(),
+  state: _enum2(["pending", "sent", "failed"]),
+  error: string2().nullable(),
+  resolve_error: string2().nullable(),
+  reply_id: string2().nullable(),
+  created_at: string2()
+});
 var CommentEventPayloadSchema = object({
   id: string2().optional(),
   artifact_name: string2().optional(),
@@ -29741,7 +29759,9 @@ var CommentEventPayloadSchema = object({
   anchor: object({ block_id: string2().nullable().optional(), quote: string2().optional() }).nullish(),
   suggestion: object({ replace_with: string2().optional() }).nullish(),
   author: object({ kind: string2(), id: string2() }).optional(),
-  created_at: string2().optional()
+  created_at: string2().optional(),
+  mentions: array(CommentMentionSchema).optional(),
+  deliveries: array(CommentDeliverySchema).optional()
 });
 var MessageEventPayloadSchema = object({
   id: string2().optional(),
@@ -29751,8 +29771,9 @@ var MessageEventPayloadSchema = object({
   reply_body: string2().optional(),
   author: object({ kind: string2(), id: string2() }).optional()
 });
+var DispatchTargetedResourceIDSchema = uuid2();
 var DispatchTargetedMessagePayloadSchema = MessageEventPayloadSchema.extend({
-  id: string2(),
+  id: DispatchTargetedResourceIDSchema,
   issue_key: string2().nullable(),
   author: object({ kind: string2(), id: string2() }),
   body: string2(),
@@ -29761,6 +29782,31 @@ var DispatchTargetedMessagePayloadSchema = MessageEventPayloadSchema.extend({
   deliveries: array(unknown()),
   created_at: string2()
 });
+var DispatchTargetedCommentPayloadSchema = CommentEventPayloadSchema.extend({
+  id: DispatchTargetedResourceIDSchema,
+  issue_key: string2().nullable(),
+  artifact_id: string2().nullable(),
+  author: object({ kind: string2(), id: string2() }),
+  body: string2(),
+  reply_to: string2().nullable(),
+  ask_id: string2().nullable(),
+  mentions: array(CommentMentionSchema),
+  deliveries: array(CommentDeliverySchema),
+  created_at: string2(),
+  artifact_name: string2()
+});
+var DispatchTargetedMessageDeliverySchema = object({
+  attempt: number2().int().positive(),
+  mode: _enum2(DELIVERY_CAPABILITIES)
+});
+var DispatchTargetedCommentDeliverySchema = DispatchTargetedMessageDeliverySchema.extend({
+  comment_id: DispatchTargetedResourceIDSchema,
+  target: string2()
+});
+var DispatchTargetedDeliverySchema = union([
+  DispatchTargetedCommentDeliverySchema,
+  DispatchTargetedMessageDeliverySchema
+]);
 var MessageDeliveryEventPayloadSchema = object({
   message_id: string2().optional(),
   attempt: number2().int().positive().optional(),
@@ -31327,13 +31373,18 @@ var TolerantInboundEnvelopeSchema = object({
   source: InboundEnvelopeSchema.shape.source.optional().catch(undefined),
   sender: object(tolerantShape(InboundSenderSchema.shape)).optional().catch(undefined)
 }).passthrough();
+function dispatchReplyPath(resource, id) {
+  const collection = resource === "message" ? "messages" : "comments";
+  return `/api/v1/${collection}/${encodeURIComponent(id)}/reply`;
+}
 async function postDeliveryReply(config, sessionId, delivery, result) {
-  const response = await fetch(`${config.url}/api/v1/messages/${delivery.messageID}/reply`, {
+  const response = await fetch(`${config.url}${dispatchReplyPath(delivery.resource, delivery.id)}`, {
     method: "POST",
     headers: { Authorization: `Bearer ${config.token}`, "Content-Type": "application/json" },
     body: JSON.stringify({
       actor: { kind: "session", id: sessionId },
       attempt: delivery.attempt,
+      ...delivery.replyFields,
       ...result
     })
   });
@@ -31352,21 +31403,32 @@ function rememberBounded(seen, key, limit) {
       seen.delete(oldest.value);
   }
 }
-var DispatchDeliveryRequestSchema = object({
-  attempt: number2().int().positive(),
-  mode: _enum2(DELIVERY_CAPABILITIES)
-});
+function isCommentTargetedDelivery(delivery) {
+  return "comment_id" in delivery;
+}
 var DispatchTargetedFrameSchema = object({
   event: DispatchEventSchema,
-  delivery: DispatchDeliveryRequestSchema
-}).refine(({ event }) => event.type === "message.created" && DispatchTargetedMessagePayloadSchema.safeParse(event.payload).success, { message: "targeted delivery requires a message.created event" });
+  delivery: DispatchTargetedDeliverySchema
+}).superRefine(({ event, delivery }, context) => {
+  if (event.type === "message.created" && !isCommentTargetedDelivery(delivery) && DispatchTargetedMessagePayloadSchema.safeParse(event.payload).success) {
+    return;
+  }
+  if (event.type === "comment.created" && isCommentTargetedDelivery(delivery) && DispatchTargetedCommentPayloadSchema.safeParse(event.payload).success) {
+    return;
+  }
+  context.addIssue({
+    code: "custom",
+    message: event.type === "comment.created" ? "targeted delivery requires a complete comment.created event" : "targeted delivery requires a complete message.created event"
+  });
+});
 var RecoverableDispatchDeliveryFailureSchema = object({
   event: object({
+    type: _enum2(["message.created", "comment.created"]),
     issue_key: string2().nullable(),
     payload: object({ id: string2(), body: string2().optional() }).passthrough()
   }).passthrough(),
-  delivery: DispatchDeliveryRequestSchema
-});
+  delivery: DispatchTargetedDeliverySchema
+}).refine(({ event, delivery }) => event.type === "comment.created" ? isCommentTargetedDelivery(delivery) : !isCommentTargetedDelivery(delivery) && DispatchTargetedResourceIDSchema.safeParse(event.payload.id).success, { message: "delivery resource must match its event type" });
 function senderLabel(envelope) {
   const sender = envelope.source_session ?? envelope.source ?? "unknown";
   return envelope.sender?.title === undefined ? sender : `${sender} (${envelope.sender.title})`;
@@ -31511,12 +31573,19 @@ function parseDispatchFrame(rawPayload) {
     }
     const recoverable = RecoverableDispatchDeliveryFailureSchema.safeParse(value);
     if (recoverable.success) {
+      const delivery = recoverable.data.delivery;
+      const commentDelivery = isCommentTargetedDelivery(delivery);
+      const resource = commentDelivery ? "comment" : "message";
+      const id = commentDelivery ? delivery.comment_id : recoverable.data.event.payload.id;
       return {
         raw: value,
         rejectedDelivery: {
-          attempt: recoverable.data.delivery.attempt,
-          mode: recoverable.data.delivery.mode,
-          messageID: recoverable.data.event.payload.id,
+          resource,
+          id,
+          attempt: delivery.attempt,
+          mode: delivery.mode,
+          replyPath: dispatchReplyPath(resource, id),
+          replyFields: commentDelivery ? { target: delivery.target } : {},
           issueKey: recoverable.data.event.issue_key,
           body: recoverable.data.event.payload.body ?? ""
         },
@@ -31633,15 +31702,18 @@ function renderInbound(raw, sessionID, subject) {
         }
         dispatchReply = dispatchCommentReplyWith(frame.event, topic, commentPayload);
         if (frame.event.type === "message.created") {
-          const message = MessageEventPayloadSchema.safeParse(frame.event.payload);
-          const requested = DispatchDeliveryRequestSchema.safeParse(frame.delivery);
-          if (message.success && requested.success && message.data.id !== undefined) {
+          const message = DispatchTargetedMessagePayloadSchema.safeParse(frame.event.payload);
+          const requested = DispatchTargetedDeliverySchema.safeParse(frame.delivery);
+          if (message.success && requested.success && !isCommentTargetedDelivery(requested.data)) {
             delivery = {
+              resource: "message",
+              id: message.data.id,
               attempt: requested.data.attempt,
               mode: requested.data.mode,
-              messageID: message.data.id,
+              replyPath: dispatchReplyPath("message", message.data.id),
+              replyFields: {},
               issueKey: frame.event.issue_key,
-              body: message.data.body ?? envelope.payload_summary ?? ""
+              body: message.data.body
             };
             if (frame.event.issue_key !== null) {
               dispatchReply = {
@@ -31650,6 +31722,21 @@ function renderInbound(raw, sessionID, subject) {
               };
             }
           }
+        } else if (frame.event.type === "comment.created") {
+          const comment = DispatchTargetedCommentPayloadSchema.safeParse(frame.event.payload);
+          const requested = DispatchTargetedDeliverySchema.safeParse(frame.delivery);
+          if (comment.success && requested.success && isCommentTargetedDelivery(requested.data)) {
+            delivery = {
+              resource: "comment",
+              id: requested.data.comment_id,
+              attempt: requested.data.attempt,
+              mode: requested.data.mode,
+              replyPath: dispatchReplyPath("comment", requested.data.comment_id),
+              replyFields: { target: requested.data.target },
+              issueKey: frame.event.issue_key,
+              body: comment.data.body
+            };
+          }
         }
         dispatchEvent = {
           owner: dispatchOwner(frame.event, topic),
@@ -34470,7 +34557,7 @@ function envoyExtension(pi) {
       }
       try {
         if (rendered.rejectedDelivery !== undefined) {
-          console.warn(`[envoy] rejecting malformed Dispatch targeted delivery ${rendered.rejectedDelivery.messageID}`);
+          console.warn(`[envoy] rejecting malformed Dispatch targeted delivery ${rendered.rejectedDelivery.id}`);
           await postDispatchReply(rendered.rejectedDelivery, {
             error: "Invalid Dispatch targeted delivery frame"
           });

package/dist/legion.js

@@ -16145,7 +16145,7 @@ import { logger } from "@oh-my-pi/pi-utils";
 // package.json
 var package_default = {
   name: "@sjawhar/pi-legion-envoy",
-  version: "1.51.2",
+  version: "1.52.0",
   type: "module",
   omp: {
     extensions: [
@@ -29045,6 +29045,24 @@ var AskEditedEventPayloadSchema = object({
   }),
   edited_by: object({ kind: string2(), id: string2() }).passthrough()
 });
+var CommentMentionSchema = object({
+  target: string2(),
+  delivery: _enum2(DELIVERY_CAPABILITIES),
+  session_id: string2().nullable()
+});
+var CommentDeliverySchema = object({
+  comment_id: string2(),
+  target: string2(),
+  attempt: number2().int().positive(),
+  delivery: _enum2(DELIVERY_CAPABILITIES),
+  session_id: string2().nullable(),
+  envelope_id: string2().nullable(),
+  state: _enum2(["pending", "sent", "failed"]),
+  error: string2().nullable(),
+  resolve_error: string2().nullable(),
+  reply_id: string2().nullable(),
+  created_at: string2()
+});
 var CommentEventPayloadSchema = object({
   id: string2().optional(),
   artifact_name: string2().optional(),
@@ -29060,7 +29078,9 @@ var CommentEventPayloadSchema = object({
   anchor: object({ block_id: string2().nullable().optional(), quote: string2().optional() }).nullish(),
   suggestion: object({ replace_with: string2().optional() }).nullish(),
   author: object({ kind: string2(), id: string2() }).optional(),
-  created_at: string2().optional()
+  created_at: string2().optional(),
+  mentions: array(CommentMentionSchema).optional(),
+  deliveries: array(CommentDeliverySchema).optional()
 });
 var MessageEventPayloadSchema = object({
   id: string2().optional(),
@@ -29070,8 +29090,9 @@ var MessageEventPayloadSchema = object({
   reply_body: string2().optional(),
   author: object({ kind: string2(), id: string2() }).optional()
 });
+var DispatchTargetedResourceIDSchema = uuid2();
 var DispatchTargetedMessagePayloadSchema = MessageEventPayloadSchema.extend({
-  id: string2(),
+  id: DispatchTargetedResourceIDSchema,
   issue_key: string2().nullable(),
   author: object({ kind: string2(), id: string2() }),
   body: string2(),
@@ -29080,6 +29101,31 @@ var DispatchTargetedMessagePayloadSchema = MessageEventPayloadSchema.extend({
   deliveries: array(unknown()),
   created_at: string2()
 });
+var DispatchTargetedCommentPayloadSchema = CommentEventPayloadSchema.extend({
+  id: DispatchTargetedResourceIDSchema,
+  issue_key: string2().nullable(),
+  artifact_id: string2().nullable(),
+  author: object({ kind: string2(), id: string2() }),
+  body: string2(),
+  reply_to: string2().nullable(),
+  ask_id: string2().nullable(),
+  mentions: array(CommentMentionSchema),
+  deliveries: array(CommentDeliverySchema),
+  created_at: string2(),
+  artifact_name: string2()
+});
+var DispatchTargetedMessageDeliverySchema = object({
+  attempt: number2().int().positive(),
+  mode: _enum2(DELIVERY_CAPABILITIES)
+});
+var DispatchTargetedCommentDeliverySchema = DispatchTargetedMessageDeliverySchema.extend({
+  comment_id: DispatchTargetedResourceIDSchema,
+  target: string2()
+});
+var DispatchTargetedDeliverySchema = union([
+  DispatchTargetedCommentDeliverySchema,
+  DispatchTargetedMessageDeliverySchema
+]);
 var MessageDeliveryEventPayloadSchema = object({
   message_id: string2().optional(),
   attempt: number2().int().positive().optional(),

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sjawhar/pi-legion-envoy",
-  "version": "1.51.2",
+  "version": "1.52.0",
   "type": "module",
   "omp": {
     "extensions": [