@agent-native/core 0.168.7 → 0.168.10

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>
   );

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

@@ -0,0 +1,260 @@
+import { useActionMutation } from "@agent-native/core/client/hooks";
+import { useT } from "@agent-native/core/client/i18n";
+import {
+  IconAlertCircle,
+  IconBrandGithub,
+  IconBrandSlack,
+  IconLoader2,
+} from "@tabler/icons-react";
+import { useState } from "react";
+import { Link } from "react-router";
+import { toast } from "sonner";
+
+import { Button } from "@/components/ui/button";
+import { Card, CardContent, CardHeader, CardTitle } from "@/components/ui/card";
+import { Input } from "@/components/ui/input";
+import { Label } from "@/components/ui/label";
+import { Switch } from "@/components/ui/switch";
+import { Textarea } from "@/components/ui/textarea";
+
+type CreateFactoryResult = {
+  ok: boolean;
+  factoryId: string;
+  name: string;
+};
+
+export function NewFactoryForm({
+  onCreated,
+}: {
+  onCreated: (factoryId: string) => void;
+}) {
+  const t = useT();
+  const createMutation = useActionMutation("create-factory");
+  const [name, setName] = useState("");
+  const [description, setDescription] = useState("");
+  const [slackChannelId, setSlackChannelId] = useState("");
+  const [slackChannelName, setSlackChannelName] = useState("");
+  const [observeSlack, setObserveSlack] = useState(false);
+  const [repository, setRepository] = useState("");
+  const [observeGithub, setObserveGithub] = useState(false);
+  const [sentryOrgSlug, setSentryOrgSlug] = useState("");
+  const [sentryProjectSlug, setSentryProjectSlug] = useState("");
+  const [sentryEnvironment, setSentryEnvironment] = useState("");
+  const [observeSentry, setObserveSentry] = useState(false);
+
+  async function handleSubmit(event: React.FormEvent) {
+    event.preventDefault();
+    const trimmedName = name.trim();
+    if (!trimmedName) {
+      toast.error(t("factoryRoute.createFactoryNameRequired"));
+      return;
+    }
+    try {
+      const result = (await createMutation.mutateAsync({
+        name: trimmedName,
+        ...(description.trim() ? { description: description.trim() } : {}),
+        ...(slackChannelId.trim()
+          ? { slackChannelId: slackChannelId.trim() }
+          : {}),
+        ...(slackChannelName.trim()
+          ? { slackChannelName: slackChannelName.trim() }
+          : {}),
+        ...(observeSlack ? { observeSlack: true } : {}),
+        ...(repository.trim() ? { repository: repository.trim() } : {}),
+        ...(observeGithub ? { observeGithub: true } : {}),
+        ...(sentryOrgSlug.trim()
+          ? { sentryOrgSlug: sentryOrgSlug.trim() }
+          : {}),
+        ...(sentryProjectSlug.trim()
+          ? { sentryProjectSlug: sentryProjectSlug.trim() }
+          : {}),
+        ...(sentryEnvironment.trim()
+          ? { sentryEnvironment: sentryEnvironment.trim() }
+          : {}),
+        ...(observeSentry ? { observeSentry: true } : {}),
+      })) as CreateFactoryResult;
+      toast.success(t("factoryRoute.createFactorySuccess"));
+      onCreated(result.factoryId);
+    } catch (error) {
+      toast.error(
+        error instanceof Error
+          ? error.message
+          : t("factoryRoute.createFactoryFailed"),
+      );
+    }
+  }
+
+  return (
+    <form
+      className="mx-auto flex w-full max-w-2xl flex-col gap-6"
+      onSubmit={(event) => void handleSubmit(event)}
+    >
+      <div className="space-y-2">
+        <Label htmlFor="new-factory-name">
+          {t("factoryRoute.createFactoryNameLabel")}
+        </Label>
+        <Input
+          id="new-factory-name"
+          value={name}
+          onChange={(event) => setName(event.target.value)}
+          placeholder={t("factoryRoute.newFactory")}
+          autoFocus
+        />
+      </div>
+      <div className="space-y-2">
+        <Label htmlFor="new-factory-description">
+          {t("factoryRoute.createFactoryDescriptionLabel")}
+        </Label>
+        <Textarea
+          id="new-factory-description"
+          value={description}
+          onChange={(event) => setDescription(event.target.value)}
+          rows={2}
+        />
+      </div>
+      <div className="space-y-4">
+        <Card>
+          <CardHeader className="px-4 pb-0 pt-4">
+            <CardTitle className="flex items-center gap-2 text-base">
+              <IconBrandSlack className="size-4" />
+              {t("factoryRoute.createFactorySlackSourceOptional")}
+            </CardTitle>
+          </CardHeader>
+          <CardContent className="space-y-3 px-4 pb-4">
+            <div className="space-y-2">
+              <Label htmlFor="new-factory-slack-channel">
+                {t("triage.slackChannelId")}
+              </Label>
+              <Input
+                id="new-factory-slack-channel"
+                value={slackChannelId}
+                onChange={(event) => setSlackChannelId(event.target.value)}
+                placeholder={t("triage.slackChannelPlaceholder")}
+              />
+            </div>
+            <div className="space-y-2">
+              <Label htmlFor="new-factory-slack-channel-name">
+                {t("triage.slackChannelName")}
+              </Label>
+              <Input
+                id="new-factory-slack-channel-name"
+                value={slackChannelName}
+                onChange={(event) => setSlackChannelName(event.target.value)}
+                placeholder={t("triage.slackChannelNamePlaceholder")}
+              />
+            </div>
+            <div className="flex items-center justify-between gap-3">
+              <Label htmlFor="new-factory-observe-slack">
+                {t("factoryRoute.createFactoryObserveSlack")}
+              </Label>
+              <Switch
+                id="new-factory-observe-slack"
+                checked={observeSlack}
+                onCheckedChange={(checked) => setObserveSlack(checked === true)}
+              />
+            </div>
+          </CardContent>
+        </Card>
+        <Card>
+          <CardHeader className="px-4 pb-0 pt-4">
+            <CardTitle className="flex items-center gap-2 text-base">
+              <IconBrandGithub className="size-4" />
+              {t("factoryRoute.createFactoryGithubSourceOptional")}
+            </CardTitle>
+          </CardHeader>
+          <CardContent className="space-y-3 px-4 pb-4">
+            <div className="space-y-2">
+              <Label htmlFor="new-factory-repository">
+                {t("triage.repository")}
+              </Label>
+              <Input
+                id="new-factory-repository"
+                value={repository}
+                onChange={(event) => setRepository(event.target.value)}
+                placeholder={t("triage.repositoryPlaceholder")}
+              />
+            </div>
+            <div className="flex items-center justify-between gap-3">
+              <Label htmlFor="new-factory-observe-github">
+                {t("factoryRoute.createFactoryObserveGithub")}
+              </Label>
+              <Switch
+                id="new-factory-observe-github"
+                checked={observeGithub}
+                onCheckedChange={(checked) =>
+                  setObserveGithub(checked === true)
+                }
+              />
+            </div>
+          </CardContent>
+        </Card>
+        <Card>
+          <CardHeader className="px-4 pb-0 pt-4">
+            <CardTitle className="flex items-center gap-2 text-base">
+              <IconAlertCircle className="size-4" />
+              {t("factoryRoute.createFactorySentrySourceOptional")}
+            </CardTitle>
+          </CardHeader>
+          <CardContent className="space-y-3 px-4 pb-4">
+            <div className="space-y-2">
+              <Label htmlFor="new-factory-sentry-org">
+                {t("triage.sentryOrgSlug")}
+              </Label>
+              <Input
+                id="new-factory-sentry-org"
+                value={sentryOrgSlug}
+                onChange={(event) => setSentryOrgSlug(event.target.value)}
+                placeholder={t("triage.sentryOrgPlaceholder")}
+              />
+            </div>
+            <div className="space-y-2">
+              <Label htmlFor="new-factory-sentry-project">
+                {t("triage.sentryProjectSlug")}
+              </Label>
+              <Input
+                id="new-factory-sentry-project"
+                value={sentryProjectSlug}
+                onChange={(event) => setSentryProjectSlug(event.target.value)}
+                placeholder={t("triage.sentryProjectPlaceholder")}
+              />
+            </div>
+            <div className="space-y-2">
+              <Label htmlFor="new-factory-sentry-environment">
+                {t("triage.sentryEnvironment")}
+              </Label>
+              <Input
+                id="new-factory-sentry-environment"
+                value={sentryEnvironment}
+                onChange={(event) => setSentryEnvironment(event.target.value)}
+                placeholder={t("triage.sentryEnvironmentPlaceholder")}
+              />
+            </div>
+            <div className="flex items-center justify-between gap-3">
+              <Label htmlFor="new-factory-observe-sentry">
+                {t("factoryRoute.createFactoryObserveSentry")}
+              </Label>
+              <Switch
+                id="new-factory-observe-sentry"
+                checked={observeSentry}
+                onCheckedChange={(checked) =>
+                  setObserveSentry(checked === true)
+                }
+              />
+            </div>
+          </CardContent>
+        </Card>
+      </div>
+      <div className="flex justify-end gap-2">
+        <Button asChild type="button" variant="outline">
+          <Link to="/factory">{t("factoryRoute.createFactoryCancel")}</Link>
+        </Button>
+        <Button type="submit" disabled={createMutation.isPending}>
+          {createMutation.isPending ? (
+            <IconLoader2 className="size-4 animate-spin" />
+          ) : null}
+          {t("factoryRoute.createFactorySubmit")}
+        </Button>
+      </div>
+    </form>
+  );
+}

