@agent-native/core 0.168.7 → 0.168.9

package/corpus/templates/factory/app/routes/factory.tsx

@@ -29,6 +29,7 @@ import {
 } from "@/components/factory/FactoryCanvas";
 import { FactoryHistoryView } from "@/components/factory/FactoryHistoryView";
 import { FactoryInspector } from "@/components/factory/FactoryInspector";
+import { FactorySettingsView } from "@/components/factory/FactorySettingsView";
 import { FactoryWorkspaceActions } from "@/components/factory/FactoryWorkspaceActions";
 import { TriageStatusPill } from "@/components/triage/triage-status-pill";
 import { Button } from "@/components/ui/button";
@@ -106,6 +107,7 @@ type WorkspaceTab =
   | "map"
   | "inbox"
   | "rules"
+  | "settings"
   | "automations"
   | "agents"
   | "audit"
@@ -124,6 +126,7 @@ type FactoryAutomationRun = {
 type FactoryAutomation = {
   id: string;
   name: string;
+  displayName: string;
   prompt?: string | null;
   body?: string | null;
   model?: string | null;
@@ -151,7 +154,6 @@ export default function FactoryRoute() {
   const activeTab = parseWorkspaceTab(searchParams.get("tab"));
   const selectedFactoryId = searchParams.get("factoryId");
   const factoryId = selectedFactoryId ?? DEFAULT_FACTORY_ID;
-  const [creating, setCreating] = useState(false);
   const [draftGraph, setDraftGraph] = useState<FactoryCanvasGraph | null>(null);
   const [dirty, setDirty] = useState(false);
   const [saveError, setSaveError] = useState<string | null>(null);
@@ -183,7 +185,6 @@ export default function FactoryRoute() {
     nextFactoryId: string,
     options?: { tab?: WorkspaceTab; replace?: boolean },
   ) {
-    setCreating(false);
     setDraftGraph(null);
     setDirty(false);
     setSelectedNodeId(null);
@@ -241,12 +242,12 @@ export default function FactoryRoute() {
   const factoryList = (factoryListQuery.data ?? []) as FactorySummary[];
 
   useEffect(() => {
-    if (!graphData || creating || dirty) return;
+    if (!graphData || dirty) return;
     setDraftGraph(graphData.graph);
     setDirty(false);
     setSelectedNodeId(null);
     setSelectedEdgeId(null);
-  }, [creating, dirty, graphData]);
+  }, [dirty, graphData]);
 
   useEffect(() => {
     setSelectedNodeId(searchParams.get("node"));
@@ -255,7 +256,6 @@ export default function FactoryRoute() {
 
   useEffect(() => {
     if (selectedFactoryId) return;
-    setCreating(false);
     setDraftGraph(null);
     setDirty(false);
     setSelectedNodeId(null);
@@ -352,37 +352,6 @@ export default function FactoryRoute() {
     });
   }
 
-  function startNewFactory() {
-    const id = `factory-${Date.now().toString(36)}`;
-    openFactory(id, { tab: "overview" });
-    setCreating(true);
-    setDraftGraph({
-      version: 1,
-      name: t("factoryRoute.newFactory"),
-      description: t("factoryRoute.newFactoryDescription"),
-      executionMode: "blueprint",
-      nodes: [
-        {
-          id: "start",
-          label: t("factoryRoute.newStep"),
-          description: t("factoryRoute.newStepDescription"),
-          kind: "decision",
-          provider: "factory",
-          position: { x: 240, y: 220 },
-        },
-      ],
-      edges: [],
-    });
-    setDirty(true);
-    setSelectedNodeId(null);
-    setSelectedEdgeId(null);
-  }
-
-  useEffect(() => {
-    if (searchParams.get("new") !== "1") return;
-    startNewFactory();
-  }, [searchParams]);
-
   async function saveGraph() {
     if (!graph || !selectedFactoryId) return;
     const submittedDraftRevision = draftRevisionRef.current;
@@ -392,15 +361,12 @@ export default function FactoryRoute() {
         factoryId: selectedFactoryId,
         name: graph.name,
         description: graph.description,
-        prompt: creating ? "" : (graphData?.factory.prompt ?? ""),
+        prompt: graphData?.factory.prompt ?? "",
         source: "manual",
-        changeSummary: creating
-          ? "Created from the Factory visual editor."
-          : "Updated in the Factory visual editor.",
-        expectedGraphVersion: creating ? 0 : graph.version,
+        changeSummary: "Updated in the Factory visual editor.",
+        expectedGraphVersion: graph.version,
         graph,
       });
-      setCreating(false);
       setDirty(draftRevisionRef.current !== submittedDraftRevision);
       setSaveConflictRemoteGraph(null);
       await Promise.all([graphQuery.refetch(), factoryListQuery.refetch()]);
@@ -445,13 +411,11 @@ export default function FactoryRoute() {
     setSaveConflictRemoteGraph(null);
     setSaveError(null);
     setDirty(false);
-    setCreating(false);
     setSelectedNodeId(null);
     setSelectedEdgeId(null);
   }
 
   async function handleFactoryRestored(result?: { graph: FactoryCanvasGraph }) {
-    setCreating(false);
     if (result?.graph) setDraftGraph(result.graph);
     else setDraftGraph(null);
     setDirty(false);
@@ -468,9 +432,10 @@ export default function FactoryRoute() {
     }
   }
 
-  if (searchParams.get("tab") === "settings") {
-    return <Navigate to="/factory-settings" replace />;
+  if (searchParams.get("new") === "1") {
+    return <Navigate to="/new-factory" replace />;
   }
+
   if (selectedFactoryId && searchParams.get("tab") === "agents") {
     return <Navigate to="/factory?tab=agents" replace />;
   }
@@ -488,7 +453,7 @@ export default function FactoryRoute() {
             {t("factoryRoute.agentsTitle")}
           </h1>
           <div className="ms-auto">
-            <FactoryWorkspaceActions onNewFactory={startNewFactory} />
+            <FactoryWorkspaceActions />
           </div>
         </div>
         <FactoryAgentsView />
@@ -502,7 +467,7 @@ export default function FactoryRoute() {
         <section className="mx-auto flex w-full max-w-6xl flex-1 flex-col gap-6 p-4 lg:p-6">
           <div className="flex flex-wrap items-end justify-between gap-4">
             <h1 className="text-2xl font-semibold tracking-tight">Factories</h1>
-            <FactoryWorkspaceActions onNewFactory={startNewFactory} />
+            <FactoryWorkspaceActions />
           </div>
 
           {factoryListQuery.isError ? (
@@ -598,7 +563,7 @@ export default function FactoryRoute() {
               </Button>
               <div className="h-5 w-48 animate-pulse rounded bg-muted" />
             </div>
-            <FactoryWorkspaceActions onNewFactory={startNewFactory} />
+            <FactoryWorkspaceActions />
           </div>
         </header>
         <main className="flex flex-1 items-center justify-center p-6">
@@ -645,7 +610,7 @@ export default function FactoryRoute() {
             </span>
           </div>
           <div className="flex items-center gap-2">
-            <FactoryWorkspaceActions onNewFactory={startNewFactory} />
+            <FactoryWorkspaceActions />
           </div>
         </div>
         <div className="flex items-center gap-2 overflow-x-auto px-2 py-2 sm:px-4 lg:px-6">
@@ -695,6 +660,12 @@ export default function FactoryRoute() {
             >
               {t("factoryRoute.historyTab")}
             </TabButton>
+            <TabButton
+              active={activeTab === "settings"}
+              onClick={() => setActiveTab("settings")}
+            >
+              {t("factoryRoute.factorySettings")}
+            </TabButton>
           </nav>
           {activeTab === "audit" && (
             <Button
@@ -723,6 +694,7 @@ export default function FactoryRoute() {
             onOpenAutomations={() => setActiveTab("automations")}
             onOpenActivity={() => setActiveTab("audit")}
             onOpenFlow={() => setActiveTab("map")}
+            onOpenSettings={() => setActiveTab("settings")}
           />
         ) : activeTab === "map" ? (
           <div className="grid min-h-full gap-4 p-4 lg:p-6 xl:grid-cols-[minmax(0,1fr)_360px]">
@@ -769,9 +741,11 @@ export default function FactoryRoute() {
             />
           </div>
         ) : activeTab === "inbox" ? (
-          <InboxView t={t} />
+          <InboxView factoryId={factoryId} t={t} />
         ) : activeTab === "rules" ? (
-          <RulesView t={t} />
+          <RulesView factoryId={factoryId} t={t} />
+        ) : activeTab === "settings" ? (
+          <FactorySettingsView factoryId={factoryId} />
         ) : activeTab === "automations" ? (
           <AutomationsView factoryId={factoryId} t={t} />
         ) : activeTab === "audit" ? (
@@ -817,6 +791,7 @@ function parseWorkspaceTab(value: string | null): WorkspaceTab {
   return value === "map" ||
     value === "inbox" ||
     value === "rules" ||
+    value === "settings" ||
     value === "automations" ||
     value === "agents" ||
     value === "audit" ||
@@ -834,6 +809,7 @@ function OverviewView({
   onOpenAutomations,
   onOpenActivity,
   onOpenFlow,
+  onOpenSettings,
 }: {
   graph: FactoryCanvasGraph;
   t: ReturnType<typeof useT>;
@@ -843,6 +819,7 @@ function OverviewView({
   onOpenAutomations: () => void;
   onOpenActivity: () => void;
   onOpenFlow: () => void;
+  onOpenSettings: () => void;
 }) {
   return (
     <div className="mx-auto flex w-full max-w-5xl flex-col gap-4 p-4 lg:p-6">
@@ -919,10 +896,12 @@ function OverviewView({
             <Button type="button" variant="outline" onClick={onOpenActivity}>
               Activity
             </Button>
-            <Button asChild type="button" variant="outline">
-              <Link to="/factory-settings">
-                {t("factoryRoute.factorySettings")}
-              </Link>
+            <Button
+              type="button"
+              variant="outline"
+              onClick={() => onOpenSettings?.()}
+            >
+              {t("factoryRoute.factorySettings")}
             </Button>
             <Button type="button" onClick={onOpenFlow}>
               {t("factoryRoute.editFlow")}
@@ -1015,6 +994,7 @@ function AutomationsView({
         current &&
         current.id === nextDraft.id &&
         current.name === nextDraft.name &&
+        current.displayName === nextDraft.displayName &&
         current.prompt === nextDraft.prompt &&
         current.body === nextDraft.body &&
         current.model === nextDraft.model &&
@@ -1035,6 +1015,7 @@ function AutomationsView({
         factoryId,
         automationId: draft.id,
         name: draft.name,
+        displayName: draft.displayName,
         prompt: draft.prompt ?? draft.body ?? "",
         model: draft.model ?? "",
         schedule: draft.schedule ?? "",
@@ -1101,8 +1082,11 @@ function AutomationsView({
                       }`}
                       onClick={() => selectAutomation(automation.id)}
                     >
-                      <span className="block truncate text-sm font-medium">
-                        {automation.name}
+                      <span
+                        className="block truncate text-sm font-medium"
+                        title={automation.name}
+                      >
+                        {automation.displayName}
                       </span>
                       <span className="mt-1 block truncate text-xs text-muted-foreground">
                         {automation.enabled
@@ -1171,6 +1155,22 @@ function AutomationsView({
               </p>
             ) : (
               <>
+                <div className="grid gap-1.5">
+                  <Label htmlFor="factory-automation-display-name">
+                    {t("factoryRoute.automationDisplayName")}
+                  </Label>
+                  <Input
+                    id="factory-automation-display-name"
+                    value={draft.displayName}
+                    onChange={(event) =>
+                      setDraft({ ...draft, displayName: event.target.value })
+                    }
+                    placeholder={t(
+                      "factoryRoute.automationDisplayNamePlaceholder",
+                    )}
+                    disabled={draft.canUpdate === false}
+                  />
+                </div>
                 <div className="grid gap-4 md:grid-cols-2">
                   <div className="grid gap-1.5">
                     <Label htmlFor="factory-automation-model">
@@ -1407,7 +1407,13 @@ function formatModelName(model: string | null | undefined) {
     .join(" ");
 }
 
-function InboxView({ t }: { t: ReturnType<typeof useT> }) {
+function InboxView({
+  factoryId,
+  t,
+}: {
+  factoryId: string;
+  t: ReturnType<typeof useT>;
+}) {
   const [searchParams, setSearchParams] = useSearchParams();
   const [status, setStatus] = useState("");
   const [selectedId, setSelectedId] = useState<string | null>(
@@ -1417,6 +1423,7 @@ function InboxView({ t }: { t: ReturnType<typeof useT> }) {
   const [verdict, setVerdict] = useState<Verdict | null>(null);
   const selectedRowRef = useRef<HTMLButtonElement | null>(null);
   const listQuery = useActionQuery("list-triage-items", {
+    factoryId,
     limit: 50,
     ...(status.trim()
       ? {
@@ -1434,7 +1441,7 @@ function InboxView({ t }: { t: ReturnType<typeof useT> }) {
   });
   const detailQuery = useActionQuery(
     "get-triage-item",
-    selectedId ? { itemId: selectedId } : undefined,
+    selectedId ? { factoryId, itemId: selectedId } : undefined,
     { enabled: Boolean(selectedId) },
   );
   const feedbackMutation = useActionMutation("record-triage-feedback");
@@ -1657,6 +1664,7 @@ function InboxView({ t }: { t: ReturnType<typeof useT> }) {
                     ];
                   if (!decision) return;
                   approveMutation.mutate({
+                    factoryId,
                     itemId: selectedItem.itemId ?? selectedItem.id ?? "",
                     decisionId: decision.decisionId,
                     confirm: true,
@@ -1711,6 +1719,7 @@ function InboxView({ t }: { t: ReturnType<typeof useT> }) {
                         onClick={() => {
                           if (verdict)
                             feedbackMutation.mutate({
+                              factoryId,
                               decisionId: decision.decisionId,
                               verdict,
                               ...(feedbackNote.trim()
@@ -1738,11 +1747,17 @@ function InboxView({ t }: { t: ReturnType<typeof useT> }) {
   );
 }
 
-function RulesView({ t }: { t: ReturnType<typeof useT> }) {
+function RulesView({
+  factoryId,
+  t,
+}: {
+  factoryId: string;
+  t: ReturnType<typeof useT>;
+}) {
   const [editingId, setEditingId] = useState<string | null>(null);
   const [name, setName] = useState("");
   const [prompt, setPrompt] = useState("");
-  const rulesQuery = useActionQuery("list-triage-rules", {});
+  const rulesQuery = useActionQuery("list-triage-rules", { factoryId });
   const saveMutation = useActionMutation("save-triage-rule");
   const rules = (rulesQuery.data ?? []) as TriageRule[];
   function selectRule(rule: TriageRule) {
@@ -1828,6 +1843,7 @@ function RulesView({ t }: { t: ReturnType<typeof useT> }) {
             onClick={() => {
               if (!name.trim() || !prompt.trim()) return;
               saveMutation.mutate({
+                factoryId,
                 ...(editingId ? { id: editingId } : {}),
                 name,
                 description: "",

package/corpus/templates/factory/app/routes/{factory-settings.tsx → new-factory.tsx}

@@ -1,17 +1,14 @@
 import { useT } from "@agent-native/core/client/i18n";
 import { IconArrowLeft } from "@tabler/icons-react";
-import { Link } from "react-router";
+import { Link, useNavigate } from "react-router";
 
-import { FactorySettingsView } from "@/components/factory/FactorySettingsView";
 import { FactoryWorkspaceActions } from "@/components/factory/FactoryWorkspaceActions";
+import { NewFactoryForm } from "@/components/factory/NewFactoryForm";
 import { Button } from "@/components/ui/button";
 
-export function meta() {
-  return [{ title: "Factory" }];
-}
-
-export default function FactorySettingsRoute() {
+export default function NewFactoryRoute() {
   const t = useT();
+  const navigate = useNavigate();
 
   return (
     <div className="flex h-full min-h-0 flex-col overflow-y-auto bg-background">
@@ -22,13 +19,19 @@ export default function FactorySettingsRoute() {
           </Link>
         </Button>
         <h1 className="text-sm font-medium sm:text-base">
-          {t("factoryRoute.factorySettings")}
+          {t("factoryRoute.createFactoryTitle")}
         </h1>
         <div className="ms-auto">
           <FactoryWorkspaceActions />
         </div>
       </div>
-      <FactorySettingsView />
+      <section className="flex flex-1 flex-col px-4 pb-8 lg:px-6">
+        <NewFactoryForm
+          onCreated={(factoryId) =>
+            navigate(`/factory?factoryId=${encodeURIComponent(factoryId)}`)
+          }
+        />
+      </section>
     </div>
   );
 }

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

@@ -31,14 +31,20 @@ export const triageItems = table(
     updatedAt: text("updated_at").notNull().default(now()),
     ownerEmail: text("owner_email").notNull(),
     orgId: text("org_id"),
+    factoryId: text("factory_id"),
   },
   (item) => ({
-    orgDedupeUnique: uniqueIndex("factory_items_org_dedupe_idx").on(
+    orgFactoryDedupeUnique: uniqueIndex(
+      "factory_items_org_factory_dedupe_idx",
+    ).on(item.orgId, item.factoryId, item.dedupeKey),
+    orgStatusIdx: index("factory_items_org_status_idx").on(
       item.orgId,
-      item.dedupeKey,
+      item.status,
+      item.updatedAt,
     ),
-    orgStatusIdx: index("factory_items_org_status_idx").on(
+    orgFactoryStatusIdx: index("factory_items_org_factory_status_idx").on(
       item.orgId,
+      item.factoryId,
       item.status,
       item.updatedAt,
     ),
@@ -58,6 +64,7 @@ export const triageRules = table("factory_rules", {
   updatedAt: text("updated_at").notNull().default(now()),
   ownerEmail: text("owner_email").notNull(),
   orgId: text("org_id"),
+  factoryId: text("factory_id"),
 });
 
 export const triageDecisions = table("factory_decisions", {
@@ -73,6 +80,7 @@ export const triageDecisions = table("factory_decisions", {
   createdAt: text("created_at").notNull().default(now()),
   ownerEmail: text("owner_email").notNull(),
   orgId: text("org_id"),
+  factoryId: text("factory_id"),
 });
 
 export const triageRuns = table("factory_runs", {
@@ -93,6 +101,7 @@ export const triageRuns = table("factory_runs", {
   error: text("error"),
   ownerEmail: text("owner_email").notNull(),
   orgId: text("org_id"),
+  factoryId: text("factory_id"),
 });
 
 export const triageFeedback = table("factory_feedback", {
@@ -103,6 +112,7 @@ export const triageFeedback = table("factory_feedback", {
   createdAt: text("created_at").notNull().default(now()),
   ownerEmail: text("owner_email").notNull(),
   orgId: text("org_id"),
+  factoryId: text("factory_id"),
 });
 
 export const triageConfig = table("factory_config", {
@@ -131,6 +141,7 @@ export const triageConfig = table("factory_config", {
   updatedAt: text("updated_at").notNull().default(now()),
   ownerEmail: text("owner_email").notNull(),
   orgId: text("org_id"),
+  factoryId: text("factory_id"),
 });
 
 export const factoryAuditEvents = table(
@@ -151,12 +162,16 @@ export const factoryAuditEvents = table(
     createdAt: text("created_at").notNull().default(now()),
     ownerEmail: text("owner_email").notNull(),
     orgId: text("org_id"),
+    factoryId: text("factory_id"),
   },
   (event) => ({
     orgCreatedIdx: index("factory_audit_events_org_created_idx").on(
       event.orgId,
       event.createdAt,
     ),
+    orgFactoryCreatedIdx: index(
+      "factory_audit_events_org_factory_created_idx",
+    ).on(event.orgId, event.factoryId, event.createdAt),
     runCreatedIdx: index("factory_audit_events_run_created_idx").on(
       event.orgId,
       event.automationRunId,

package/corpus/templates/factory/server/factory-graph/contracts.ts

@@ -91,6 +91,30 @@ export function normalizeFactoryGraph(value: unknown): FactoryGraph {
   };
 }
 
+export function minimalFactoryGraph(
+  name: string,
+  description = "",
+): FactoryGraph {
+  return {
+    version: 1,
+    name,
+    description,
+    executionMode: "blueprint",
+    nodes: [
+      {
+        id: "start",
+        label: "Start",
+        description:
+          "Add sources and rules to route work through this factory.",
+        kind: "decision",
+        provider: "factory",
+        position: { x: 240, y: 220 },
+      },
+    ],
+    edges: [],
+  };
+}
+
 export function defaultFactoryGraph(): FactoryGraph {
   return {
     version: 1,

package/corpus/templates/factory/server/factory-graph/store.ts

@@ -62,6 +62,7 @@ export async function readFactoryDefinition(orgId: string, factoryId: string) {
 
 export async function readFactoryMetrics(
   orgId: string,
+  factoryId: string,
 ): Promise<FactoryMetricSummary> {
   const [
     totalItems,
@@ -72,13 +73,18 @@ export async function readFactoryMetrics(
     runs,
     completedRuns,
   ] = await Promise.all([
-    countRows(triageItems, orgId),
-    countRows(triageItems, orgId, eq(triageItems.source, "slack")),
-    countRows(triageItems, orgId, eq(triageItems.source, "github")),
-    countRows(triageDecisions, orgId),
-    countRows(triageItems, orgId, eq(triageItems.status, "needs_manual")),
-    countRows(triageRuns, orgId),
-    countRows(triageRuns, orgId, eq(triageRuns.status, "completed")),
+    countRows(triageItems, orgId, factoryId),
+    countRows(triageItems, orgId, factoryId, eq(triageItems.source, "slack")),
+    countRows(triageItems, orgId, factoryId, eq(triageItems.source, "github")),
+    countRows(triageDecisions, orgId, factoryId),
+    countRows(
+      triageItems,
+      orgId,
+      factoryId,
+      eq(triageItems.status, "needs_manual"),
+    ),
+    countRows(triageRuns, orgId, factoryId),
+    countRows(triageRuns, orgId, factoryId, eq(triageRuns.status, "completed")),
   ]);
 
   return {
@@ -95,11 +101,12 @@ export async function readFactoryMetrics(
 async function countRows(
   table: typeof triageItems | typeof triageDecisions | typeof triageRuns,
   orgId: string,
+  factoryId: string,
   extra?: SQL,
 ) {
   const where = extra
-    ? and(eq(table.orgId, orgId), extra)
-    : eq(table.orgId, orgId);
+    ? and(eq(table.orgId, orgId), eq(table.factoryId, factoryId), extra)
+    : and(eq(table.orgId, orgId), eq(table.factoryId, factoryId));
   const row = (
     await getDb().select({ value: count() }).from(table).where(where)
   )[0];