@agent-native/core 0.161.8 → 0.161.10

package/corpus/templates/factory/actions/start-builder-for-item.ts

@@ -1,5 +1,5 @@
 import { defineAction } from "@agent-native/core/action";
-import { and, eq } from "drizzle-orm";
+import { and, eq, inArray } from "drizzle-orm";
 import { z } from "zod";
 
 import { getDb } from "../server/db/index.js";
@@ -26,22 +26,107 @@ import { detectOwnerOwnedArea } from "../server/triage/pr-policy.js";
 import { createSlackReader } from "../server/triage/slack-client.js";
 
 const replyTextPrefix =
-  "@builderio please fix this in a reply. This is a clear bug based on the feedback above. Please send a PR when ready.";
+  "@builder.io please run /address-feedback in the repo to address this feedback. Read the address-feedback, address-feedback-with-replies, review-latest-feedback, and review-prs skills as relevant, inspect the full thread and linked evidence, and fix the owning boundary. Please send a PR when ready.";
+const legacyReplyTextPrefix = "@builderio please fix this in a reply.";
 
-function replyTextForItem(item: {
+type RelatedFeedbackItem = {
   id: string;
   sourceUrl: string | null;
-}): string {
+  title: string;
+};
+
+const startedTriageRunStatuses = new Set([
+  "submitted",
+  "acknowledged",
+  "running",
+  "completed",
+  "timed_out",
+  "reconciliation_required",
+]);
+
+export function hasFeedbackCluster(metadata: Record<string, unknown>): boolean {
+  return (
+    (typeof metadata.feedbackClusterRepresentativeId === "string" &&
+      metadata.feedbackClusterRepresentativeId.trim().length > 0) ||
+    (Array.isArray(metadata.feedbackClusterItemIds) &&
+      metadata.feedbackClusterItemIds.length > 0)
+  );
+}
+
+export function isStartedTriageRunStatus(status: string): boolean {
+  return startedTriageRunStatuses.has(status);
+}
+
+export function relatedDispatchConflictReason(
+  item: Pick<RelatedFeedbackItem, "id">,
+  metadata: Record<string, unknown>,
+  runStatuses: readonly string[],
+): string | null {
+  if (hasFeedbackCluster(metadata)) {
+    return `Related Factory item ${item.id} already belongs to a feedback cluster.`;
+  }
+  if (runStatuses.some(isStartedTriageRunStatus)) {
+    return `Related Factory item ${item.id} already has a started Builder run.`;
+  }
+  return null;
+}
+
+export function ownerOwnedAreaValuesForItem(
+  item: Pick<RelatedFeedbackItem, "title"> & {
+    summary: string | null;
+    repository: string | null;
+  },
+  metadata: Record<string, unknown>,
+): Array<string | undefined> {
+  return [
+    item.title,
+    item.summary ?? undefined,
+    item.repository ?? undefined,
+    typeof metadata.productArea === "string" ? metadata.productArea : undefined,
+    typeof metadata.path === "string" ? metadata.path : undefined,
+  ];
+}
+
+export function replyTextForItem(
+  item: {
+    id: string;
+    sourceUrl: string | null;
+  },
+  relatedItems: RelatedFeedbackItem[] = [],
+): string {
+  const relatedText =
+    relatedItems.length > 0
+      ? [
+          "Related feedback in the same issue cluster - inspect and fix all of these too:",
+          ...relatedItems.map(
+            (related) =>
+              `- ${related.title} (${related.id})${related.sourceUrl ? `: ${related.sourceUrl}` : ""}`,
+          ),
+        ]
+      : [];
   return [
     replyTextPrefix,
     `Factory item: ${item.id}`,
     item.sourceUrl ? `Source: ${item.sourceUrl}` : "",
-    "Please include the Factory item and source link in the PR description.",
+    ...relatedText,
+    "Please include the Factory item, every related item, and their source links in the PR description, and make sure the fix covers the whole cluster rather than one report.",
   ]
     .filter(Boolean)
     .join("\n");
 }
 
+function relatedFeedbackSummary(relatedItems: RelatedFeedbackItem[]): string {
+  if (relatedItems.length === 0) return "";
+  return [
+    "Related feedback in the same issue cluster:",
+    ...relatedItems.map(
+      (related) =>
+        `- ${related.title} (${related.id})${related.sourceUrl ? `: ${related.sourceUrl}` : ""}`,
+    ),
+    "Read and address every related report in one change.",
+  ].join("\n");
+}
+
 async function writeMetadata(
   itemId: string,
   orgId: string,
@@ -104,17 +189,31 @@ async function recordDecision(input: {
 
 export default defineAction({
   description:
-    "Start the governed clear-bug Builder flow for a Factory item. Slack items are kept in-thread by adding 👀 and tagging @builderio; GitHub issues and Sentry errors use the Builder agent run API. Owner-managed Clips, Design, and Content items are always left for their owner.",
+    "Start the governed clear-bug Builder flow for a Factory item. Slack items are kept in-thread by adding 👀 and tagging @builder.io; grouped Slack repeats share one Builder thread. GitHub issues and Sentry errors use the Builder agent run API. Owner-managed Clips, Design, and Content items are always left for their owner.",
   schema: z.object({
     itemId: z.string().min(1),
     clearBug: z.boolean(),
     reason: z.string().trim().min(1).max(4_000),
     productUxImplications: z.boolean().default(false),
     clearErrorReport: z.string().trim().max(8_000).optional(),
+    relatedItemIds: z
+      .array(z.string().trim().min(1))
+      .max(10)
+      .default([])
+      .describe(
+        "Other Factory item ids in the same verified feedback cluster; dispatches one Builder thread for the whole group.",
+      ),
   }),
   http: false,
   run: async (
-    { itemId, clearBug, reason, productUxImplications, clearErrorReport },
+    {
+      itemId,
+      clearBug,
+      reason,
+      productUxImplications,
+      clearErrorReport,
+      relatedItemIds,
+    },
     context,
   ) => {
     const { userEmail, orgId } = await requireWorkspaceMember(
@@ -135,6 +234,65 @@ export default defineAction({
     )[0];
     if (!item) throw new Error("Factory item not found.");
     const metadata = parseTriageMetadata(item.metadataJson);
+    const relatedIds = [...new Set(relatedItemIds)].filter(
+      (relatedId) => relatedId !== itemId,
+    );
+    const relatedItems =
+      relatedIds.length > 0
+        ? await db
+            .select()
+            .from(triageItems)
+            .where(
+              and(
+                eq(triageItems.orgId, orgId),
+                inArray(triageItems.id, relatedIds),
+              ),
+            )
+        : [];
+    if (relatedItems.length !== relatedIds.length) {
+      throw new Error("One or more related Factory items were not found.");
+    }
+    if (relatedItems.some((related) => related.source !== item.source)) {
+      throw new Error(
+        "Grouped Factory items must come from the same feedback source.",
+      );
+    }
+    if (
+      item.source === "slack" &&
+      relatedItems.some((related) => !related.channelId || !related.threadTs)
+    ) {
+      throw new Error(
+        "Grouped Slack feedback is missing a channel or thread identity.",
+      );
+    }
+    const relatedMetadata = new Map(
+      relatedItems.map((related) => [
+        related.id,
+        parseTriageMetadata(related.metadataJson),
+      ]),
+    );
+    const relatedRunRows =
+      relatedIds.length > 0
+        ? await db
+            .select({ itemId: triageRuns.itemId, status: triageRuns.status })
+            .from(triageRuns)
+            .where(
+              and(
+                eq(triageRuns.orgId, orgId),
+                inArray(triageRuns.itemId, relatedIds),
+              ),
+            )
+        : [];
+    for (const related of relatedItems) {
+      const conflictReason = relatedDispatchConflictReason(
+        related,
+        relatedMetadata.get(related.id) ?? {},
+        relatedRunRows
+          .filter((run) => run.itemId === related.id)
+          .map((run) => run.status),
+      );
+      if (conflictReason) throw new Error(conflictReason);
+    }
     const ownerOwnedArea = detectOwnerOwnedArea([
       item.title,
       item.summary,
@@ -144,6 +302,18 @@ export default defineAction({
         : undefined,
       typeof metadata.path === "string" ? metadata.path : undefined,
     ]);
+    const relatedOwnerOwnedArea =
+      relatedItems
+        .map((related) =>
+          detectOwnerOwnedArea(
+            ownerOwnedAreaValuesForItem(
+              related,
+              relatedMetadata.get(related.id) ?? {},
+            ),
+          ),
+        )
+        .find(Boolean) ?? null;
+    const ownerManagedArea = ownerOwnedArea ?? relatedOwnerOwnedArea ?? null;
     const guardResults = [
       {
         code: "unknown_change",
@@ -159,12 +329,12 @@ export default defineAction({
           ? "Product or UX implications require manual ownership."
           : "No product or UX decision was detected.",
       },
-      ...(ownerOwnedArea
+      ...(ownerManagedArea
         ? [
             {
               code: "owner_owned",
               passed: false,
-              reason: `${ownerOwnedArea} is fully owned by its product owner and is excluded from autonomous Builder work.`,
+              reason: `${ownerManagedArea} is fully owned by its product owner and is excluded from autonomous Builder work.`,
             },
           ]
         : []),
@@ -198,7 +368,7 @@ export default defineAction({
           decisionId,
           clearBug,
           productUxImplications,
-          ownerOwnedArea: ownerOwnedArea ?? null,
+          ownerOwnedArea: ownerManagedArea,
           guardResults,
         },
       },
@@ -302,13 +472,20 @@ export default defineAction({
         const workspace =
           config?.slackWorkspace === "secondary" ? "secondary" : "primary";
         const slack = createSlackReader({ ownerEmail: userEmail, orgId });
-        if (!metadataBoolean(metadata, "slackEyesReactedAt")) {
+        for (const feedbackItem of [item, ...relatedItems]) {
+          const feedbackMetadata =
+            feedbackItem.id === itemId
+              ? metadata
+              : parseTriageMetadata(feedbackItem.metadataJson);
+          if (metadataBoolean(feedbackMetadata, "slackEyesReactedAt")) {
+            continue;
+          }
           const reaction = await slack.addEyesReaction(
             workspace,
-            item.channelId,
-            item.threadTs,
+            feedbackItem.channelId!,
+            feedbackItem.threadTs!,
           );
-          await writeMetadata(itemId, orgId, {
+          await writeMetadata(feedbackItem.id, orgId, {
             slackEyesReactedAt: new Date().toISOString(),
             slackEyesReactionAlreadyPresent: reaction.already_present,
           });
@@ -319,11 +496,21 @@ export default defineAction({
           item.threadTs,
           100,
         );
+        const hasCurrentBuilderReply = thread.messages.some((message) =>
+          message.text.includes(replyTextPrefix),
+        );
+        const hasLegacyBuilderReply = thread.messages.some((message) =>
+          message.text.includes(legacyReplyTextPrefix),
+        );
+        const hasRelatedClusterDetails = thread.messages.some((message) =>
+          message.text.includes(
+            "Related feedback in the same issue cluster - inspect and fix all of these too:",
+          ),
+        );
         if (
           thread.has_more &&
-          !thread.messages.some((message) =>
-            message.text.includes(replyTextPrefix),
-          )
+          !hasCurrentBuilderReply &&
+          !hasLegacyBuilderReply
         ) {
           throw new Error(
             "Slack thread is truncated; refusing to risk a duplicate Builder handoff.",
@@ -331,21 +518,47 @@ export default defineAction({
         }
         if (
           !metadataBoolean(metadata, "slackBuilderReplyAt") &&
-          !thread.messages.some((message) =>
-            message.text.includes(replyTextPrefix),
-          )
+          ((!hasCurrentBuilderReply && !hasLegacyBuilderReply) ||
+            (relatedItems.length > 0 && !hasRelatedClusterDetails))
         ) {
           const posted = await slack.postThreadReply(
             workspace,
             item.channelId,
             item.threadTs,
-            replyTextForItem(item),
+            replyTextForItem(item, relatedItems),
           );
           await writeMetadata(itemId, orgId, {
             slackBuilderReplyAt: new Date().toISOString(),
             slackBuilderReplyTs: posted.ts,
           });
         }
+        const clusterItemIds = [itemId, ...relatedItems.map(({ id }) => id)];
+        const clusterMetadata = {
+          feedbackClusterRepresentativeId: itemId,
+          feedbackClusterItemIds: clusterItemIds,
+          feedbackClusterGroupedAt: new Date().toISOString(),
+        };
+        await writeMetadata(itemId, orgId, clusterMetadata);
+        for (const related of relatedItems) {
+          await writeMetadata(related.id, orgId, clusterMetadata);
+          await db
+            .update(triageItems)
+            .set({
+              status: "automation_started",
+              updatedAt: new Date().toISOString(),
+            })
+            .where(
+              and(eq(triageItems.id, related.id), eq(triageItems.orgId, orgId)),
+            );
+          await recordDecision({
+            itemId: related.id,
+            userEmail,
+            orgId,
+            outcome: "propose_fix",
+            reason: `Grouped with Factory item ${itemId}: ${reason}`,
+            guardResults,
+          });
+        }
         await db
           .update(triageItems)
           .set({
@@ -363,7 +576,11 @@ export default defineAction({
             source: item.source,
             sourceUrl: item.sourceUrl,
             summary: "Tagged Builder in the Slack thread and requested a PR.",
-            details: { provider: "bot-tag", runId },
+            details: {
+              provider: "bot-tag",
+              runId,
+              relatedItemIds: relatedItems.map(({ id }) => id),
+            },
           },
         );
         return {
@@ -385,8 +602,10 @@ export default defineAction({
         summary: item.summary,
         sourceUrl: item.sourceUrl,
         instructions: [
+          "Run /address-feedback in the repository and read the address-feedback, address-feedback-with-replies, review-latest-feedback, and review-prs skills as relevant. Inspect all linked evidence and repeat reports, then fix the smallest owning boundary and verify it before opening the PR.",
           reason,
           clearErrorReport ? `Error report:\n${clearErrorReport}` : "",
+          relatedFeedbackSummary(relatedItems),
         ]
           .filter(Boolean)
           .join("\n\n"),

package/corpus/templates/factory/server/plugins/agent-chat.ts

@@ -87,11 +87,15 @@ requests, broad UX suggestions, vague questions, and incomplete context stay
 manual. Clips, Design, and Content are fully owner-managed: never react, tag
 Builder, auto-approve, or auto-merge those items. Slack clear bugs use the
 thread-preserving start-builder-for-item flow; GitHub and Sentry clear bugs use
-the Builder agent-run flow. For pull requests, auto-approval requires an internal
-BuilderIO author, a clear bug, passing CI, and handled review feedback. Auto-merge
-also requires a verified Factory Builder run. When a user says to do a review-gated
-item now, use the explicit approval action, which records the approver and applies
-the rule's configured executor policy. Keep Slack replies concise and link to the
+the Builder agent-run flow. Slack repeat reports must be clustered by underlying
+symptom, with one Builder thread for the cluster and 👀 on every grouped report.
+Use /address-feedback for the repository feedback workflow. For pull requests,
+follow review-prs: read the complete diff and review evidence, verify current
+BuilderIO membership, preserve the ultra-scary safety gate, and distinguish
+unknown or unresolved checks from clean ones. Auto-merge also requires a
+verified Factory Builder run. When a user says to do a review-gated item now,
+use the explicit approval action, which records the approver and applies the
+rule's configured executor policy. Keep Slack replies concise and link to the
 Factory item when a review is needed. The scheduled builder-io-bot PR babysitter
 posts its exact feedback-fix request through GitHub, persists a 20-minute quiet
 window, and never approves or merges.`,

package/corpus/templates/factory/server/plugins/factory-scheduler-job.ts

@@ -181,12 +181,21 @@ const AUTOMATION_SEEDS: AutomationSeed[] = [
     body: `
 # Factory Slack feedback triage
 
-Read the Factory configuration. When Slack polling is enabled and a channel is
-configured, call poll-slack-channel first. Then list at most 2 new or changed
-Slack items by passing needsReview true, source slack, and limit 2. Process
-them sequentially, and call get-slack-feedback-context for each item before
-classifying it. Never list the full queue or use the action's default page
-size.
+Follow the repository's address-feedback, address-feedback-with-replies, and
+review-latest-feedback skills for this workflow, and use review-prs when a PR
+needs review. Read the Factory configuration. When Slack polling is enabled
+and a channel is configured, call poll-slack-channel first. Then list at most 5
+new or changed Slack items by passing needsReview true, source slack, and limit
+5. Use one additional bounded recent Slack lookup with needsReview false,
+source slack, and limit 20 only to find possible repeat reports; never list the
+full queue or use an action's default page size.
+
+Call get-slack-feedback-context for every new item and every possible repeat
+that may belong to the same issue before classifying it. Read the full parent,
+replies, reactions, and linked evidence. An unreadable or truncated thread is
+not a clear bug and must stay manual. Search recent Slack history, local Git
+history, merged PRs, and linked issues for repeats or an existing fix when
+those sources are available.
 
 Start work only for a clear bug: a concrete broken behavior, reproducible
 failure, error, regression, stuck run, incorrect result, or a report with a
@@ -201,10 +210,20 @@ and concrete auth or configuration failures. Use those examples to recognize
 the shape of a bug, not to turn similar-sounding reports into automatic work.
 
 For a clear bug outside Clips, Design, and Content, call start-builder-for-item
-with clearBug true and a short evidence-grounded reason. That action adds the
-eyes reaction and tags @builderio in the Slack thread, asking Builder to fix
-it in a reply and send a PR. Never add the reaction or tag Builder for
-owner-managed Clips, Design, or Content work, or for a non-bug report.
+with clearBug true and a short evidence-grounded reason. If multiple reports
+describe the same underlying issue, treat them as one similar-feedback cluster:
+read and eyeball every report, choose one representative, and call
+start-builder-for-item once with the other Factory item ids in relatedItemIds.
+The action adds 👀 to every grouped Slack thread but posts one Builder reply in
+the representative thread. Do not start one Builder thread per duplicate.
+Separate reports only when their failure modes, surfaces, or owners differ.
+
+The Builder reply must tag @builder.io with the dot and tell it to run
+/address-feedback. It must point Builder to the relevant repository skills,
+the representative source, every related source, and the need to fix the
+underlying boundary across the whole cluster. Never add the reaction or tag
+Builder for owner-managed Clips, Design, or Content work, or for a non-bug
+report.
 
 Keep each run bounded. Preserve action errors and do not claim a Builder reply,
 PR, merge, or fix unless an action returned that state.
@@ -274,6 +293,19 @@ confirmation.
     body: `
 # Factory pull-request governance
 
+Follow the repository's review-prs skill. Read the full PR title, body, linked
+issue and source links, complete changed-file diff including generated and
+migration files, every human and bot review comment and reply, actual check
+conclusions, and the affected ownership boundary. Verify current BuilderIO
+organization membership through the GitHub organization API; never infer it
+from a name, email, association, branch, or bot label. Never approve external
+or unverified authors. Apply the skill's ultra-scary gate for auth, permissions,
+tenant isolation, secrets, destructive data loss, RCE, SSRF, payments,
+deployment, or unexplained dependency and infrastructure risk. Record failed,
+pending, skipped, unknown, and unresolved ordinary feedback accurately - never
+call it clean just because the author is internal. Sid's verified Design-owner
+exception still does not waive membership or the ultra-scary gate.
+
 Read the Factory configuration. When GitHub polling is enabled and a repository
 is configured, call poll-github-sources with includeIssues false and
 includePullRequests true. List at most 3 new or changed pull requests by
@@ -281,11 +313,15 @@ passing needsReview true, source github, and limit 3. Never list the full queue
 or use the action's default page size.
 
 For each open agent-native PR, inspect the item and classify whether it is a
-clear bug fix or has product or UX implications. Call
+clear bug fix or has product or UX implications. Avoid duplicate review noise
+when no commit, review, comment, or check result changed. Call
 govern-agent-native-pull-request with the item id, repository, pull request
 number, clearBug, productUxImplications, and a short reason. The action fetches
-fresh CI and review evidence before approving or merging. Clear internal bug
-fixes with passing CI and handled review feedback may be auto-approved.
+fresh CI and review evidence before approving or merging. For a verified
+current BuilderIO member, the internal-author exception means ordinary failed,
+pending, skipped, or unknown checks and unresolved ordinary feedback do not by
+themselves block approval; record their exact states and never call them clean.
+The exception does not waive membership, ownership, or the ultra-scary gate.
 
 Only auto-merge when the PR proves its Factory origin by retaining the Factory
 item id or source link in the PR description, or by using the Factory branch
@@ -352,7 +388,7 @@ function defaultGithubPollingEnabled(): 0 | 1 {
 function automationPromptGuard(name: string): string | undefined {
   switch (name) {
     case "factory-slack-feedback":
-      return "Runtime safety bound: call list-triage-items with needsReview true, source slack, and limit 2; process at most two Slack items sequentially, and never use the default page size.";
+      return "Runtime safety bound: call list-triage-items with needsReview true, source slack, and limit 5; process at most five new Slack items sequentially, and never use the default page size.";
     case "factory-sentry-errors":
       return "Runtime safety bound: call list-triage-items with needsReview true, source sentry, and limit 3; process at most three Sentry items.";
     case "factory-github-issues":

package/corpus/templates/factory/server/triage/builder-executor.ts

@@ -71,6 +71,7 @@ export async function startBuilderRun(
     input.sourceUrl ? `Source: ${input.sourceUrl}` : "",
     input.repository ? `Repository: ${input.repository}` : "",
     input.instructions ? `Triage instructions: ${input.instructions}` : "",
+    "Run /address-feedback in the repository and read the address-feedback, address-feedback-with-replies, review-latest-feedback, and review-prs skills as relevant. Search for repeat reports, fix the smallest owning boundary, and verify the full path before opening the pull request.",
     "Inspect the repository, make the smallest safe fix, run validation, and open a pull request.",
     "Include the Factory item id and source link in the pull request description.",
     "Do not touch protected areas: auth/session/identity, credentials/vault, migrations, payments, security, or publishable packages.",