@sjawhar/pi-legion-envoy 0.16.0 → 0.16.1

package/dist/envoy.js

@@ -30785,147 +30785,37 @@ var ChildStatusPayloadSchema = object({
   from: string2().optional(),
   to: string2().optional()
 });
-function dispatchActorLabel(actor) {
-  return `${actor.kind} ${actor.id ?? "unknown"}`;
-}
-function dispatchBody(event) {
-  const lines = [];
-  switch (event.type) {
-    case "issue.created":
-    case "issue.updated":
-    case "issue.closed": {
-      const parsed = IssuePayloadSchema.safeParse(event.payload);
-      if (!parsed.success)
-        break;
-      if (parsed.data.title)
-        lines.push(`Title: ${parsed.data.title}`);
-      if (parsed.data.status)
-        lines.push(`Status: ${parsed.data.status}`);
-      if (parsed.data.route)
-        lines.push(`Route: ${parsed.data.route}`);
-      break;
-    }
-    case "artifact.created": {
-      const parsed = ArtifactCreatedPayloadSchema.safeParse(event.payload);
-      const name = parsed.success ? parsed.data.artifact?.name : undefined;
-      if (name)
-        lines.push(`Artifact: ${name}`);
-      break;
-    }
-    case "artifact.version": {
-      const parsed = ArtifactVersionPayloadSchema.safeParse(event.payload);
-      if (!parsed.success)
-        break;
-      const version = parsed.data.version;
-      if (parsed.data.name)
-        lines.push(`Artifact: ${parsed.data.name}`);
-      if (version?.number !== undefined)
-        lines.push(`Version: ${version.number}`);
-      if (version?.summary)
-        lines.push(`Summary: ${version.summary}`);
-      if (parsed.data.diff)
-        lines.push("Diff:", parsed.data.diff);
-      break;
-    }
-    case "ask.opened":
-    case "ask.answered": {
-      const parsed = AskPayloadSchema.safeParse(event.payload);
-      if (!parsed.success)
-        break;
-      if (parsed.data.question)
-        lines.push(`Question: ${parsed.data.question}`);
-      if (event.type === "ask.opened") {
-        const options = (parsed.data.options ?? []).map((option) => option.label).filter((label) => label !== undefined);
-        if (options.length > 0)
-          lines.push(`Options: ${options.join(", ")}`);
-        break;
-      }
-      const answer = parsed.data.answer;
-      lines.push(`Selected: ${answer?.selected?.join(", ") || "none"}`);
-      if (answer?.text)
-        lines.push(`Text: ${answer.text}`);
-      break;
-    }
-    case "comment.created":
-    case "comment.resolved": {
-      const parsed = CommentPayloadSchema.safeParse(event.payload);
-      if (!parsed.success)
-        break;
-      const quote = parsed.data.anchor?.quote;
-      if (parsed.data.artifact_name)
-        lines.push(`Artifact: ${parsed.data.artifact_name}`);
-      if (quote)
-        lines.push(`> ${quote}`);
-      if (parsed.data.reply_to)
-        lines.push(`Reply chain: ${parsed.data.reply_to}`);
-      if (parsed.data.body)
-        lines.push(`Body: ${parsed.data.body}`);
-      break;
-    }
-    case "suggestion.accepted":
-    case "suggestion.rejected": {
-      const parsed = CommentPayloadSchema.safeParse(event.payload);
-      if (!parsed.success)
-        break;
-      const quote = parsed.data.anchor?.quote;
-      const replacement = parsed.data.suggestion?.replace_with;
-      if (parsed.data.artifact_name)
-        lines.push(`Artifact: ${parsed.data.artifact_name}`);
-      if (quote)
-        lines.push(`> ${quote}`);
-      if (quote && replacement)
-        lines.push(`${quote} \u2192 ${replacement}`);
-      break;
-    }
-    case "message.created": {
-      const parsed = MessagePayloadSchema.safeParse(event.payload);
-      const body = parsed.success ? parsed.data.body : undefined;
-      if (body)
-        lines.push(`Body: ${body}`);
-      break;
-    }
-    case "child.status": {
-      const parsed = ChildStatusPayloadSchema.safeParse(event.payload);
-      if (!parsed.success)
-        break;
-      const { child_key: child, from, to } = parsed.data;
-      if (child && from && to)
-        lines.push(`Child: ${child} ${from} \u2192 ${to}`);
-      break;
-    }
-  }
-  return lines;
-}
-function renderDispatch(envelope, sessionID) {
-  const invalid = () => ({
-    skip: false,
-    content: "dispatch: invalid event",
-    envelope
-  });
-  if (envelope.payload === undefined)
-    return invalid();
-  let rawEvent;
+var DISPATCH_PAYLOAD_SCHEMAS = {
+  "issue.created": IssuePayloadSchema,
+  "issue.updated": IssuePayloadSchema,
+  "issue.closed": IssuePayloadSchema,
+  "artifact.created": ArtifactCreatedPayloadSchema,
+  "artifact.version": ArtifactVersionPayloadSchema,
+  "ask.opened": AskPayloadSchema,
+  "ask.answered": AskPayloadSchema,
+  "comment.created": CommentPayloadSchema,
+  "comment.resolved": CommentPayloadSchema,
+  "suggestion.accepted": CommentPayloadSchema,
+  "suggestion.rejected": CommentPayloadSchema,
+  "message.created": MessagePayloadSchema,
+  "child.status": ChildStatusPayloadSchema
+};
+function dispatchPayload(event) {
+  const schema = DISPATCH_PAYLOAD_SCHEMAS[event.type];
+  if (schema === undefined)
+    return event.payload;
+  const parsed = schema.safeParse(event.payload);
+  return parsed.success ? parsed.data : event.payload;
+}
+function parseDispatchFrame(rawPayload) {
+  let value;
   try {
-    rawEvent = JSON.parse(envelope.payload);
+    value = JSON.parse(rawPayload);
   } catch {
-    return invalid();
-  }
-  const parsed = DispatchEventSchema.safeParse(rawEvent);
-  if (!parsed.success)
-    return invalid();
-  const event = parsed.data;
-  if (event.actor.kind === "session" && event.actor.id === sessionID) {
-    return { skip: true, content: "", envelope };
+    return { raw: rawPayload };
   }
-  return {
-    skip: false,
-    content: [
-      `dispatch ${event.issue_key} \xB7 ${event.type} \xB7 by ${dispatchActorLabel(event.actor)}`,
-      ...dispatchBody(event)
-    ].join(`
-`),
-    envelope
-  };
+  const parsed = DispatchEventSchema.safeParse(value);
+  return parsed.success ? { event: parsed.data } : { raw: value };
 }
 function inboundTimestamp(milliseconds) {
   if (milliseconds === undefined)
@@ -30961,13 +30851,31 @@ function renderInbound(raw, sessionID, subject) {
     const data = tolerant.data;
     envelope = { ...data, source: data.source ?? "unknown" };
   }
+  let dispatchEvent;
+  let dispatchIssue;
+  const dispatchRendered = envelope.source === "dispatch" && envelope.payload !== undefined;
   if (envelope.source === "dispatch") {
-    const renderedDispatch = renderDispatch(envelope, sessionID);
-    if (renderedDispatch !== null)
-      return renderedDispatch;
+    if (envelope.payload === undefined) {
+      dispatchIssue = "payload";
+    } else {
+      const frame = parseDispatchFrame(envelope.payload);
+      if ("event" in frame) {
+        if (frame.event.actor.kind === "session" && frame.event.actor.id === sessionID) {
+          return { skip: true, content: "", envelope };
+        }
+        dispatchEvent = {
+          issue_key: frame.event.issue_key,
+          type: frame.event.type,
+          actor: frame.event.actor,
+          payload: dispatchPayload(frame.event)
+        };
+      } else {
+        dispatchEvent = frame.raw;
+      }
+    }
   }
   let parsedPayload;
-  if (envelope.payload !== undefined && (envelope.source === "github" || envelope.payload !== envelope.payload_summary)) {
+  if (!dispatchRendered && envelope.payload !== undefined && (envelope.source === "github" || envelope.payload !== envelope.payload_summary)) {
     try {
       parsedPayload = JSON.parse(envelope.payload);
     } catch {
@@ -30975,7 +30883,7 @@ function renderInbound(raw, sessionID, subject) {
     }
   }
   const payloadSummary = envelope.payload_summary ?? "unknown";
-  const message = envelope.payload !== undefined && envelope.payload !== envelope.payload_summary ? parsedPayload : undefined;
+  const message = !dispatchRendered && envelope.payload !== undefined && envelope.payload !== envelope.payload_summary ? parsedPayload : undefined;
   const summaryIsHead = typeof message === "string" && envelope.payload_summary !== undefined && message.startsWith(envelope.payload_summary.endsWith("\u2026") ? envelope.payload_summary.slice(0, -1) : envelope.payload_summary);
   const body = `${envelope.payload_summary ?? ""}
 ${envelope.payload ?? ""}`;
@@ -30989,7 +30897,11 @@ ${envelope.payload ?? ""}`;
   const role = envelope.sender?.roles?.[0];
   const reply = replyWith(envelope);
   const sourceIssue = parseIssues.includes("source") || KNOWN_SOURCES[envelope.source] !== undefined ? undefined : `source=${envelope.source}`;
-  const unrecognised = [...parseIssues, ...sourceIssue === undefined ? [] : [sourceIssue]].join(", ") || undefined;
+  const unrecognised = [
+    ...parseIssues,
+    ...sourceIssue === undefined ? [] : [sourceIssue],
+    ...dispatchIssue === undefined ? [] : [dispatchIssue]
+  ].join(", ") || undefined;
   const rendered = {
     ...envelope.topic === agentSubject(sessionID) ? { to: `you (${sessionID.slice(0, 4)}\u2026)` } : {},
     from: senderLabel(envelope),
@@ -31004,8 +30916,10 @@ ${envelope.payload ?? ""}`;
     ...role === undefined ? {} : {
       reply_role: `envoy_publish(topic="notifications.role.${role}", message="...")`
     },
-    ...summaryIsHead ? {} : { summary: payloadSummary },
-    ...message === undefined ? {} : { message },
+    ...dispatchRendered ? { dispatch: dispatchEvent } : {
+      ...summaryIsHead ? {} : { summary: payloadSummary },
+      ...message === undefined ? {} : { message }
+    },
     ...foreignSession === undefined ? {} : {
       note: `body names session ${foreignSession}; the sender is ${envelope.source_session ?? "unknown"}`
     },

package/dist/legion.js

@@ -31282,147 +31282,37 @@ var ChildStatusPayloadSchema = object({
   from: string2().optional(),
   to: string2().optional()
 });
-function dispatchActorLabel(actor) {
-  return `${actor.kind} ${actor.id ?? "unknown"}`;
-}
-function dispatchBody(event) {
-  const lines = [];
-  switch (event.type) {
-    case "issue.created":
-    case "issue.updated":
-    case "issue.closed": {
-      const parsed = IssuePayloadSchema.safeParse(event.payload);
-      if (!parsed.success)
-        break;
-      if (parsed.data.title)
-        lines.push(`Title: ${parsed.data.title}`);
-      if (parsed.data.status)
-        lines.push(`Status: ${parsed.data.status}`);
-      if (parsed.data.route)
-        lines.push(`Route: ${parsed.data.route}`);
-      break;
-    }
-    case "artifact.created": {
-      const parsed = ArtifactCreatedPayloadSchema.safeParse(event.payload);
-      const name = parsed.success ? parsed.data.artifact?.name : undefined;
-      if (name)
-        lines.push(`Artifact: ${name}`);
-      break;
-    }
-    case "artifact.version": {
-      const parsed = ArtifactVersionPayloadSchema.safeParse(event.payload);
-      if (!parsed.success)
-        break;
-      const version = parsed.data.version;
-      if (parsed.data.name)
-        lines.push(`Artifact: ${parsed.data.name}`);
-      if (version?.number !== undefined)
-        lines.push(`Version: ${version.number}`);
-      if (version?.summary)
-        lines.push(`Summary: ${version.summary}`);
-      if (parsed.data.diff)
-        lines.push("Diff:", parsed.data.diff);
-      break;
-    }
-    case "ask.opened":
-    case "ask.answered": {
-      const parsed = AskPayloadSchema.safeParse(event.payload);
-      if (!parsed.success)
-        break;
-      if (parsed.data.question)
-        lines.push(`Question: ${parsed.data.question}`);
-      if (event.type === "ask.opened") {
-        const options = (parsed.data.options ?? []).map((option) => option.label).filter((label) => label !== undefined);
-        if (options.length > 0)
-          lines.push(`Options: ${options.join(", ")}`);
-        break;
-      }
-      const answer = parsed.data.answer;
-      lines.push(`Selected: ${answer?.selected?.join(", ") || "none"}`);
-      if (answer?.text)
-        lines.push(`Text: ${answer.text}`);
-      break;
-    }
-    case "comment.created":
-    case "comment.resolved": {
-      const parsed = CommentPayloadSchema.safeParse(event.payload);
-      if (!parsed.success)
-        break;
-      const quote = parsed.data.anchor?.quote;
-      if (parsed.data.artifact_name)
-        lines.push(`Artifact: ${parsed.data.artifact_name}`);
-      if (quote)
-        lines.push(`> ${quote}`);
-      if (parsed.data.reply_to)
-        lines.push(`Reply chain: ${parsed.data.reply_to}`);
-      if (parsed.data.body)
-        lines.push(`Body: ${parsed.data.body}`);
-      break;
-    }
-    case "suggestion.accepted":
-    case "suggestion.rejected": {
-      const parsed = CommentPayloadSchema.safeParse(event.payload);
-      if (!parsed.success)
-        break;
-      const quote = parsed.data.anchor?.quote;
-      const replacement = parsed.data.suggestion?.replace_with;
-      if (parsed.data.artifact_name)
-        lines.push(`Artifact: ${parsed.data.artifact_name}`);
-      if (quote)
-        lines.push(`> ${quote}`);
-      if (quote && replacement)
-        lines.push(`${quote} \u2192 ${replacement}`);
-      break;
-    }
-    case "message.created": {
-      const parsed = MessagePayloadSchema.safeParse(event.payload);
-      const body = parsed.success ? parsed.data.body : undefined;
-      if (body)
-        lines.push(`Body: ${body}`);
-      break;
-    }
-    case "child.status": {
-      const parsed = ChildStatusPayloadSchema.safeParse(event.payload);
-      if (!parsed.success)
-        break;
-      const { child_key: child, from, to } = parsed.data;
-      if (child && from && to)
-        lines.push(`Child: ${child} ${from} \u2192 ${to}`);
-      break;
-    }
-  }
-  return lines;
-}
-function renderDispatch(envelope, sessionID) {
-  const invalid = () => ({
-    skip: false,
-    content: "dispatch: invalid event",
-    envelope
-  });
-  if (envelope.payload === undefined)
-    return invalid();
-  let rawEvent;
+var DISPATCH_PAYLOAD_SCHEMAS = {
+  "issue.created": IssuePayloadSchema,
+  "issue.updated": IssuePayloadSchema,
+  "issue.closed": IssuePayloadSchema,
+  "artifact.created": ArtifactCreatedPayloadSchema,
+  "artifact.version": ArtifactVersionPayloadSchema,
+  "ask.opened": AskPayloadSchema,
+  "ask.answered": AskPayloadSchema,
+  "comment.created": CommentPayloadSchema,
+  "comment.resolved": CommentPayloadSchema,
+  "suggestion.accepted": CommentPayloadSchema,
+  "suggestion.rejected": CommentPayloadSchema,
+  "message.created": MessagePayloadSchema,
+  "child.status": ChildStatusPayloadSchema
+};
+function dispatchPayload(event) {
+  const schema = DISPATCH_PAYLOAD_SCHEMAS[event.type];
+  if (schema === undefined)
+    return event.payload;
+  const parsed = schema.safeParse(event.payload);
+  return parsed.success ? parsed.data : event.payload;
+}
+function parseDispatchFrame(rawPayload) {
+  let value;
   try {
-    rawEvent = JSON.parse(envelope.payload);
+    value = JSON.parse(rawPayload);
   } catch {
-    return invalid();
-  }
-  const parsed = DispatchEventSchema.safeParse(rawEvent);
-  if (!parsed.success)
-    return invalid();
-  const event = parsed.data;
-  if (event.actor.kind === "session" && event.actor.id === sessionID) {
-    return { skip: true, content: "", envelope };
+    return { raw: rawPayload };
   }
-  return {
-    skip: false,
-    content: [
-      `dispatch ${event.issue_key} \xB7 ${event.type} \xB7 by ${dispatchActorLabel(event.actor)}`,
-      ...dispatchBody(event)
-    ].join(`
-`),
-    envelope
-  };
+  const parsed = DispatchEventSchema.safeParse(value);
+  return parsed.success ? { event: parsed.data } : { raw: value };
 }
 function inboundTimestamp(milliseconds) {
   if (milliseconds === undefined)
@@ -31458,13 +31348,31 @@ function renderInbound(raw, sessionID, subject) {
     const data = tolerant.data;
     envelope = { ...data, source: data.source ?? "unknown" };
   }
+  let dispatchEvent;
+  let dispatchIssue;
+  const dispatchRendered = envelope.source === "dispatch" && envelope.payload !== undefined;
   if (envelope.source === "dispatch") {
-    const renderedDispatch = renderDispatch(envelope, sessionID);
-    if (renderedDispatch !== null)
-      return renderedDispatch;
+    if (envelope.payload === undefined) {
+      dispatchIssue = "payload";
+    } else {
+      const frame = parseDispatchFrame(envelope.payload);
+      if ("event" in frame) {
+        if (frame.event.actor.kind === "session" && frame.event.actor.id === sessionID) {
+          return { skip: true, content: "", envelope };
+        }
+        dispatchEvent = {
+          issue_key: frame.event.issue_key,
+          type: frame.event.type,
+          actor: frame.event.actor,
+          payload: dispatchPayload(frame.event)
+        };
+      } else {
+        dispatchEvent = frame.raw;
+      }
+    }
   }
   let parsedPayload;
-  if (envelope.payload !== undefined && (envelope.source === "github" || envelope.payload !== envelope.payload_summary)) {
+  if (!dispatchRendered && envelope.payload !== undefined && (envelope.source === "github" || envelope.payload !== envelope.payload_summary)) {
     try {
       parsedPayload = JSON.parse(envelope.payload);
     } catch {
@@ -31472,7 +31380,7 @@ function renderInbound(raw, sessionID, subject) {
     }
   }
   const payloadSummary = envelope.payload_summary ?? "unknown";
-  const message = envelope.payload !== undefined && envelope.payload !== envelope.payload_summary ? parsedPayload : undefined;
+  const message = !dispatchRendered && envelope.payload !== undefined && envelope.payload !== envelope.payload_summary ? parsedPayload : undefined;
   const summaryIsHead = typeof message === "string" && envelope.payload_summary !== undefined && message.startsWith(envelope.payload_summary.endsWith("\u2026") ? envelope.payload_summary.slice(0, -1) : envelope.payload_summary);
   const body = `${envelope.payload_summary ?? ""}
 ${envelope.payload ?? ""}`;
@@ -31486,7 +31394,11 @@ ${envelope.payload ?? ""}`;
   const role = envelope.sender?.roles?.[0];
   const reply = replyWith(envelope);
   const sourceIssue = parseIssues.includes("source") || KNOWN_SOURCES[envelope.source] !== undefined ? undefined : `source=${envelope.source}`;
-  const unrecognised = [...parseIssues, ...sourceIssue === undefined ? [] : [sourceIssue]].join(", ") || undefined;
+  const unrecognised = [
+    ...parseIssues,
+    ...sourceIssue === undefined ? [] : [sourceIssue],
+    ...dispatchIssue === undefined ? [] : [dispatchIssue]
+  ].join(", ") || undefined;
   const rendered = {
     ...envelope.topic === agentSubject(sessionID) ? { to: `you (${sessionID.slice(0, 4)}\u2026)` } : {},
     from: senderLabel(envelope),
@@ -31501,8 +31413,10 @@ ${envelope.payload ?? ""}`;
     ...role === undefined ? {} : {
       reply_role: `envoy_publish(topic="notifications.role.${role}", message="...")`
     },
-    ...summaryIsHead ? {} : { summary: payloadSummary },
-    ...message === undefined ? {} : { message },
+    ...dispatchRendered ? { dispatch: dispatchEvent } : {
+      ...summaryIsHead ? {} : { summary: payloadSummary },
+      ...message === undefined ? {} : { message }
+    },
     ...foreignSession === undefined ? {} : {
       note: `body names session ${foreignSession}; the sender is ${envelope.source_session ?? "unknown"}`
     },

package/package.json

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