package/corpus/templates/factory/app/components/layout/Layout.tsx

@@ -42,7 +42,7 @@ function routeOwnsToolbar(pathname: string): boolean {
     pathname === "/chat" ||
     pathname.startsWith("/chat/") ||
     pathname === "/factory" ||
-    pathname === "/factory-settings" ||
+    pathname === "/new-factory" ||
     pathname === "/agents" ||
     pathname === "/database" ||
     pathname.startsWith("/extensions")

package/corpus/templates/factory/app/components/layout/Sidebar.tsx

@@ -445,7 +445,8 @@ export function Sidebar({
               item.href === "/"
                 ? isChatRoute
                 : item.href === "/factory"
-                  ? location.pathname === "/factory"
+                  ? location.pathname === "/factory" ||
+                    location.pathname === "/new-factory"
                   : location.pathname.startsWith(item.href);
             const link = (
               <Link

package/corpus/templates/factory/app/hooks/use-navigation-state.ts

@@ -13,6 +13,7 @@ export interface NavigationState {
   factoryAuditRunId?: string;
   factoryNodeId?: string;
   factoryEdgeId?: string;
+  creatingFactory?: boolean;
 }
 
 export function useNavigationState() {
@@ -48,6 +49,7 @@ export function useNavigationState() {
         ...(pathname === "/factory" && searchParams.get("edge")
           ? { factoryEdgeId: searchParams.get("edge") ?? undefined }
           : {}),
+        ...(pathname === "/new-factory" ? { creatingFactory: true } : {}),
       };
     },
     getCommandPath: (command) =>
@@ -73,7 +75,7 @@ function viewForPath(pathname: string): string {
   if (pathname.startsWith("/extensions")) return "extensions";
   if (pathname.startsWith("/observability")) return "observability";
   if (pathname.startsWith("/agents")) return "agents";
-  if (pathname === "/factory-settings") return "factory-settings";
+  if (pathname === "/new-factory") return "factory";
   if (pathname === "/factory") return "factory";
   if (pathname.startsWith("/settings/agent") || pathname.startsWith("/agent")) {
     return "agent";
@@ -97,8 +99,6 @@ function pathForView(view?: string): string {
       return "/observability";
     case "factory":
       return "/factory";
-    case "factory-settings":
-      return "/factory-settings";
     case "agents":
       return "/agents";
     case "agent":