@agent-native/core 0.84.54 → 0.84.56

package/corpus/templates/plan/actions/create-visual-recap.ts

@@ -44,12 +44,24 @@ const sourceTypeSchema = z
 
 const sourcePrStateSchema = z.enum(["open", "closed", "merged", "unknown"]);
 
+const sourceAuthorEmailSchema = z
+  .string()
+  .trim()
+  .email()
+  .transform((email) => email.toLowerCase())
+  .optional();
+
+const sourceAuthorTextSchema = z.string().trim().min(1).optional();
+
 type RecapSourceMetadata = {
   sourceType?: string;
   sourceRepo?: string;
   sourcePrNumber?: number;
   sourcePrState?: "open" | "closed" | "merged" | "unknown";
   sourcePrMergedAt?: string;
+  sourceAuthorEmail?: string;
+  sourceAuthorName?: string;
+  sourceAuthorLogin?: string;
 };
 
 type RecapVisibility = "private" | "org" | "public";
@@ -82,17 +94,26 @@ function normalizeRecapSourceMetadata(args: {
   sourcePrNumber?: number;
   sourcePrState?: "open" | "closed" | "merged" | "unknown";
   sourcePrMergedAt?: string;
+  sourceAuthorEmail?: string;
+  sourceAuthorName?: string;
+  sourceAuthorLogin?: string;
 }): RecapSourceMetadata {
   const inferred = inferGithubPullRequestSource(args.sourceUrl);
   const sourcePrMergedAt = args.sourcePrMergedAt?.trim();
   const sourcePrState =
     args.sourcePrState ?? (sourcePrMergedAt ? "merged" : undefined);
+  const sourceAuthorEmail = args.sourceAuthorEmail?.trim().toLowerCase();
+  const sourceAuthorName = args.sourceAuthorName?.trim();
+  const sourceAuthorLogin = args.sourceAuthorLogin?.trim();
   return {
     sourceType: args.sourceType ?? inferred.sourceType,
     sourceRepo: args.sourceRepo ?? inferred.sourceRepo,
     sourcePrNumber: args.sourcePrNumber ?? inferred.sourcePrNumber,
     sourcePrState,
     sourcePrMergedAt: sourcePrMergedAt || undefined,
+    sourceAuthorEmail: sourceAuthorEmail || undefined,
+    sourceAuthorName: sourceAuthorName || undefined,
+    sourceAuthorLogin: sourceAuthorLogin || undefined,
   };
 }
 
