@agent-native/core 0.168.7 → 0.168.9

package/corpus/templates/factory/actions/save-triage-config.ts

@@ -1,20 +1,38 @@
 import { defineAction } from "@agent-native/core/action";
-import { and, eq } from "drizzle-orm";
 import { z } from "zod";
 
 import { getDb } from "../server/db/index.js";
 import { triageConfig } from "../server/db/schema.js";
+import {
+  readFactoryDefinition,
+  DEFAULT_FACTORY_ID,
+} from "../server/factory-graph/store.js";
+import {
+  isFactorySlackChannelConflict,
+  resolveEnabledAutomationsFromSavedConfig,
+} from "../server/lib/factory-automation-plan.js";
+import {
+  assertUniqueSlackChannelForFactory,
+  factoryConfigRowId,
+  factoryIdSchema,
+  readTriageConfigRow,
+} from "../server/lib/factory-scope.js";
 import {
   requireWorkspaceMember,
   workspaceMemberIdentityFromContext,
 } from "../server/lib/require-workspace-member.js";
+import {
+  ensureFactoryAutomations,
+  syncFactoryAutomationEnabledStates,
+} from "../server/plugins/factory-scheduler-job.js";
 
 const workspaceSchema = z.enum(["primary", "secondary"]);
 
 export default defineAction({
   description:
-    "Save Factory observation and automation alert settings. Provider credentials live in shared workspace integrations; source routing metadata including the Builder Slack member id is stored on Factory config.",
+    "Save Factory observation and automation alert settings for the selected factory. Provider credentials live in shared workspace integrations; source routing metadata including the Builder Slack member id is stored on Factory config.",
   schema: z.object({
+    factoryId: factoryIdSchema.default(DEFAULT_FACTORY_ID),
     slackWorkspace: workspaceSchema.optional(),
     slackChannelId: z.string().trim().max(128).optional(),
     slackChannelName: z.string().trim().max(200).optional(),
@@ -41,6 +59,7 @@ export default defineAction({
   http: { method: "POST" },
   run: async (
     {
+      factoryId,
       slackWorkspace,
       slackChannelId,
       slackChannelName,
@@ -62,13 +81,11 @@ export default defineAction({
     );
     const now = new Date().toISOString();
     const db = getDb();
-    const existing = (
-      await db
-        .select()
-        .from(triageConfig)
-        .where(and(eq(triageConfig.id, orgId), eq(triageConfig.orgId, orgId)))
-        .limit(1)
-    )[0];
+    if (factoryId !== DEFAULT_FACTORY_ID) {
+      const factory = await readFactoryDefinition(orgId, factoryId);
+      if (!factory) throw new Error("Factory not found.");
+    }
+    const existing = await readTriageConfigRow(db, orgId, factoryId);
     const persistText = (
       next: string | undefined,
       previous: string | null | undefined,
@@ -79,6 +96,12 @@ export default defineAction({
       slackChannelId,
       existing?.slackChannelId,
     );
+    await assertUniqueSlackChannelForFactory(
+      db,
+      orgId,
+      factoryId,
+      persistedSlackChannelId,
+    );
     const persistedSlackChannelName = persistText(
       slackChannelName,
       existing?.slackChannelName,
@@ -130,31 +153,13 @@ export default defineAction({
       automationFailureAlertEmail,
       existing?.automationFailureAlertEmail,
     );
-    await db
-      .insert(triageConfig)
-      .values({
-        id: orgId,
-        slackWorkspace: persistedSlackWorkspace,
-        slackChannelId: persistedSlackChannelId,
-        slackChannelName: persistedSlackChannelName,
-        builderSlackUserId: persistedBuilderSlackUserId,
-        pollingEnabled: persistedPollingEnabled,
-        githubPollingEnabled: persistedGithubPollingEnabled,
-        sentryPollingEnabled: persistedSentryPollingEnabled,
-        sentryOrgSlug: persistedSentryOrgSlug,
-        sentryProjectSlug: persistedSentryProjectSlug,
-        sentryEnvironment: persistedSentryEnvironment,
-        repository: persistedRepository,
-        automationFailureAlertsEnabled: persistedAutomationFailureAlertsEnabled,
-        automationFailureAlertEmail: persistedAutomationFailureAlertEmail,
-        createdAt: now,
-        updatedAt: now,
-        ownerEmail: userEmail,
-        orgId,
-      })
-      .onConflictDoUpdate({
-        target: triageConfig.id,
-        set: {
+    const configId = factoryConfigRowId(orgId, factoryId);
+    try {
+      await db
+        .insert(triageConfig)
+        .values({
+          id: configId,
+          factoryId,
           slackWorkspace: persistedSlackWorkspace,
           slackChannelId: persistedSlackChannelId,
           slackChannelName: persistedSlackChannelName,
@@ -169,12 +174,61 @@ export default defineAction({
           automationFailureAlertsEnabled:
             persistedAutomationFailureAlertsEnabled,
           automationFailureAlertEmail: persistedAutomationFailureAlertEmail,
+          createdAt: now,
           updatedAt: now,
           ownerEmail: userEmail,
-        },
-      });
+          orgId,
+        })
+        .onConflictDoUpdate({
+          target: triageConfig.id,
+          set: {
+            factoryId,
+            slackWorkspace: persistedSlackWorkspace,
+            slackChannelId: persistedSlackChannelId,
+            slackChannelName: persistedSlackChannelName,
+            builderSlackUserId: persistedBuilderSlackUserId,
+            pollingEnabled: persistedPollingEnabled,
+            githubPollingEnabled: persistedGithubPollingEnabled,
+            sentryPollingEnabled: persistedSentryPollingEnabled,
+            sentryOrgSlug: persistedSentryOrgSlug,
+            sentryProjectSlug: persistedSentryProjectSlug,
+            sentryEnvironment: persistedSentryEnvironment,
+            repository: persistedRepository,
+            automationFailureAlertsEnabled:
+              persistedAutomationFailureAlertsEnabled,
+            automationFailureAlertEmail: persistedAutomationFailureAlertEmail,
+            updatedAt: now,
+            ownerEmail: userEmail,
+          },
+        });
+    } catch (error) {
+      if (isFactorySlackChannelConflict(error)) {
+        throw new Error(
+          "That Slack channel is already used by another Factory in this workspace.",
+        );
+      }
+      throw error;
+    }
+
+    const enabledNames = resolveEnabledAutomationsFromSavedConfig({
+      pollingEnabled: persistedPollingEnabled,
+      githubPollingEnabled: persistedGithubPollingEnabled,
+      sentryPollingEnabled: persistedSentryPollingEnabled,
+      slackChannelId: persistedSlackChannelId,
+      repository: persistedRepository,
+      sentryOrgSlug: persistedSentryOrgSlug,
+      sentryProjectSlug: persistedSentryProjectSlug,
+    });
+    await ensureFactoryAutomations(userEmail, orgId, factoryId, {
+      enabledNames,
+    });
+    await syncFactoryAutomationEnabledStates(userEmail, orgId, factoryId, [
+      ...enabledNames,
+    ]);
+
     return {
       ok: true,
+      factoryId,
       pollingEnabled: persistedPollingEnabled === 1,
       githubPollingEnabled: persistedGithubPollingEnabled === 1,
       sentryPollingEnabled: persistedSentryPollingEnabled === 1,

package/corpus/templates/factory/actions/save-triage-rule.ts

@@ -4,6 +4,11 @@ import { z } from "zod";
 
 import { getDb } from "../server/db/index.js";
 import { triageRules } from "../server/db/schema.js";
+import { DEFAULT_FACTORY_ID } from "../server/factory-graph/store.js";
+import {
+  factoryIdSchema,
+  orgFactoryRuleFilter,
+} from "../server/lib/factory-scope.js";
 import {
   requireWorkspaceMember,
   workspaceMemberIdentityFromContext,
@@ -20,6 +25,7 @@ export default defineAction({
   description:
     "Create or update a Factory rule. Disabled and shadow modes are accepted; execution still requires an explicit approval action.",
   schema: z.object({
+    factoryId: factoryIdSchema.default(DEFAULT_FACTORY_ID),
     id: z.string().min(1).optional(),
     name: z.string().trim().min(1).max(120),
     description: z.string().trim().max(500).default(""),
@@ -30,19 +36,24 @@ export default defineAction({
   }),
   http: { method: "POST" },
   run: async (
-    { id, name, description, promptText, mode, enabled, guards },
+    { factoryId, id, name, description, promptText, mode, enabled, guards },
     context,
   ) => {
     const { userEmail, orgId } = await requireWorkspaceMember(
       workspaceMemberIdentityFromContext(context),
     );
     const now = new Date().toISOString();
-    const ruleId = id ?? stableId("rule", orgId, name);
+    const ruleId = id ?? stableId("rule", orgId, factoryId, name);
     const existing = (
       await getDb()
         .select({ promptVersion: triageRules.promptVersion })
         .from(triageRules)
-        .where(and(eq(triageRules.id, ruleId), eq(triageRules.orgId, orgId)))
+        .where(
+          and(
+            eq(triageRules.id, ruleId),
+            orgFactoryRuleFilter(orgId, factoryId),
+          ),
+        )
         .limit(1)
     )[0];
     if (id && !existing) {
@@ -68,6 +79,7 @@ export default defineAction({
         updatedAt: now,
         ownerEmail: userEmail,
         orgId,
+        factoryId,
       })
       .onConflictDoUpdate({
         target: triageRules.id,
@@ -81,6 +93,7 @@ export default defineAction({
           promptVersion: nextPromptVersion,
           updatedAt: now,
           ownerEmail: userEmail,
+          factoryId,
         },
       });
 

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

@@ -4,11 +4,16 @@ import { z } from "zod";
 
 import { getDb } from "../server/db/index.js";
 import {
-  triageConfig,
   triageDecisions,
   triageItems,
   triageRuns,
 } from "../server/db/schema.js";
+import {
+  DEFAULT_FACTORY_ID,
+  orgFactoryItemFilter,
+  orgFactoryRunFilter,
+} from "../server/lib/factory-scope.js";
+import { readTriageConfigRow } from "../server/lib/factory-scope.js";
 import { requireFactoryAutomation } from "../server/lib/require-factory-automation.js";
 import {
   requireWorkspaceMember,
@@ -188,6 +193,7 @@ export async function recordAutomaticBuilderDecision(input: {
   itemId: string;
   userEmail: string;
   orgId: string;
+  factoryId: string;
   outcome: "propose_fix" | "needs_manual";
   reason: string;
   guardResults: Array<{ code: string; passed: boolean; reason: string }>;
@@ -214,6 +220,7 @@ export async function recordAutomaticBuilderDecision(input: {
       createdAt: now,
       ownerEmail: input.userEmail,
       orgId: input.orgId,
+      factoryId: input.factoryId,
     })
     .onConflictDoUpdate({
       target: triageDecisions.id,
@@ -260,11 +267,6 @@ export default defineAction({
     const { userEmail, orgId } = await requireWorkspaceMember(
       workspaceMemberIdentityFromContext(context),
     );
-    await requireFactoryAutomation(
-      context,
-      { userEmail, orgId },
-      "builderDispatch",
-    );
     const db = getDb();
     const item = (
       await db
@@ -274,6 +276,13 @@ export default defineAction({
         .limit(1)
     )[0];
     if (!item) throw new Error("Factory item not found.");
+    const factoryId = item.factoryId ?? DEFAULT_FACTORY_ID;
+    await requireFactoryAutomation(
+      context,
+      { userEmail, orgId },
+      "builderDispatch",
+      factoryId,
+    );
     const metadata = parseTriageMetadata(item.metadataJson);
     const relatedIds = [...new Set(relatedItemIds)].filter(
       (relatedId) => relatedId !== itemId,
@@ -285,7 +294,7 @@ export default defineAction({
             .from(triageItems)
             .where(
               and(
-                eq(triageItems.orgId, orgId),
+                orgFactoryItemFilter(orgId, factoryId),
                 inArray(triageItems.id, relatedIds),
               ),
             )
@@ -319,7 +328,7 @@ export default defineAction({
             .from(triageRuns)
             .where(
               and(
-                eq(triageRuns.orgId, orgId),
+                orgFactoryRunFilter(orgId, factoryId),
                 inArray(triageRuns.itemId, relatedIds),
               ),
             )
@@ -385,6 +394,7 @@ export default defineAction({
       itemId,
       userEmail,
       orgId,
+      factoryId,
       outcome: blocked ? "needs_manual" : "propose_fix",
       reason,
       guardResults,
@@ -395,6 +405,7 @@ export default defineAction({
       {
         action: "start-builder-for-item",
         kind: "decision",
+        factoryId,
         itemId,
         source: item.source,
         sourceUrl: item.sourceUrl,
@@ -483,6 +494,7 @@ export default defineAction({
         error: null,
         ownerEmail: item.ownerEmail,
         orgId,
+        factoryId: item.factoryId ?? DEFAULT_FACTORY_ID,
       });
     }
 
@@ -493,18 +505,11 @@ export default defineAction({
             "Slack feedback is missing its channel or thread identity.",
           );
         }
-        const config = (
-          await db
-            .select({
-              slackWorkspace: triageConfig.slackWorkspace,
-              builderSlackUserId: triageConfig.builderSlackUserId,
-            })
-            .from(triageConfig)
-            .where(
-              and(eq(triageConfig.id, orgId), eq(triageConfig.orgId, orgId)),
-            )
-            .limit(1)
-        )[0];
+        const config = await readTriageConfigRow(
+          db,
+          orgId,
+          item.factoryId ?? DEFAULT_FACTORY_ID,
+        );
         const workspace =
           config?.slackWorkspace === "secondary" ? "secondary" : "primary";
         const builderSlackUserId = requireBuilderSlackUserId(
@@ -638,6 +643,7 @@ export default defineAction({
             itemId: related.id,
             userEmail,
             orgId,
+            factoryId: related.factoryId ?? factoryId,
             outcome: "propose_fix",
             reason: `Grouped with Factory item ${itemId}: ${reason}`,
             guardResults,
@@ -656,6 +662,7 @@ export default defineAction({
           {
             action: "start-builder-for-item",
             kind: "external_action",
+            factoryId,
             itemId,
             source: item.source,
             sourceUrl: item.sourceUrl,
@@ -728,6 +735,7 @@ export default defineAction({
         {
           action: "start-builder-for-item",
           kind: "external_action",
+          factoryId,
           itemId,
           source: item.source,
           sourceUrl: item.sourceUrl,

package/corpus/templates/factory/actions/suggest-factory-rules.ts

@@ -1,9 +1,15 @@
 import { defineAction } from "@agent-native/core/action";
-import { desc, eq } from "drizzle-orm";
+import { desc } from "drizzle-orm";
 import { z } from "zod";
 
 import { getDb } from "../server/db/index.js";
 import { triageDecisions, triageFeedback } from "../server/db/schema.js";
+import { DEFAULT_FACTORY_ID } from "../server/factory-graph/store.js";
+import {
+  factoryIdSchema,
+  orgFactoryDecisionFilter,
+  orgFactoryFeedbackFilter,
+} from "../server/lib/factory-scope.js";
 import {
   requireWorkspaceMember,
   workspaceMemberIdentityFromContext,
@@ -13,11 +19,12 @@ export default defineAction({
   description:
     "Mine human feedback on Factory decisions into inspectable rule proposals. This never edits a rule or enables execution.",
   schema: z.object({
+    factoryId: factoryIdSchema.default(DEFAULT_FACTORY_ID),
     limit: z.coerce.number().int().min(1).max(50).default(10),
   }),
   http: { method: "GET" },
   readOnly: true,
-  run: async ({ limit }, context) => {
+  run: async ({ factoryId, limit }, context) => {
     const { orgId } = await requireWorkspaceMember(
       workspaceMemberIdentityFromContext(context),
     );
@@ -25,13 +32,13 @@ export default defineAction({
     const decisions = await db
       .select()
       .from(triageDecisions)
-      .where(eq(triageDecisions.orgId, orgId))
+      .where(orgFactoryDecisionFilter(orgId, factoryId))
       .orderBy(desc(triageDecisions.createdAt))
       .limit(500);
     const feedback = await db
       .select()
       .from(triageFeedback)
-      .where(eq(triageFeedback.orgId, orgId))
+      .where(orgFactoryFeedbackFilter(orgId, factoryId))
       .orderBy(desc(triageFeedback.createdAt))
       .limit(500);
     const decisionsById = new Map(

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

@@ -41,18 +41,6 @@ export default defineAction({
     const screen: Record<string, unknown> = {};
     if (navigation) screen.navigation = navigation;
 
-    if (
-      navigation &&
-      typeof navigation === "object" &&
-      "view" in navigation &&
-      navigation.view === "factory-settings"
-    ) {
-      screen.factorySettings = {
-        scope: "workspace",
-        path: "/factory-settings",
-      };
-    }
-
     if (
       navigation &&
       typeof navigation === "object" &&
@@ -63,25 +51,29 @@ export default defineAction({
         workspaceMemberIdentityFromContext(context),
       );
       const state = navigation as Record<string, unknown>;
-      const factoryId =
-        typeof state.factoryId === "string" && state.factoryId.trim()
-          ? state.factoryId
-          : DEFAULT_FACTORY_ID;
-      const row = await readFactoryDefinition(orgId, factoryId);
-      const fallback = defaultFactoryDefinition();
-      const graph = row ? parseFactoryGraph(row.graphJson) : fallback.graph;
-      const selectedNodeId =
-        typeof state.factoryNodeId === "string" ? state.factoryNodeId : null;
-      const selectedEdgeId =
-        typeof state.factoryEdgeId === "string" ? state.factoryEdgeId : null;
+      if (state.creatingFactory === true) {
+        screen.factory = { creating: true };
+      } else {
+        const factoryId =
+          typeof state.factoryId === "string" && state.factoryId.trim()
+            ? state.factoryId
+            : DEFAULT_FACTORY_ID;
+        const row = await readFactoryDefinition(orgId, factoryId);
+        const fallback = defaultFactoryDefinition();
+        const graph = row ? parseFactoryGraph(row.graphJson) : fallback.graph;
+        const selectedNodeId =
+          typeof state.factoryNodeId === "string" ? state.factoryNodeId : null;
+        const selectedEdgeId =
+          typeof state.factoryEdgeId === "string" ? state.factoryEdgeId : null;
 
-      screen.factory = {
-        id: factoryId,
-        name: row?.name ?? fallback.name,
-        graphVersion: row?.graphVersion ?? graph.version,
-        selectedNode: graph.nodes.find((node) => node.id === selectedNodeId),
-        selectedEdge: graph.edges.find((edge) => edge.id === selectedEdgeId),
-      };
+        screen.factory = {
+          id: factoryId,
+          name: row?.name ?? fallback.name,
+          graphVersion: row?.graphVersion ?? graph.version,
+          selectedNode: graph.nodes.find((node) => node.id === selectedNodeId),
+          selectedEdge: graph.edges.find((edge) => edge.id === selectedEdgeId),
+        };
+      }
 
       if (state.factoryTab === "agents") {
         const [apps, agents] = await Promise.all([

package/corpus/templates/factory/app/components/factory/FactorySettingsView.tsx

@@ -49,7 +49,11 @@ function formatAutomationDate(value: string | number | null | undefined) {
   return Number.isNaN(date.getTime()) ? String(value) : date.toLocaleString();
 }
 
-export function FactorySettingsView() {
+export function FactorySettingsView({
+  factoryId = "product-feedback",
+}: {
+  factoryId?: string;
+}) {
   const t = useT();
   const [workspace, setWorkspace] = useState<"primary" | "secondary">(
     "primary",
@@ -68,7 +72,7 @@ export function FactorySettingsView() {
     useState(true);
   const [automationFailureAlertEmail, setAutomationFailureAlertEmail] =
     useState("");
-  const query = useActionQuery("get-triage-config", {});
+  const query = useActionQuery("get-triage-config", { factoryId });
   const schedulerHealthQuery = useActionQuery<FactoryAutomationHealth>(
     "get-factory-automation-health",
     {},
@@ -105,6 +109,7 @@ export function FactorySettingsView() {
     }
     try {
       await mutation.mutateAsync({
+        factoryId,
         slackWorkspace: workspace,
         slackChannelId: channelId,
         slackChannelName: channelName,

package/corpus/templates/factory/app/components/factory/FactoryWorkspaceActions.tsx

@@ -6,14 +6,9 @@ import { Link, useLocation, useSearchParams } from "react-router";
 import { Button } from "@/components/ui/button";
 
 export const FACTORY_AGENTS_HREF = "/factory?tab=agents";
-export const FACTORY_SETTINGS_HREF = "/factory-settings";
-export const FACTORY_NEW_HREF = "/factory?new=1";
+export const NEW_FACTORY_HREF = "/new-factory";
 
-export function FactoryWorkspaceActions({
-  onNewFactory,
-}: {
-  onNewFactory?: () => void;
-}) {
+export function FactoryWorkspaceActions() {
   const t = useT();
   const location = useLocation();
   const [searchParams] = useSearchParams();
@@ -22,31 +17,21 @@ export function FactoryWorkspaceActions({
     (location.pathname === "/factory" &&
       searchParams.get("tab") === "agents" &&
       !searchParams.get("factoryId"));
-  const onSettings = location.pathname === "/factory-settings";
+  const onNewFactoryPage = location.pathname === "/new-factory";
 
   return (
     <div className="flex items-center gap-2">
       <Button asChild variant={onAgents ? "default" : "outline"} size="sm">
         <Link to={FACTORY_AGENTS_HREF}>{t("factoryRoute.agentsTab")}</Link>
       </Button>
-      <Button asChild variant={onSettings ? "default" : "outline"} size="sm">
-        <Link to={FACTORY_SETTINGS_HREF}>
-          {t("factoryRoute.factorySettings")}
-        </Link>
-      </Button>
-      {onNewFactory ? (
-        <Button type="button" size="sm" onClick={onNewFactory}>
-          <IconPlus className="size-4" />
-          {t("factoryRoute.newFactory")}
-        </Button>
-      ) : (
-        <Button asChild size="sm">
-          <Link to={FACTORY_NEW_HREF}>
+      {!onNewFactoryPage ? (
+        <Button asChild variant="outline" size="sm">
+          <Link to={NEW_FACTORY_HREF}>
             <IconPlus className="size-4" />
             {t("factoryRoute.newFactory")}
           </Link>
         </Button>
-      )}
+      ) : null}
       <AgentToggleButton />
     </div>
   );