@agent-native/core 0.164.4 → 0.164.12

package/corpus/templates/factory/actions/restore-factory-graph-version.ts

@@ -0,0 +1,163 @@
+import { defineAction } from "@agent-native/core/action";
+import { buildDeepLink } from "@agent-native/core/server";
+import { and, eq } from "drizzle-orm";
+import { z } from "zod";
+
+import { getDb } from "../server/db/index.js";
+import {
+  factoryDefinitions,
+  factoryGraphVersions,
+} from "../server/db/schema.js";
+import { normalizeFactoryGraph } from "../server/factory-graph/contracts.js";
+import {
+  DEFAULT_FACTORY_ID,
+  parseFactoryGraph,
+} from "../server/factory-graph/store.js";
+import {
+  requireWorkspaceMember,
+  workspaceMemberIdentityFromContext,
+} from "../server/lib/require-workspace-member.js";
+import { stableId } from "../server/triage/ids.js";
+
+export default defineAction({
+  description:
+    "Restore a Factory visual graph version. Restoring never deletes history: it validates the selected snapshot, appends it as a new version, and makes that new version current while preserving the Factory prompt.",
+  schema: z.object({
+    factoryId: z
+      .string()
+      .trim()
+      .min(1)
+      .max(120)
+      .regex(/^[a-z0-9][a-z0-9-]*$/)
+      .default(DEFAULT_FACTORY_ID),
+    versionId: z.string().trim().min(1).max(240),
+  }),
+  link: ({ result }) => ({
+    url: buildDeepLink({
+      app: "factory",
+      view: "factory",
+      params: { factoryId: result.factoryId, tab: "history" },
+    }),
+    label: `Open ${result.name} history in Factory`,
+  }),
+  run: async ({ factoryId, versionId }, context) => {
+    const { userEmail, orgId } = await requireWorkspaceMember(
+      workspaceMemberIdentityFromContext(context),
+    );
+    const db = getDb();
+
+    return db.transaction(async (tx) => {
+      const definition = (
+        await tx
+          .select()
+          .from(factoryDefinitions)
+          .where(
+            and(
+              eq(factoryDefinitions.id, factoryId),
+              eq(factoryDefinitions.orgId, orgId),
+            ),
+          )
+          .limit(1)
+      )[0];
+      if (!definition) {
+        throw new Error("Factory has no saved definition to restore.");
+      }
+
+      const version = (
+        await tx
+          .select()
+          .from(factoryGraphVersions)
+          .where(
+            and(
+              eq(factoryGraphVersions.id, versionId),
+              eq(factoryGraphVersions.factoryId, factoryId),
+              eq(factoryGraphVersions.orgId, orgId),
+            ),
+          )
+          .limit(1)
+      )[0];
+      if (!version) {
+        throw new Error("Factory graph version not found.");
+      }
+
+      const selectedGraph = parseFactoryGraph(version.graphJson);
+
+      if (version.version === definition.graphVersion) {
+        return {
+          ok: true,
+          alreadyCurrent: true,
+          factoryId,
+          versionId: version.id,
+          restoredFromVersion: version.version,
+          graphVersion: definition.graphVersion,
+          name: definition.name,
+          graph: selectedGraph,
+          source: "restore" as const,
+        };
+      }
+
+      const nextVersion = definition.graphVersion + 1;
+      const restoredGraph = normalizeFactoryGraph({
+        ...selectedGraph,
+        version: nextVersion,
+      });
+      const now = new Date().toISOString();
+      const nextVersionId = stableId(
+        "factory-graph",
+        orgId,
+        factoryId,
+        String(nextVersion),
+      );
+      const changeSummary = `Restored version ${version.version}.`;
+
+      const updated = await tx
+        .update(factoryDefinitions)
+        .set({
+          name: restoredGraph.name,
+          description: restoredGraph.description,
+          graphVersion: nextVersion,
+          graphJson: JSON.stringify(restoredGraph),
+          updatedAt: now,
+          ownerEmail: userEmail,
+        })
+        .where(
+          and(
+            eq(factoryDefinitions.id, factoryId),
+            eq(factoryDefinitions.orgId, orgId),
+            eq(factoryDefinitions.graphVersion, definition.graphVersion),
+          ),
+        )
+        .returning({ id: factoryDefinitions.id });
+      if (updated.length === 0) {
+        throw new Error(
+          "Factory changed while restoring. Refresh history and try again.",
+        );
+      }
+
+      await tx.insert(factoryGraphVersions).values({
+        id: nextVersionId,
+        factoryId,
+        version: nextVersion,
+        graphJson: JSON.stringify(restoredGraph),
+        source: "restore",
+        changeSummary,
+        createdAt: now,
+        createdBy: userEmail,
+        ownerEmail: userEmail,
+        orgId,
+      });
+
+      return {
+        ok: true,
+        alreadyCurrent: false,
+        factoryId,
+        versionId: nextVersionId,
+        restoredFromVersion: version.version,
+        graphVersion: nextVersion,
+        name: restoredGraph.name,
+        graph: restoredGraph,
+        source: "restore" as const,
+      };
+    });
+  },
+});