@@ -229,6 +250,15 @@ export default defineAction({
       .min(1)
       .optional()
       .describe("ISO timestamp for when the source pull request was merged."),
+    sourceAuthorEmail: sourceAuthorEmailSchema.describe(
+      "Email address for the human author of the source PR, used as the default human comment target for recap feedback.",
+    ),
+    sourceAuthorName: sourceAuthorTextSchema.describe(
+      "Display name for the human author of the source PR.",
+    ),
+    sourceAuthorLogin: sourceAuthorTextSchema.describe(
+      "GitHub login for the human author of the source PR.",
+    ),
     idempotencyKey: z
       .string()
       .trim()
@@ -328,6 +358,15 @@ export default defineAction({
           ...(sourceMetadata.sourcePrMergedAt !== undefined
             ? { sourcePrMergedAt: sourceMetadata.sourcePrMergedAt }
             : {}),
+          ...(sourceMetadata.sourceAuthorEmail !== undefined
+            ? { sourceAuthorEmail: sourceMetadata.sourceAuthorEmail }
+            : {}),
+          ...(sourceMetadata.sourceAuthorName !== undefined
+            ? { sourceAuthorName: sourceMetadata.sourceAuthorName }
+            : {}),
+          ...(sourceMetadata.sourceAuthorLogin !== undefined
+            ? { sourceAuthorLogin: sourceMetadata.sourceAuthorLogin }
+            : {}),
           ...(idempotencyKey ? { recapIdempotencyKey: idempotencyKey } : {}),
         };
         if (Object.keys(planPatch).length > 0) {

package/corpus/templates/plan/actions/list-visual-plans.ts

@@ -77,6 +77,8 @@ export default defineAction({
         hostedPlanId: schema.plans.hostedPlanId,
         hostedPlanUrl: schema.plans.hostedPlanUrl,
         sourceUrl: schema.plans.sourceUrl,
+        sourceAuthorName: schema.plans.sourceAuthorName,
+        sourceAuthorLogin: schema.plans.sourceAuthorLogin,
         createdAt: schema.plans.createdAt,
         updatedAt: schema.plans.updatedAt,
         approvedAt: schema.plans.approvedAt,

package/corpus/templates/plan/actions/view-screen.ts

@@ -152,6 +152,8 @@ export default defineAction({
             hostedPlanId: schema.plans.hostedPlanId,
             hostedPlanUrl: schema.plans.hostedPlanUrl,
             sourceUrl: schema.plans.sourceUrl,
+            sourceAuthorName: schema.plans.sourceAuthorName,
+            sourceAuthorLogin: schema.plans.sourceAuthorLogin,
             createdAt: schema.plans.createdAt,
             updatedAt: schema.plans.updatedAt,
             approvedAt: schema.plans.approvedAt,

package/corpus/templates/plan/app/pages/PlansPage.tsx

@@ -26,6 +26,7 @@ import {
   type DomainMatchOrg,
 } from "@agent-native/core/client/org";
 import {
+  SOURCE_AUTHOR_COMMENT_MENTION_EMAIL,
   extractCommentMentions,
   formatPlanCommentAnchorForAgent,
   formatPlanCommentMentionToken,
@@ -374,7 +375,7 @@ function readDesktopPlanAutoSync(planId: string | undefined): boolean {
 
 type PlanAnnotationAnchor = PlanCommentAnchor & { x: number; y: number };
 
-type CommentDraft = {
+export type CommentDraft = {
   message: string;
   mentions: PlanCommentMention[];
   resolutionTarget: PlanCommentResolutionTarget;
@@ -1245,6 +1246,110 @@ function displayNameForMention(email: string) {
   return emailToName(email).replace(/\s+/g, " ").trim() || email;
 }
 
+function elementForShortcutTarget(target: EventTarget | null) {
+  if (target instanceof Element) return target;
+  if (target instanceof Node) return target.parentElement;
+  return null;
+}
+
+export function isPlanCommentShortcutEditableTarget(
+  target: EventTarget | null,
+) {
+  const element = elementForShortcutTarget(target);
+  if (!element) return false;
+  return Boolean(
+    element.closest(
+      "input, textarea, select, [contenteditable]:not([contenteditable='false']), [role='textbox']",
+    ),
+  );
+}
+
+export function shouldHandlePlanCommentShortcut(
+  event: Pick<
+    KeyboardEvent,
+    | "altKey"
+    | "ctrlKey"
+    | "defaultPrevented"
+    | "key"
+    | "metaKey"
+    | "shiftKey"
+    | "target"
+  >,
+) {
+  if (event.defaultPrevented) return false;
+  const activeElement =
+    typeof document === "undefined" ? null : document.activeElement;
+  if (
+    isPlanCommentShortcutEditableTarget(activeElement) ||
+    isPlanCommentShortcutEditableTarget(event.target)
+  ) {
+    return false;
+  }
+  const key = event.key.toLowerCase();
+  if (
+    key === "c" &&
+    !event.metaKey &&
+    !event.ctrlKey &&
+    !event.altKey &&
+    !event.shiftKey
+  ) {
+    return true;
+  }
+  return (
+    key === "m" &&
+    event.metaKey &&
+    event.shiftKey &&
+    !event.ctrlKey &&
+    !event.altKey
+  );
+}
+
+export function defaultInlineCommentDraftForPlanContext(input: {
+  planKind?: PlanKind | null;
+  ownerEmail?: string | null;
+  sourceAuthorName?: string | null;
+  sourceAuthorLogin?: string | null;
+  accessRole?: NonNullable<PlanBundle["access"]>["role"] | null;
+  currentEmail?: string | null;
+}): CommentDraft {
+  const currentEmail = normalizeCommentEmail(input.currentEmail);
+  if (input.planKind === "recap") {
+    const targetLabel =
+      input.sourceAuthorName?.trim() || input.sourceAuthorLogin?.trim();
+    if (!targetLabel || input.accessRole === "owner") {
+      return { message: "", mentions: [], resolutionTarget: "agent" };
+    }
+    const mention: PlanCommentMention = {
+      email: SOURCE_AUTHOR_COMMENT_MENTION_EMAIL,
+      label: targetLabel,
+      role: "source-author",
+    };
+    return {
+      message: `${formatPlanCommentMentionToken(mention)} `,
+      mentions: [mention],
+      resolutionTarget: "human",
+    };
+  }
+
+  const targetEmail = normalizeCommentEmail(input.ownerEmail);
+  if (
+    !targetEmail ||
+    input.accessRole === "owner" ||
+    targetEmail === currentEmail
+  ) {
+    return { message: "", mentions: [], resolutionTarget: "agent" };
+  }
+  const mention = {
+    email: targetEmail,
+    label: displayNameForMention(targetEmail),
+  };
+  return {
+    message: `${formatPlanCommentMentionToken(mention)} `,
+    mentions: [mention],
+    resolutionTarget: "human",
+  };
+}
+
 function safeDecodeURIComponent(value: string): string {
   try {
     return decodeURIComponent(value);
@@ -3282,25 +3387,22 @@ export function PlansPage({ localPlanSlug }: { localPlanSlug?: string } = {}) {
     bundle && (localPlanMode || session || canEditPlanContent),
   );
   const defaultInlineCommentDraft = useMemo<CommentDraft>(() => {
-    const ownerEmail = normalizeCommentEmail(bundle?.access?.ownerEmail);
-    const currentEmail = normalizeCommentEmail(collabUser?.email);
-    if (
-      !ownerEmail ||
-      effectivePlanAccessRole === "owner" ||
-      ownerEmail === currentEmail
-    ) {
-      return { message: "", mentions: [], resolutionTarget: "agent" };
-    }
-    const mention = {
-      email: ownerEmail,
-      label: displayNameForMention(ownerEmail),
-    };
-    return {
-      message: `${formatPlanCommentMentionToken(mention)} `,
-      mentions: [mention],
-      resolutionTarget: "human",
-    };
-  }, [bundle?.access?.ownerEmail, collabUser?.email, effectivePlanAccessRole]);
+    return defaultInlineCommentDraftForPlanContext({
+      planKind: bundle?.plan.kind,
+      ownerEmail: bundle?.access?.ownerEmail,
+      sourceAuthorName: bundle?.plan.sourceAuthorName,
+      sourceAuthorLogin: bundle?.plan.sourceAuthorLogin,
+      accessRole: effectivePlanAccessRole,
+      currentEmail: collabUser?.email,
+    });
+  }, [
+    bundle?.access?.ownerEmail,
+    bundle?.plan.kind,
+    bundle?.plan.sourceAuthorName,
+    bundle?.plan.sourceAuthorLogin,
+    collabUser?.email,
+    effectivePlanAccessRole,
+  ]);
   const commentThreads = useMemo(
     () => buildCommentThreads(bundle?.comments ?? []),
     [bundle?.comments],
@@ -4547,13 +4649,13 @@ export function PlansPage({ localPlanSlug }: { localPlanSlug?: string } = {}) {
     });
   };
 
-  const startCommenting = () => {
+  const startCommenting = useCallback(() => {
     setCanvasMarkupMode("none");
     setActiveAnnotation(null);
     setAnnotationsOpen(false);
     setCommentVisibility("open");
     setAnnotateMode(true);
-  };
+  }, []);
 
   const selectReviewMode = (mode: CanvasMarkupMode) => {
     preservePlanReaderScroll(() => {
@@ -4609,96 +4711,135 @@ export function PlansPage({ localPlanSlug }: { localPlanSlug?: string } = {}) {
     scheduleNativeMarkerUpdate();
   };
 
-  const readNativeSelectionComment = (): NativeSelectionComment | null => {
-    const reader = nativeReaderRef.current;
-    const selection = window.getSelection();
-    if (!reader || !selection || selection.rangeCount === 0) return null;
-    if (selection.isCollapsed) return null;
-    const textQuote = selection.toString().replace(/\s+/g, " ").trim();
-    if (!textQuote) return null;
-    const range = selection.getRangeAt(0);
-    if (!reader.contains(range.commonAncestorContainer)) return null;
-
-    const rects = Array.from(range.getClientRects()).filter(
-      (rect) => rect.width > 0 && rect.height > 0,
-    );
-    const selectionRect = rects[0] ?? range.getBoundingClientRect();
-    if (selectionRect.width <= 0 || selectionRect.height <= 0) return null;
-
-    const readerRect = reader.getBoundingClientRect();
-    const pointX =
-      selectionRect.left + selectionRect.width / 2 - readerRect.left;
-    const pointY =
-      selectionRect.top + selectionRect.height / 2 - readerRect.top;
-    const startElement =
-      range.startContainer instanceof Element
-        ? range.startContainer
-        : range.startContainer.parentElement;
-    const blockElement = startElement?.closest<HTMLElement>("[data-block-id]");
-    const blockType = blockElement?.dataset.blockId
-      ? findPlanBlockById(
-          bundle?.plan.content?.blocks ?? [],
-          blockElement.dataset.blockId,
-        )?.type
-      : undefined;
-    const quoteContext = textQuoteContextForBlock({
-      block: blockElement,
-      quote: textQuote,
-    });
-    const snippet = textQuote.slice(0, 220);
-    const anchor = {
-      ...buildNativeAnchorFromElement({
-        reader,
-        target: startElement instanceof HTMLElement ? startElement : reader,
-        pointX,
-        pointY,
-        planTitle: bundle?.plan.title,
-      }),
-      snippet,
-      textQuote: snippet,
-      anchorKind: "text",
-      tagName: "selection",
-      blockType,
-      ...quoteContext,
-    } satisfies PlanAnnotationAnchor;
-    const toolbarWidth = 132;
-    const toolbarLeft = clamp(
-      pointX - toolbarWidth / 2,
-      12,
-      Math.max(12, readerRect.width - toolbarWidth - 12),
-    );
-    const toolbarTop = clamp(
-      selectionRect.top - readerRect.top - 48,
-      12,
-      Math.max(12, readerRect.height - 48),
-    );
-    return {
-      anchor,
-      toolbarLeft,
-      toolbarTop,
-      position:
-        getPositionFromAnchor(anchor) ??
-        resolveInlineCommentPosition({
+  const readNativeSelectionComment =
+    useCallback((): NativeSelectionComment | null => {
+      const reader = nativeReaderRef.current;
+      const selection = window.getSelection();
+      if (!reader || !selection || selection.rangeCount === 0) return null;
+      if (selection.isCollapsed) return null;
+      const textQuote = selection.toString().replace(/\s+/g, " ").trim();
+      if (!textQuote) return null;
+      const range = selection.getRangeAt(0);
+      if (!reader.contains(range.commonAncestorContainer)) return null;
+
+      const rects = Array.from(range.getClientRects()).filter(
+        (rect) => rect.width > 0 && rect.height > 0,
+      );
+      const selectionRect = rects[0] ?? range.getBoundingClientRect();
+      if (selectionRect.width <= 0 || selectionRect.height <= 0) return null;
+
+      const readerRect = reader.getBoundingClientRect();
+      const pointX =
+        selectionRect.left + selectionRect.width / 2 - readerRect.left;
+      const pointY =
+        selectionRect.top + selectionRect.height / 2 - readerRect.top;
+      const startElement =
+        range.startContainer instanceof Element
+          ? range.startContainer
+          : range.startContainer.parentElement;
+      const blockElement =
+        startElement?.closest<HTMLElement>("[data-block-id]");
+      const blockType = blockElement?.dataset.blockId
+        ? findPlanBlockById(
+            bundle?.plan.content?.blocks ?? [],
+            blockElement.dataset.blockId,
+          )?.type
+        : undefined;
+      const quoteContext = textQuoteContextForBlock({
+        block: blockElement,
+        quote: textQuote,
+      });
+      const snippet = textQuote.slice(0, 220);
+      const anchor = {
+        ...buildNativeAnchorFromElement({
+          reader,
+          target: startElement instanceof HTMLElement ? startElement : reader,
           pointX,
           pointY,
-          viewportWidth: readerRect.width,
-          viewportHeight: readerRect.height,
+          planTitle: bundle?.plan.title,
         }),
-    };
-  };
+        snippet,
+        textQuote: snippet,
+        anchorKind: "text",
+        tagName: "selection",
+        blockType,
+        ...quoteContext,
+      } satisfies PlanAnnotationAnchor;
+      const toolbarWidth = 132;
+      const toolbarLeft = clamp(
+        pointX - toolbarWidth / 2,
+        12,
+        Math.max(12, readerRect.width - toolbarWidth - 12),
+      );
+      const toolbarTop = clamp(
+        selectionRect.top - readerRect.top - 48,
+        12,
+        Math.max(12, readerRect.height - 48),
+      );
+      return {
+        anchor,
+        toolbarLeft,
+        toolbarTop,
+        position:
+          getPositionFromAnchor(anchor) ??
+          resolveInlineCommentPosition({
+            pointX,
+            pointY,
+            viewportWidth: readerRect.width,
+            viewportHeight: readerRect.height,
+          }),
+      };
+    }, [
+      bundle?.plan.content?.blocks,
+      bundle?.plan.title,
+      getPositionFromAnchor,
+    ]);
+
+  const openNativeSelectionComment = useCallback(
+    (selectionComment: NativeSelectionComment) => {
+      documentStateRef.current = readNativeDocumentState();
+      setCanvasMarkupMode("none");
+      setActiveAnnotation(null);
+      setAnnotationsOpen(false);
+      setCommentVisibility("open");
+      setAnnotateMode(true);
+      setPendingAnnotation(selectionComment.anchor);
+      setInlineCommentPosition(selectionComment.position);
+      setNativeSelectionComment(null);
+      window.getSelection()?.removeAllRanges();
+    },
+    [readNativeDocumentState],
+  );
 
   const beginNativeSelectionComment = () => {
     if (!nativeSelectionComment) return;
-    documentStateRef.current = readNativeDocumentState();
-    // Implicitly enter annotate mode when a selection comment is started
-    // outside of review mode so the inline comment popover renders correctly.
-    if (!annotateMode) setAnnotateMode(true);
-    setPendingAnnotation(nativeSelectionComment.anchor);
-    setInlineCommentPosition(nativeSelectionComment.position);
-    setNativeSelectionComment(null);
-    window.getSelection()?.removeAllRanges();
+    openNativeSelectionComment(nativeSelectionComment);
   };
 
+  useEffect(() => {
+    if (!bundle) return;
+    const handleCommentShortcut = (event: KeyboardEvent) => {
+      if (!shouldHandlePlanCommentShortcut(event)) return;
+      event.preventDefault();
+      preservePlanReaderScroll(() => {
+        const selectionComment = readNativeSelectionComment();
+        if (selectionComment) {
+          openNativeSelectionComment(selectionComment);
+          return;
+        }
+        startCommenting();
+      });
+    };
+    window.addEventListener("keydown", handleCommentShortcut);
+    return () => window.removeEventListener("keydown", handleCommentShortcut);
+  }, [
+    bundle,
+    openNativeSelectionComment,
+    preservePlanReaderScroll,
+    readNativeSelectionComment,
+    startCommenting,
+  ]);
+
   const handleNativeReaderPointerDown = (
     event: PointerEvent<HTMLDivElement>,
   ) => {
@@ -9303,6 +9444,22 @@ function commentBodyText(message: string) {
     .trim();
 }
 
+export function canSubmitInlineCommentDraft(input: {
+  draft: CommentDraft;
+  isSubmitting?: boolean;
+  lockToAgent?: boolean;
+}) {
+  const needsHumanMention =
+    !input.lockToAgent &&
+    input.draft.resolutionTarget === "human" &&
+    input.draft.mentions.length === 0;
+  return (
+    commentBodyText(input.draft.message).length > 0 &&
+    !needsHumanMention &&
+    !input.isSubmitting
+  );
+}
+
 export function mentionQueryAtCaret(root: HTMLElement) {
   const selection = window.getSelection();
   if (!selection || selection.rangeCount === 0) return null;
@@ -9600,7 +9757,11 @@ function InlineCommentPopover({
       mountedRef.current = false;
     };
   }, []);
-  const canSubmit = commentBodyText(draft.message).length > 0 && !isSubmitting;
+  const canSubmit = canSubmitInlineCommentDraft({
+    draft,
+    isSubmitting,
+    lockToAgent,
+  });
   const submit = async () => {
     if (!canSubmit) return;
     setSubmitError(false);
@@ -9666,15 +9827,19 @@ function InlineCommentPopover({
           autoFocus
           onSubmitShortcut={submit}
           onChange={(value) =>
-            setDraft((current) => ({
-              ...current,
-              ...value,
-              resolutionTarget: resolverTouched
-                ? current.resolutionTarget
-                : value.mentions.length > 0
-                  ? "human"
-                  : "agent",
-            }))
+            setDraft((current) => {
+              const addedMention =
+                value.mentions.length > current.mentions.length;
+              return {
+                ...current,
+                ...value,
+                resolutionTarget: resolverTouched
+                  ? current.resolutionTarget
+                  : addedMention
+                    ? "human"
+                    : current.resolutionTarget,
+              };
+            })
           }
         />
         <Button

package/corpus/templates/plan/changelog/2026-07-02-plan-comment-shortcuts-now-open-comment-mode-from-the-keyboa.md

@@ -0,0 +1,6 @@
+---
+type: improved
+date: 2026-07-02
+---
+
+Plan comment shortcuts now open comment mode from the keyboard and PR recaps target the PR author for human feedback.

package/corpus/templates/plan/server/db/schema.ts

@@ -59,6 +59,9 @@ export const plans = table("plans", {
   sourcePrNumber: integer("source_pr_number"),
   sourcePrState: text("source_pr_state"),
   sourcePrMergedAt: text("source_pr_merged_at"),
+  sourceAuthorEmail: text("source_author_email"),
+  sourceAuthorName: text("source_author_name"),
+  sourceAuthorLogin: text("source_author_login"),
   // Stable key used by PR Visual Recap publish retries to replace the recap
   // created by an earlier attempt instead of creating duplicate recap rows.
   recapIdempotencyKey: text("recap_idempotency_key"),

package/corpus/templates/plan/server/lib/comment-notifications.ts

@@ -7,7 +7,10 @@ import {
 } from "@agent-native/core/server";
 import { eq } from "drizzle-orm";
 
-import { extractCommentMentions } from "../../shared/comment-context.js";
+import {
+  SOURCE_AUTHOR_COMMENT_MENTION_EMAIL,
+  extractCommentMentions,
+} from "../../shared/comment-context.js";
 import type { PlanBundle, PlanComment } from "../../shared/types.js";
 import { getDb, schema } from "../db/index.js";
 
@@ -29,6 +32,7 @@ function normalizeEmail(email: string | null | undefined): string | null {
 
 function isSyntheticQaEmail(email: string): boolean {
   const trimmed = email.trim().toLowerCase();
+  if (trimmed === SOURCE_AUTHOR_COMMENT_MENTION_EMAIL) return true;
   const at = trimmed.lastIndexOf("@");
   if (at <= 0) return false;
   const local = trimmed.slice(0, at);
@@ -150,9 +154,11 @@ export function planCommentNotificationRecipients(input: {
   comment: PlanComment;
   comments: PlanComment[];
   planOwnerEmail?: string | null;
+  sourceAuthorEmail?: string | null;
 }): NotificationRecipient[] {
   if (input.comment.createdBy !== "human") return [];
   const actorEmail = normalizeEmail(input.comment.authorEmail);
+  const sourceAuthorEmail = normalizeEmail(input.sourceAuthorEmail);
   const recipients = new Map<string, NotificationRecipient>();
   const addRecipient = (
     email: string | null | undefined,
@@ -166,12 +172,22 @@ export function planCommentNotificationRecipients(input: {
     recipients.set(normalized, { email: normalized, reason });
   };
 
-  addRecipient(input.planOwnerEmail, "plan-owner");
   const mentionedPeople =
     input.comment.mentions && input.comment.mentions.length > 0
       ? input.comment.mentions
       : extractCommentMentions(input.comment.message);
+  const mentionsSourceAuthor = mentionedPeople.some(
+    (mention) =>
+      normalizeEmail(mention.email) === SOURCE_AUTHOR_COMMENT_MENTION_EMAIL,
+  );
+  if (!(mentionsSourceAuthor && sourceAuthorEmail)) {
+    addRecipient(input.planOwnerEmail, "plan-owner");
+  }
   for (const mention of mentionedPeople) {
+    if (normalizeEmail(mention.email) === SOURCE_AUTHOR_COMMENT_MENTION_EMAIL) {
+      addRecipient(sourceAuthorEmail, "mention");
+      continue;
+    }
     addRecipient(mention.email, "mention");
   }
 
@@ -238,10 +254,12 @@ export async function notifyPlanCommentRecipients({
       id: schema.plans.id,
       title: schema.plans.title,
       ownerEmail: schema.plans.ownerEmail,
+      sourceAuthorEmail: schema.plans.sourceAuthorEmail,
     })
     .from(schema.plans)
     .where(eq(schema.plans.id, bundle.plan.id));
   const planOwnerEmail = planRow?.ownerEmail ?? null;
+  const sourceAuthorEmail = planRow?.sourceAuthorEmail ?? null;
   const planTitle = planRow?.title ?? bundle.plan.title;
   const insertedById = new Map(
     bundle.comments
@@ -261,6 +279,7 @@ export async function notifyPlanCommentRecipients({
       comment,
       comments: commentsForRecipients,
       planOwnerEmail,
+      sourceAuthorEmail,
     });
     for (const recipient of recipients) {
       try {