package/corpus/templates/factory/actions/save-factory-graph.ts

@@ -12,10 +12,7 @@ import {
   factoryGraphSchema,
   normalizeFactoryGraph,
 } from "../server/factory-graph/contracts.js";
-import {
-  DEFAULT_FACTORY_ID,
-  readFactoryDefinition,
-} from "../server/factory-graph/store.js";
+import { DEFAULT_FACTORY_ID } from "../server/factory-graph/store.js";
 import {
   requireWorkspaceMember,
   workspaceMemberIdentityFromContext,
@@ -24,7 +21,7 @@ import { stableId } from "../server/triage/ids.js";
 
 export default defineAction({
   description:
-    "Create or update a Factory's versioned visual graph. Use source=ai for an agent-proposed graph and source=manual for a direct editor save. This changes configuration only; it never starts provider work.",
+    "Create or update a Factory's versioned visual graph. Pass expectedGraphVersion from the graph you inspected so stale edits are rejected. Use source=ai for an agent-proposed graph and source=manual for a direct editor save. This changes configuration only; it never starts provider work.",
   schema: z.object({
     factoryId: z
       .string()
@@ -38,6 +35,7 @@ export default defineAction({
     prompt: z.string().trim().max(10_000).default(""),
     source: z.enum(["manual", "ai", "seed"]).default("manual"),
     changeSummary: z.string().trim().max(500).default(""),
+    expectedGraphVersion: z.coerce.number().int().nonnegative(),
     graph: factoryGraphSchema,
   }),
   link: ({ result }) => ({
@@ -49,81 +47,116 @@ export default defineAction({
     label: `Open ${result.name} in Factory`,
   }),
   run: async (
-    { factoryId, name, description, prompt, source, changeSummary, graph },
+    {
+      factoryId,
+      name,
+      description,
+      prompt,
+      source,
+      changeSummary,
+      expectedGraphVersion,
+      graph,
+    },
     context,
   ) => {
     const { userEmail, orgId } = await requireWorkspaceMember(
       workspaceMemberIdentityFromContext(context),
     );
     const db = getDb();
-    const existing = await readFactoryDefinition(orgId, factoryId);
-    const nextVersion = (existing?.graphVersion ?? 0) + 1;
-    const normalizedGraph = normalizeFactoryGraph({
-      ...graph,
-      version: nextVersion,
-      name,
-      description,
-    });
-    const now = new Date().toISOString();
-    const versionId = stableId(
-      "factory-graph",
-      orgId,
-      factoryId,
-      String(nextVersion),
-    );
 
-    await db.insert(factoryGraphVersions).values({
-      id: versionId,
-      factoryId,
-      version: nextVersion,
-      graphJson: JSON.stringify(normalizedGraph),
-      source,
-      changeSummary,
-      createdAt: now,
-      createdBy: userEmail,
-      ownerEmail: userEmail,
-      orgId,
-    });
+    return db.transaction(async (tx) => {
+      const existing = (
+        await tx
+          .select()
+          .from(factoryDefinitions)
+          .where(
+            and(
+              eq(factoryDefinitions.id, factoryId),
+              eq(factoryDefinitions.orgId, orgId),
+            ),
+          )
+          .limit(1)
+      )[0];
+      if ((existing?.graphVersion ?? 0) !== expectedGraphVersion) {
+        throw new Error(
+          "Factory changed while saving. Refresh the Factory and try again.",
+        );
+      }
+      const nextVersion = (existing?.graphVersion ?? 0) + 1;
+      const normalizedGraph = normalizeFactoryGraph({
+        ...graph,
+        version: nextVersion,
+        name,
+        description,
+      });
+      const now = new Date().toISOString();
+      const versionId = stableId(
+        "factory-graph",
+        orgId,
+        factoryId,
+        String(nextVersion),
+      );
 
-    if (existing) {
-      await db
-        .update(factoryDefinitions)
-        .set({
+      if (existing) {
+        const updated = await tx
+          .update(factoryDefinitions)
+          .set({
+            name,
+            description,
+            prompt,
+            graphVersion: nextVersion,
+            graphJson: JSON.stringify(normalizedGraph),
+            updatedAt: now,
+            ownerEmail: userEmail,
+          })
+          .where(
+            and(
+              eq(factoryDefinitions.id, factoryId),
+              eq(factoryDefinitions.orgId, orgId),
+              eq(factoryDefinitions.graphVersion, expectedGraphVersion),
+            ),
+          )
+          .returning({ id: factoryDefinitions.id });
+        if (updated.length === 0) {
+          throw new Error(
+            "Factory changed while saving. Refresh the Factory and try again.",
+          );
+        }
+      } else {
+        await tx.insert(factoryDefinitions).values({
+          id: factoryId,
           name,
           description,
           prompt,
           graphVersion: nextVersion,
           graphJson: JSON.stringify(normalizedGraph),
+          createdAt: now,
           updatedAt: now,
           ownerEmail: userEmail,
-        })
-        .where(
-          and(
-            eq(factoryDefinitions.id, factoryId),
-            eq(factoryDefinitions.orgId, orgId),
-          ),
-        );
-    } else {
-      await db.insert(factoryDefinitions).values({
-        id: factoryId,
-        name,
-        description,
-        prompt,
-        graphVersion: nextVersion,
+          orgId,
+        });
+      }
+
+      await tx.insert(factoryGraphVersions).values({
+        id: versionId,
+        factoryId,
+        version: nextVersion,
         graphJson: JSON.stringify(normalizedGraph),
+        source,
+        changeSummary,
         createdAt: now,
-        updatedAt: now,
+        createdBy: userEmail,
         ownerEmail: userEmail,
         orgId,
       });
-    }
 
-    return {
-      ok: true,
-      factoryId,
-      name,
-      graphVersion: nextVersion,
-      source,
-    };
+      return {
+        ok: true,
+        factoryId,
+        name,
+        graphVersion: nextVersion,
+        source,
+      };
+    });
   },
 });

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

@@ -153,7 +153,7 @@ async function writeMetadata(
     .where(and(eq(triageItems.id, itemId), eq(triageItems.orgId, orgId)));
 }
 
-async function recordDecision(input: {
+export async function recordAutomaticBuilderDecision(input: {
   itemId: string;
   userEmail: string;
   orgId: string;
@@ -167,6 +167,7 @@ async function recordDecision(input: {
     input.itemId,
     "automatic-builder",
   );
+  const now = new Date().toISOString();
   await getDb()
     .insert(triageDecisions)
     .values({
@@ -179,17 +180,26 @@ async function recordDecision(input: {
       guardResultsJson: JSON.stringify(input.guardResults),
       model: "factory-automation",
       promptVersion: 1,
-      createdAt: new Date().toISOString(),
+      createdAt: now,
       ownerEmail: input.userEmail,
       orgId: input.orgId,
     })
-    .onConflictDoNothing();
+    .onConflictDoUpdate({
+      target: triageDecisions.id,
+      set: {
+        outcome: input.outcome,
+        reason: input.reason,
+        guardResultsJson: JSON.stringify(input.guardResults),
+        createdAt: now,
+        ownerEmail: input.userEmail,
+      },
+    });
   return id;
 }
 
 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 @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.",
+    "Start the governed clear-bug Builder flow for a Factory item, or record a skip with a reason when clearBug is false. 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(),
@@ -340,17 +350,12 @@ export default defineAction({
         : []),
     ];
     const blocked = guardResults.some((guard) => !guard.passed);
-    const decisionId = await recordDecision({
+    const decisionId = await recordAutomaticBuilderDecision({
       itemId,
       userEmail,
       orgId,
       outcome: blocked ? "needs_manual" : "propose_fix",
-      reason: blocked
-        ? guardResults
-            .filter((guard) => !guard.passed)
-            .map((guard) => guard.reason)
-            .join(" ")
-        : reason,
+      reason,
       guardResults,
     });
     await recordFactoryAudit(
@@ -363,7 +368,7 @@ export default defineAction({
         source: item.source,
         sourceUrl: item.sourceUrl,
         status: blocked ? "skipped" : "success",
-        summary: blocked ? "Factory kept this item for manual review." : reason,
+        summary: reason,
         details: {
           decisionId,
           clearBug,
@@ -383,10 +388,7 @@ export default defineAction({
         started: false,
         needsManual: true,
         decisionId,
-        reason: guardResults
-          .filter((guard) => !guard.passed)
-          .map((guard) => guard.reason)
-          .join(" "),
+        reason,
       };
     }
 
@@ -550,7 +552,7 @@ export default defineAction({
             .where(
               and(eq(triageItems.id, related.id), eq(triageItems.orgId, orgId)),
             );
-          await recordDecision({
+          await recordAutomaticBuilderDecision({
             itemId: related.id,
             userEmail,
             orgId,

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

@@ -1,3 +1,4 @@
+import { requestAgentChatThreadOpen } from "@agent-native/core/client/agent-chat";
 import { useActionQuery } from "@agent-native/core/client/hooks";
 import { useT } from "@agent-native/core/client/i18n";
 import {
@@ -8,7 +9,7 @@ import {
   IconExternalLink,
   IconSearch,
 } from "@tabler/icons-react";
-import { useEffect, useMemo } from "react";
+import { useEffect, useMemo, useRef } from "react";
 import { useSearchParams } from "react-router";
 
 import { Card, CardContent, CardHeader, CardTitle } from "@/components/ui/card";
@@ -70,6 +71,7 @@ export function FactoryAuditView({
 }) {
   const t = useT();
   const [searchParams, setSearchParams] = useSearchParams();
+  const viewRef = useRef<HTMLDivElement>(null);
   const selectedRunId = searchParams.get("auditRunId");
   const auditQuery = useActionQuery<FactoryAuditResponse>(
     "list-factory-audit",
@@ -109,8 +111,13 @@ export function FactoryAuditView({
     );
   }
 
+  useEffect(() => {
+    if (!selectedRunId) return;
+    viewRef.current?.scrollIntoView({ block: "start" });
+  }, [selectedRunId]);
+
   return (
-    <div className="p-4 lg:p-6">
+    <div ref={viewRef} className="p-4 lg:p-6">
       {auditQuery.isError ? (
         <Card>
           <CardContent className="flex items-start gap-2 p-4 text-sm text-destructive">
@@ -144,30 +151,38 @@ export function FactoryAuditView({
             </CardHeader>
             <CardContent className="p-0">
               <div className="grid gap-1.5 p-2">
-                {runs.map((run) => (
-                  <button
-                    key={run.id}
-                    type="button"
-                    className={`w-full cursor-pointer rounded-lg bg-muted/20 p-3 text-left transition-colors hover:bg-muted/50 focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-inset focus-visible:ring-ring ${selectedRun?.id === run.id ? "bg-muted/60" : ""}`}
-                    onClick={() => selectRun(run.id)}
-                  >
-                    <div className="flex items-center justify-between gap-3">
-                      <span className="min-w-0 truncate text-sm font-medium">
-                        {formatAutomationName(run.automation)}
-                      </span>
-                      <AuditStatus status={run.status} />
-                    </div>
-                    <div className="mt-1 flex items-center justify-between gap-2 text-xs text-muted-foreground">
-                      <span className="shrink-0">
-                        {formatAuditAge(run.startedAt)}
-                      </span>
-                      <span className="shrink-0">
-                        {run.events.length}{" "}
-                        {formatAuditCountLabel(run.events.length)}
-                      </span>
-                    </div>
-                  </button>
-                ))}
+                {runs.map((run) => {
+                  const selected = selectedRun?.id === run.id;
+                  return (
+                    <button
+                      key={run.id}
+                      type="button"
+                      aria-current={selected ? "true" : undefined}
+                      className={`w-full cursor-pointer rounded-lg p-3 text-left transition-colors focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-inset focus-visible:ring-ring ${
+                        selected
+                          ? "bg-primary/10 ring-1 ring-inset ring-primary/40"
+                          : "bg-muted/20 hover:bg-muted/50"
+                      }`}
+                      onClick={() => selectRun(run.id)}
+                    >
+                      <div className="flex items-center justify-between gap-3">
+                        <span className="min-w-0 truncate text-sm font-medium">
+                          {formatAutomationName(run.automation)}
+                        </span>
+                        <AuditStatus status={run.status} />
+                      </div>
+                      <div className="mt-1 flex items-center justify-between gap-2 text-xs text-muted-foreground">
+                        <span className="shrink-0">
+                          {formatAuditAge(run.startedAt)}
+                        </span>
+                        <span className="shrink-0">
+                          {run.events.length}{" "}
+                          {formatAuditCountLabel(run.events.length)}
+                        </span>
+                      </div>
+                    </button>
+                  );
+                })}
               </div>
             </CardContent>
           </Card>
@@ -190,7 +205,9 @@ export function FactoryAuditView({
               </div>
             </CardHeader>
             <CardContent className="pt-4">
-              {selectedRun && <AuditRunDetail run={selectedRun} />}
+              {selectedRun && (
+                <AuditRunDetail run={selectedRun} factoryId={factoryId} />
+              )}
             </CardContent>
           </Card>
         </div>
@@ -199,7 +216,13 @@ export function FactoryAuditView({
   );
 }
 
-function AuditRunDetail({ run }: { run: FactoryAuditRun }) {
+function AuditRunDetail({
+  run,
+  factoryId,
+}: {
+  run: FactoryAuditRun;
+  factoryId: string;
+}) {
   const t = useT();
   const groups = useMemo(() => groupAuditEvents(run.events), [run.events]);
   const itemCount = new Set(
@@ -229,10 +252,22 @@ function AuditRunDetail({ run }: { run: FactoryAuditRun }) {
         {run.threadId && (
           <a
             href={`/chat/${encodeURIComponent(run.threadId)}`}
-            className="ml-auto inline-flex items-center gap-1 text-primary hover:underline"
+            className="ml-auto inline-flex items-center text-primary hover:underline"
+            onClick={(event) => {
+              if (
+                event.metaKey ||
+                event.ctrlKey ||
+                event.shiftKey ||
+                event.altKey ||
+                event.button !== 0
+              ) {
+                return;
+              }
+              event.preventDefault();
+              requestAgentChatThreadOpen({ threadId: run.threadId! });
+            }}
           >
             {t("factoryRoute.auditOpenThread")}
-            <IconExternalLink className="size-3" />
           </a>
         )}
       </div>
@@ -260,7 +295,11 @@ function AuditRunDetail({ run }: { run: FactoryAuditRun }) {
         ) : (
           <div className="grid gap-1.5">
             {groups.map((group) => (
-              <AuditItemRow key={group.key} group={group} />
+              <AuditItemRow
+                key={group.key}
+                group={group}
+                factoryId={factoryId}
+              />
             ))}
           </div>
         )}
@@ -269,15 +308,20 @@ function AuditRunDetail({ run }: { run: FactoryAuditRun }) {
   );
 }
 
-function AuditItemRow({ group }: { group: AuditItemGroup }) {
+function AuditItemRow({
+  group,
+  factoryId,
+}: {
+  group: AuditItemGroup;
+  factoryId: string;
+}) {
   const t = useT();
   const decision = group.decision;
   const rationale = decision?.summary ?? group.externalAction?.summary ?? null;
-  const sourceLink =
-    group.sourceUrl ?? group.events.find((event) => event.sourceUrl)?.sourceUrl;
+  const sourceLink = resolveAuditSourceLink(group);
 
   return (
-    <details className="group rounded-lg bg-muted/20">
+    <details className="group overflow-hidden rounded-lg border border-border bg-muted/20">
       <summary className="flex cursor-pointer list-none items-center gap-3 rounded-lg px-3 py-3 hover:bg-muted/40 focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-inset focus-visible:ring-ring [&::-webkit-details-marker]:hidden">
         <AuditSourceIcon source={group.source} />
         <div className="min-w-0 flex-1">
@@ -336,7 +380,7 @@ function AuditItemRow({ group }: { group: AuditItemGroup }) {
           <div className="mt-4 flex flex-wrap items-center gap-x-4 gap-y-2 bg-background/40 px-3 py-3 text-xs">
             {group.itemId && (
               <a
-                href={`/factory?tab=inbox&itemId=${encodeURIComponent(group.itemId)}`}
+                href={`/factory?factoryId=${encodeURIComponent(factoryId)}&tab=inbox&itemId=${encodeURIComponent(group.itemId)}`}
                 className="text-primary hover:underline"
               >
                 {t("factoryRoute.auditOpenItem")}
@@ -579,6 +623,26 @@ function formatAuditSource(source: string | null): string {
   return source ? formatAuditLabel(source) : "Factory";
 }
 
+function resolveAuditSourceLink(group: AuditItemGroup): string | null {
+  const storedUrl =
+    group.sourceUrl ??
+    group.events.find((event) => event.sourceUrl)?.sourceUrl ??
+    null;
+  if (storedUrl) return storedUrl;
+
+  for (const event of group.events) {
+    const channelId = readStringDetail(event.details, "channelId");
+    const threadTs = readStringDetail(event.details, "threadTs");
+    if (channelId && threadTs) return slackThreadUrl(channelId, threadTs);
+  }
+  return null;
+}
+
+function slackThreadUrl(channelId: string, threadTs: string): string {
+  const compactTs = threadTs.replace(".", "");
+  return `https://slack.com/archives/${encodeURIComponent(channelId)}/p${compactTs}?thread_ts=${encodeURIComponent(threadTs)}`;
+}
+
 function formatAutomationName(value: string): string {
   const words = value
     .replace(/^factory-/, "")