diff --git a/.changeset/run-nested-automations-by-path.md b/.changeset/run-nested-automations-by-path.md
new file mode 100644
index 0000000000..702a9d6c89
--- /dev/null
+++ b/.changeset/run-nested-automations-by-path.md
@@ -0,0 +1,5 @@
+---
+"@agent-native/core": patch
+---
+
+Let a manual automation run target a resource path, including the generic `run-automation-now` action and manage-automations `run-now` tool, so automations nested under `jobs/` (such as per-factory jobs) can be run immediately instead of failing with "A valid automation name is required." Preserve application-owned frontmatter when automation status is written back after a run, and dispatch local runs back to the inbound request host when present.
diff --git a/packages/core/src/client/agent-page/use-jobs.ts b/packages/core/src/client/agent-page/use-jobs.ts
index 7307776dbc..6bb25e9601 100644
--- a/packages/core/src/client/agent-page/use-jobs.ts
+++ b/packages/core/src/client/agent-page/use-jobs.ts
@@ -69,7 +69,8 @@ export type ManageJobInput = {
 export type ManageAutomationInput = ManageJobInput;
 
 export interface RunAutomationNowInput {
-  name: string;
+  name?: string;
+  path?: string;
   scope: "personal" | "organization";
 }
 
@@ -213,12 +214,11 @@ export function useRunAutomationNow() {
       onSuccess: (_result, variables) => {
         const scope =
           variables.scope === "organization" ? "organization" : "personal";
+        const name =
+          variables.name ??
+          variables.path?.replace(/^jobs\//, "").replace(/\.md$/, "");
         queryClient.invalidateQueries({
-          queryKey: [
-            "action",
-            "list-automation-runs",
-            { scope, name: variables.name },
-          ],
+          queryKey: ["action", "list-automation-runs", { scope, name }],
         });
         queryClient.invalidateQueries({
           queryKey: ["action", "list-automations", { scope }],
diff --git a/packages/core/src/jobs/actions/run-automation-now.ts b/packages/core/src/jobs/actions/run-automation-now.ts
index bb96f351fc..38b7423b53 100644
--- a/packages/core/src/jobs/actions/run-automation-now.ts
+++ b/packages/core/src/jobs/actions/run-automation-now.ts
@@ -5,20 +5,26 @@ import { queueAutomationRunNow } from "../run-now.js";
 
 export default defineAction({
   description:
-    "Run one personal or organization automation immediately. This is an explicit send/run action and may perform the automation's real side effects.",
+    "Run one personal or organization automation immediately. This is an explicit send/run action and may perform the automation's real side effects. Pass a flat `name` or a nested `path` such as jobs/factories/<id>/factory-slack-feedback.md — not both.",
   agentTool: false,
-  schema: z.object({
-    name: z.string().min(1),
-    scope: z.enum(["personal", "organization"]).default("personal"),
-  }),
-  run: async ({ name, scope }, ctx) => {
+  schema: z
+    .object({
+      name: z.string().min(1).optional(),
+      path: z.string().min(1).optional(),
+      scope: z.enum(["personal", "organization"]).default("personal"),
+    })
+    .refine((value) => Boolean(value.name) !== Boolean(value.path), {
+      message: "Specify either an automation name or a path, not both.",
+    }),
+  run: async ({ name, path, scope }, ctx) => {
     if (!ctx?.userEmail) throw new Error("Not authenticated.");
     return queueAutomationRunNow({
       userEmail: ctx.userEmail,
       orgId: ctx.orgId,
       appId: ctx.appId,
       scope,
-      name,
+      ...(path ? { path } : { name }),
+      requestHeaders: ctx.requestHeaders,
     });
   },
 });
diff --git a/packages/core/src/jobs/frontmatter.spec.ts b/packages/core/src/jobs/frontmatter.spec.ts
index 2c5f33f9bf..cd15e10c0b 100644
--- a/packages/core/src/jobs/frontmatter.spec.ts
+++ b/packages/core/src/jobs/frontmatter.spec.ts
@@ -58,6 +58,30 @@ describe("job resource frontmatter", () => {
     });
   });
 
+  it("preserves application-owned fields during a scheduler rewrite", () => {
+    const content = `---
+schedule: "0 9 * * *"
+enabled: true
+triggerType: schedule
+domain: "factory"
+factoryId: enzo-test-factory-3
+displayName: My Slack triage
+---
+
+Run the automation.`;
+    const parsed = parseJobResource(content);
+    const rewrittenMeta = {
+      ...parsed.meta,
+      lastRun: "2026-08-21T17:30:01.097Z",
+    };
+
+    const rewritten = buildJobResourceContent(rewrittenMeta, parsed.body);
+
+    expect(rewritten).toContain("factoryId: enzo-test-factory-3");
+    expect(rewritten).toContain("displayName: My Slack triage");
+    expect(rewritten).toContain('lastRun: "2026-08-21T17:30:01.097Z"');
+  });
+
   it("distinguishes legacy jobs from explicit scheduled automations", () => {
     const legacy = `---
 schedule: "0 9 * * *"
diff --git a/packages/core/src/jobs/frontmatter.ts b/packages/core/src/jobs/frontmatter.ts
index 6ee6155b6b..878ec09d23 100644
--- a/packages/core/src/jobs/frontmatter.ts
+++ b/packages/core/src/jobs/frontmatter.ts
@@ -114,6 +114,48 @@ const FRONTMATTER_RE = /^---\r?\n([\s\S]*?)\r?\n---(?:\r?\n)?([\s\S]*)$/;
 const DELEGATED_POLICY_ID_RE = /^[a-z0-9][a-z0-9._:-]{0,127}$/i;
 const EXECUTION_ID_RE = /^[a-z0-9][a-z0-9._:-]{0,127}$/i;
 const REMOTE_ID_RE = /^[a-z0-9][a-z0-9@+._:/-]{0,511}$/i;
+const EXTRA_FRONTMATTER_LINES = Symbol("extraFrontmatterLines");
+const KNOWN_FRONTMATTER_FIELDS = new Set([
+  "schedule",
+  "enabled",
+  "timezone",
+  "createdBy",
+  "orgId",
+  "runAs",
+  "lastRun",
+  "lastCheck",
+  "lastStatus",
+  "lastError",
+  "nextRun",
+  "originScopeId",
+  "deliveryPlatform",
+  "deliveryDestination",
+  "deliveryThreadRef",
+  "deliveryTenantId",
+  "model",
+  "maxIterations",
+  "maxRunInputTokens",
+  "mcpTools",
+  "triggerType",
+  "event",
+  "condition",
+  "mode",
+  "domain",
+  "appId",
+  "executionHostId",
+  "executionEngine",
+  "executionCwd",
+  "remoteRequestId",
+  "remoteCommandId",
+  "remoteRunId",
+  "remoteAutomationRunId",
+  "remoteAdvanceSchedule",
+  "delegatedPolicyId",
+]);
+
+type JobFrontmatterWithExtras = JobFrontmatter & {
+  [EXTRA_FRONTMATTER_LINES]?: string[];
+};
 
 function assertBoundedFrontmatterValue(
   value: string | undefined,
@@ -333,15 +375,23 @@ export function parseJobResource(content: string): ParsedJobResource {
     };
   }
 
-  const meta: JobFrontmatter = { schedule: "", enabled: true };
+  const meta: JobFrontmatterWithExtras = { schedule: "", enabled: true };
+  const extraLines: string[] = [];
   for (const line of match[1].split(/\r?\n/)) {
     const colonIdx = line.indexOf(":");
-    if (colonIdx === -1) continue;
-    parseKnownField(
-      meta,
-      line.slice(0, colonIdx).trim(),
-      line.slice(colonIdx + 1),
-    );
+    if (colonIdx === -1) {
+      if (line.trim()) extraLines.push(line);
+      continue;
+    }
+    const key = line.slice(0, colonIdx).trim();
+    if (!KNOWN_FRONTMATTER_FIELDS.has(key)) {
+      extraLines.push(line);
+      continue;
+    }
+    parseKnownField(meta, key, line.slice(colonIdx + 1));
+  }
+  if (extraLines.length) {
+    meta[EXTRA_FRONTMATTER_LINES] = extraLines;
   }
 
   return {
@@ -471,6 +521,9 @@ export function buildJobResourceContent(
   if (meta.mcpTools?.length) {
     lines.push(`mcpTools: ${JSON.stringify(meta.mcpTools)}`);
   }
+  lines.push(
+    ...((meta as JobFrontmatterWithExtras)[EXTRA_FRONTMATTER_LINES] ?? []),
+  );
   lines.push("---", "", body);
   return lines.join("\n");
 }
diff --git a/packages/core/src/jobs/run-now.spec.ts b/packages/core/src/jobs/run-now.spec.ts
new file mode 100644
index 0000000000..5cb2e809c9
--- /dev/null
+++ b/packages/core/src/jobs/run-now.spec.ts
@@ -0,0 +1,167 @@
+import { beforeEach, describe, expect, it, vi } from "vitest";
+
+const canUpdateAutomationResourceMock = vi.hoisted(() => vi.fn());
+const resourceGetByPathMock = vi.hoisted(() => vi.fn());
+const startAutomationRunMock = vi.hoisted(() => vi.fn());
+const listUnclaimedAutomationRunsMock = vi.hoisted(() => vi.fn());
+const fireInternalDispatchMock = vi.hoisted(() => vi.fn());
+
+vi.mock("../automations/service.js", () => ({
+  canUpdateAutomationResource: canUpdateAutomationResourceMock,
+}));
+
+vi.mock("../resources/store.js", () => ({
+  organizationResourceOwner: (orgId: string) => `__organization__:${orgId}`,
+  resourceGetByPath: resourceGetByPathMock,
+}));
+
+vi.mock("./run-history.js", () => ({
+  startAutomationRun: startAutomationRunMock,
+  listUnclaimedAutomationRuns: listUnclaimedAutomationRunsMock,
+}));
+
+vi.mock("../server/self-dispatch.js", () => ({
+  fireInternalDispatch: fireInternalDispatchMock,
+}));
+
+vi.mock("../db/client.js", () => ({ isLocalDatabase: () => true }));
+
+vi.mock("../agent/durable-background.js", () => ({
+  AGENT_CHAT_BACKGROUND_RUN_FIELD: "__backgroundRun",
+  dispatchPathTargetsNetlifyBackgroundFunction: () => false,
+  resolveAgentChatProcessRunDispatchPath: () => "/_agent-native/process-run",
+}));
+
+import { queueAutomationRunNow } from "./run-now.js";
+
+function resourceAt(path: string) {
+  return {
+    id: "resource-1",
+    path,
+    owner: "__organization__:org-1",
+    content: `---\ndomain: factory\n---\nObserve the channel.\n`,
+  };
+}
+
+const organizationRun = {
+  userEmail: "alice@example.com",
+  orgId: "org-1",
+  appId: "factory",
+  scope: "organization" as const,
+};
+
+beforeEach(() => {
+  vi.clearAllMocks();
+  canUpdateAutomationResourceMock.mockResolvedValue(true);
+  listUnclaimedAutomationRunsMock.mockResolvedValue([]);
+  startAutomationRunMock.mockResolvedValue("history-1");
+  fireInternalDispatchMock.mockResolvedValue(undefined);
+});
+
+describe("queueAutomationRunNow", () => {
+  // Per-factory automations live at jobs/factories/<factoryId>/<name>.md, so
+  // their name contains a slash and cannot round-trip through `name`.
+  it("queues a nested automation by path", async () => {
+    const path = "jobs/factories/enzo-test-factory-3/factory-slack-feedback.md";
+    resourceGetByPathMock.mockResolvedValue(resourceAt(path));
+
+    const result = await queueAutomationRunNow({ ...organizationRun, path });
+
+    expect(resourceGetByPathMock).toHaveBeenCalledWith(
+      "__organization__:org-1",
+      path,
+    );
+    expect(startAutomationRunMock).toHaveBeenCalledWith(
+      expect.objectContaining({
+        automation: "factories/enzo-test-factory-3/factory-slack-feedback",
+        path,
+      }),
+    );
+    expect(result).toEqual({
+      queued: true,
+      runId: "history-1",
+      automationRunId: "history-1",
+    });
+  });
+
+  it("still resolves a flat name to its jobs/ path", async () => {
+    resourceGetByPathMock.mockResolvedValue(resourceAt("jobs/digest.md"));
+
+    await queueAutomationRunNow({ ...organizationRun, name: "digest" });
+
+    expect(resourceGetByPathMock).toHaveBeenCalledWith(
+      "__organization__:org-1",
+      "jobs/digest.md",
+    );
+    expect(startAutomationRunMock).toHaveBeenCalledWith(
+      expect.objectContaining({ automation: "digest", path: "jobs/digest.md" }),
+    );
+  });
+
+  it("dispatches new and recovered runs to the inbound local host", async () => {
+    const requestHeaders = new Headers({ host: "localhost:8080" });
+    resourceGetByPathMock.mockResolvedValue(resourceAt("jobs/digest.md"));
+    listUnclaimedAutomationRunsMock.mockResolvedValue([
+      { id: "history-stale" },
+    ]);
+
+    await queueAutomationRunNow({
+      ...organizationRun,
+      name: "digest",
+      requestHeaders,
+    });
+
+    expect(fireInternalDispatchMock).toHaveBeenNthCalledWith(
+      1,
+      expect.objectContaining({
+        taskId: "history-stale",
+        event: { headers: requestHeaders },
+      }),
+    );
+    expect(fireInternalDispatchMock).toHaveBeenNthCalledWith(
+      2,
+      expect.objectContaining({
+        taskId: "history-1",
+        event: { headers: requestHeaders },
+      }),
+    );
+  });
+
+  it("rejects a name that carries a path separator", async () => {
+    await expect(
+      queueAutomationRunNow({
+        ...organizationRun,
+        name: "factories/f3/factory-slack-channel",
+      }),
+    ).rejects.toThrow("A valid automation name is required.");
+    expect(resourceGetByPathMock).not.toHaveBeenCalled();
+  });
+
+  it("rejects a path that escapes the jobs/ tree", async () => {
+    await expect(
+      queueAutomationRunNow({
+        ...organizationRun,
+        path: "jobs/../secrets.md",
+      }),
+    ).rejects.toThrow("A valid automation path is required.");
+    expect(resourceGetByPathMock).not.toHaveBeenCalled();
+  });
+
+  it("rejects a path outside jobs/", async () => {
+    await expect(
+      queueAutomationRunNow({ ...organizationRun, path: "secrets/keys.md" }),
+    ).rejects.toThrow("A valid automation path is required.");
+    expect(resourceGetByPathMock).not.toHaveBeenCalled();
+  });
+
+  it("refuses to guess when both a name and a path are given", async () => {
+    await expect(
+      queueAutomationRunNow({
+        ...organizationRun,
+        name: "digest",
+        path: "jobs/other.md",
+      }),
+    ).rejects.toThrow("Specify either an automation name or a path, not both.");
+    expect(resourceGetByPathMock).not.toHaveBeenCalled();
+  });
+});
diff --git a/packages/core/src/jobs/run-now.ts b/packages/core/src/jobs/run-now.ts
index 46b0816b54..a321f3572c 100644
--- a/packages/core/src/jobs/run-now.ts
+++ b/packages/core/src/jobs/run-now.ts
@@ -24,7 +24,16 @@ export interface RunAutomationNowInput {
   orgId?: string | null;
   appId?: string | null;
   scope: AutomationScope;
-  name: string;
+  /** Inbound request headers used to dispatch back to this exact local host. */
+  requestHeaders?: Headers;
+  /** Flat automation name, resolved as `jobs/<name>.md`. */
+  name?: string;
+  /**
+   * Full resource path for an automation the caller already resolved. Required
+   * for automations nested under `jobs/` (e.g. per-factory jobs), whose names
+   * contain a slash and cannot round-trip through `name`.
+   */
+  path?: string;
 }
 
 export interface QueuedAutomationRun {
@@ -33,11 +42,15 @@ export interface QueuedAutomationRun {
   automationRunId: string;
 }
 
-async function dispatchAutomationRun(historyId: string): Promise<void> {
+async function dispatchAutomationRun(
+  historyId: string,
+  requestHeaders?: Headers,
+): Promise<void> {
   const dispatchPath = resolveAgentChatProcessRunDispatchPath();
   await fireInternalDispatch({
     path: dispatchPath,
     taskId: historyId,
+    ...(requestHeaders ? { event: { headers: requestHeaders } } : {}),
     body: {
       [AGENT_CHAT_BACKGROUND_RUN_FIELD]: {
         runId: historyId,
@@ -52,6 +65,10 @@ async function dispatchAutomationRun(historyId: string): Promise<void> {
   });
 }
 
+function automationName(path: string): string {
+  return path.replace(/^jobs\//, "").replace(/\.md$/, "");
+}
+
 function ownerForScope(input: RunAutomationNowInput): string {
   if (input.scope === "personal") return input.userEmail.trim().toLowerCase();
   if (!input.orgId) {
@@ -63,17 +80,55 @@ function ownerForScope(input: RunAutomationNowInput): string {
   return organizationResourceOwner(input.orgId);
 }
 
-export async function queueAutomationRunNow(
-  input: RunAutomationNowInput,
-): Promise<QueuedAutomationRun> {
-  const name = input.name.trim();
+/**
+ * One place decides which resource a run-now request means. Callers that
+ * already hold the resource pass `path`; callers that only know a flat slug
+ * pass `name`. Accepting both at once would let two disagreeing identifiers
+ * silently pick a winner.
+ */
+function resolveAutomationTarget(input: RunAutomationNowInput): {
+  path: string;
+  name: string;
+} {
+  const path = input.path?.trim();
+  const name = input.name?.trim();
+  if (path && name) {
+    throw Object.assign(
+      new Error("Specify either an automation name or a path, not both."),
+      { statusCode: 400 },
+    );
+  }
+  if (path) {
+    const segments = path.split("/");
+    const valid =
+      segments[0] === "jobs" &&
+      segments.length > 1 &&
+      path.endsWith(".md") &&
+      !path.includes("\\") &&
+      segments.every(
+        (segment) => segment && segment !== "." && segment !== "..",
+      );
+    if (!valid) {
+      throw Object.assign(new Error("A valid automation path is required."), {
+        statusCode: 400,
+      });
+    }
+    return { path, name: automationName(path) };
+  }
   if (!name || name.includes("/") || name.endsWith(".md")) {
     throw Object.assign(new Error("A valid automation name is required."), {
       statusCode: 400,
     });
   }
+  return { path: `jobs/${name}.md`, name };
+}
+
+export async function queueAutomationRunNow(
+  input: RunAutomationNowInput,
+): Promise<QueuedAutomationRun> {
+  const { path, name } = resolveAutomationTarget(input);
   const owner = ownerForScope(input);
-  const resource = await resourceGetByPath(owner, `jobs/${name}.md`);
+  const resource = await resourceGetByPath(owner, path);
   if (!resource) {
     throw Object.assign(new Error(`Automation "${name}" not found.`), {
       statusCode: 404,
@@ -99,14 +154,15 @@ export async function queueAutomationRunNow(
 
   // A manual-run request is a guaranteed app request even on hosts without a
   // durable timer. Use it to recover older rows before adding the new one.
-  await redispatchUnclaimedAutomationRuns({ appId: input.appId }).catch(
-    (error) => {
-      console.warn(
-        "[automations] Could not sweep queued runs before run-now:",
-        error,
-      );
-    },
-  );
+  await redispatchUnclaimedAutomationRuns({
+    appId: input.appId,
+    requestHeaders: input.requestHeaders,
+  }).catch((error) => {
+    console.warn(
+      "[automations] Could not sweep queued runs before run-now:",
+      error,
+    );
+  });
 
   const historyId = await startAutomationRun({
     owner: resource.owner,
@@ -118,7 +174,7 @@ export async function queueAutomationRunNow(
     dispatchPending: true,
   });
   try {
-    await dispatchAutomationRun(historyId);
+    await dispatchAutomationRun(historyId, input.requestHeaders);
   } catch (error) {
     const message =
       error instanceof Error ? error.message : "Background dispatch failed";
@@ -139,12 +195,13 @@ export async function queueAutomationRunNow(
  */
 export async function redispatchUnclaimedAutomationRuns(options?: {
   appId?: string | null;
+  requestHeaders?: Headers;
 }): Promise<number> {
   const runs = await listUnclaimedAutomationRuns({ appId: options?.appId });
   let attempted = 0;
   for (const run of runs) {
     try {
-      await dispatchAutomationRun(run.id);
+      await dispatchAutomationRun(run.id, options?.requestHeaders);
       attempted += 1;
     } catch (error) {
       console.error(
diff --git a/packages/core/src/jobs/scheduler.ts b/packages/core/src/jobs/scheduler.ts
index 4cfeea233c..f96d68c968 100644
--- a/packages/core/src/jobs/scheduler.ts
+++ b/packages/core/src/jobs/scheduler.ts
@@ -782,9 +782,9 @@ export async function runJobNow(
   owner: string,
   name: string,
   deps: SchedulerDeps,
-  options: { historyId?: string } = {},
+  options: { historyId?: string; path?: string } = {},
 ): Promise<JobExecutionResult> {
-  const path = `jobs/${name}.md`;
+  const path = options.path ?? `jobs/${name}.md`;
   const resource = await resourceGetByPath(owner, path);
   if (!resource) throw new Error(`Automation "${name}" not found.`);
   const { meta, body } = parseJobFrontmatter(resource.content);
@@ -814,6 +814,7 @@ export async function runQueuedAutomation(
   }
   const result = await runJobNow(queued.owner, queued.automation, deps, {
     historyId,
+    path: queued.path,
   });
   return {
     skipped: false,
diff --git a/packages/core/src/server/self-dispatch.spec.ts b/packages/core/src/server/self-dispatch.spec.ts
index 7b3c662fd2..975e312539 100644
--- a/packages/core/src/server/self-dispatch.spec.ts
+++ b/packages/core/src/server/self-dispatch.spec.ts
@@ -13,6 +13,33 @@ describe("fireInternalDispatch", () => {
     vi.restoreAllMocks();
   });
 
+  it("uses the Agent Native dev port when retrying outside a request", () => {
+    const keys = [
+      "DEPLOY_PRIME_URL",
+      "DEPLOY_URL",
+      "URL",
+      "APP_URL",
+      "VITE_APP_URL",
+      "BETTER_AUTH_URL",
+      "VITE_BETTER_AUTH_URL",
+      "PORT",
+    ] as const;
+    const previous = Object.fromEntries(
+      keys.map((key) => [key, process.env[key]]),
+    );
+    for (const key of keys) delete process.env[key];
+
+    try {
+      expect(resolveSelfDispatchBaseUrl()).toBe("http://localhost:3000");
+    } finally {
+      for (const key of keys) {
+        const value = previous[key];
+        if (value === undefined) delete process.env[key];
+        else process.env[key] = value;
+      }
+    }
+  });
+
   it("rejects quickly returned non-2xx processor responses", async () => {
     const errorSpy = vi.spyOn(console, "error").mockImplementation(() => {});
     globalThis.fetch = vi.fn(async () => ({
diff --git a/packages/core/src/triggers/actions.spec.ts b/packages/core/src/triggers/actions.spec.ts
index c1ff1c7be5..07c5406882 100644
--- a/packages/core/src/triggers/actions.spec.ts
+++ b/packages/core/src/triggers/actions.spec.ts
@@ -46,8 +46,10 @@ vi.mock("../localization/user-timezone.js", () => ({
   resolveUserSchedulingTimezone: resolveUserSchedulingTimezoneMock,
 }));
 
-vi.mock("../jobs/run-history.js", () => ({
-  deleteAutomationRuns: deleteAutomationRunsMock,
+const queueAutomationRunNowMock = vi.hoisted(() => vi.fn());
+
+vi.mock("../jobs/run-now.js", () => ({
+  queueAutomationRunNow: queueAutomationRunNowMock,
 }));
 
 vi.mock("../integrations/remote-devices-store.js", () => ({
@@ -67,6 +69,11 @@ describe("manage-automations tool", () => {
     refreshEventSubscriptionsMock.mockResolvedValue(undefined);
     resolveUserSchedulingTimezoneMock.mockResolvedValue("America/Los_Angeles");
     deleteAutomationRunsMock.mockResolvedValue(undefined);
+    queueAutomationRunNowMock.mockResolvedValue({
+      queued: true,
+      runId: "run-1",
+      automationRunId: "run-1",
+    });
     listRemoteDevicesForOwnerMock.mockResolvedValue([]);
     getRemoteExecutionCapabilitiesMock.mockReturnValue(null);
   });
@@ -438,6 +445,22 @@ Record the signal.`,
     );
 
     expect(result).toBe("Error: an automation cannot run another automation.");
-    expect(resourceGetByPathMock).not.toHaveBeenCalled();
+    expect(queueAutomationRunNowMock).not.toHaveBeenCalled();
+  });
+
+  it("runs a nested automation by path without sending an empty name", async () => {
+    const path = "jobs/factories/enzo-test-factory-3/factory-slack-feedback.md";
+
+    await tool().run({ action: "run-now", path, scope: "organization" });
+
+    expect(queueAutomationRunNowMock).toHaveBeenCalledWith(
+      expect.objectContaining({
+        path,
+        scope: "organization",
+      }),
+    );
+    expect(queueAutomationRunNowMock.mock.calls[0]?.[0]).not.toHaveProperty(
+      "name",
+    );
   });
 });
diff --git a/packages/core/src/triggers/actions.ts b/packages/core/src/triggers/actions.ts
index 3b520ed0b0..eea34dd0ff 100644
--- a/packages/core/src/triggers/actions.ts
+++ b/packages/core/src/triggers/actions.ts
@@ -379,12 +379,15 @@ async function handleRunNow(
     return "Error: an automation cannot run another automation.";
   }
   try {
+    const path = typeof args.path === "string" ? args.path.trim() : "";
+    const name = typeof args.name === "string" ? args.name : "";
     const result = await queueAutomationRunNow({
       userEmail: getCurrentUser(),
       orgId: getRequestOrgId(),
       appId,
       scope: automationScope(args.scope),
-      name: typeof args.name === "string" ? args.name : "",
+      ...(path ? { path } : { name }),
+      requestHeaders: context?.requestHeaders,
     });
     return JSON.stringify(result);
   } catch (error) {
@@ -423,7 +426,7 @@ export function createAutomationToolEntries(
 - **update**: Update an existing automation's settings without changing its creator (enabled, schedule, timezone, condition, body, policy, model, execution host, MCP allowlist). Required param: name. Use the same scope it was created in.
 - **delete**: Delete an automation. Always confirm with the user first. Required param: name.
 - **fire-test**: Fire a test event to validate automations. Emits a test.event.fired event. Optional param: data (JSON string).
-- **run-now**: Run one automation immediately using its real actions and side effects. This is an explicit user-authorized run and returns a durable run id; it does not change the automation's next scheduled run. Required params: name; optional scope.`,
+- **run-now**: Run one automation immediately using its real actions and side effects. This is an explicit user-authorized run and returns a durable run id; it does not change the automation's next scheduled run. Required params: name or path (not both); optional scope. Use path for automations nested under jobs/ (for example jobs/factories/<id>/factory-slack-feedback.md); those names contain a slash and cannot round-trip through name.`,
         parameters: {
           type: "object" as const,
           properties: {
@@ -436,7 +439,12 @@ export function createAutomationToolEntries(
             name: {
               type: "string",
               description:
-                "Slug name for the automation (lowercase, hyphens). Used by define, update, delete, and run-now.",
+                "Slug name for the automation (lowercase, hyphens). Used by define, update, delete, and run-now for flat automations. For nested automations, pass path to run-now instead.",
+            },
+            path: {
+              type: "string",
+              description:
+                "Full jobs resource path (jobs/...md) for a nested automation. Use with run-now instead of name when the automation name contains a slash.",
             },
             scope: {
               type: "string",
diff --git a/templates/factory/actions/create-factory.spec.ts b/templates/factory/actions/create-factory.spec.ts
index 58501d7b85..0b82c35d89 100644
--- a/templates/factory/actions/create-factory.spec.ts
+++ b/templates/factory/actions/create-factory.spec.ts
@@ -129,7 +129,9 @@ describe("create-factory", () => {
     const result = await action.run(
       {
         name: "Support triage",
+        slackWorkspace: "secondary",
         slackChannelId: "C123",
+        builderSlackUserId: "U096KN3EL2Y",
         observeSlack: true,
         repository: "agent-native/agent-native",
       },
@@ -144,6 +146,12 @@ describe("create-factory", () => {
       ]),
     );
     expect(insertedConfig).toHaveLength(1);
+    expect(insertedConfig[0]).toMatchObject({
+      slackWorkspace: "secondary",
+      slackChannelId: "C123",
+      builderSlackUserId: "U096KN3EL2Y",
+      pollingEnabled: 1,
+    });
     expect(assertUniqueSlackChannelForFactoryMock).toHaveBeenCalled();
     expect(syncFactoryAutomationEnabledStatesMock).toHaveBeenCalledWith(
       "owner@example.com",
diff --git a/templates/factory/actions/create-factory.ts b/templates/factory/actions/create-factory.ts
index 689e22316a..4ccf17e1d3 100644
--- a/templates/factory/actions/create-factory.ts
+++ b/templates/factory/actions/create-factory.ts
@@ -20,6 +20,7 @@ import {
 } from "../server/lib/factory-automation-plan.js";
 import {
   assertUniqueSlackChannelForFactory,
+  builderSlackUserIdSchema,
   factoryConfigRowId,
   resolveUniqueFactoryId,
 } from "../server/lib/factory-scope.js";
@@ -40,8 +41,10 @@ export default defineAction({
   schema: z.object({
     name: z.string().trim().min(1).max(120),
     description: z.string().trim().max(500).optional(),
+    slackWorkspace: z.enum(["primary", "secondary"]).optional(),
     slackChannelId: z.string().trim().max(128).optional(),
     slackChannelName: z.string().trim().max(200).optional(),
+    builderSlackUserId: builderSlackUserIdSchema.optional(),
     observeSlack: z.boolean().optional(),
     repository: z.string().trim().max(256).optional(),
     observeGithub: z.boolean().optional(),
@@ -111,7 +114,16 @@ export default defineAction({
             orgId,
           });
 
-          if (automationPlan.hasConfig) {
+          const shouldWriteConfig =
+            automationPlan.hasConfig ||
+            Boolean(input.slackChannelId?.trim()) ||
+            Boolean(input.slackChannelName?.trim()) ||
+            Boolean(input.builderSlackUserId?.trim()) ||
+            Boolean(input.slackWorkspace) ||
+            Boolean(input.sentryOrgSlug?.trim()) ||
+            Boolean(input.sentryProjectSlug?.trim()) ||
+            Boolean(input.sentryEnvironment?.trim());
+          if (shouldWriteConfig) {
             const slackChannelId = input.slackChannelId?.trim() || null;
             await assertUniqueSlackChannelForFactory(
               tx as unknown as typeof db,
@@ -122,10 +134,11 @@ export default defineAction({
             await tx.insert(triageConfig).values({
               id: factoryConfigRowId(orgId, factoryId),
               factoryId,
-              slackWorkspace: "primary",
+              slackWorkspace:
+                input.slackWorkspace === "secondary" ? "secondary" : "primary",
               slackChannelId,
               slackChannelName: input.slackChannelName?.trim() || null,
-              builderSlackUserId: null,
+              builderSlackUserId: input.builderSlackUserId?.trim() || null,
               pollingEnabled: automationPlan.pollingEnabled ? 1 : 0,
               githubPollingEnabled: automationPlan.githubPollingEnabled ? 1 : 0,
               sentryPollingEnabled: automationPlan.sentryPollingEnabled ? 1 : 0,
diff --git a/templates/factory/actions/get-slack-feedback-context.ts b/templates/factory/actions/get-slack-feedback-context.ts
index 32676dd465..461d22e820 100644
--- a/templates/factory/actions/get-slack-feedback-context.ts
+++ b/templates/factory/actions/get-slack-feedback-context.ts
@@ -72,6 +72,8 @@ export default defineAction({
           threadTs: item.threadTs,
           coverage: hasMore ? "partial" : "complete",
           messageCount: messages.length,
+          itemTitle: item.title,
+          itemSummary: item.summary,
         },
       },
       factoryId,
diff --git a/templates/factory/actions/get-triage-item.ts b/templates/factory/actions/get-triage-item.ts
index 2118d2c783..cf3627cbf2 100644
--- a/templates/factory/actions/get-triage-item.ts
+++ b/templates/factory/actions/get-triage-item.ts
@@ -95,6 +95,8 @@ export default defineAction({
           feedbackCount: matchingFeedback.length,
           runCount: runs.length,
           coverage: item.coverage,
+          itemTitle: item.title,
+          itemSummary: item.summary,
         },
       },
       factoryId,
diff --git a/templates/factory/actions/list-factory-audit.ts b/templates/factory/actions/list-factory-audit.ts
index 8d84b6aebd..f14abbc76c 100644
--- a/templates/factory/actions/list-factory-audit.ts
+++ b/templates/factory/actions/list-factory-audit.ts
@@ -7,9 +7,17 @@ import { and, desc, eq, inArray } from "drizzle-orm";
 import { z } from "zod";
 
 import { getDb } from "../server/db/index.js";
-import { factoryAuditEvents } from "../server/db/schema.js";
+import {
+  factoryAuditEvents,
+  triageItems,
+  triageRuns,
+} from "../server/db/schema.js";
+import { projectFactoryAuditReport } from "../server/lib/factory-audit-report.js";
 import {
   factoryIdSchema,
+  orgFactoryItemFilter,
+  orgFactoryRunFilter,
+  readAutomationDisplayName,
   readAutomationFactoryId,
 } from "../server/lib/factory-scope.js";
 import {
@@ -39,23 +47,30 @@ export default defineAction({
     const factoryDefinitions = definitions.filter(
       ({ meta, name, resource }) =>
         meta.domain === "factory" &&
-        readAutomationFactoryId(meta, resource.content) === factoryId &&
+        readAutomationFactoryId(meta, resource.content, resource.path) ===
+          factoryId &&
         (!automation || name === automation),
     );
     const runGroups = await Promise.all(
-      factoryDefinitions.map(async ({ name, resource }) =>
-        listAutomationRuns({
+      factoryDefinitions.map(async ({ name, resource }) => {
+        const runs = await listAutomationRuns({
           owners: [resource.owner],
           automation: name,
           appId: "factory",
           limit,
-        }),
-      ),
+        });
+        // Absent must stay distinguishable from a stored label so the client
+        // can derive its own fallback instead of rendering the nested path.
+        const displayName = readAutomationDisplayName(resource.content);
+        return runs.map((run) => ({ run, displayName }));
+      }),
     );
-    const runs = runGroups.flat().sort((a, b) => b.startedAt - a.startedAt);
-    const boundedRuns = runs.slice(0, limit);
-    const runIds = boundedRuns
-      .map((run) => run.runId)
+    const entries = runGroups
+      .flat()
+      .sort((a, b) => b.run.startedAt - a.run.startedAt);
+    const boundedEntries = entries.slice(0, limit);
+    const runIds = boundedEntries
+      .map(({ run }) => run.runId)
       .filter((runId): runId is string => Boolean(runId));
 
     const db = getDb();
@@ -80,33 +95,98 @@ export default defineAction({
       eventsByRun.set(event.automationRunId, current);
     }
 
+    const itemIds = [
+      ...new Set(
+        events.flatMap((event) => {
+          const ids: string[] = [];
+          if (event.itemId) ids.push(event.itemId);
+          const details = parseDetails(event.detailsJson);
+          const listed = details.itemIds;
+          if (Array.isArray(listed)) {
+            for (const value of listed) {
+              if (typeof value === "string" && value) ids.push(value);
+            }
+          }
+          return ids;
+        }),
+      ),
+    ];
+    const itemRows = itemIds.length
+      ? await db
+          .select({
+            id: triageItems.id,
+            title: triageItems.title,
+            summary: triageItems.summary,
+            source: triageItems.source,
+            sourceUrl: triageItems.sourceUrl,
+          })
+          .from(triageItems)
+          .where(
+            and(
+              orgFactoryItemFilter(orgId, factoryId),
+              inArray(triageItems.id, itemIds),
+            ),
+          )
+      : [];
+    const runRows = itemIds.length
+      ? await db
+          .select({
+            itemId: triageRuns.itemId,
+            status: triageRuns.status,
+            error: triageRuns.error,
+            provider: triageRuns.provider,
+            startedAt: triageRuns.startedAt,
+          })
+          .from(triageRuns)
+          .where(
+            and(
+              orgFactoryRunFilter(orgId, factoryId),
+              inArray(triageRuns.itemId, itemIds),
+            ),
+          )
+      : [];
+
     return {
-      runs: boundedRuns.map((run) => ({
-        id: run.id,
-        automation: run.automation,
-        runId: run.runId,
-        threadId: run.threadId,
-        status: run.status,
-        startedAt: run.startedAt,
-        finishedAt: run.finishedAt,
-        error: run.error,
-        events: (eventsByRun.get(run.runId ?? "") ?? []).map((event) => ({
-          id: event.id,
-          automationRunId: event.automationRunId,
-          automationThreadId: event.automationThreadId,
-          automationName: event.automationName,
-          itemId: event.itemId,
-          source: event.source,
-          sourceUrl: event.sourceUrl,
-          action: event.action,
-          kind: event.kind,
-          status: event.status,
-          summary: event.summary,
-          details: parseDetails(event.detailsJson),
-          createdAt: event.createdAt,
-        })),
-      })),
-      count: boundedRuns.length,
+      runs: boundedEntries.map(({ run, displayName }) => {
+        const mappedEvents = (eventsByRun.get(run.runId ?? "") ?? []).map(
+          (event) => ({
+            id: event.id,
+            automationRunId: event.automationRunId,
+            automationThreadId: event.automationThreadId,
+            automationName: event.automationName,
+            itemId: event.itemId,
+            source: event.source,
+            sourceUrl: event.sourceUrl,
+            action: event.action,
+            kind: event.kind,
+            status: event.status,
+            summary: event.summary,
+            details: parseDetails(event.detailsJson),
+            createdAt: event.createdAt,
+          }),
+        );
+        const report = projectFactoryAuditReport(
+          mappedEvents,
+          itemRows,
+          runRows,
+          { startedAt: run.startedAt, finishedAt: run.finishedAt },
+        );
+        return {
+          id: run.id,
+          automation: run.automation,
+          displayName,
+          runId: run.runId,
+          threadId: run.threadId,
+          status: run.status,
+          startedAt: run.startedAt,
+          finishedAt: run.finishedAt,
+          error: run.error,
+          counts: report.counts,
+          items: report.items,
+          trace: report.trace,
+        };
+      }),
+      count: boundedEntries.length,
     };
   },
 });
diff --git a/templates/factory/actions/list-factory-automations.ts b/templates/factory/actions/list-factory-automations.ts
index 180d2b52d7..4ec99e92a0 100644
--- a/templates/factory/actions/list-factory-automations.ts
+++ b/templates/factory/actions/list-factory-automations.ts
@@ -43,7 +43,8 @@ export default defineAction({
     const scoped = definitions.filter(
       ({ meta, resource }) =>
         meta.domain === "factory" &&
-        readAutomationFactoryId(meta, resource.content) === factoryId,
+        readAutomationFactoryId(meta, resource.content, resource.path) ===
+          factoryId,
     );
     return Promise.all(
       scoped.map(async ({ resource, name, meta, body, canUpdate }) => {
diff --git a/templates/factory/actions/list-triage-items.ts b/templates/factory/actions/list-triage-items.ts
index f253b41c6e..6b427fc5bc 100644
--- a/templates/factory/actions/list-triage-items.ts
+++ b/templates/factory/actions/list-triage-items.ts
@@ -106,26 +106,29 @@ export default defineAction({
       };
     });
 
-    for (const item of listedItems) {
-      await recordFactoryAudit(
-        context,
-        { userEmail, orgId },
-        {
-          action: "list-triage-items",
-          kind: "read",
-          itemId: item.itemId,
-          source: item.source,
-          sourceUrl: item.sourceUrl,
-          summary: item.title,
-          details: {
-            status: item.status,
-            coverage: item.coverage,
-            decision: item.latestDecision?.outcome ?? null,
-          },
+    const purpose = needsReview ? "review_candidates" : "repeat_scan";
+    const noun = listedItems.length === 1 ? "item" : "items";
+    await recordFactoryAudit(
+      context,
+      { userEmail, orgId },
+      {
+        action: "list-triage-items",
+        kind: "read",
+        source: source ?? listedItems[0]?.source ?? null,
+        summary: needsReview
+          ? `Loaded ${listedItems.length} review candidate${listedItems.length === 1 ? "" : "s"}.`
+          : `Loaded ${listedItems.length} recent ${source ?? "queue"} ${noun}.`,
+        details: {
+          purpose,
+          limit,
+          count: listedItems.length,
+          needsReview,
+          source: source ?? null,
+          itemIds: listedItems.map((item) => item.itemId),
         },
-        factoryId,
-      );
-    }
+      },
+      factoryId,
+    );
     return listedItems;
   },
 });
diff --git a/templates/factory/actions/run-factory-automation.ts b/templates/factory/actions/run-factory-automation.ts
index 182629b522..d52c095469 100644
--- a/templates/factory/actions/run-factory-automation.ts
+++ b/templates/factory/actions/run-factory-automation.ts
@@ -37,8 +37,11 @@ export default defineAction({
     );
     if (!definition) throw new Error("Factory automation not found.");
     if (
-      readAutomationFactoryId(definition.meta, definition.resource.content) !==
-      factoryId
+      readAutomationFactoryId(
+        definition.meta,
+        definition.resource.content,
+        definition.resource.path,
+      ) !== factoryId
     ) {
       throw new Error("Factory automation not found.");
     }
@@ -47,7 +50,8 @@ export default defineAction({
       orgId,
       appId: "factory",
       scope: "organization",
-      name: definition.name,
+      path: definition.resource.path,
+      requestHeaders: context?.requestHeaders,
     });
   },
 });
diff --git a/templates/factory/actions/save-factory-automation.ts b/templates/factory/actions/save-factory-automation.ts
index 9a93302a83..869db64fe4 100644
--- a/templates/factory/actions/save-factory-automation.ts
+++ b/templates/factory/actions/save-factory-automation.ts
@@ -63,8 +63,11 @@ export default defineAction({
     );
     if (!definition) throw new Error("Factory automation not found.");
     if (
-      readAutomationFactoryId(definition.meta, definition.resource.content) !==
-      factoryId
+      readAutomationFactoryId(
+        definition.meta,
+        definition.resource.content,
+        definition.resource.path,
+      ) !== factoryId
     ) {
       throw new Error("Factory automation not found.");
     }
diff --git a/templates/factory/actions/save-triage-config.ts b/templates/factory/actions/save-triage-config.ts
index 73cf5e979d..9743ad5926 100644
--- a/templates/factory/actions/save-triage-config.ts
+++ b/templates/factory/actions/save-triage-config.ts
@@ -13,6 +13,7 @@ import {
 } from "../server/lib/factory-automation-plan.js";
 import {
   assertUniqueSlackChannelForFactory,
+  builderSlackUserIdSchema,
   factoryConfigRowId,
   factoryIdSchema,
   readTriageConfigRow,
@@ -36,14 +37,7 @@ export default defineAction({
     slackWorkspace: workspaceSchema.optional(),
     slackChannelId: z.string().trim().max(128).optional(),
     slackChannelName: z.string().trim().max(200).optional(),
-    builderSlackUserId: z
-      .string()
-      .trim()
-      .max(32)
-      .refine((value) => value === "" || /^[UW][A-Z0-9]+$/i.test(value), {
-        message: "Builder Slack member id must look like U01234567.",
-      })
-      .optional(),
+    builderSlackUserId: builderSlackUserIdSchema.optional(),
     pollingEnabled: z.boolean().optional(),
     githubPollingEnabled: z.boolean().optional(),
     sentryPollingEnabled: z.boolean().optional(),
diff --git a/templates/factory/actions/start-builder-for-item.ts b/templates/factory/actions/start-builder-for-item.ts
index a903e3ca4f..e48b1690a3 100644
--- a/templates/factory/actions/start-builder-for-item.ts
+++ b/templates/factory/actions/start-builder-for-item.ts
@@ -670,6 +670,7 @@ export default defineAction({
             details: {
               provider: "bot-tag",
               runId,
+              factoryRunId: runId,
               relatedItemIds: relatedItems.map(({ id }) => id),
             },
           },
@@ -743,6 +744,7 @@ export default defineAction({
           details: {
             provider: "builder-http",
             runId,
+            factoryRunId: runId,
             providerTaskId: result.providerTaskId ?? null,
           },
         },
@@ -765,6 +767,25 @@ export default defineAction({
           heartbeatAt: new Date().toISOString(),
         })
         .where(and(eq(triageRuns.id, runId), eq(triageRuns.orgId, orgId)));
+      await recordFactoryAudit(
+        context,
+        { userEmail, orgId },
+        {
+          action: "start-builder-for-item",
+          kind: "external_action",
+          factoryId,
+          itemId,
+          source: item.source,
+          sourceUrl: item.sourceUrl,
+          status: "error",
+          summary: `Builder dispatch failed: ${message}`,
+          details: {
+            provider: isSlack ? "bot-tag" : "builder-http",
+            runId,
+            factoryRunId: runId,
+          },
+        },
+      );
       throw new Error(
         `Factory Builder dispatch failed after recording the run: ${message}`,
       );
diff --git a/templates/factory/app/components/factory/FactoryAuditView.layout.test.ts b/templates/factory/app/components/factory/FactoryAuditView.layout.test.ts
new file mode 100644
index 0000000000..8cb2ed970d
--- /dev/null
+++ b/templates/factory/app/components/factory/FactoryAuditView.layout.test.ts
@@ -0,0 +1,21 @@
+import { readFileSync } from "node:fs";
+
+import { describe, expect, it } from "vitest";
+
+function readViewSource() {
+  return readFileSync(
+    new URL("./FactoryAuditView.tsx", import.meta.url),
+    "utf8",
+  );
+}
+
+describe("FactoryAuditView outcome-first audit", () => {
+  it("renders run headlines from investigated outcomes instead of raw event checks", () => {
+    const source = readViewSource();
+    expect(source).toContain("formatRunHeadline(run.counts, t)");
+    expect(source).toContain("run.items");
+    expect(source).toContain('t("factoryRoute.auditTrace")');
+    expect(source).not.toContain("formatAuditCountLabel");
+    expect(source).not.toContain("Slack thread");
+  });
+});
diff --git a/templates/factory/app/components/factory/FactoryAuditView.tsx b/templates/factory/app/components/factory/FactoryAuditView.tsx
index 05f32353c5..c99872147b 100644
--- a/templates/factory/app/components/factory/FactoryAuditView.tsx
+++ b/templates/factory/app/components/factory/FactoryAuditView.tsx
@@ -9,16 +9,22 @@ import {
   IconExternalLink,
   IconSearch,
 } from "@tabler/icons-react";
-import { useEffect, useMemo, useRef } from "react";
+import { useEffect, useRef } from "react";
 import { useSearchParams } from "react-router";
 
 import { Card, CardContent, CardHeader, CardTitle } from "@/components/ui/card";
 
+type FactoryAuditCounts = {
+  newlyObserved: number;
+  scanned: number;
+  investigated: number;
+  held: number;
+  dispatched: number;
+  failed: number;
+};
+
 type FactoryAuditEvent = {
   id: string;
-  automationRunId: string | null;
-  automationThreadId: string | null;
-  automationName: string | null;
   itemId: string | null;
   source: string | null;
   sourceUrl: string | null;
@@ -30,16 +36,45 @@ type FactoryAuditEvent = {
   createdAt: string;
 };
 
+type FactoryAuditItem = {
+  itemId: string;
+  source: string | null;
+  sourceUrl: string | null;
+  title: string;
+  outcome: "held" | "dispatched" | "failed" | "inspected";
+  status: string;
+  rationale: string | null;
+  dispatchError: string | null;
+  clearBug: boolean | null;
+  productUx: boolean | null;
+  ownerArea: string | null;
+  guards: string | null;
+  events: FactoryAuditEvent[];
+};
+
+type FactoryAuditTraceStep = {
+  id: string;
+  action: string;
+  summary: string;
+  status: string;
+  createdAt: string;
+  count: number;
+  purpose: string | null;
+};
+
 type FactoryAuditRun = {
   id: string;
   automation: string;
+  displayName: string | null;
   runId: string | null;
   threadId: string | null;
   status: string;
   startedAt: number;
   finishedAt: number | null;
   error: string | null;
-  events: FactoryAuditEvent[];
+  counts: FactoryAuditCounts;
+  items: FactoryAuditItem[];
+  trace: FactoryAuditTraceStep[];
 };
 
 type FactoryAuditResponse = {
@@ -47,21 +82,6 @@ type FactoryAuditResponse = {
   count: number;
 };
 
-type AuditItemGroup = {
-  key: string;
-  events: FactoryAuditEvent[];
-  itemId: string | null;
-  source: string | null;
-  sourceUrl: string | null;
-  title: string;
-  outcome: string;
-  status: string;
-  latestAt: string;
-  checks: number;
-  decision: FactoryAuditEvent | null;
-  externalAction: FactoryAuditEvent | null;
-};
-
 export function FactoryAuditView({
   factoryId,
   refreshToken = 0,
@@ -76,7 +96,13 @@ export function FactoryAuditView({
   const auditQuery = useActionQuery<FactoryAuditResponse>(
     "list-factory-audit",
     { factoryId, limit: 30 },
-    { staleTime: 5_000 },
+    {
+      staleTime: 5_000,
+      refetchInterval: (query) =>
+        query.state.data?.runs.some((run) => run.status === "running")
+          ? 1_000
+          : false,
+    },
   );
   const refetchAudit = auditQuery.refetch;
   const runs = auditQuery.data?.runs ?? [];
@@ -140,14 +166,9 @@ export function FactoryAuditView({
         <div className="grid gap-4 lg:grid-cols-[minmax(240px,.4fr)_minmax(0,1fr)]">
           <Card>
             <CardHeader className="px-4 py-3">
-              <div className="flex items-center justify-between gap-3">
-                <CardTitle className="text-sm">
-                  {t("factoryRoute.auditRuns")}
-                </CardTitle>
-                <span className="text-xs text-muted-foreground">
-                  {runs.length}
-                </span>
-              </div>
+              <CardTitle className="text-sm">
+                {t("factoryRoute.auditRuns")}
+              </CardTitle>
             </CardHeader>
             <CardContent className="p-0">
               <div className="grid gap-1.5 p-2">
@@ -167,17 +188,16 @@ export function FactoryAuditView({
                     >
                       <div className="flex items-center justify-between gap-3">
                         <span className="min-w-0 truncate text-sm font-medium">
-                          {formatAutomationName(run.automation)}
+                          {automationLabel(run)}
                         </span>
-                        <AuditStatus status={run.status} />
+                        <AuditStatus status={runHeadlineStatus(run)} />
                       </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 className="min-w-0 truncate">
+                          {formatRunHeadline(run.counts, t)}
                         </span>
                       </div>
                     </button>
@@ -192,16 +212,19 @@ export function FactoryAuditView({
               <div className="flex flex-wrap items-start justify-between gap-3">
                 <div className="min-w-0">
                   <CardTitle className="truncate text-base">
-                    {selectedRun &&
-                      formatAutomationName(selectedRun.automation)}
+                    {selectedRun && automationLabel(selectedRun)}
                   </CardTitle>
                   {selectedRun && (
                     <p className="mt-1 truncate text-xs text-muted-foreground">
                       {formatAuditAge(selectedRun.startedAt)}
+                      <span aria-hidden="true"> · </span>
+                      {formatRunHeadline(selectedRun.counts, t)}
                     </p>
                   )}
                 </div>
-                {selectedRun && <AuditStatus status={selectedRun.status} />}
+                {selectedRun && (
+                  <AuditStatus status={runHeadlineStatus(selectedRun)} />
+                )}
               </div>
             </CardHeader>
             <CardContent className="pt-4">
@@ -224,35 +247,17 @@ function AuditRunDetail({
   factoryId: string;
 }) {
   const t = useT();
-  const groups = useMemo(() => groupAuditEvents(run.events), [run.events]);
-  const itemCount = new Set(
-    run.events
-      .map((event) => event.itemId)
-      .filter((itemId): itemId is string => Boolean(itemId)),
-  ).size;
-  const decisionCount = run.events.filter(
-    (event) => event.kind === "decision",
-  ).length;
-  const actionCount = run.events.filter(
-    (event) => event.kind === "external_action",
-  ).length;
+  const items = run.items ?? [];
+  const trace = run.trace ?? [];
+  const failedItems = items.filter((item) => item.outcome === "failed");
 
   return (
     <>
       <div className="flex flex-wrap items-center gap-x-4 gap-y-2 text-xs text-muted-foreground">
-        <span>
-          {itemCount} {itemCount === 1 ? "item" : "items"}
-        </span>
-        <span>
-          {decisionCount} {decisionCount === 1 ? "decision" : "decisions"}
-        </span>
-        <span>
-          {actionCount} {actionCount === 1 ? "action" : "actions"}
-        </span>
         {run.threadId && (
           <a
             href={`/chat/${encodeURIComponent(run.threadId)}`}
-            className="ml-auto inline-flex items-center text-primary hover:underline"
+            className="inline-flex items-center text-primary hover:underline"
             onClick={(event) => {
               if (
                 event.metaKey ||
@@ -272,167 +277,194 @@ function AuditRunDetail({
         )}
       </div>
 
-      {run.error && (
+      {(run.error || failedItems.length > 0) && (
         <div className="mt-4 rounded-md bg-destructive/5 p-3 text-sm">
           <p className="font-medium text-destructive">
             {t("factoryRoute.auditRunError")}
           </p>
-          <p className="mt-1 break-words text-muted-foreground">{run.error}</p>
+          {run.error ? (
+            <p className="mt-1 break-words text-muted-foreground">
+              {run.error}
+            </p>
+          ) : null}
+          {failedItems.map((item) => (
+            <p
+              key={item.itemId}
+              className="mt-1 break-words text-muted-foreground"
+            >
+              {item.title}
+              {item.dispatchError ? ` — ${item.dispatchError}` : ""}
+            </p>
+          ))}
         </div>
       )}
 
-      <div className="mt-5">
-        <div className="mb-2 flex items-center justify-between gap-3">
-          <h3 className="text-sm font-medium">Activity</h3>
-          <span className="text-xs text-muted-foreground">
-            {groups.length} {groups.length === 1 ? "thing" : "things"}
-          </span>
-        </div>
-        {groups.length === 0 ? (
+      <div className="mt-5 grid gap-1.5">
+        {items.length === 0 ? (
           <p className="rounded-md bg-muted/20 p-4 text-sm text-muted-foreground">
             {t("factoryRoute.auditNoEvents")}
           </p>
         ) : (
-          <div className="grid gap-1.5">
-            {groups.map((group) => (
-              <AuditItemRow
-                key={group.key}
-                group={group}
-                factoryId={factoryId}
-              />
-            ))}
-          </div>
+          items.map((item) => (
+            <AuditItemRow key={item.itemId} item={item} factoryId={factoryId} />
+          ))
         )}
       </div>
+
+      {trace.length > 0 && (
+        <details className="group mt-5 overflow-hidden rounded-lg border border-border bg-muted/20">
+          <summary className="flex cursor-pointer list-none items-center justify-between gap-3 rounded-lg px-3 py-3 text-sm hover:bg-muted/40 focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-inset focus-visible:ring-ring [&::-webkit-details-marker]:hidden">
+            <span>{t("factoryRoute.auditTrace")}</span>
+            <IconChevronDown className="size-4 shrink-0 text-muted-foreground transition-transform duration-200 ease-[var(--ease-collapse)] group-open:rotate-180 motion-reduce:transition-none" />
+          </summary>
+          <div className="space-y-2 px-4 pb-4">
+            {trace.map((step) => (
+              <div
+                key={step.id}
+                className="flex items-center justify-between gap-3 text-xs text-muted-foreground"
+              >
+                <span className="min-w-0 truncate">{step.summary}</span>
+                <time className="shrink-0">
+                  {formatAuditAge(step.createdAt)}
+                </time>
+              </div>
+            ))}
+          </div>
+        </details>
+      )}
     </>
   );
 }
 
 function AuditItemRow({
-  group,
+  item,
   factoryId,
 }: {
-  group: AuditItemGroup;
+  item: FactoryAuditItem;
   factoryId: string;
 }) {
   const t = useT();
-  const decision = group.decision;
-  const rationale = decision?.summary ?? group.externalAction?.summary ?? null;
-  const sourceLink = resolveAuditSourceLink(group);
+  const sourceLink = resolveAuditSourceLink(item);
 
   return (
     <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} />
+        <AuditSourceIcon source={item.source} />
         <div className="min-w-0 flex-1">
-          <p className="truncate text-sm font-medium">{group.title}</p>
+          <p className="truncate text-sm font-medium">{item.title}</p>
           <p className="mt-0.5 truncate text-xs text-muted-foreground">
-            {group.outcome}
-            <span aria-hidden="true"> · </span>
-            {group.checks} {formatAuditCountLabel(group.checks)}
+            {formatItemOutcome(item.outcome, t)}
           </p>
         </div>
         <span className="hidden shrink-0 text-[11px] text-muted-foreground sm:block">
-          {formatAuditSource(group.source)}
+          {formatAuditSource(item.source)}
         </span>
-        <AuditStatus status={group.status} compact />
+        <AuditStatus status={item.status} compact />
         <IconChevronDown className="size-4 shrink-0 text-muted-foreground transition-transform duration-200 ease-[var(--ease-collapse)] group-open:rotate-180 motion-reduce:transition-none" />
       </summary>
       <div className="bg-muted/20 px-4 pb-4 pt-3">
         <div className="grid gap-3 sm:grid-cols-[minmax(0,1fr)_auto]">
           <div>
             <p className="text-[11px] font-medium uppercase tracking-wide text-muted-foreground">
-              {rationale ? "Why" : "What happened"}
+              {item.rationale || item.dispatchError
+                ? t("factoryRoute.auditWhy")
+                : t("factoryRoute.auditWhatHappened")}
             </p>
             <p className="mt-1 max-w-[72ch] text-sm leading-6">
-              {rationale ??
-                "The source was inspected, but no action was taken."}
+              {item.dispatchError ??
+                item.rationale ??
+                t("factoryRoute.auditInspectedOnly")}
             </p>
           </div>
-          <AuditDecisionFacts event={decision} />
+          <AuditDecisionFacts item={item} />
         </div>
 
-        <div className="mt-4 rounded-md bg-background/40 p-3">
-          <p className="text-[11px] font-medium uppercase tracking-wide text-muted-foreground">
-            Trace
-          </p>
-          <div className="mt-2 space-y-2">
-            {group.events.map((event) => (
-              <div
-                key={event.id}
-                className="flex items-center justify-between gap-3 text-xs text-muted-foreground"
-              >
-                <span className="flex min-w-0 items-center gap-2">
-                  <AuditStatus status={event.status} compact />
-                  <span className="truncate">
-                    {formatAuditAction(event.action)}
+        {item.events.length > 0 && (
+          <div className="mt-4 rounded-md bg-background/40 p-3">
+            <p className="text-[11px] font-medium uppercase tracking-wide text-muted-foreground">
+              {t("factoryRoute.auditTrace")}
+            </p>
+            <div className="mt-2 space-y-2">
+              {item.events.map((entry) => (
+                <div
+                  key={entry.id}
+                  className="flex items-center justify-between gap-3 text-xs text-muted-foreground"
+                >
+                  <span className="flex min-w-0 items-center gap-2">
+                    <AuditStatus status={entry.status} compact />
+                    <span className="truncate">
+                      {formatAuditAction(entry.action)}
+                    </span>
                   </span>
-                </span>
-                <time className="shrink-0">
-                  {formatAuditAge(event.createdAt)}
-                </time>
-              </div>
-            ))}
-          </div>
-        </div>
-
-        {(group.itemId || sourceLink) && (
-          <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?factoryId=${encodeURIComponent(factoryId)}&tab=inbox&itemId=${encodeURIComponent(group.itemId)}`}
-                className="text-primary hover:underline"
-              >
-                {t("factoryRoute.auditOpenItem")}
-              </a>
-            )}
-            {sourceLink && (
-              <a
-                href={sourceLink}
-                target="_blank"
-                rel="noreferrer"
-                className="inline-flex items-center gap-1 text-primary hover:underline"
-              >
-                {t("factoryRoute.auditOpenSource")}
-                <IconExternalLink className="size-3" />
-              </a>
-            )}
+                  <time className="shrink-0">
+                    {formatAuditAge(entry.createdAt)}
+                  </time>
+                </div>
+              ))}
+            </div>
           </div>
         )}
+
+        <div className="mt-4 flex flex-wrap items-center gap-x-4 gap-y-2 bg-background/40 px-3 py-3 text-xs">
+          <a
+            href={`/factory?factoryId=${encodeURIComponent(factoryId)}&tab=inbox&itemId=${encodeURIComponent(item.itemId)}`}
+            className="text-primary hover:underline"
+          >
+            {t("factoryRoute.auditOpenItem")}
+          </a>
+          {sourceLink && (
+            <a
+              href={sourceLink}
+              target="_blank"
+              rel="noreferrer"
+              className="inline-flex items-center gap-1 text-primary hover:underline"
+            >
+              {t("factoryRoute.auditOpenSource")}
+              <IconExternalLink className="size-3" />
+            </a>
+          )}
+        </div>
       </div>
     </details>
   );
 }
 
-function AuditDecisionFacts({ event }: { event: FactoryAuditEvent | null }) {
+function AuditDecisionFacts({ item }: { item: FactoryAuditItem }) {
   const t = useT();
-  if (!event) return null;
-  const clearBug = readBooleanDetail(event.details, "clearBug");
-  const productUx = readBooleanDetail(event.details, "productUxImplications");
-  const ownerArea = readStringDetail(event.details, "ownerOwnedArea");
-  const guards = readGuardSummary(event.details.guardResults);
-  if (clearBug === null && productUx === null && !ownerArea && !guards)
+  if (
+    item.clearBug === null &&
+    item.productUx === null &&
+    !item.ownerArea &&
+    !item.guards
+  ) {
     return null;
+  }
 
   return (
     <div className="flex flex-wrap content-start gap-x-3 gap-y-1 text-xs text-muted-foreground sm:max-w-[260px] sm:justify-end">
-      {clearBug !== null && (
+      {item.clearBug !== null && (
         <AuditFact
           label={t("factoryRoute.auditClearBug")}
-          value={yesNo(clearBug)}
+          value={yesNo(item.clearBug)}
         />
       )}
-      {productUx !== null && (
+      {item.productUx !== null && (
         <AuditFact
           label={t("factoryRoute.auditUxImpact")}
-          value={yesNo(productUx)}
+          value={yesNo(item.productUx)}
         />
       )}
-      {ownerArea && (
-        <AuditFact label={t("factoryRoute.auditOwnerArea")} value={ownerArea} />
+      {item.ownerArea && (
+        <AuditFact
+          label={t("factoryRoute.auditOwnerArea")}
+          value={item.ownerArea}
+        />
       )}
-      {guards && (
-        <AuditFact label={t("factoryRoute.auditGuardsLabel")} value={guards} />
+      {item.guards && (
+        <AuditFact
+          label={t("factoryRoute.auditGuardsLabel")}
+          value={item.guards}
+        />
       )}
     </div>
   );
@@ -502,117 +534,51 @@ function AuditSkeleton({ rows }: { rows: number }) {
   );
 }
 
-function groupAuditEvents(events: FactoryAuditEvent[]): AuditItemGroup[] {
-  const grouped = new Map<string, FactoryAuditEvent[]>();
-  for (const event of events) {
-    const key = event.itemId ?? `event:${event.id}`;
-    const current = grouped.get(key) ?? [];
-    current.push(event);
-    grouped.set(key, current);
+function runHeadlineStatus(run: FactoryAuditRun): string {
+  if (run.status === "error" || (run.counts?.failed ?? 0) > 0) return "error";
+  if (run.status === "running") return "running";
+  if ((run.counts?.held ?? 0) > 0 && (run.counts?.dispatched ?? 0) === 0) {
+    return "skipped";
   }
-
-  return [...grouped.entries()]
-    .map(([key, groupEvents]) => {
-      const decision =
-        groupEvents.find((event) => event.kind === "decision") ?? null;
-      const externalAction =
-        groupEvents.find((event) => event.kind === "external_action") ?? null;
-      const titleEvent =
-        groupEvents.find((event) => event.action === "get-triage-item") ??
-        groupEvents.find(
-          (event) => event.action === "get-slack-feedback-context",
-        ) ??
-        groupEvents.find((event) => event.action === "list-triage-items") ??
-        groupEvents.find((event) => event.kind === "observed") ??
-        groupEvents[0];
-      const latestAt = groupEvents.reduce(
-        (latest, event) =>
-          new Date(event.createdAt).getTime() > new Date(latest).getTime()
-            ? event.createdAt
-            : latest,
-        groupEvents[0].createdAt,
-      );
-
-      return {
-        key,
-        events: groupEvents,
-        itemId: titleEvent.itemId,
-        source: titleEvent.source,
-        sourceUrl: titleEvent.sourceUrl,
-        title: formatAuditSubject(titleEvent),
-        outcome: formatAuditOutcome(groupEvents, decision, externalAction),
-        status: formatGroupStatus(groupEvents, decision, externalAction),
-        latestAt,
-        checks: groupEvents.filter(
-          (event) => event.kind === "read" || event.kind === "observed",
-        ).length,
-        decision,
-        externalAction,
-      };
-    })
-    .sort(
-      (left, right) =>
-        new Date(right.latestAt).getTime() - new Date(left.latestAt).getTime(),
-    );
+  return run.status;
 }
 
-function formatAuditSubject(event: FactoryAuditEvent): string {
-  if (event.action === "get-slack-feedback-context") {
-    const messageCount = readNumberDetail(event.details, "messageCount");
-    return `Slack thread${messageCount === null ? "" : ` · ${messageCount} ${messageCount === 1 ? "message" : "messages"}`}`;
-  }
-  const summary = event.summary.trim();
-  const subject = summary.replace(/^(Inspected|Read)\s+/i, "");
-  return truncateAuditText(subject || formatAuditAction(event.action), 110);
-}
-
-function formatAuditOutcome(
-  events: FactoryAuditEvent[],
-  decision: FactoryAuditEvent | null,
-  externalAction: FactoryAuditEvent | null,
+function formatRunHeadline(
+  counts: FactoryAuditCounts | undefined,
+  t: ReturnType<typeof useT>,
 ): string {
-  if (externalAction) {
-    const provider = readStringDetail(externalAction.details, "provider");
-    if (provider === "bot-tag") return "Builder tagged in Slack";
-    if (provider === "builder-http") return "Builder fix submitted";
-    return "Action taken";
-  }
-  if (decision) {
-    const ownerArea = readStringDetail(decision.details, "ownerOwnedArea");
-    const productUx = readBooleanDetail(
-      decision.details,
-      "productUxImplications",
+  if (!counts) return "";
+  const parts: string[] = [];
+  if (counts.newlyObserved > 0) {
+    parts.push(
+      t("factoryRoute.auditObserved", { count: counts.newlyObserved }),
     );
-    if (decision.status === "skipped" || ownerArea || productUx === true) {
-      return "Held for review";
-    }
-    if (readBooleanDetail(decision.details, "clearBug") === true) {
-      return "Builder fix selected";
-    }
-    return "Decision recorded";
+  } else {
+    parts.push(t("factoryRoute.auditNoNew"));
   }
-  if (
-    events.some(
-      (event) =>
-        event.kind === "observed" && /no new|no result/i.test(event.summary),
-    )
-  ) {
-    return "No new items";
+  if (counts.scanned > 0 && counts.scanned !== counts.newlyObserved) {
+    parts.push(t("factoryRoute.auditScanned", { count: counts.scanned }));
+  }
+  if (counts.failed > 0) {
+    parts.push(t("factoryRoute.auditFailed", { count: counts.failed }));
+  }
+  if (counts.dispatched > 0) {
+    parts.push(t("factoryRoute.auditDispatched", { count: counts.dispatched }));
   }
-  return "Inspected only";
+  if (counts.held > 0) {
+    parts.push(t("factoryRoute.auditHeld", { count: counts.held }));
+  }
+  return parts.join(" · ");
 }
 
-function formatGroupStatus(
-  events: FactoryAuditEvent[],
-  decision: FactoryAuditEvent | null,
-  externalAction: FactoryAuditEvent | null,
+function formatItemOutcome(
+  outcome: FactoryAuditItem["outcome"],
+  t: ReturnType<typeof useT>,
 ): string {
-  if (events.some((event) => event.status === "error")) return "error";
-  if (externalAction) return externalAction.status;
-  if (decision) return decision.status;
-  return events.some((event) => event.status === "running")
-    ? "running"
-    : "success";
+  if (outcome === "failed") return t("factoryRoute.auditOutcomeFailed");
+  if (outcome === "dispatched") return t("factoryRoute.auditOutcomeDispatched");
+  if (outcome === "held") return t("factoryRoute.auditOutcomeHeld");
+  return t("factoryRoute.auditOutcomeInspected");
 }
 
 function formatAuditSource(source: string | null): string {
@@ -623,14 +589,9 @@ 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) {
+function resolveAuditSourceLink(item: FactoryAuditItem): string | null {
+  if (item.sourceUrl) return item.sourceUrl;
+  for (const event of item.events) {
     const channelId = readStringDetail(event.details, "channelId");
     const threadTs = readStringDetail(event.details, "threadTs");
     if (channelId && threadTs) return slackThreadUrl(channelId, threadTs);
@@ -643,6 +604,12 @@ function slackThreadUrl(channelId: string, threadTs: string): string {
   return `https://slack.com/archives/${encodeURIComponent(channelId)}/p${compactTs}?thread_ts=${encodeURIComponent(threadTs)}`;
 }
 
+function automationLabel(run: FactoryAuditRun): string {
+  if (run.displayName) return run.displayName;
+  const segments = run.automation.split("/");
+  return formatAutomationName(segments[segments.length - 1] || run.automation);
+}
+
 function formatAutomationName(value: string): string {
   const words = value
     .replace(/^factory-/, "")
@@ -665,10 +632,6 @@ function formatAuditAction(value: string): string {
   return formatAuditLabel(value).replace(/^Poll /, "Check ");
 }
 
-function formatAuditCountLabel(value: number): string {
-  return value === 1 ? "check" : "checks";
-}
-
 function formatAuditAge(value: string | number) {
   const date = new Date(value);
   if (Number.isNaN(date.getTime())) return String(value);
@@ -695,24 +658,6 @@ function formatAuditLabel(value: string): string {
     .replace(/\b\w/g, (letter) => letter.toUpperCase());
 }
 
-function truncateAuditText(value: string, maxLength: number): string {
-  return value.length > maxLength ? `${value.slice(0, maxLength - 1)}…` : value;
-}
-
-function readBooleanDetail(
-  details: Record<string, unknown>,
-  key: string,
-): boolean | null {
-  return typeof details[key] === "boolean" ? details[key] : null;
-}
-
-function readNumberDetail(
-  details: Record<string, unknown>,
-  key: string,
-): number | null {
-  return typeof details[key] === "number" ? details[key] : null;
-}
-
 function readStringDetail(
   details: Record<string, unknown>,
   key: string,
@@ -720,19 +665,6 @@ function readStringDetail(
   return typeof details[key] === "string" && details[key] ? details[key] : null;
 }
 
-function readGuardSummary(value: unknown): string | null {
-  if (!Array.isArray(value) || value.length === 0) return null;
-  const passed = value.filter(
-    (guard): guard is { passed: boolean } =>
-      typeof guard === "object" &&
-      guard !== null &&
-      "passed" in guard &&
-      typeof guard.passed === "boolean" &&
-      guard.passed,
-  ).length;
-  return `${passed}/${value.length} passed`;
-}
-
 function yesNo(value: boolean): string {
   return value ? "yes" : "no";
 }
diff --git a/templates/factory/app/components/factory/FactorySettingsView.layout.test.ts b/templates/factory/app/components/factory/FactorySettingsView.layout.test.ts
index 6c699948a4..de07d085df 100644
--- a/templates/factory/app/components/factory/FactorySettingsView.layout.test.ts
+++ b/templates/factory/app/components/factory/FactorySettingsView.layout.test.ts
@@ -19,12 +19,61 @@ describe("FactorySettingsView load gating", () => {
     expect(source).toContain("if (!configLoaded) {");
     expect(source).toContain("ActionQueryError");
     expect(source).toContain("onRetry={() => void query.refetch()}");
-    expect(source).toContain("disabled={mutation.isPending || !configLoaded}");
+    expect(source).toContain("disabled={saving || !configLoaded}");
     expect(source).toMatch(
       /if \(!configLoaded\) \{\s*toast\.error\(t\("triage\.settingsError"\)\);\s*return;/,
     );
     expect(source).toContain(
-      "automationFailureAlertEmail: automationFailureAlertEmail.trim()",
+      "automationFailureAlertEmail: form.automationFailureAlertEmail.trim()",
+    );
+    expect(source).toContain("channelId: form.channelId.trim()");
+    expect(source).toContain("repository: form.repository.trim()");
+    expect(source).toContain(
+      "builderSlackUserId: form.builderSlackUserId.trim()",
+    );
+  });
+});
+
+describe("FactorySettingsView factory switching", () => {
+  it("resets hydration when factoryId changes so Factory B cannot inherit Factory A edits", () => {
+    const source = readViewSource();
+
+    expect(source).toContain("hydratedRef.current = false");
+    expect(source).toContain("dirtyRef.current = false");
+    expect(source).toContain("setBaseline(null)");
+    expect(source).toContain("}, [factoryId]);");
+  });
+
+  it("keeps unsaved edits when a background refetch delivers new config", () => {
+    const source = readViewSource();
+
+    expect(source).toContain(
+      "if (hydratedRef.current && dirtyRef.current) return;",
+    );
+  });
+});
+
+describe("FactorySettingsView unsaved-change bar", () => {
+  it("saves from a sticky bar that only appears while the form is dirty", () => {
+    const source = readViewSource();
+
+    expect(source).toContain("const dirty = baseline !== null");
+    expect(source).toMatch(/\{dirty \? \(\s*<div className="sticky top-0/);
+    expect(source).toContain('t("triage.unsavedSettings")');
+    expect(source).toContain('t("triage.discardSettingsChanges")');
+    // The bar is the only save control; a second one at the bottom of a long
+    // page is what made saving invisible.
+    expect(source.match(/t\("triage\.saveSettings"\)/g)).toHaveLength(1);
+  });
+
+  it("does not overwrite edits made while Save is pending", () => {
+    const source = readViewSource();
+
+    expect(source).toContain(
+      '<fieldset disabled={saving} className="contents">',
+    );
+    expect(source).toContain(
+      "if (isSameForm(trimmedForm(latestFormRef.current), submitted))",
     );
   });
 });
diff --git a/templates/factory/app/components/factory/FactorySettingsView.tsx b/templates/factory/app/components/factory/FactorySettingsView.tsx
index 25712ec93d..3b7ecda052 100644
--- a/templates/factory/app/components/factory/FactorySettingsView.tsx
+++ b/templates/factory/app/components/factory/FactorySettingsView.tsx
@@ -7,7 +7,7 @@ import { buildSettingsRoute } from "@agent-native/core/client/navigation";
 import { SettingsGroup, SettingsRow } from "@agent-native/core/client/settings";
 import { ActionQueryError } from "@agent-native/dispatch/components";
 import { IconLoader2 } from "@tabler/icons-react";
-import { useEffect, useState } from "react";
+import { useCallback, useEffect, useRef, useState } from "react";
 import { Link } from "react-router";
 import { toast } from "sonner";
 
@@ -15,6 +15,8 @@ import { Button } from "@/components/ui/button";
 import { Input } from "@/components/ui/input";
 import { Switch } from "@/components/ui/switch";
 
+import { FactorySourceSettingsGroup } from "./FactorySourceSettingsGroup";
+
 type TriageConfig = {
   slackWorkspace?: "primary" | "secondary";
   slackChannelId?: string | null;
@@ -35,6 +37,60 @@ type TriageConfig = {
   };
 };
 
+type TriageFormState = {
+  workspace: "primary" | "secondary";
+  channelId: string;
+  channelName: string;
+  builderSlackUserId: string;
+  repository: string;
+  polling: boolean;
+  githubPolling: boolean;
+  sentryPolling: boolean;
+  sentryOrgSlug: string;
+  sentryProjectSlug: string;
+  sentryEnvironment: string;
+  automationFailureAlertsEnabled: boolean;
+  automationFailureAlertEmail: string;
+};
+
+function formStateFromConfig(data: TriageConfig): TriageFormState {
+  return {
+    workspace: data.slackWorkspace ?? "primary",
+    channelId: data.slackChannelId ?? "",
+    channelName: data.slackChannelName ?? "",
+    builderSlackUserId: data.builderSlackUserId ?? "",
+    repository: data.repository ?? "",
+    polling: data.pollingEnabled ?? false,
+    githubPolling: data.githubPollingEnabled ?? false,
+    sentryPolling: data.sentryPollingEnabled ?? false,
+    sentryOrgSlug: data.sentryOrgSlug ?? "",
+    sentryProjectSlug: data.sentryProjectSlug ?? "",
+    sentryEnvironment: data.sentryEnvironment ?? "",
+    automationFailureAlertsEnabled: data.automationFailureAlertsEnabled ?? true,
+    automationFailureAlertEmail: data.automationFailureAlertEmail ?? "",
+  };
+}
+
+function isSameForm(a: TriageFormState, b: TriageFormState) {
+  return (Object.keys(a) as (keyof TriageFormState)[]).every(
+    (key) => a[key] === b[key],
+  );
+}
+
+function trimmedForm(form: TriageFormState): TriageFormState {
+  return {
+    ...form,
+    channelId: form.channelId.trim(),
+    channelName: form.channelName.trim(),
+    builderSlackUserId: form.builderSlackUserId.trim(),
+    repository: form.repository.trim(),
+    sentryOrgSlug: form.sentryOrgSlug.trim(),
+    sentryProjectSlug: form.sentryProjectSlug.trim(),
+    sentryEnvironment: form.sentryEnvironment.trim(),
+    automationFailureAlertEmail: form.automationFailureAlertEmail.trim(),
+  };
+}
+
 type FactoryAutomationHealth = {
   status: "healthy" | "stale" | "error" | "no-data";
   lastCheckedAt?: number | null;
@@ -78,52 +134,99 @@ export function FactorySettingsView({
     {},
     { refetchInterval: 60_000 },
   );
+  const [baseline, setBaseline] = useState<TriageFormState | null>(null);
+  const hydratedRef = useRef(false);
+  const dirtyRef = useRef(false);
   const mutation = useActionMutation("save-triage-config");
 
+  const applyForm = useCallback((state: TriageFormState) => {
+    setWorkspace(state.workspace);
+    setChannelId(state.channelId);
+    setChannelName(state.channelName);
+    setBuilderSlackUserId(state.builderSlackUserId);
+    setRepository(state.repository);
+    setPolling(state.polling);
+    setGithubPolling(state.githubPolling);
+    setSentryPolling(state.sentryPolling);
+    setSentryOrgSlug(state.sentryOrgSlug);
+    setSentryProjectSlug(state.sentryProjectSlug);
+    setSentryEnvironment(state.sentryEnvironment);
+    setAutomationFailureAlertsEnabled(state.automationFailureAlertsEnabled);
+    setAutomationFailureAlertEmail(state.automationFailureAlertEmail);
+  }, []);
+
+  useEffect(() => {
+    hydratedRef.current = false;
+    dirtyRef.current = false;
+    setBaseline(null);
+  }, [factoryId]);
+
   useEffect(() => {
     const data = query.data as TriageConfig | undefined;
     if (!data) return;
-    setWorkspace(data.slackWorkspace ?? "primary");
-    setChannelId(data.slackChannelId ?? "");
-    setChannelName(data.slackChannelName ?? "");
-    setBuilderSlackUserId(data.builderSlackUserId ?? "");
-    setRepository(data.repository ?? "");
-    setPolling(data.pollingEnabled ?? false);
-    setGithubPolling(data.githubPollingEnabled ?? false);
-    setSentryPolling(data.sentryPollingEnabled ?? false);
-    setSentryOrgSlug(data.sentryOrgSlug ?? "");
-    setSentryProjectSlug(data.sentryProjectSlug ?? "");
-    setSentryEnvironment(data.sentryEnvironment ?? "");
-    setAutomationFailureAlertsEnabled(
-      data.automationFailureAlertsEnabled ?? true,
-    );
-    setAutomationFailureAlertEmail(data.automationFailureAlertEmail ?? "");
-  }, [query.data]);
+    // A background refetch must never overwrite edits the user has not saved
+    // yet: the sticky bar is the only signal those edits still exist.
+    if (hydratedRef.current && dirtyRef.current) return;
+    const next = formStateFromConfig(data);
+    applyForm(next);
+    setBaseline(next);
+    hydratedRef.current = true;
+  }, [applyForm, query.data]);
 
   const configLoaded = Boolean(query.data) && !query.isError;
 
+  const currentForm: TriageFormState = {
+    workspace,
+    channelId,
+    channelName,
+    builderSlackUserId,
+    repository,
+    polling,
+    githubPolling,
+    sentryPolling,
+    sentryOrgSlug,
+    sentryProjectSlug,
+    sentryEnvironment,
+    automationFailureAlertsEnabled,
+    automationFailureAlertEmail,
+  };
+  const dirty = baseline !== null && !isSameForm(baseline, currentForm);
+  const saving = mutation.isPending;
+  const latestFormRef = useRef(currentForm);
+  latestFormRef.current = currentForm;
+
+  useEffect(() => {
+    dirtyRef.current = dirty;
+  }, [dirty]);
+
   const saveSettings = async () => {
     if (!configLoaded) {
       toast.error(t("triage.settingsError"));
       return;
     }
+    const submitted = trimmedForm(currentForm);
     try {
       await mutation.mutateAsync({
         factoryId,
-        slackWorkspace: workspace,
-        slackChannelId: channelId,
-        slackChannelName: channelName,
-        builderSlackUserId,
-        repository,
-        pollingEnabled: polling,
-        githubPollingEnabled: githubPolling,
-        sentryPollingEnabled: sentryPolling,
-        sentryOrgSlug,
-        sentryProjectSlug,
-        sentryEnvironment,
-        automationFailureAlertsEnabled,
-        automationFailureAlertEmail: automationFailureAlertEmail.trim(),
+        slackWorkspace: submitted.workspace,
+        slackChannelId: submitted.channelId,
+        slackChannelName: submitted.channelName,
+        builderSlackUserId: submitted.builderSlackUserId,
+        repository: submitted.repository,
+        pollingEnabled: submitted.polling,
+        githubPollingEnabled: submitted.githubPolling,
+        sentryPollingEnabled: submitted.sentryPolling,
+        sentryOrgSlug: submitted.sentryOrgSlug,
+        sentryProjectSlug: submitted.sentryProjectSlug,
+        sentryEnvironment: submitted.sentryEnvironment,
+        automationFailureAlertsEnabled:
+          submitted.automationFailureAlertsEnabled,
+        automationFailureAlertEmail: submitted.automationFailureAlertEmail,
       });
+      if (isSameForm(trimmedForm(latestFormRef.current), submitted)) {
+        applyForm(submitted);
+      }
+      setBaseline(submitted);
       toast.success(t("triage.settingsSaved"));
     } catch (error) {
       toast.error(
@@ -155,6 +258,34 @@ export function FactorySettingsView({
 
   return (
     <div className="mx-auto w-full max-w-3xl space-y-6 p-4 lg:p-6">
+      {dirty ? (
+        <div className="sticky top-0 z-10 -mt-4 bg-background pt-4 lg:-mt-6 lg:pt-6">
+          <div className="flex flex-wrap items-center justify-between gap-3 rounded-xl border border-border/70 bg-card px-4 py-3 shadow-sm">
+            <span className="text-sm font-medium text-foreground">
+              {t("triage.unsavedSettings")}
+            </span>
+            <div className="flex items-center gap-2">
+              <Button
+                type="button"
+                variant="ghost"
+                onClick={() => baseline && applyForm(baseline)}
+                disabled={saving}
+              >
+                {t("triage.discardSettingsChanges")}
+              </Button>
+              <Button
+                type="button"
+                onClick={() => void saveSettings()}
+                disabled={saving || !configLoaded}
+              >
+                {mutation.isPending && <IconLoader2 className="animate-spin" />}
+                {t("triage.saveSettings")}
+              </Button>
+            </div>
+          </div>
+        </div>
+      ) : null}
+
       <SettingsGroup variant="soft">
         <SettingsRow
           label={t("factoryRoute.workspaceIntegrations")}
@@ -176,192 +307,208 @@ export function FactorySettingsView({
         />
       </SettingsGroup>
 
-      <SettingsGroup variant="soft">
-        <SettingsRow
-          label={t("triage.slackWorkspace")}
-          control={
-            <select
-              aria-label={t("triage.slackWorkspace")}
-              value={workspace}
-              onChange={(event) =>
-                setWorkspace(event.target.value as "primary" | "secondary")
-              }
-              className="h-9 w-full rounded-md border border-input bg-background px-3 text-sm sm:w-64"
-            >
-              <option value="primary">primary</option>
-              <option value="secondary">secondary</option>
-            </select>
-          }
-        />
-        <SettingsRow
-          label={t("triage.slackChannelId")}
-          control={
-            <Input
-              aria-label={t("triage.slackChannelId")}
-              value={channelId}
-              onChange={(event) => setChannelId(event.target.value)}
-              placeholder={t("triage.slackChannelPlaceholder")}
-              className={fieldControlClass}
-            />
-          }
-        />
-        <SettingsRow
-          label={t("triage.slackChannelName")}
-          control={
-            <Input
-              aria-label={t("triage.slackChannelName")}
-              value={channelName}
-              onChange={(event) => setChannelName(event.target.value)}
-              placeholder={t("triage.slackChannelNamePlaceholder")}
-              className={fieldControlClass}
-            />
-          }
-        />
-        <SettingsRow
-          label={t("triage.builderSlackUserId")}
-          control={
-            <Input
-              aria-label={t("triage.builderSlackUserId")}
-              value={builderSlackUserId}
-              onChange={(event) => setBuilderSlackUserId(event.target.value)}
-              placeholder={t("triage.builderSlackUserIdPlaceholder")}
-              className={fieldControlClass}
-            />
-          }
-        />
-        <SettingsRow
-          label={t("triage.repository")}
-          control={
-            <Input
-              aria-label={t("triage.repository")}
-              value={repository}
-              onChange={(event) => setRepository(event.target.value)}
-              placeholder={t("triage.repositoryPlaceholder")}
-              className={fieldControlClass}
-            />
-          }
-        />
-        <SettingsRow
-          label={t("triage.enablePolling")}
-          control={
-            <Switch
-              aria-label={t("triage.enablePolling")}
-              checked={polling}
-              onCheckedChange={(checked) => setPolling(checked === true)}
-            />
-          }
-        />
-        <SettingsRow
-          label={t("triage.enableGithubPolling")}
-          control={
-            <Switch
-              aria-label={t("triage.enableGithubPolling")}
-              checked={githubPolling}
-              onCheckedChange={(checked) => setGithubPolling(checked === true)}
-            />
-          }
-        />
-        <SettingsRow
-          label={t("triage.sentryOrgSlug")}
-          control={
-            <Input
-              aria-label={t("triage.sentryOrgSlug")}
-              value={sentryOrgSlug}
-              onChange={(event) => setSentryOrgSlug(event.target.value)}
-              placeholder={t("triage.sentryOrgPlaceholder")}
-              className={fieldControlClass}
-            />
-          }
-        />
-        <SettingsRow
-          label={t("triage.sentryProjectSlug")}
-          control={
-            <Input
-              aria-label={t("triage.sentryProjectSlug")}
-              value={sentryProjectSlug}
-              onChange={(event) => setSentryProjectSlug(event.target.value)}
-              placeholder={t("triage.sentryProjectPlaceholder")}
-              className={fieldControlClass}
-            />
-          }
-        />
-        <SettingsRow
-          label={t("triage.sentryEnvironment")}
-          control={
-            <Input
-              aria-label={t("triage.sentryEnvironment")}
-              value={sentryEnvironment}
-              onChange={(event) => setSentryEnvironment(event.target.value)}
-              placeholder={t("triage.sentryEnvironmentPlaceholder")}
-              className={fieldControlClass}
-            />
-          }
-        />
-        <SettingsRow
-          label={t("triage.enableSentryPolling")}
-          control={
-            <Switch
-              aria-label={t("triage.enableSentryPolling")}
-              checked={sentryPolling}
-              onCheckedChange={(checked) => setSentryPolling(checked === true)}
-            />
-          }
-        />
-      </SettingsGroup>
+      <fieldset disabled={saving} className="contents">
+        <FactorySourceSettingsGroup
+          title={t("factoryRoute.slackSource")}
+          description={t("factoryRoute.slackSourceDescription")}
+          optionalLabel={t("factoryInspector.optional")}
+        >
+          <SettingsRow
+            label={t("triage.slackWorkspace")}
+            control={
+              <select
+                aria-label={t("triage.slackWorkspace")}
+                value={workspace}
+                onChange={(event) =>
+                  setWorkspace(event.target.value as "primary" | "secondary")
+                }
+                className="h-9 w-full rounded-md border border-input bg-background px-3 text-sm sm:w-64"
+              >
+                <option value="primary">primary</option>
+                <option value="secondary">secondary</option>
+              </select>
+            }
+          />
+          <SettingsRow
+            label={t("triage.slackChannelId")}
+            control={
+              <Input
+                aria-label={t("triage.slackChannelId")}
+                value={channelId}
+                onChange={(event) => setChannelId(event.target.value)}
+                placeholder={t("triage.slackChannelPlaceholder")}
+                className={fieldControlClass}
+              />
+            }
+          />
+          <SettingsRow
+            label={t("triage.slackChannelName")}
+            control={
+              <Input
+                aria-label={t("triage.slackChannelName")}
+                value={channelName}
+                onChange={(event) => setChannelName(event.target.value)}
+                placeholder={t("triage.slackChannelNamePlaceholder")}
+                className={fieldControlClass}
+              />
+            }
+          />
+          <SettingsRow
+            label={t("triage.builderSlackUserId")}
+            control={
+              <Input
+                aria-label={t("triage.builderSlackUserId")}
+                value={builderSlackUserId}
+                onChange={(event) => setBuilderSlackUserId(event.target.value)}
+                placeholder={t("triage.builderSlackUserIdPlaceholder")}
+                className={fieldControlClass}
+              />
+            }
+          />
+          <SettingsRow
+            label={t("triage.enablePolling")}
+            control={
+              <Switch
+                aria-label={t("triage.enablePolling")}
+                checked={polling}
+                onCheckedChange={(checked) => setPolling(checked === true)}
+              />
+            }
+          />
+        </FactorySourceSettingsGroup>
 
-      <SettingsGroup variant="soft">
-        <SettingsRow
-          label={t("factoryRoute.automationFailureAlertsTitle")}
-          description={t("factoryRoute.automationFailureAlertsDescription")}
-          control={
-            <Switch
-              aria-label={t("factoryRoute.automationFailureAlertsEnabled")}
-              checked={automationFailureAlertsEnabled}
-              onCheckedChange={(checked) =>
-                setAutomationFailureAlertsEnabled(checked === true)
-              }
-            />
-          }
-        />
-        <SettingsRow
-          label={t("factoryRoute.automationFailureAlertEmail")}
-          description={t("factoryRoute.automationFailureAlertEmailPlaceholder")}
-          control={
-            <Input
-              aria-label={t("factoryRoute.automationFailureAlertEmail")}
-              type="email"
-              value={automationFailureAlertEmail}
-              onChange={(event) =>
-                setAutomationFailureAlertEmail(event.target.value)
-              }
-              placeholder={t(
-                "factoryRoute.automationFailureAlertEmailPlaceholder",
-              )}
-              className={fieldControlClass}
-            />
-          }
-        />
-        <SettingsRow
-          label={t("factoryRoute.automationFailureEmailReadiness")}
-          description={t("factoryRoute.automationEmailReadinessHint")}
-          control={
-            <span className="rounded-full bg-muted px-2.5 py-1 text-xs font-medium text-muted-foreground">
-              {(query.data as TriageConfig | undefined)?.emailReadiness
-                ?.status ?? "unknown"}
-            </span>
-          }
-        />
-      </SettingsGroup>
+        <FactorySourceSettingsGroup
+          title={t("factoryRoute.githubSource")}
+          description={t("factoryRoute.githubSourceDescription")}
+          optionalLabel={t("factoryInspector.optional")}
+        >
+          <SettingsRow
+            label={t("triage.repository")}
+            control={
+              <Input
+                aria-label={t("triage.repository")}
+                value={repository}
+                onChange={(event) => setRepository(event.target.value)}
+                placeholder={t("triage.repositoryPlaceholder")}
+                className={fieldControlClass}
+              />
+            }
+          />
+          <SettingsRow
+            label={t("triage.enableGithubPolling")}
+            control={
+              <Switch
+                aria-label={t("triage.enableGithubPolling")}
+                checked={githubPolling}
+                onCheckedChange={(checked) =>
+                  setGithubPolling(checked === true)
+                }
+              />
+            }
+          />
+        </FactorySourceSettingsGroup>
 
-      <div className="flex flex-wrap items-center justify-end gap-3">
-        <Button
-          onClick={() => void saveSettings()}
-          disabled={mutation.isPending || !configLoaded}
+        <FactorySourceSettingsGroup
+          title={t("factoryRoute.sentrySource")}
+          description={t("factoryRoute.sentrySourceDescription")}
+          optionalLabel={t("factoryInspector.optional")}
         >
-          {mutation.isPending && <IconLoader2 className="animate-spin" />}
-          {t("triage.saveSettings")}
-        </Button>
-      </div>
+          <SettingsRow
+            label={t("triage.sentryOrgSlug")}
+            control={
+              <Input
+                aria-label={t("triage.sentryOrgSlug")}
+                value={sentryOrgSlug}
+                onChange={(event) => setSentryOrgSlug(event.target.value)}
+                placeholder={t("triage.sentryOrgPlaceholder")}
+                className={fieldControlClass}
+              />
+            }
+          />
+          <SettingsRow
+            label={t("triage.sentryProjectSlug")}
+            control={
+              <Input
+                aria-label={t("triage.sentryProjectSlug")}
+                value={sentryProjectSlug}
+                onChange={(event) => setSentryProjectSlug(event.target.value)}
+                placeholder={t("triage.sentryProjectPlaceholder")}
+                className={fieldControlClass}
+              />
+            }
+          />
+          <SettingsRow
+            label={t("triage.sentryEnvironment")}
+            control={
+              <Input
+                aria-label={t("triage.sentryEnvironment")}
+                value={sentryEnvironment}
+                onChange={(event) => setSentryEnvironment(event.target.value)}
+                placeholder={t("triage.sentryEnvironmentPlaceholder")}
+                className={fieldControlClass}
+              />
+            }
+          />
+          <SettingsRow
+            label={t("triage.enableSentryPolling")}
+            control={
+              <Switch
+                aria-label={t("triage.enableSentryPolling")}
+                checked={sentryPolling}
+                onCheckedChange={(checked) =>
+                  setSentryPolling(checked === true)
+                }
+              />
+            }
+          />
+        </FactorySourceSettingsGroup>
+
+        <SettingsGroup variant="soft">
+          <SettingsRow
+            label={t("factoryRoute.automationFailureAlertsTitle")}
+            description={t("factoryRoute.automationFailureAlertsDescription")}
+            control={
+              <Switch
+                aria-label={t("factoryRoute.automationFailureAlertsEnabled")}
+                checked={automationFailureAlertsEnabled}
+                onCheckedChange={(checked) =>
+                  setAutomationFailureAlertsEnabled(checked === true)
+                }
+              />
+            }
+          />
+          <SettingsRow
+            label={t("factoryRoute.automationFailureAlertEmail")}
+            description={t(
+              "factoryRoute.automationFailureAlertEmailPlaceholder",
+            )}
+            control={
+              <Input
+                aria-label={t("factoryRoute.automationFailureAlertEmail")}
+                type="email"
+                value={automationFailureAlertEmail}
+                onChange={(event) =>
+                  setAutomationFailureAlertEmail(event.target.value)
+                }
+                placeholder={t(
+                  "factoryRoute.automationFailureAlertEmailPlaceholder",
+                )}
+                className={fieldControlClass}
+              />
+            }
+          />
+          <SettingsRow
+            label={t("factoryRoute.automationFailureEmailReadiness")}
+            description={t("factoryRoute.automationEmailReadinessHint")}
+            control={
+              <span className="rounded-full bg-muted px-2.5 py-1 text-xs font-medium text-muted-foreground">
+                {(query.data as TriageConfig | undefined)?.emailReadiness
+                  ?.status ?? "unknown"}
+              </span>
+            }
+          />
+        </SettingsGroup>
+      </fieldset>
 
       <SchedulerHealthStatus
         health={schedulerHealthQuery.data}
@@ -376,7 +523,7 @@ export function FactorySettingsView({
 function FactorySettingsSkeleton({ t }: { t: ReturnType<typeof useT> }) {
   return (
     <div className="space-y-6" aria-label={t("triage.loading")}>
-      {[2, 11, 3].map((rowCount, index) => (
+      {[2, 5, 2, 4, 3, 3].map((rowCount, index) => (
         <div key={index} className="grid gap-2">
           <div className="grid gap-2">
             {Array.from({ length: rowCount }).map((_, rowIndex) => (
@@ -416,47 +563,50 @@ function SchedulerHealthStatus({
           "no-data": t("factoryRoute.automationHealthNoData"),
         }[health.status]
       : t("factoryRoute.automationHealthNoData");
-  const hasNoHeartbeat =
-    !isError &&
-    (!health || health.status === "no-data") &&
-    !health?.lastCheckedAt;
-  const healthDescription = isError
+  const errorDetail = isError
     ? `${t("factoryRoute.automationDiagnosticsLoadError")} ${error instanceof Error ? error.message : String(error)}`
-    : health?.lastError
-      ? `${t("factoryRoute.automationHealthErrorDetail")}: ${health.lastError}`
-      : health?.status === "stale"
-        ? t("factoryRoute.automationHealthStaleHint")
-        : hasNoHeartbeat
-          ? t("factoryRoute.automationHealthNoDataHint")
-          : undefined;
+    : health?.lastError || null;
 
   return (
-    <SettingsGroup variant="soft">
+    <SettingsGroup
+      variant="soft"
+      title={t("factoryRoute.automationHealthTitle")}
+      description={t("factoryRoute.automationHealthDescription")}
+    >
       <SettingsRow
-        label={t("factoryRoute.automationHealthTitle")}
-        description={
-          healthDescription ?? t("factoryRoute.automationHealthDescription")
+        label={t("factoryRoute.automationHealthStatus")}
+        control={
+          <span className="rounded-full bg-muted px-2.5 py-1 text-xs font-medium">
+            {healthLabel}
+          </span>
         }
+      />
+      <SettingsRow
+        label={t("factoryRoute.automationLastCheck")}
         control={
-          <div className="flex flex-wrap items-center justify-end gap-x-4 gap-y-1">
-            <span className="rounded-full bg-muted px-2.5 py-1 text-xs font-medium">
-              {healthLabel}
-            </span>
-            {health?.lastCheckedAt && (
-              <span className="text-xs text-muted-foreground">
-                {t("factoryRoute.automationLastCheck")}:{" "}
-                {formatAutomationDate(health.lastCheckedAt)}
-              </span>
-            )}
-            {health?.lastDispatchedAt && (
-              <span className="text-xs text-muted-foreground">
-                {t("factoryRoute.automationLastDispatch")}:{" "}
-                {formatAutomationDate(health.lastDispatchedAt)}
-              </span>
-            )}
-          </div>
+          <span className="text-sm text-muted-foreground">
+            {formatAutomationDate(health?.lastCheckedAt)}
+          </span>
+        }
+      />
+      <SettingsRow
+        label={t("factoryRoute.automationLastDispatch")}
+        control={
+          <span className="text-sm text-muted-foreground">
+            {formatAutomationDate(health?.lastDispatchedAt)}
+          </span>
         }
       />
+      {errorDetail ? (
+        <SettingsRow
+          label={t("factoryRoute.automationHealthErrorDetail")}
+          control={
+            <span className="max-w-sm text-end text-sm text-muted-foreground">
+              {errorDetail}
+            </span>
+          }
+        />
+      ) : null}
     </SettingsGroup>
   );
 }
diff --git a/templates/factory/app/components/factory/FactorySourceSettingsGroup.tsx b/templates/factory/app/components/factory/FactorySourceSettingsGroup.tsx
new file mode 100644
index 0000000000..be9a082c17
--- /dev/null
+++ b/templates/factory/app/components/factory/FactorySourceSettingsGroup.tsx
@@ -0,0 +1,33 @@
+import { SettingsGroup } from "@agent-native/core/client/settings";
+import type { ReactNode } from "react";
+
+export function FactorySourceSettingsGroup({
+  title,
+  description,
+  optionalLabel,
+  children,
+}: {
+  title: string;
+  description?: string;
+  optionalLabel: string;
+  children: ReactNode;
+}) {
+  return (
+    <section>
+      <header className="mb-2.5">
+        <div className="flex items-baseline gap-2">
+          <h2 className="text-sm font-semibold text-foreground">{title}</h2>
+          <span className="text-xs font-normal text-muted-foreground">
+            {optionalLabel}
+          </span>
+        </div>
+        {description ? (
+          <p className="mt-1 text-xs leading-5 text-muted-foreground">
+            {description}
+          </p>
+        ) : null}
+      </header>
+      <SettingsGroup variant="soft">{children}</SettingsGroup>
+    </section>
+  );
+}
diff --git a/templates/factory/app/components/factory/NewFactoryForm.tsx b/templates/factory/app/components/factory/NewFactoryForm.tsx
index e613110803..c103b0d3ba 100644
--- a/templates/factory/app/components/factory/NewFactoryForm.tsx
+++ b/templates/factory/app/components/factory/NewFactoryForm.tsx
@@ -1,28 +1,28 @@
 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 { SettingsGroup, SettingsRow } from "@agent-native/core/client/settings";
+import { 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";
 
+import { FactorySourceSettingsGroup } from "./FactorySourceSettingsGroup";
+
 type CreateFactoryResult = {
   ok: boolean;
   factoryId: string;
   name: string;
 };
 
+const fieldControlClass = "h-9 w-full sm:w-64";
+const selectControlClass =
+  "h-9 w-full rounded-md border border-input bg-background px-3 text-sm sm:w-64";
+
 export function NewFactoryForm({
   onCreated,
 }: {
@@ -32,8 +32,12 @@ export function NewFactoryForm({
   const createMutation = useActionMutation("create-factory");
   const [name, setName] = useState("");
   const [description, setDescription] = useState("");
+  const [slackWorkspace, setSlackWorkspace] = useState<"primary" | "secondary">(
+    "primary",
+  );
   const [slackChannelId, setSlackChannelId] = useState("");
   const [slackChannelName, setSlackChannelName] = useState("");
+  const [builderSlackUserId, setBuilderSlackUserId] = useState("");
   const [observeSlack, setObserveSlack] = useState(false);
   const [repository, setRepository] = useState("");
   const [observeGithub, setObserveGithub] = useState(false);
@@ -49,16 +53,26 @@ export function NewFactoryForm({
       toast.error(t("factoryRoute.createFactoryNameRequired"));
       return;
     }
+    const hasSlackFields =
+      slackChannelId.trim() ||
+      slackChannelName.trim() ||
+      builderSlackUserId.trim() ||
+      observeSlack ||
+      slackWorkspace !== "primary";
     try {
       const result = (await createMutation.mutateAsync({
         name: trimmedName,
         ...(description.trim() ? { description: description.trim() } : {}),
+        ...(hasSlackFields ? { slackWorkspace } : {}),
         ...(slackChannelId.trim()
           ? { slackChannelId: slackChannelId.trim() }
           : {}),
         ...(slackChannelName.trim()
           ? { slackChannelName: slackChannelName.trim() }
           : {}),
+        ...(builderSlackUserId.trim()
+          ? { builderSlackUserId: builderSlackUserId.trim() }
+          : {}),
         ...(observeSlack ? { observeSlack: true } : {}),
         ...(repository.trim() ? { repository: repository.trim() } : {}),
         ...(observeGithub ? { observeGithub: true } : {}),
@@ -86,164 +100,190 @@ export function NewFactoryForm({
 
   return (
     <form
-      className="mx-auto flex w-full max-w-2xl flex-col gap-6"
+      className="mx-auto flex w-full max-w-3xl 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
+      <SettingsGroup variant="soft">
+        <SettingsRow
+          label={t("factoryRoute.createFactoryNameLabel")}
+          control={
+            <Input
+              id="new-factory-name"
+              value={name}
+              onChange={(event) => setName(event.target.value)}
+              placeholder={t("factoryRoute.newFactory")}
+              autoFocus
+              className={fieldControlClass}
+            />
+          }
         />
-      </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}
+        <SettingsRow
+          label={
+            <span className="flex items-baseline gap-2">
+              <span>{t("factoryRoute.createFactoryDescriptionLabel")}</span>
+              <span className="text-xs font-normal text-muted-foreground">
+                {t("factoryInspector.optional")}
+              </span>
+            </span>
+          }
+        >
+          <Textarea
+            id="new-factory-description"
+            aria-label={t("factoryRoute.createFactoryDescriptionLabel")}
+            value={description}
+            onChange={(event) => setDescription(event.target.value)}
+            rows={2}
+          />
+        </SettingsRow>
+      </SettingsGroup>
+      <FactorySourceSettingsGroup
+        title={t("factoryRoute.slackSource")}
+        description={t("factoryRoute.slackSourceDescription")}
+        optionalLabel={t("factoryInspector.optional")}
+      >
+        <SettingsRow
+          label={t("triage.slackWorkspace")}
+          control={
+            <select
+              aria-label={t("triage.slackWorkspace")}
+              value={slackWorkspace}
+              onChange={(event) =>
+                setSlackWorkspace(event.target.value as "primary" | "secondary")
+              }
+              className={selectControlClass}
+            >
+              <option value="primary">primary</option>
+              <option value="secondary">secondary</option>
+            </select>
+          }
         />
-      </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>
+        <SettingsRow
+          label={t("triage.slackChannelId")}
+          control={
+            <Input
+              aria-label={t("triage.slackChannelId")}
+              value={slackChannelId}
+              onChange={(event) => setSlackChannelId(event.target.value)}
+              placeholder={t("triage.slackChannelPlaceholder")}
+              className={fieldControlClass}
+            />
+          }
+        />
+        <SettingsRow
+          label={t("triage.slackChannelName")}
+          control={
+            <Input
+              aria-label={t("triage.slackChannelName")}
+              value={slackChannelName}
+              onChange={(event) => setSlackChannelName(event.target.value)}
+              placeholder={t("triage.slackChannelNamePlaceholder")}
+              className={fieldControlClass}
+            />
+          }
+        />
+        <SettingsRow
+          label={t("triage.builderSlackUserId")}
+          control={
+            <Input
+              aria-label={t("triage.builderSlackUserId")}
+              value={builderSlackUserId}
+              onChange={(event) => setBuilderSlackUserId(event.target.value)}
+              placeholder={t("triage.builderSlackUserIdPlaceholder")}
+              className={fieldControlClass}
+            />
+          }
+        />
+        <SettingsRow
+          label={t("triage.enablePolling")}
+          control={
+            <Switch
+              aria-label={t("triage.enablePolling")}
+              checked={observeSlack}
+              onCheckedChange={(checked) => setObserveSlack(checked === true)}
+            />
+          }
+        />
+      </FactorySourceSettingsGroup>
+      <FactorySourceSettingsGroup
+        title={t("factoryRoute.githubSource")}
+        description={t("factoryRoute.githubSourceDescription")}
+        optionalLabel={t("factoryInspector.optional")}
+      >
+        <SettingsRow
+          label={t("triage.repository")}
+          control={
+            <Input
+              aria-label={t("triage.repository")}
+              value={repository}
+              onChange={(event) => setRepository(event.target.value)}
+              placeholder={t("triage.repositoryPlaceholder")}
+              className={fieldControlClass}
+            />
+          }
+        />
+        <SettingsRow
+          label={t("triage.enableGithubPolling")}
+          control={
+            <Switch
+              aria-label={t("triage.enableGithubPolling")}
+              checked={observeGithub}
+              onCheckedChange={(checked) => setObserveGithub(checked === true)}
+            />
+          }
+        />
+      </FactorySourceSettingsGroup>
+      <FactorySourceSettingsGroup
+        title={t("factoryRoute.sentrySource")}
+        description={t("factoryRoute.sentrySourceDescription")}
+        optionalLabel={t("factoryInspector.optional")}
+      >
+        <SettingsRow
+          label={t("triage.sentryOrgSlug")}
+          control={
+            <Input
+              aria-label={t("triage.sentryOrgSlug")}
+              value={sentryOrgSlug}
+              onChange={(event) => setSentryOrgSlug(event.target.value)}
+              placeholder={t("triage.sentryOrgPlaceholder")}
+              className={fieldControlClass}
+            />
+          }
+        />
+        <SettingsRow
+          label={t("triage.sentryProjectSlug")}
+          control={
+            <Input
+              aria-label={t("triage.sentryProjectSlug")}
+              value={sentryProjectSlug}
+              onChange={(event) => setSentryProjectSlug(event.target.value)}
+              placeholder={t("triage.sentryProjectPlaceholder")}
+              className={fieldControlClass}
+            />
+          }
+        />
+        <SettingsRow
+          label={t("triage.sentryEnvironment")}
+          control={
+            <Input
+              aria-label={t("triage.sentryEnvironment")}
+              value={sentryEnvironment}
+              onChange={(event) => setSentryEnvironment(event.target.value)}
+              placeholder={t("triage.sentryEnvironmentPlaceholder")}
+              className={fieldControlClass}
+            />
+          }
+        />
+        <SettingsRow
+          label={t("triage.enableSentryPolling")}
+          control={
+            <Switch
+              aria-label={t("triage.enableSentryPolling")}
+              checked={observeSentry}
+              onCheckedChange={(checked) => setObserveSentry(checked === true)}
+            />
+          }
+        />
+      </FactorySourceSettingsGroup>
       <div className="flex justify-end gap-2">
         <Button asChild type="button" variant="outline">
           <Link to="/factory">{t("factoryRoute.createFactoryCancel")}</Link>
diff --git a/templates/factory/app/factory-i18n.spec.ts b/templates/factory/app/factory-i18n.spec.ts
index f000c2330d..2df0954969 100644
--- a/templates/factory/app/factory-i18n.spec.ts
+++ b/templates/factory/app/factory-i18n.spec.ts
@@ -38,6 +38,7 @@ const requiredKeys = [
   "factoryRoute.defaultFactoryLabel",
   "factoryRoute.savedFactoryLabel",
   "factoryRoute.auditGuardsLabel",
+  "factoryRoute.auditTrace",
   "factoryRoute.factorySettings",
 ] as const;
 
diff --git a/templates/factory/app/i18n/ar-SA.ts b/templates/factory/app/i18n/ar-SA.ts
index 92d65fd35b..d7b9c75b3f 100644
--- a/templates/factory/app/i18n/ar-SA.ts
+++ b/templates/factory/app/i18n/ar-SA.ts
@@ -98,9 +98,9 @@ const messages = {
     builderSlackUserIdPlaceholder: "مثال: U096KN3EL2Y",
     repository: "المستودع",
     repositoryPlaceholder: "مثال: BuilderIO/agent-native",
-    enablePolling: "تفعيل استطلاع الملاحظات كل دقيقة",
-    enableGithubPolling: "تفعيل استطلاع مشكلات وطلبات GitHub",
-    enableSentryPolling: "تفعيل استطلاع أخطاء Sentry يوميًا",
+    enablePolling: "تفعيل الاستطلاع",
+    enableGithubPolling: "تفعيل الاستطلاع",
+    enableSentryPolling: "تفعيل الاستطلاع",
     sentryOrgSlug: "معرّف مؤسسة Sentry",
     sentryProjectSlug: "معرّف مشروع Sentry",
     sentryEnvironment: "بيئة Sentry",
@@ -108,6 +108,8 @@ const messages = {
     sentryProjectPlaceholder: "معرّف مشروع اختياري",
     sentryEnvironmentPlaceholder: "مثال: production",
     saveSettings: "حفظ الإعدادات",
+    unsavedSettings: "تغييرات غير محفوظة",
+    discardSettingsChanges: "تجاهل",
     settingsError: "تعذر حفظ إعدادات المراقبة.",
     settingsSaved: "تم حفظ إعدادات المراقبة.",
     ruleName: "الاسم",
@@ -130,11 +132,20 @@ const messages = {
     createFactorySubmit: "إنشاء المصنع",
     createFactoryCancel: "إلغاء",
     createFactoryNameLabel: "الاسم",
-    createFactoryDescriptionLabel: "الوصف (اختياري)",
+    createFactoryDescriptionLabel: "ما الذي يفعله هذا المصنع",
     createFactorySourcesOptional: "المصادر (اختياري)",
     createFactorySlackSourceOptional: "مصدر Slack (اختياري)",
     createFactoryGithubSourceOptional: "مصدر GitHub (اختياري)",
     createFactorySentrySourceOptional: "مصدر Sentry (اختياري)",
+    slackSource: "Slack",
+    githubSource: "GitHub",
+    sentrySource: "Sentry",
+    slackSourceDescription:
+      "استطلع هذه القناة لإضافة رسائل Slack إلى صندوق الوارد.",
+    githubSourceDescription:
+      "استطلع هذا المستودع لإضافة المشكلات وطلبات السحب إلى صندوق الوارد.",
+    sentrySourceDescription:
+      "استطلع هذا المشروع لإضافة الأخطاء غير المحلولة إلى صندوق الوارد.",
     createFactoryObserveSlack: "مراقبة قناة Slack",
     createFactoryObserveGithub: "مراقبة مشكلات GitHub",
     createFactoryObserveSentry: "مراقبة أخطاء Sentry",
@@ -213,6 +224,20 @@ const messages = {
     auditUxImpact: "تأثير تجربة المستخدم",
     auditOwnerArea: "مجال المسؤولية",
     auditGuardsLabel: "الضوابط",
+    auditTrace: "التتبع",
+    auditWhy: "السبب",
+    auditWhatHappened: "ما الذي حدث",
+    auditInspectedOnly: "تم الفحص فقط",
+    auditNoNew: "لا عناصر جديدة",
+    auditFailed: "{{count}} فشل",
+    auditHeld: "{{count}} معلّق",
+    auditDispatched: "{{count}} مُرسل",
+    auditObserved: "{{count}} جديد",
+    auditScanned: "{{count}} مفحوص",
+    auditOutcomeHeld: "معلّق",
+    auditOutcomeDispatched: "مُرسل",
+    auditOutcomeFailed: "فشل الإرسال",
+    auditOutcomeInspected: "تم الفحص",
     historyTab: "السجل",
     historyTitle: "الإصدارات المحفوظة",
     historyLoading: "جارٍ تحميل الإصدارات المحفوظة",
@@ -280,8 +305,11 @@ const messages = {
     saveAutomation: "حفظ",
     automationSaved: "تم الحفظ",
     automationSaveFailed: "تعذر حفظ الأتمتة.",
+    automationRunFailed: "تعذر تشغيل الأتمتة.",
+    automationRunning: "قيد التشغيل",
     runNow: "تشغيل الآن",
     automationHealthTitle: "صحة المجدول",
+    automationHealthStatus: "الحالة",
     automationHealthDescription:
       "توضح نبضة الحياة ما إذا كان عامل المهام المتكررة المنشور لا يزال يفحص الجداول.",
     automationHealthHealthy: "سليم",
diff --git a/templates/factory/app/i18n/de-DE.ts b/templates/factory/app/i18n/de-DE.ts
index dc8b68d303..19579786d9 100644
--- a/templates/factory/app/i18n/de-DE.ts
+++ b/templates/factory/app/i18n/de-DE.ts
@@ -102,9 +102,9 @@ const messages = {
     builderSlackUserIdPlaceholder: "Zum Beispiel: U096KN3EL2Y",
     repository: "Repository",
     repositoryPlaceholder: "Zum Beispiel: BuilderIO/agent-native",
-    enablePolling: "Minütliche Beobachtungsabfrage aktivieren",
-    enableGithubPolling: "GitHub-Issue- und Pull-Request-Abfrage aktivieren",
-    enableSentryPolling: "Tägliche Sentry-Fehlerabfrage aktivieren",
+    enablePolling: "Abfrage aktivieren",
+    enableGithubPolling: "Abfrage aktivieren",
+    enableSentryPolling: "Abfrage aktivieren",
     sentryOrgSlug: "Sentry-Organisations-Slug",
     sentryProjectSlug: "Sentry-Projekt-Slug",
     sentryEnvironment: "Sentry-Umgebung",
@@ -112,6 +112,8 @@ const messages = {
     sentryProjectPlaceholder: "Optionaler Projekt-Slug",
     sentryEnvironmentPlaceholder: "Zum Beispiel: production",
     saveSettings: "Einstellungen speichern",
+    unsavedSettings: "Nicht gespeicherte Änderungen",
+    discardSettingsChanges: "Verwerfen",
     settingsError:
       "Beobachtungseinstellungen konnten nicht gespeichert werden.",
     settingsSaved: "Beobachtungseinstellungen gespeichert.",
@@ -138,11 +140,20 @@ const messages = {
     createFactorySubmit: "Factory erstellen",
     createFactoryCancel: "Abbrechen",
     createFactoryNameLabel: "Name",
-    createFactoryDescriptionLabel: "Beschreibung (optional)",
+    createFactoryDescriptionLabel: "Was diese Factory macht",
     createFactorySourcesOptional: "Quellen (optional)",
     createFactorySlackSourceOptional: "Slack-Quelle (optional)",
     createFactoryGithubSourceOptional: "GitHub-Quelle (optional)",
     createFactorySentrySourceOptional: "Sentry-Quelle (optional)",
+    slackSource: "Slack",
+    githubSource: "GitHub",
+    sentrySource: "Sentry",
+    slackSourceDescription:
+      "Frage diesen Kanal ab, um Slack-Nachrichten ins Postfach aufzunehmen.",
+    githubSourceDescription:
+      "Frage dieses Repository ab, um Issues und Pull Requests ins Postfach aufzunehmen.",
+    sentrySourceDescription:
+      "Frage dieses Projekt ab, um ungelöste Fehler ins Postfach aufzunehmen.",
     createFactoryObserveSlack: "Slack-Kanal beobachten",
     createFactoryObserveGithub: "GitHub-Issues beobachten",
     createFactoryObserveSentry: "Sentry-Fehler beobachten",
@@ -225,6 +236,20 @@ const messages = {
     auditUxImpact: "UX-Auswirkung",
     auditOwnerArea: "Verantwortungsbereich",
     auditGuardsLabel: "Guards",
+    auditTrace: "Spur",
+    auditWhy: "Warum",
+    auditWhatHappened: "Was passiert ist",
+    auditInspectedOnly: "Nur geprüft",
+    auditNoNew: "Keine neuen Elemente",
+    auditFailed: "{{count}} fehlgeschlagen",
+    auditHeld: "{{count}} zurückgehalten",
+    auditDispatched: "{{count}} gesendet",
+    auditObserved: "{{count}} neu",
+    auditScanned: "{{count}} geprüft",
+    auditOutcomeHeld: "Zurückgehalten",
+    auditOutcomeDispatched: "Gesendet",
+    auditOutcomeFailed: "Versand fehlgeschlagen",
+    auditOutcomeInspected: "Geprüft",
     historyTab: "Verlauf",
     historyTitle: "Gespeicherte Versionen",
     historyLoading: "Gespeicherte Versionen werden geladen",
@@ -297,8 +322,11 @@ const messages = {
     automationSaved: "Gespeichert",
     automationSaveFailed:
       "Die Automatisierung konnte nicht gespeichert werden.",
+    automationRunFailed: "Die Automatisierung konnte nicht ausgeführt werden.",
+    automationRunning: "Wird ausgeführt",
     runNow: "Jetzt ausführen",
     automationHealthTitle: "Scheduler-Status",
+    automationHealthStatus: "Status",
     automationHealthDescription:
       "Der Heartbeat zeigt, ob der bereitgestellte Worker für wiederkehrende Aufgaben weiterhin Zeitpläne prüft.",
     automationHealthHealthy: "Gesund",
diff --git a/templates/factory/app/i18n/en-US.ts b/templates/factory/app/i18n/en-US.ts
index 7fa78d9576..d8f5e00625 100644
--- a/templates/factory/app/i18n/en-US.ts
+++ b/templates/factory/app/i18n/en-US.ts
@@ -112,9 +112,9 @@ const messages = {
     builderSlackUserIdPlaceholder: "For example, U096KN3EL2Y",
     repository: "Repository",
     repositoryPlaceholder: "For example, BuilderIO/agent-native",
-    enablePolling: "Enable one-minute observation polling",
-    enableGithubPolling: "Enable GitHub issue and pull-request polling",
-    enableSentryPolling: "Enable daily Sentry error polling",
+    enablePolling: "Enable polling",
+    enableGithubPolling: "Enable polling",
+    enableSentryPolling: "Enable polling",
     sentryOrgSlug: "Sentry organization slug",
     sentryProjectSlug: "Sentry project slug",
     sentryEnvironment: "Sentry environment",
@@ -122,6 +122,8 @@ const messages = {
     sentryProjectPlaceholder: "Optional project slug",
     sentryEnvironmentPlaceholder: "For example, production",
     saveSettings: "Save settings",
+    unsavedSettings: "Unsaved changes",
+    discardSettingsChanges: "Discard",
     settingsError: "Could not save observation settings.",
     settingsSaved: "Observation settings saved.",
     approvalError: "Approval could not be started.",
@@ -137,11 +139,20 @@ const messages = {
     createFactorySubmit: "Create factory",
     createFactoryCancel: "Cancel",
     createFactoryNameLabel: "Name",
-    createFactoryDescriptionLabel: "Description (optional)",
+    createFactoryDescriptionLabel: "What this factory does",
     createFactorySourcesOptional: "Sources (optional)",
     createFactorySlackSourceOptional: "Slack source (optional)",
     createFactoryGithubSourceOptional: "GitHub source (optional)",
     createFactorySentrySourceOptional: "Sentry source (optional)",
+    slackSource: "Slack",
+    githubSource: "GitHub",
+    sentrySource: "Sentry",
+    slackSourceDescription:
+      "Poll this channel to add Slack messages to the inbox.",
+    githubSourceDescription:
+      "Poll this repository to add issues and pull requests to the inbox.",
+    sentrySourceDescription:
+      "Poll this project to add unresolved errors to the inbox.",
     createFactoryObserveSlack: "Observe Slack channel",
     createFactoryObserveGithub: "Observe GitHub issues",
     createFactoryObserveSentry: "Observe Sentry errors",
@@ -222,6 +233,20 @@ const messages = {
     auditUxImpact: "UX impact",
     auditOwnerArea: "Owner area",
     auditGuardsLabel: "Guards",
+    auditTrace: "Trace",
+    auditWhy: "Why",
+    auditWhatHappened: "What happened",
+    auditInspectedOnly: "Inspected only",
+    auditNoNew: "No new items",
+    auditFailed: "{{count}} failed",
+    auditHeld: "{{count}} held",
+    auditDispatched: "{{count}} dispatched",
+    auditObserved: "{{count}} new",
+    auditScanned: "{{count}} scanned",
+    auditOutcomeHeld: "Held",
+    auditOutcomeDispatched: "Dispatched",
+    auditOutcomeFailed: "Dispatch failed",
+    auditOutcomeInspected: "Inspected",
     historyTab: "History",
     historyTitle: "Saved versions",
     historyLoading: "Loading saved versions",
@@ -290,8 +315,11 @@ const messages = {
     saveAutomation: "Save",
     automationSaved: "Saved",
     automationSaveFailed: "Could not save the automation.",
+    automationRunFailed: "Could not run the automation.",
+    automationRunning: "Running",
     runNow: "Run now",
     automationHealthTitle: "Scheduler health",
+    automationHealthStatus: "Status",
     automationHealthDescription:
       "The heartbeat shows whether the deployed recurring-job worker is still checking schedules.",
     automationHealthHealthy: "Healthy",
diff --git a/templates/factory/app/i18n/es-ES.ts b/templates/factory/app/i18n/es-ES.ts
index e4c44ca3d5..3f465eb327 100644
--- a/templates/factory/app/i18n/es-ES.ts
+++ b/templates/factory/app/i18n/es-ES.ts
@@ -107,10 +107,9 @@ const messages = {
     builderSlackUserIdPlaceholder: "Por ejemplo: U096KN3EL2Y",
     repository: "Repositorio",
     repositoryPlaceholder: "Por ejemplo: BuilderIO/agent-native",
-    enablePolling: "Activar el sondeo de observaciones cada minuto",
-    enableGithubPolling:
-      "Activar el sondeo de incidencias y pull requests de GitHub",
-    enableSentryPolling: "Activar el sondeo diario de errores de Sentry",
+    enablePolling: "Activar sondeo",
+    enableGithubPolling: "Activar sondeo",
+    enableSentryPolling: "Activar sondeo",
     sentryOrgSlug: "Slug de organización de Sentry",
     sentryProjectSlug: "Slug de proyecto de Sentry",
     sentryEnvironment: "Entorno de Sentry",
@@ -118,6 +117,8 @@ const messages = {
     sentryProjectPlaceholder: "Slug de proyecto opcional",
     sentryEnvironmentPlaceholder: "Por ejemplo: production",
     saveSettings: "Guardar configuración",
+    unsavedSettings: "Cambios sin guardar",
+    discardSettingsChanges: "Descartar",
     settingsError: "No se pudo guardar la configuración de observación.",
     settingsSaved: "Configuración de observación guardada.",
     ruleName: "Nombre",
@@ -142,11 +143,20 @@ const messages = {
     createFactorySubmit: "Crear fábrica",
     createFactoryCancel: "Cancelar",
     createFactoryNameLabel: "Nombre",
-    createFactoryDescriptionLabel: "Descripción (opcional)",
+    createFactoryDescriptionLabel: "Qué hace esta fábrica",
     createFactorySourcesOptional: "Fuentes (opcional)",
     createFactorySlackSourceOptional: "Fuente de Slack (opcional)",
     createFactoryGithubSourceOptional: "Fuente de GitHub (opcional)",
     createFactorySentrySourceOptional: "Fuente de Sentry (opcional)",
+    slackSource: "Slack",
+    githubSource: "GitHub",
+    sentrySource: "Sentry",
+    slackSourceDescription:
+      "Sondea este canal para añadir mensajes de Slack a la bandeja.",
+    githubSourceDescription:
+      "Sondea este repositorio para añadir issues y pull requests a la bandeja.",
+    sentrySourceDescription:
+      "Sondea este proyecto para añadir errores sin resolver a la bandeja.",
     createFactoryObserveSlack: "Observar canal de Slack",
     createFactoryObserveGithub: "Observar issues de GitHub",
     createFactoryObserveSentry: "Observar errores de Sentry",
@@ -231,6 +241,20 @@ const messages = {
     auditUxImpact: "Impacto de UX",
     auditOwnerArea: "Área responsable",
     auditGuardsLabel: "Guards",
+    auditTrace: "Rastro",
+    auditWhy: "Por qué",
+    auditWhatHappened: "Qué ocurrió",
+    auditInspectedOnly: "Solo inspeccionado",
+    auditNoNew: "Ningún elemento nuevo",
+    auditFailed: "{{count}} fallidos",
+    auditHeld: "{{count}} retenidos",
+    auditDispatched: "{{count}} enviados",
+    auditObserved: "{{count}} nuevos",
+    auditScanned: "{{count}} revisados",
+    auditOutcomeHeld: "Retenido",
+    auditOutcomeDispatched: "Enviado",
+    auditOutcomeFailed: "El envío falló",
+    auditOutcomeInspected: "Inspeccionado",
     historyTab: "Historial",
     historyTitle: "Versiones guardadas",
     historyLoading: "Cargando versiones guardadas",
@@ -301,8 +325,11 @@ const messages = {
     saveAutomation: "Guardar",
     automationSaved: "Guardado",
     automationSaveFailed: "No se pudo guardar la automatización.",
+    automationRunFailed: "No se pudo ejecutar la automatización.",
+    automationRunning: "En ejecución",
     runNow: "Ejecutar ahora",
     automationHealthTitle: "Estado del programador",
+    automationHealthStatus: "Estado",
     automationHealthDescription:
       "El latido muestra si el trabajador de tareas recurrentes desplegado sigue comprobando los horarios.",
     automationHealthHealthy: "Saludable",
diff --git a/templates/factory/app/i18n/fr-FR.ts b/templates/factory/app/i18n/fr-FR.ts
index 8974d3ee40..f02e3462fb 100644
--- a/templates/factory/app/i18n/fr-FR.ts
+++ b/templates/factory/app/i18n/fr-FR.ts
@@ -107,10 +107,9 @@ const messages = {
     builderSlackUserIdPlaceholder: "Par exemple : U096KN3EL2Y",
     repository: "Dépôt",
     repositoryPlaceholder: "Par exemple : BuilderIO/agent-native",
-    enablePolling: "Activer le sondage des observations chaque minute",
-    enableGithubPolling:
-      "Activer le sondage des issues et pull requests GitHub",
-    enableSentryPolling: "Activer le sondage quotidien des erreurs Sentry",
+    enablePolling: "Activer le sondage",
+    enableGithubPolling: "Activer le sondage",
+    enableSentryPolling: "Activer le sondage",
     sentryOrgSlug: "Slug de l’organisation Sentry",
     sentryProjectSlug: "Slug du projet Sentry",
     sentryEnvironment: "Environnement Sentry",
@@ -118,6 +117,8 @@ const messages = {
     sentryProjectPlaceholder: "Slug de projet facultatif",
     sentryEnvironmentPlaceholder: "Par exemple : production",
     saveSettings: "Enregistrer les paramètres",
+    unsavedSettings: "Modifications non enregistrées",
+    discardSettingsChanges: "Annuler",
     settingsError: "Impossible d’enregistrer les paramètres d’observation.",
     settingsSaved: "Paramètres d’observation enregistrés.",
     ruleName: "Nom",
@@ -142,11 +143,20 @@ const messages = {
     createFactorySubmit: "Créer la factory",
     createFactoryCancel: "Annuler",
     createFactoryNameLabel: "Nom",
-    createFactoryDescriptionLabel: "Description (facultatif)",
+    createFactoryDescriptionLabel: "Ce que fait cette factory",
     createFactorySourcesOptional: "Sources (facultatif)",
     createFactorySlackSourceOptional: "Source Slack (facultatif)",
     createFactoryGithubSourceOptional: "Source GitHub (facultatif)",
     createFactorySentrySourceOptional: "Source Sentry (facultatif)",
+    slackSource: "Slack",
+    githubSource: "GitHub",
+    sentrySource: "Sentry",
+    slackSourceDescription:
+      "Sondez ce canal pour ajouter les messages Slack à la boîte de réception.",
+    githubSourceDescription:
+      "Sondez ce dépôt pour ajouter les issues et pull requests à la boîte de réception.",
+    sentrySourceDescription:
+      "Sondez ce projet pour ajouter les erreurs non résolues à la boîte de réception.",
     createFactoryObserveSlack: "Observer le canal Slack",
     createFactoryObserveGithub: "Observer les issues GitHub",
     createFactoryObserveSentry: "Observer les erreurs Sentry",
@@ -232,6 +242,20 @@ const messages = {
     auditUxImpact: "Impact UX",
     auditOwnerArea: "Domaine responsable",
     auditGuardsLabel: "Gardes",
+    auditTrace: "Trace",
+    auditWhy: "Pourquoi",
+    auditWhatHappened: "Ce qui s’est passé",
+    auditInspectedOnly: "Inspecté seulement",
+    auditNoNew: "Aucun nouvel élément",
+    auditFailed: "{{count}} échec(s)",
+    auditHeld: "{{count}} retenu(s)",
+    auditDispatched: "{{count}} envoyé(s)",
+    auditObserved: "{{count}} nouveau(x)",
+    auditScanned: "{{count}} parcouru(s)",
+    auditOutcomeHeld: "Retenu",
+    auditOutcomeDispatched: "Envoyé",
+    auditOutcomeFailed: "Envoi échoué",
+    auditOutcomeInspected: "Inspecté",
     historyTab: "Historique",
     historyTitle: "Versions enregistrées",
     historyLoading: "Chargement des versions enregistrées",
@@ -304,8 +328,11 @@ const messages = {
     saveAutomation: "Enregistrer",
     automationSaved: "Enregistré",
     automationSaveFailed: "Impossible d'enregistrer l'automatisation.",
+    automationRunFailed: "Impossible d'exécuter l'automatisation.",
+    automationRunning: "En cours",
     runNow: "Exécuter maintenant",
     automationHealthTitle: "État du planificateur",
+    automationHealthStatus: "État",
     automationHealthDescription:
       "Le signal indique si le worker de tâches récurrentes déployé vérifie toujours les plannings.",
     automationHealthHealthy: "Opérationnel",
diff --git a/templates/factory/app/i18n/hi-IN.ts b/templates/factory/app/i18n/hi-IN.ts
index 375d7c8386..41928fcff6 100644
--- a/templates/factory/app/i18n/hi-IN.ts
+++ b/templates/factory/app/i18n/hi-IN.ts
@@ -98,9 +98,9 @@ const messages = {
     builderSlackUserIdPlaceholder: "उदाहरण: U096KN3EL2Y",
     repository: "रिपॉज़िटरी",
     repositoryPlaceholder: "उदाहरण: BuilderIO/agent-native",
-    enablePolling: "हर मिनट अवलोकन पोलिंग सक्षम करें",
-    enableGithubPolling: "GitHub इश्यू और पुल रिक्वेस्ट पोलिंग सक्षम करें",
-    enableSentryPolling: "दैनिक Sentry त्रुटि पोलिंग सक्षम करें",
+    enablePolling: "पोलिंग सक्षम करें",
+    enableGithubPolling: "पोलिंग सक्षम करें",
+    enableSentryPolling: "पोलिंग सक्षम करें",
     sentryOrgSlug: "Sentry संगठन स्लग",
     sentryProjectSlug: "Sentry प्रोजेक्ट स्लग",
     sentryEnvironment: "Sentry वातावरण",
@@ -108,6 +108,8 @@ const messages = {
     sentryProjectPlaceholder: "वैकल्पिक प्रोजेक्ट स्लग",
     sentryEnvironmentPlaceholder: "उदाहरण: production",
     saveSettings: "सेटिंग्स सेव करें",
+    unsavedSettings: "बिना सेव किए बदलाव",
+    discardSettingsChanges: "रद्द करें",
     settingsError: "अवलोकन सेटिंग्स सेव नहीं हो सकीं।",
     settingsSaved: "अवलोकन सेटिंग्स सेव हो गईं।",
     ruleName: "नाम",
@@ -131,11 +133,18 @@ const messages = {
     createFactorySubmit: "फ़ैक्टरी बनाएँ",
     createFactoryCancel: "रद्द करें",
     createFactoryNameLabel: "नाम",
-    createFactoryDescriptionLabel: "विवरण (वैकल्पिक)",
+    createFactoryDescriptionLabel: "यह फ़ैक्टरी क्या करती है",
     createFactorySourcesOptional: "स्रोत (वैकल्पिक)",
     createFactorySlackSourceOptional: "Slack स्रोत (वैकल्पिक)",
     createFactoryGithubSourceOptional: "GitHub स्रोत (वैकल्पिक)",
     createFactorySentrySourceOptional: "Sentry स्रोत (वैकल्पिक)",
+    slackSource: "Slack",
+    githubSource: "GitHub",
+    sentrySource: "Sentry",
+    slackSourceDescription: "इस चैनल को पोल करके Slack संदेश इनबॉक्स में जोड़ें।",
+    githubSourceDescription:
+      "इस रिपॉज़िटरी को पोल करके इश्यू और पुल रिक्वेस्ट इनबॉक्स में जोड़ें।",
+    sentrySourceDescription: "इस प्रोजेक्ट को पोल करके अनसुलझी त्रुटियाँ इनबॉक्स में जोड़ें।",
     createFactoryObserveSlack: "Slack चैनल देखें",
     createFactoryObserveGithub: "GitHub issues देखें",
     createFactoryObserveSentry: "Sentry errors देखें",
@@ -215,6 +224,20 @@ const messages = {
     auditUxImpact: "UX प्रभाव",
     auditOwnerArea: "जिम्मेदारी का क्षेत्र",
     auditGuardsLabel: "गार्ड्स",
+    auditTrace: "ट्रेस",
+    auditWhy: "क्यों",
+    auditWhatHappened: "क्या हुआ",
+    auditInspectedOnly: "केवल जाँचा गया",
+    auditNoNew: "कोई नई आइटम नहीं",
+    auditFailed: "{{count}} विफल",
+    auditHeld: "{{count}} रोकी गईं",
+    auditDispatched: "{{count}} भेजी गईं",
+    auditObserved: "{{count}} नई",
+    auditScanned: "{{count}} स्कैन की गईं",
+    auditOutcomeHeld: "रोकी गई",
+    auditOutcomeDispatched: "भेजी गई",
+    auditOutcomeFailed: "भेजना विफल",
+    auditOutcomeInspected: "जाँची गई",
     historyTab: "इतिहास",
     historyTitle: "सहेजे गए संस्करण",
     historyLoading: "सहेजे गए संस्करण लोड हो रहे हैं",
@@ -284,8 +307,11 @@ const messages = {
     saveAutomation: "सहेजें",
     automationSaved: "सहेजा गया",
     automationSaveFailed: "स्वचालन सहेजा नहीं जा सका।",
+    automationRunFailed: "स्वचालन चलाया नहीं जा सका।",
+    automationRunning: "चल रहा है",
     runNow: "अभी रन करें",
     automationHealthTitle: "शेड्यूलर की स्थिति",
+    automationHealthStatus: "स्थिति",
     automationHealthDescription:
       "हार्टबीट दिखाता है कि तैनात आवर्ती-कार्य वर्कर अभी भी शेड्यूल जाँच रहा है या नहीं।",
     automationHealthHealthy: "स्वस्थ",
diff --git a/templates/factory/app/i18n/ja-JP.ts b/templates/factory/app/i18n/ja-JP.ts
index 8541b1ea4f..c8be52df46 100644
--- a/templates/factory/app/i18n/ja-JP.ts
+++ b/templates/factory/app/i18n/ja-JP.ts
@@ -101,10 +101,9 @@ const messages = {
     builderSlackUserIdPlaceholder: "例：U096KN3EL2Y",
     repository: "リポジトリ",
     repositoryPlaceholder: "例：BuilderIO/agent-native",
-    enablePolling: "毎分の観測ポーリングを有効にする",
-    enableGithubPolling:
-      "GitHub の Issue と Pull Request のポーリングを有効にする",
-    enableSentryPolling: "Sentry エラーの毎日ポーリングを有効にする",
+    enablePolling: "ポーリングを有効にする",
+    enableGithubPolling: "ポーリングを有効にする",
+    enableSentryPolling: "ポーリングを有効にする",
     sentryOrgSlug: "Sentry 組織スラッグ",
     sentryProjectSlug: "Sentry プロジェクトスラッグ",
     sentryEnvironment: "Sentry 環境",
@@ -112,6 +111,8 @@ const messages = {
     sentryProjectPlaceholder: "任意のプロジェクトスラッグ",
     sentryEnvironmentPlaceholder: "例：production",
     saveSettings: "設定を保存",
+    unsavedSettings: "未保存の変更",
+    discardSettingsChanges: "破棄",
     settingsError: "観測設定を保存できませんでした。",
     settingsSaved: "観測設定を保存しました。",
     ruleName: "名前",
@@ -135,11 +136,20 @@ const messages = {
     createFactorySubmit: "ファクトリーを作成",
     createFactoryCancel: "キャンセル",
     createFactoryNameLabel: "名前",
-    createFactoryDescriptionLabel: "説明（任意）",
+    createFactoryDescriptionLabel: "このファクトリーが行うこと",
     createFactorySourcesOptional: "ソース（任意）",
     createFactorySlackSourceOptional: "Slack ソース（任意）",
     createFactoryGithubSourceOptional: "GitHub ソース（任意）",
     createFactorySentrySourceOptional: "Sentry ソース（任意）",
+    slackSource: "Slack",
+    githubSource: "GitHub",
+    sentrySource: "Sentry",
+    slackSourceDescription:
+      "このチャンネルをポーリングして、Slack メッセージを受信箱に追加します。",
+    githubSourceDescription:
+      "このリポジトリをポーリングして、Issue と Pull Request を受信箱に追加します。",
+    sentrySourceDescription:
+      "このプロジェクトをポーリングして、未解決のエラーを受信箱に追加します。",
     createFactoryObserveSlack: "Slack チャンネルを監視",
     createFactoryObserveGithub: "GitHub issue を監視",
     createFactoryObserveSentry: "Sentry エラーを監視",
@@ -222,6 +232,20 @@ const messages = {
     auditUxImpact: "UXへの影響",
     auditOwnerArea: "担当領域",
     auditGuardsLabel: "ガード",
+    auditTrace: "トレース",
+    auditWhy: "理由",
+    auditWhatHappened: "何が起きたか",
+    auditInspectedOnly: "確認のみ",
+    auditNoNew: "新しい項目はありません",
+    auditFailed: "{{count}} 件失敗",
+    auditHeld: "{{count}} 件保留",
+    auditDispatched: "{{count}} 件送信",
+    auditObserved: "{{count}} 件新規",
+    auditScanned: "{{count}} 件スキャン",
+    auditOutcomeHeld: "保留",
+    auditOutcomeDispatched: "送信済み",
+    auditOutcomeFailed: "送信失敗",
+    auditOutcomeInspected: "確認済み",
     historyTab: "履歴",
     historyTitle: "保存済みバージョン",
     historyLoading: "保存済みバージョンを読み込んでいます",
@@ -294,8 +318,11 @@ const messages = {
     saveAutomation: "保存",
     automationSaved: "保存しました",
     automationSaveFailed: "自動化を保存できませんでした。",
+    automationRunFailed: "自動化を実行できませんでした。",
+    automationRunning: "実行中",
     runNow: "今すぐ実行",
     automationHealthTitle: "スケジューラーの状態",
+    automationHealthStatus: "ステータス",
     automationHealthDescription:
       "ハートビートは、デプロイ済みの定期ジョブワーカーが引き続きスケジュールを確認しているかを示します。",
     automationHealthHealthy: "正常",
diff --git a/templates/factory/app/i18n/ko-KR.ts b/templates/factory/app/i18n/ko-KR.ts
index 7d896374c9..802aa3f21f 100644
--- a/templates/factory/app/i18n/ko-KR.ts
+++ b/templates/factory/app/i18n/ko-KR.ts
@@ -101,9 +101,9 @@ const messages = {
     builderSlackUserIdPlaceholder: "예: U096KN3EL2Y",
     repository: "리포지토리",
     repositoryPlaceholder: "예: BuilderIO/agent-native",
-    enablePolling: "분당 관찰 폴링 사용",
-    enableGithubPolling: "GitHub 이슈 및 풀 리퀘스트 폴링 사용",
-    enableSentryPolling: "매일 Sentry 오류 폴링 사용",
+    enablePolling: "폴링 사용",
+    enableGithubPolling: "폴링 사용",
+    enableSentryPolling: "폴링 사용",
     sentryOrgSlug: "Sentry 조직 슬러그",
     sentryProjectSlug: "Sentry 프로젝트 슬러그",
     sentryEnvironment: "Sentry 환경",
@@ -111,6 +111,8 @@ const messages = {
     sentryProjectPlaceholder: "선택적 프로젝트 슬러그",
     sentryEnvironmentPlaceholder: "예: production",
     saveSettings: "설정 저장",
+    unsavedSettings: "저장되지 않은 변경 사항",
+    discardSettingsChanges: "취소",
     settingsError: "관찰 설정을 저장하지 못했습니다.",
     settingsSaved: "관찰 설정을 저장했습니다.",
     ruleName: "이름",
@@ -134,11 +136,20 @@ const messages = {
     createFactorySubmit: "팩토리 만들기",
     createFactoryCancel: "취소",
     createFactoryNameLabel: "이름",
-    createFactoryDescriptionLabel: "설명(선택)",
+    createFactoryDescriptionLabel: "이 팩토리가 하는 일",
     createFactorySourcesOptional: "소스(선택)",
     createFactorySlackSourceOptional: "Slack 소스(선택)",
     createFactoryGithubSourceOptional: "GitHub 소스(선택)",
     createFactorySentrySourceOptional: "Sentry 소스(선택)",
+    slackSource: "Slack",
+    githubSource: "GitHub",
+    sentrySource: "Sentry",
+    slackSourceDescription:
+      "이 채널을 폴링하여 Slack 메시지를 받은편지함에 추가합니다.",
+    githubSourceDescription:
+      "이 저장소를 폴링하여 이슈와 풀 리퀘스트를 받은편지함에 추가합니다.",
+    sentrySourceDescription:
+      "이 프로젝트를 폴링하여 미해결 오류를 받은편지함에 추가합니다.",
     createFactoryObserveSlack: "Slack 채널 관찰",
     createFactoryObserveGithub: "GitHub 이슈 관찰",
     createFactoryObserveSentry: "Sentry 오류 관찰",
@@ -220,6 +231,20 @@ const messages = {
     auditUxImpact: "UX 영향",
     auditOwnerArea: "담당 영역",
     auditGuardsLabel: "가드",
+    auditTrace: "추적",
+    auditWhy: "이유",
+    auditWhatHappened: "무슨 일이 있었는지",
+    auditInspectedOnly: "검사만 함",
+    auditNoNew: "새 항목 없음",
+    auditFailed: "{{count}}건 실패",
+    auditHeld: "{{count}}건 보류",
+    auditDispatched: "{{count}}건 전달",
+    auditObserved: "{{count}}건 신규",
+    auditScanned: "{{count}}건 스캔",
+    auditOutcomeHeld: "보류",
+    auditOutcomeDispatched: "전달됨",
+    auditOutcomeFailed: "전달 실패",
+    auditOutcomeInspected: "검사됨",
     historyTab: "기록",
     historyTitle: "저장된 버전",
     historyLoading: "저장된 버전을 불러오는 중",
@@ -288,8 +313,11 @@ const messages = {
     saveAutomation: "저장",
     automationSaved: "저장됨",
     automationSaveFailed: "자동화를 저장하지 못했습니다.",
+    automationRunFailed: "자동화를 실행하지 못했습니다.",
+    automationRunning: "실행 중",
     runNow: "지금 실행",
     automationHealthTitle: "스케줄러 상태",
+    automationHealthStatus: "상태",
     automationHealthDescription:
       "하트비트는 배포된 반복 작업 워커가 계속 일정을 확인하고 있는지 보여 줍니다.",
     automationHealthHealthy: "정상",
diff --git a/templates/factory/app/i18n/pt-BR.ts b/templates/factory/app/i18n/pt-BR.ts
index 190cc80b90..86dcf81c9d 100644
--- a/templates/factory/app/i18n/pt-BR.ts
+++ b/templates/factory/app/i18n/pt-BR.ts
@@ -106,9 +106,9 @@ const messages = {
     builderSlackUserIdPlaceholder: "Por exemplo: U096KN3EL2Y",
     repository: "Repositório",
     repositoryPlaceholder: "Por exemplo: BuilderIO/agent-native",
-    enablePolling: "Ativar polling de observações a cada minuto",
-    enableGithubPolling: "Ativar polling de issues e pull requests do GitHub",
-    enableSentryPolling: "Ativar polling diário de erros do Sentry",
+    enablePolling: "Ativar polling",
+    enableGithubPolling: "Ativar polling",
+    enableSentryPolling: "Ativar polling",
     sentryOrgSlug: "Slug da organização no Sentry",
     sentryProjectSlug: "Slug do projeto no Sentry",
     sentryEnvironment: "Ambiente do Sentry",
@@ -116,6 +116,8 @@ const messages = {
     sentryProjectPlaceholder: "Slug de projeto opcional",
     sentryEnvironmentPlaceholder: "Por exemplo: production",
     saveSettings: "Salvar configurações",
+    unsavedSettings: "Alterações não salvas",
+    discardSettingsChanges: "Descartar",
     settingsError: "Não foi possível salvar as configurações de observação.",
     settingsSaved: "Configurações de observação salvas.",
     ruleName: "Nome",
@@ -139,11 +141,20 @@ const messages = {
     createFactorySubmit: "Criar fábrica",
     createFactoryCancel: "Cancelar",
     createFactoryNameLabel: "Nome",
-    createFactoryDescriptionLabel: "Descrição (opcional)",
+    createFactoryDescriptionLabel: "O que esta fábrica faz",
     createFactorySourcesOptional: "Fontes (opcional)",
     createFactorySlackSourceOptional: "Fonte Slack (opcional)",
     createFactoryGithubSourceOptional: "Fonte GitHub (opcional)",
     createFactorySentrySourceOptional: "Fonte Sentry (opcional)",
+    slackSource: "Slack",
+    githubSource: "GitHub",
+    sentrySource: "Sentry",
+    slackSourceDescription:
+      "Faça polling neste canal para adicionar mensagens do Slack à caixa de entrada.",
+    githubSourceDescription:
+      "Faça polling neste repositório para adicionar issues e pull requests à caixa de entrada.",
+    sentrySourceDescription:
+      "Faça polling neste projeto para adicionar erros não resolvidos à caixa de entrada.",
     createFactoryObserveSlack: "Observar canal do Slack",
     createFactoryObserveGithub: "Observar issues do GitHub",
     createFactoryObserveSentry: "Observar erros do Sentry",
@@ -227,6 +238,20 @@ const messages = {
     auditUxImpact: "Impacto de UX",
     auditOwnerArea: "Área responsável",
     auditGuardsLabel: "Guards",
+    auditTrace: "Rastro",
+    auditWhy: "Por quê",
+    auditWhatHappened: "O que aconteceu",
+    auditInspectedOnly: "Apenas inspecionado",
+    auditNoNew: "Nenhum item novo",
+    auditFailed: "{{count}} com falha",
+    auditHeld: "{{count}} retidos",
+    auditDispatched: "{{count}} enviados",
+    auditObserved: "{{count}} novos",
+    auditScanned: "{{count}} verificados",
+    auditOutcomeHeld: "Retido",
+    auditOutcomeDispatched: "Enviado",
+    auditOutcomeFailed: "Envio falhou",
+    auditOutcomeInspected: "Inspecionado",
     historyTab: "Histórico",
     historyTitle: "Versões salvas",
     historyLoading: "Carregando versões salvas",
@@ -296,8 +321,11 @@ const messages = {
     saveAutomation: "Salvar",
     automationSaved: "Salvo",
     automationSaveFailed: "Não foi possível salvar a automação.",
+    automationRunFailed: "Não foi possível executar a automação.",
+    automationRunning: "Em execução",
     runNow: "Executar agora",
     automationHealthTitle: "Saúde do agendador",
+    automationHealthStatus: "Status",
     automationHealthDescription:
       "O heartbeat mostra se o worker de tarefas recorrentes implantado continua verificando os agendamentos.",
     automationHealthHealthy: "Saudável",
diff --git a/templates/factory/app/i18n/zh-CN.ts b/templates/factory/app/i18n/zh-CN.ts
index c85904c29b..cab5cbf33a 100644
--- a/templates/factory/app/i18n/zh-CN.ts
+++ b/templates/factory/app/i18n/zh-CN.ts
@@ -95,9 +95,9 @@ const messages = {
     builderSlackUserIdPlaceholder: "例如：U096KN3EL2Y",
     repository: "代码库",
     repositoryPlaceholder: "例如：BuilderIO/agent-native",
-    enablePolling: "启用每分钟观察轮询",
-    enableGithubPolling: "启用 GitHub issue 和 pull request 轮询",
-    enableSentryPolling: "启用每日 Sentry 错误轮询",
+    enablePolling: "启用轮询",
+    enableGithubPolling: "启用轮询",
+    enableSentryPolling: "启用轮询",
     sentryOrgSlug: "Sentry 组织 slug",
     sentryProjectSlug: "Sentry 项目 slug",
     sentryEnvironment: "Sentry 环境",
@@ -105,6 +105,8 @@ const messages = {
     sentryProjectPlaceholder: "可选项目 slug",
     sentryEnvironmentPlaceholder: "例如：production",
     saveSettings: "保存设置",
+    unsavedSettings: "未保存的更改",
+    discardSettingsChanges: "放弃",
     settingsError: "无法保存观察设置。",
     settingsSaved: "观察设置已保存。",
     ruleName: "名称",
@@ -127,11 +129,17 @@ const messages = {
     createFactorySubmit: "创建工厂",
     createFactoryCancel: "取消",
     createFactoryNameLabel: "名称",
-    createFactoryDescriptionLabel: "描述（可选）",
+    createFactoryDescriptionLabel: "此工厂的作用",
     createFactorySourcesOptional: "来源（可选）",
     createFactorySlackSourceOptional: "Slack 来源（可选）",
     createFactoryGithubSourceOptional: "GitHub 来源（可选）",
     createFactorySentrySourceOptional: "Sentry 来源（可选）",
+    slackSource: "Slack",
+    githubSource: "GitHub",
+    sentrySource: "Sentry",
+    slackSourceDescription: "轮询此频道，将 Slack 消息加入收件箱。",
+    githubSourceDescription: "轮询此代码库，将议题和拉取请求加入收件箱。",
+    sentrySourceDescription: "轮询此项目，将未解决错误加入收件箱。",
     createFactoryObserveSlack: "观察 Slack 频道",
     createFactoryObserveGithub: "观察 GitHub 议题",
     createFactoryObserveSentry: "观察 Sentry 错误",
@@ -209,6 +217,20 @@ const messages = {
     auditUxImpact: "用户体验影响",
     auditOwnerArea: "负责领域",
     auditGuardsLabel: "守卫",
+    auditTrace: "追踪",
+    auditWhy: "原因",
+    auditWhatHappened: "发生了什么",
+    auditInspectedOnly: "仅检查",
+    auditNoNew: "没有新项目",
+    auditFailed: "{{count}} 失败",
+    auditHeld: "{{count}} 暂缓",
+    auditDispatched: "{{count}} 已派发",
+    auditObserved: "{{count}} 新项",
+    auditScanned: "{{count}} 已扫描",
+    auditOutcomeHeld: "暂缓",
+    auditOutcomeDispatched: "已派发",
+    auditOutcomeFailed: "派发失败",
+    auditOutcomeInspected: "已检查",
     historyTab: "历史",
     historyTitle: "已保存的版本",
     historyLoading: "正在加载已保存的版本",
@@ -274,8 +296,11 @@ const messages = {
     saveAutomation: "保存",
     automationSaved: "已保存",
     automationSaveFailed: "无法保存自动化。",
+    automationRunFailed: "无法运行自动化。",
+    automationRunning: "运行中",
     runNow: "立即运行",
     automationHealthTitle: "调度器状态",
+    automationHealthStatus: "状态",
     automationHealthDescription:
       "心跳显示已部署的周期任务工作程序是否仍在检查计划。",
     automationHealthHealthy: "正常",
diff --git a/templates/factory/app/i18n/zh-TW.ts b/templates/factory/app/i18n/zh-TW.ts
index 1f6ddf18a7..7f48549bc4 100644
--- a/templates/factory/app/i18n/zh-TW.ts
+++ b/templates/factory/app/i18n/zh-TW.ts
@@ -95,9 +95,9 @@ const messages = {
     builderSlackUserIdPlaceholder: "例如：U096KN3EL2Y",
     repository: "儲存庫",
     repositoryPlaceholder: "例如：BuilderIO/agent-native",
-    enablePolling: "啟用每分鐘觀察輪詢",
-    enableGithubPolling: "啟用 GitHub issue 與 pull request 輪詢",
-    enableSentryPolling: "啟用每日 Sentry 錯誤輪詢",
+    enablePolling: "啟用輪詢",
+    enableGithubPolling: "啟用輪詢",
+    enableSentryPolling: "啟用輪詢",
     sentryOrgSlug: "Sentry 組織 slug",
     sentryProjectSlug: "Sentry 專案 slug",
     sentryEnvironment: "Sentry 環境",
@@ -105,6 +105,8 @@ const messages = {
     sentryProjectPlaceholder: "選填專案 slug",
     sentryEnvironmentPlaceholder: "例如：production",
     saveSettings: "儲存設定",
+    unsavedSettings: "未儲存的變更",
+    discardSettingsChanges: "捨棄",
     settingsError: "無法儲存觀察設定。",
     settingsSaved: "觀察設定已儲存。",
     ruleName: "名稱",
@@ -127,11 +129,17 @@ const messages = {
     createFactorySubmit: "建立工廠",
     createFactoryCancel: "取消",
     createFactoryNameLabel: "名稱",
-    createFactoryDescriptionLabel: "描述（選填）",
+    createFactoryDescriptionLabel: "此工廠的作用",
     createFactorySourcesOptional: "來源（選填）",
     createFactorySlackSourceOptional: "Slack 來源（選填）",
     createFactoryGithubSourceOptional: "GitHub 來源（選填）",
     createFactorySentrySourceOptional: "Sentry 來源（選填）",
+    slackSource: "Slack",
+    githubSource: "GitHub",
+    sentrySource: "Sentry",
+    slackSourceDescription: "輪詢此頻道，將 Slack 訊息加入收件匣。",
+    githubSourceDescription: "輪詢此儲存庫，將議題與拉取請求加入收件匣。",
+    sentrySourceDescription: "輪詢此專案，將未解決錯誤加入收件匣。",
     createFactoryObserveSlack: "觀察 Slack 頻道",
     createFactoryObserveGithub: "觀察 GitHub 議題",
     createFactoryObserveSentry: "觀察 Sentry 錯誤",
@@ -209,6 +217,20 @@ const messages = {
     auditUxImpact: "使用者體驗影響",
     auditOwnerArea: "負責範圍",
     auditGuardsLabel: "守衛",
+    auditTrace: "追蹤",
+    auditWhy: "原因",
+    auditWhatHappened: "發生了什麼",
+    auditInspectedOnly: "僅檢查",
+    auditNoNew: "沒有新項目",
+    auditFailed: "{{count}} 失敗",
+    auditHeld: "{{count}} 暫緩",
+    auditDispatched: "{{count}} 已派發",
+    auditObserved: "{{count}} 新項",
+    auditScanned: "{{count}} 已掃描",
+    auditOutcomeHeld: "暫緩",
+    auditOutcomeDispatched: "已派發",
+    auditOutcomeFailed: "派發失敗",
+    auditOutcomeInspected: "已檢查",
     historyTab: "歷史記錄",
     historyTitle: "已儲存的版本",
     historyLoading: "正在載入已儲存的版本",
@@ -274,8 +296,11 @@ const messages = {
     saveAutomation: "儲存",
     automationSaved: "已儲存",
     automationSaveFailed: "無法儲存自動化。",
+    automationRunFailed: "無法執行自動化。",
+    automationRunning: "執行中",
     runNow: "立即執行",
     automationHealthTitle: "排程器狀態",
+    automationHealthStatus: "狀態",
     automationHealthDescription:
       "心跳顯示已部署的週期工作執行程序是否仍在檢查排程。",
     automationHealthHealthy: "正常",
diff --git a/templates/factory/app/routes/factory.layout.test.ts b/templates/factory/app/routes/factory.layout.test.ts
new file mode 100644
index 0000000000..317b6a79b0
--- /dev/null
+++ b/templates/factory/app/routes/factory.layout.test.ts
@@ -0,0 +1,27 @@
+import { readFileSync } from "node:fs";
+
+import { describe, expect, it } from "vitest";
+
+function readSource() {
+  return readFileSync(new URL("./factory.tsx", import.meta.url), "utf8");
+}
+
+describe("Factory route factory switching", () => {
+  it("remounts Settings and Automations when factoryId changes", () => {
+    const source = readSource();
+    expect(source).toContain(
+      "<FactorySettingsView key={factoryId} factoryId={factoryId} />",
+    );
+    expect(source).toContain(
+      "<AutomationsView key={factoryId} factoryId={factoryId} t={t} />",
+    );
+  });
+
+  it("clears queued automation polling when factoryId changes", () => {
+    const source = readSource();
+    expect(source).toContain("setQueuedRuns({})");
+    expect(source).toMatch(
+      /useEffect\(\(\) => \{\s*setQueuedRuns\(\{\}\);\s*\}, \[factoryId\]\);/,
+    );
+  });
+});
diff --git a/templates/factory/app/routes/factory.tsx b/templates/factory/app/routes/factory.tsx
index 5c7a818f32..16d482a3e3 100644
--- a/templates/factory/app/routes/factory.tsx
+++ b/templates/factory/app/routes/factory.tsx
@@ -16,6 +16,7 @@ import {
   IconPlus,
   IconRefresh,
 } from "@tabler/icons-react";
+import { useQueryClient } from "@tanstack/react-query";
 import { useEffect, useMemo, useRef, useState } from "react";
 import { Link, Navigate, useSearchParams } from "react-router";
 import { toast } from "sonner";
@@ -142,6 +143,12 @@ type FactoryAutomation = {
   pastRuns?: FactoryAutomationRun[] | null;
 };
 
+type RunFactoryAutomationResult = {
+  queued: true;
+  runId: string;
+  automationRunId: string;
+};
+
 const DEFAULT_FACTORY_ID = "product-feedback";
 
 export function meta() {
@@ -745,9 +752,9 @@ export default function FactoryRoute() {
         ) : activeTab === "rules" ? (
           <RulesView factoryId={factoryId} t={t} />
         ) : activeTab === "settings" ? (
-          <FactorySettingsView factoryId={factoryId} />
+          <FactorySettingsView key={factoryId} factoryId={factoryId} />
         ) : activeTab === "automations" ? (
-          <AutomationsView factoryId={factoryId} t={t} />
+          <AutomationsView key={factoryId} factoryId={factoryId} t={t} />
         ) : activeTab === "audit" ? (
           <FactoryAuditView
             factoryId={factoryId}
@@ -922,13 +929,22 @@ function AutomationsView({
 }) {
   const [searchParams, setSearchParams] = useSearchParams();
   const [draft, setDraft] = useState<FactoryAutomation | null>(null);
+  const [queuedRuns, setQueuedRuns] = useState<Record<string, string>>({});
+  const queryClient = useQueryClient();
+  useEffect(() => {
+    setQueuedRuns({});
+  }, [factoryId]);
   const selectedId = searchParams.get("automationId");
   const automationsQuery = useActionQuery<FactoryAutomation[]>(
     "list-factory-automations",
     { factoryId },
+    { refetchInterval: Object.keys(queuedRuns).length > 0 ? 1_000 : false },
   );
   const saveMutation = useActionMutation("save-factory-automation");
-  const runMutation = useActionMutation("run-factory-automation");
+  const runMutation = useActionMutation<
+    RunFactoryAutomationResult,
+    { factoryId: string; automationId: string }
+  >("run-factory-automation", { skipActionQueryInvalidation: true });
   const {
     availableModels,
     defaultModel,
@@ -1008,6 +1024,28 @@ function AutomationsView({
     });
   }, [selected, selectedId]);
 
+  useEffect(() => {
+    if (Object.keys(queuedRuns).length === 0 || !response) return;
+    const finishedAutomationIds = Object.entries(queuedRuns).flatMap(
+      ([automationId, runId]) => {
+        const automation = response.find((entry) => entry.id === automationId);
+        const run = automation?.runs?.find((entry) => entry.id === runId);
+        return run && run.status !== "running" ? [automationId] : [];
+      },
+    );
+    if (finishedAutomationIds.length === 0) return;
+    setQueuedRuns((current) => {
+      const next = { ...current };
+      for (const automationId of finishedAutomationIds) {
+        delete next[automationId];
+      }
+      return next;
+    });
+    void queryClient.invalidateQueries({
+      queryKey: ["action", "list-factory-audit"],
+    });
+  }, [queryClient, queuedRuns, response]);
+
   async function saveAutomation() {
     if (!draft) return;
     try {
@@ -1034,8 +1072,33 @@ function AutomationsView({
 
   async function runAutomation() {
     if (!draft) return;
-    await runMutation.mutateAsync({ factoryId, automationId: draft.id });
-    await automationsQuery.refetch();
+    try {
+      const result = await runMutation.mutateAsync({
+        factoryId,
+        automationId: draft.id,
+      });
+      setQueuedRuns((current) => ({
+        ...current,
+        [draft.id]: result.automationRunId,
+      }));
+      setSearchParams(
+        (current) => {
+          const next = new URLSearchParams(current);
+          next.set("auditRunId", result.automationRunId);
+          return next;
+        },
+        { replace: true },
+      );
+      void queryClient.invalidateQueries({
+        queryKey: ["action", "list-factory-audit"],
+      });
+    } catch (error) {
+      toast.error(
+        error instanceof Error
+          ? error.message
+          : t("factoryRoute.automationRunFailed"),
+      );
+    }
   }
 
   return (
@@ -1067,6 +1130,7 @@ function AutomationsView({
               >
                 {automations.map((automation) => {
                   const selected = activeAutomationId === automation.id;
+                  const running = Boolean(queuedRuns[automation.id]);
                   return (
                     <button
                       key={automation.id}
@@ -1083,15 +1147,20 @@ function AutomationsView({
                       onClick={() => selectAutomation(automation.id)}
                     >
                       <span
-                        className="block truncate text-sm font-medium"
+                        className="block break-words text-sm font-medium"
                         title={automation.name}
                       >
                         {automation.displayName}
                       </span>
-                      <span className="mt-1 block truncate text-xs text-muted-foreground">
-                        {automation.enabled
-                          ? t("factoryRoute.automationEnabled")
-                          : t("factoryRoute.automationDisabled")}
+                      <span className="mt-1 flex items-center gap-1.5 truncate text-xs text-muted-foreground">
+                        {running && (
+                          <IconLoader2 className="size-3 animate-spin motion-reduce:animate-none" />
+                        )}
+                        {running
+                          ? t("factoryRoute.automationRunning")
+                          : automation.enabled
+                            ? t("factoryRoute.automationEnabled")
+                            : t("factoryRoute.automationDisabled")}
                       </span>
                     </button>
                   );
@@ -1126,7 +1195,11 @@ function AutomationsView({
                   variant="outline"
                   size="sm"
                   onClick={() => void runAutomation()}
-                  disabled={runMutation.isPending || draft.canUpdate === false}
+                  disabled={
+                    runMutation.isPending ||
+                    Boolean(queuedRuns[draft.id]) ||
+                    draft.canUpdate === false
+                  }
                 >
                   {runMutation.isPending && (
                     <IconLoader2 className="animate-spin" />
diff --git a/templates/factory/changelog/2026-08-21-activity-runs-use-automation-display-names.md b/templates/factory/changelog/2026-08-21-activity-runs-use-automation-display-names.md
new file mode 100644
index 0000000000..d5d9864016
--- /dev/null
+++ b/templates/factory/changelog/2026-08-21-activity-runs-use-automation-display-names.md
@@ -0,0 +1,5 @@
+---
+type: improved
+date: 2026-08-21
+---
+Activity run history labels each run with the automation's display name instead of its full resource path.
diff --git a/templates/factory/changelog/2026-08-21-create-and-settings-source-cards.md b/templates/factory/changelog/2026-08-21-create-and-settings-source-cards.md
new file mode 100644
index 0000000000..4ec97df68f
--- /dev/null
+++ b/templates/factory/changelog/2026-08-21-create-and-settings-source-cards.md
@@ -0,0 +1,5 @@
+---
+type: improved
+date: 2026-08-21
+---
+Create Factory and Settings now share the same labeled source cards, Enable polling toggles, and uncrowded scheduler health rows.
diff --git a/templates/factory/changelog/2026-08-21-keep-automations-visible-while-running.md b/templates/factory/changelog/2026-08-21-keep-automations-visible-while-running.md
new file mode 100644
index 0000000000..f23e22a8e5
--- /dev/null
+++ b/templates/factory/changelog/2026-08-21-keep-automations-visible-while-running.md
@@ -0,0 +1,5 @@
+---
+type: fixed
+date: 2026-08-21
+---
+Automations remain visible while running, with live status updates in Automations and Activity.
diff --git a/templates/factory/changelog/2026-08-21-nested-factory-automations-can-poll.md b/templates/factory/changelog/2026-08-21-nested-factory-automations-can-poll.md
new file mode 100644
index 0000000000..447f09f2cb
--- /dev/null
+++ b/templates/factory/changelog/2026-08-21-nested-factory-automations-can-poll.md
@@ -0,0 +1,5 @@
+---
+type: fixed
+date: 2026-08-21
+---
+Factory Slack, GitHub, and Sentry automations now run for nested factories instead of failing before they can poll.
diff --git a/templates/factory/changelog/2026-08-21-settings-sticky-unsaved-bar.md b/templates/factory/changelog/2026-08-21-settings-sticky-unsaved-bar.md
new file mode 100644
index 0000000000..ce69447b7e
--- /dev/null
+++ b/templates/factory/changelog/2026-08-21-settings-sticky-unsaved-bar.md
@@ -0,0 +1,5 @@
+---
+type: improved
+date: 2026-08-21
+---
+Factory settings now show a sticky Save and Discard bar at the top as soon as a field changes, instead of a save button buried below the page.
diff --git a/templates/factory/server/lib/factory-audit-report.spec.ts b/templates/factory/server/lib/factory-audit-report.spec.ts
new file mode 100644
index 0000000000..f3764d536c
--- /dev/null
+++ b/templates/factory/server/lib/factory-audit-report.spec.ts
@@ -0,0 +1,236 @@
+import { describe, expect, it } from "vitest";
+
+import {
+  auditItemSubject,
+  projectFactoryAuditReport,
+  type FactoryAuditEventRecord,
+} from "./factory-audit-report.js";
+
+function event(
+  partial: Partial<FactoryAuditEventRecord> &
+    Pick<FactoryAuditEventRecord, "id" | "action" | "kind" | "summary">,
+): FactoryAuditEventRecord {
+  return {
+    itemId: null,
+    source: "slack",
+    sourceUrl: null,
+    status: "success",
+    details: {},
+    createdAt: "2026-08-21T23:00:00.000Z",
+    ...partial,
+  };
+}
+
+describe("projectFactoryAuditReport", () => {
+  it("collapses per-item list reads and titles investigated items from summaries", () => {
+    const itemId = "item-analytics";
+    const report = projectFactoryAuditReport(
+      [
+        event({
+          id: "poll-1",
+          itemId,
+          action: "poll-slack-channel",
+          kind: "observed",
+          summary: "`Analytics` stuck in an infinite re-confirmation loop",
+          createdAt: "2026-08-21T23:01:21.000Z",
+        }),
+        event({
+          id: "list-1",
+          itemId,
+          action: "list-triage-items",
+          kind: "read",
+          summary: "Slack user Enzo",
+          createdAt: "2026-08-21T23:01:24.000Z",
+        }),
+        event({
+          id: "list-2",
+          itemId,
+          action: "list-triage-items",
+          kind: "read",
+          summary: "Slack user Enzo",
+          createdAt: "2026-08-21T23:01:24.100Z",
+        }),
+        event({
+          id: "list-other",
+          itemId: "item-other",
+          action: "list-triage-items",
+          kind: "read",
+          summary: "Slack user Enzo",
+          createdAt: "2026-08-21T23:01:24.200Z",
+        }),
+        event({
+          id: "ctx-1",
+          itemId,
+          action: "get-slack-feedback-context",
+          kind: "read",
+          summary: "Read the Slack thread (1 message).",
+          createdAt: "2026-08-21T23:01:28.000Z",
+        }),
+        event({
+          id: "dec-1",
+          itemId,
+          action: "start-builder-for-item",
+          kind: "decision",
+          status: "skipped",
+          summary: "Owner-managed UX request; keep manual.",
+          createdAt: "2026-08-21T23:01:32.000Z",
+          details: { clearBug: false, productUxImplications: true },
+        }),
+      ],
+      [
+        {
+          id: itemId,
+          title: "Slack user Enzo",
+          summary: "`Analytics` stuck in an infinite re-confirmation loop",
+          source: "slack",
+          sourceUrl: "https://slack.example/analytics",
+        },
+      ],
+    );
+
+    expect(report.counts).toEqual({
+      newlyObserved: 1,
+      scanned: 2,
+      investigated: 1,
+      held: 1,
+      dispatched: 0,
+      failed: 0,
+    });
+    expect(report.items).toHaveLength(1);
+    expect(report.items[0]?.title).toContain("Analytics");
+    expect(report.items[0]?.title).not.toMatch(/Slack thread/i);
+    expect(report.items[0]?.outcome).toBe("held");
+    expect(
+      report.trace.some((step) => step.action === "list-triage-items"),
+    ).toBe(true);
+    expect(
+      report.items[0]?.events.some(
+        (entry) => entry.action === "list-triage-items",
+      ),
+    ).toBe(false);
+  });
+
+  it("surfaces a failed factory run even when no dispatch audit event exists", () => {
+    const itemId = "item-analytics";
+    const report = projectFactoryAuditReport(
+      [
+        event({
+          id: "poll-empty",
+          action: "poll-slack-channel",
+          kind: "observed",
+          summary: "No new Slack feedback was observed.",
+          createdAt: "2026-08-21T23:32:47.000Z",
+        }),
+        event({
+          id: "scan",
+          action: "list-triage-items",
+          kind: "read",
+          summary: "Loaded 5 review candidates.",
+          createdAt: "2026-08-21T23:32:50.000Z",
+          details: {
+            purpose: "review_candidates",
+            count: 5,
+            itemIds: [itemId],
+          },
+        }),
+        event({
+          id: "ctx",
+          itemId,
+          action: "get-slack-feedback-context",
+          kind: "read",
+          summary: "Read the Slack thread (1 message).",
+          createdAt: "2026-08-21T23:32:55.000Z",
+        }),
+        event({
+          id: "dec",
+          itemId,
+          action: "start-builder-for-item",
+          kind: "decision",
+          status: "success",
+          summary: "Reproducible stuck multi-turn flow.",
+          createdAt: "2026-08-21T23:33:02.000Z",
+          details: { clearBug: true, productUxImplications: false },
+        }),
+      ],
+      [
+        {
+          id: itemId,
+          title: "Slack user Enzo",
+          summary: "`Analytics` stuck in an infinite re-confirmation loop",
+          source: "slack",
+          sourceUrl: null,
+        },
+      ],
+      [
+        {
+          itemId,
+          status: "failed",
+          error: "Slack API error: missing_scope",
+          provider: "bot-tag",
+          startedAt: "2026-08-21T23:33:02.410Z",
+        },
+      ],
+      {
+        startedAt: Date.parse("2026-08-21T23:32:47.000Z"),
+        finishedAt: Date.parse("2026-08-21T23:33:10.000Z"),
+      },
+    );
+
+    expect(report.counts.newlyObserved).toBe(0);
+    expect(report.counts.failed).toBe(1);
+    expect(report.items[0]?.outcome).toBe("failed");
+    expect(report.items[0]?.dispatchError).toBe(
+      "Slack API error: missing_scope",
+    );
+    expect(report.trace[0]?.summary).toMatch(/No new Slack feedback/);
+  });
+
+  it("records a batched list scan as one trace step", () => {
+    const report = projectFactoryAuditReport([
+      event({
+        id: "scan",
+        action: "list-triage-items",
+        kind: "read",
+        summary: "Loaded 20 recent slack items.",
+        details: {
+          purpose: "repeat_scan",
+          count: 20,
+          itemIds: ["a", "b"],
+        },
+      }),
+    ]);
+    expect(report.counts.scanned).toBe(2);
+    expect(report.items).toHaveLength(0);
+    expect(report.trace).toEqual([
+      expect.objectContaining({
+        purpose: "repeat_scan",
+        count: 20,
+        summary: "Loaded 20 recent slack items.",
+      }),
+    ]);
+  });
+});
+
+describe("auditItemSubject", () => {
+  it("prefers the stored feedback summary over a generic Slack title", () => {
+    expect(
+      auditItemSubject(
+        {
+          id: "item",
+          title: "Slack user Enzo",
+          summary: "Settings url drops /dispatch from the slug",
+          source: "slack",
+          sourceUrl: null,
+        },
+        [
+          event({
+            id: "ctx",
+            action: "get-slack-feedback-context",
+            kind: "read",
+            summary: "Read the Slack thread (1 message).",
+          }),
+        ],
+      ),
+    ).toBe("Settings url drops /dispatch from the slug");
+  });
+});
diff --git a/templates/factory/server/lib/factory-audit-report.ts b/templates/factory/server/lib/factory-audit-report.ts
new file mode 100644
index 0000000000..4a4ffd1d5e
--- /dev/null
+++ b/templates/factory/server/lib/factory-audit-report.ts
@@ -0,0 +1,412 @@
+export type FactoryAuditEventRecord = {
+  id: string;
+  itemId: string | null;
+  source: string | null;
+  sourceUrl: string | null;
+  action: string;
+  kind: string;
+  status: string;
+  summary: string;
+  details: Record<string, unknown>;
+  createdAt: string;
+};
+
+export type FactoryAuditItemSnapshot = {
+  id: string;
+  title: string;
+  summary: string | null;
+  source: string | null;
+  sourceUrl: string | null;
+};
+
+export type FactoryAuditRunSnapshot = {
+  itemId: string;
+  status: string;
+  error: string | null;
+  provider: string | null;
+  startedAt: string;
+};
+
+export type FactoryAuditItemOutcome =
+  | "held"
+  | "dispatched"
+  | "failed"
+  | "inspected";
+
+export type FactoryAuditReportItem = {
+  itemId: string;
+  source: string | null;
+  sourceUrl: string | null;
+  title: string;
+  outcome: FactoryAuditItemOutcome;
+  status: string;
+  rationale: string | null;
+  dispatchError: string | null;
+  clearBug: boolean | null;
+  productUx: boolean | null;
+  ownerArea: string | null;
+  guards: string | null;
+  events: FactoryAuditEventRecord[];
+  latestAt: string;
+};
+
+export type FactoryAuditTraceStep = {
+  id: string;
+  action: string;
+  summary: string;
+  status: string;
+  createdAt: string;
+  count: number;
+  purpose: string | null;
+};
+
+export type FactoryAuditCounts = {
+  newlyObserved: number;
+  scanned: number;
+  investigated: number;
+  held: number;
+  dispatched: number;
+  failed: number;
+};
+
+export type FactoryAuditReport = {
+  counts: FactoryAuditCounts;
+  items: FactoryAuditReportItem[];
+  trace: FactoryAuditTraceStep[];
+};
+
+const INVESTIGATE_ACTIONS = new Set([
+  "get-slack-feedback-context",
+  "get-triage-item",
+]);
+
+export function projectFactoryAuditReport(
+  events: FactoryAuditEventRecord[],
+  items: FactoryAuditItemSnapshot[] = [],
+  runs: FactoryAuditRunSnapshot[] = [],
+  window?: { startedAt: number; finishedAt: number | null },
+): FactoryAuditReport {
+  const itemsById = new Map(items.map((item) => [item.id, item]));
+  const latestRunByItem = latestRunsByItem(
+    window ? runsInWindow(runs, window) : runs,
+  );
+  const chronological = [...events].sort(byCreatedAtAsc);
+
+  const primaryItemIds = new Set<string>();
+  for (const event of chronological) {
+    if (!event.itemId) continue;
+    if (
+      INVESTIGATE_ACTIONS.has(event.action) ||
+      event.kind === "decision" ||
+      event.kind === "external_action"
+    ) {
+      primaryItemIds.add(event.itemId);
+    }
+  }
+
+  const reportItems = [...primaryItemIds]
+    .map((itemId) =>
+      projectItem(
+        itemId,
+        chronological.filter(
+          (event) => event.itemId === itemId && !isScanEvent(event),
+        ),
+        itemsById.get(itemId),
+        latestRunByItem.get(itemId),
+      ),
+    )
+    .sort(
+      (left, right) =>
+        new Date(right.latestAt).getTime() - new Date(left.latestAt).getTime(),
+    );
+
+  const counts: FactoryAuditCounts = {
+    newlyObserved: uniqueItemIds(
+      chronological.filter((event) => isPollEvent(event) && event.itemId),
+    ).size,
+    scanned: scannedItemCount(chronological),
+    investigated: reportItems.length,
+    held: reportItems.filter((item) => item.outcome === "held").length,
+    dispatched: reportItems.filter((item) => item.outcome === "dispatched")
+      .length,
+    failed: reportItems.filter((item) => item.outcome === "failed").length,
+  };
+
+  return {
+    counts,
+    items: reportItems,
+    trace: collapseTrace(chronological),
+  };
+}
+
+function projectItem(
+  itemId: string,
+  events: FactoryAuditEventRecord[],
+  item: FactoryAuditItemSnapshot | undefined,
+  run: FactoryAuditRunSnapshot | undefined,
+): FactoryAuditReportItem {
+  const decision = events.find((event) => event.kind === "decision") ?? null;
+  const dispatch =
+    events.find((event) => event.kind === "external_action") ?? null;
+  const latestAt = events.reduce(
+    (latest, event) =>
+      new Date(event.createdAt).getTime() > new Date(latest).getTime()
+        ? event.createdAt
+        : latest,
+    events[0]?.createdAt ?? new Date(0).toISOString(),
+  );
+  const dispatchError = readDispatchError(dispatch, run);
+  const outcome = itemOutcome(decision, dispatch, dispatchError);
+
+  return {
+    itemId,
+    source: item?.source ?? events[0]?.source ?? null,
+    sourceUrl:
+      item?.sourceUrl ??
+      events.find((event) => event.sourceUrl)?.sourceUrl ??
+      null,
+    title: auditItemSubject(item, events),
+    outcome,
+    status:
+      outcome === "failed"
+        ? "error"
+        : outcome === "held"
+          ? "skipped"
+          : "success",
+    rationale: decision?.summary ?? dispatch?.summary ?? null,
+    dispatchError,
+    clearBug: readBooleanDetail(decision?.details, "clearBug"),
+    productUx: readBooleanDetail(decision?.details, "productUxImplications"),
+    ownerArea: readStringDetail(decision?.details, "ownerOwnedArea"),
+    guards: readGuardSummary(decision?.details?.guardResults),
+    events,
+    latestAt,
+  };
+}
+
+function itemOutcome(
+  decision: FactoryAuditEventRecord | null,
+  dispatch: FactoryAuditEventRecord | null,
+  dispatchError: string | null,
+): FactoryAuditItemOutcome {
+  if (dispatchError) return "failed";
+  if (dispatch?.status === "error") return "failed";
+  if (dispatch) return "dispatched";
+  if (decision?.status === "skipped") return "held";
+  if (decision) return "held";
+  return "inspected";
+}
+
+function readDispatchError(
+  dispatch: FactoryAuditEventRecord | null,
+  run: FactoryAuditRunSnapshot | undefined,
+): string | null {
+  if (dispatch?.status === "error") {
+    return dispatch.summary.trim() || run?.error || "Dispatch failed.";
+  }
+  if (run?.status === "failed" && run.error) return run.error;
+  return null;
+}
+
+export function auditItemSubject(
+  item: FactoryAuditItemSnapshot | undefined,
+  events: FactoryAuditEventRecord[],
+): string {
+  const observed = events.find(
+    (event) =>
+      isPollEvent(event) && event.summary.trim() && !isEmptyObservation(event),
+  )?.summary;
+  const detailSummary = events
+    .map((event) => readStringDetail(event.details, "itemSummary"))
+    .find((value): value is string => Boolean(value));
+  const storedSummary =
+    item?.summary?.trim() || detailSummary?.trim() || observed?.trim() || "";
+  if (storedSummary) return firstLine(storedSummary, 110);
+
+  const storedTitle = item?.title?.trim() ?? "";
+  if (storedTitle && !isGenericSlackTitle(storedTitle)) return storedTitle;
+
+  const listed = events.find((event) => event.action === "list-triage-items");
+  const listedTitle = listed?.summary.trim() ?? "";
+  if (listedTitle && !isGenericSlackTitle(listedTitle)) return listedTitle;
+
+  return storedTitle || "Item";
+}
+
+function collapseTrace(
+  events: FactoryAuditEventRecord[],
+): FactoryAuditTraceStep[] {
+  const steps: FactoryAuditTraceStep[] = [];
+  const scanGroups = new Map<string, FactoryAuditEventRecord[]>();
+
+  for (const event of events) {
+    if (isScanEvent(event)) {
+      const purpose = readStringDetail(event.details, "purpose") ?? "scan";
+      const bucket = event.createdAt.slice(0, 19);
+      const key = `${purpose}:${bucket}`;
+      const current = scanGroups.get(key) ?? [];
+      current.push(event);
+      scanGroups.set(key, current);
+      continue;
+    }
+    if (isPollEvent(event)) {
+      if (event.itemId && !isEmptyObservation(event)) continue;
+      steps.push({
+        id: event.id,
+        action: event.action,
+        summary: event.summary,
+        status: event.status,
+        createdAt: event.createdAt,
+        count: event.itemId ? 1 : 0,
+        purpose: null,
+      });
+    }
+  }
+
+  for (const group of scanGroups.values()) {
+    const first = group[0]!;
+    const itemIds = new Set<string>();
+    for (const event of group) {
+      for (const itemId of eventItemIds(event)) itemIds.add(itemId);
+    }
+    const purpose = readStringDetail(first.details, "purpose");
+    const count =
+      typeof first.details.count === "number"
+        ? first.details.count
+        : itemIds.size;
+    steps.push({
+      id: first.id,
+      action: first.action,
+      summary:
+        group.length === 1 && !first.itemId
+          ? first.summary
+          : `Loaded ${count} item${count === 1 ? "" : "s"}.`,
+      status: first.status,
+      createdAt: first.createdAt,
+      count,
+      purpose,
+    });
+  }
+
+  return steps.sort(
+    (left, right) =>
+      new Date(left.createdAt).getTime() - new Date(right.createdAt).getTime(),
+  );
+}
+
+function scannedItemCount(events: FactoryAuditEventRecord[]): number {
+  const ids = new Set<string>();
+  for (const event of events) {
+    if (!isScanEvent(event)) continue;
+    for (const itemId of eventItemIds(event)) ids.add(itemId);
+  }
+  return ids.size;
+}
+
+function eventItemIds(event: FactoryAuditEventRecord): string[] {
+  if (event.itemId) return [event.itemId];
+  const raw = event.details.itemIds;
+  if (!Array.isArray(raw)) return [];
+  return raw.filter(
+    (value): value is string => typeof value === "string" && value.length > 0,
+  );
+}
+
+function uniqueItemIds(events: FactoryAuditEventRecord[]): Set<string> {
+  const ids = new Set<string>();
+  for (const event of events) {
+    for (const itemId of eventItemIds(event)) ids.add(itemId);
+  }
+  return ids;
+}
+
+function latestRunsByItem(
+  runs: FactoryAuditRunSnapshot[],
+): Map<string, FactoryAuditRunSnapshot> {
+  const latest = new Map<string, FactoryAuditRunSnapshot>();
+  for (const run of runs) {
+    const current = latest.get(run.itemId);
+    if (
+      !current ||
+      new Date(run.startedAt).getTime() > new Date(current.startedAt).getTime()
+    ) {
+      latest.set(run.itemId, run);
+    }
+  }
+  return latest;
+}
+
+function runsInWindow(
+  runs: FactoryAuditRunSnapshot[],
+  window: { startedAt: number; finishedAt: number | null },
+): FactoryAuditRunSnapshot[] {
+  const start = window.startedAt - 5_000;
+  const end = (window.finishedAt ?? Date.now()) + 5_000;
+  return runs.filter((run) => {
+    const at = new Date(run.startedAt).getTime();
+    return at >= start && at <= end;
+  });
+}
+
+function isScanEvent(event: FactoryAuditEventRecord): boolean {
+  return event.action === "list-triage-items";
+}
+
+function isPollEvent(event: FactoryAuditEventRecord): boolean {
+  return (
+    event.kind === "observed" ||
+    event.action.startsWith("poll-") ||
+    event.action === "ingest-github-observation"
+  );
+}
+
+function isEmptyObservation(event: FactoryAuditEventRecord): boolean {
+  return /no new|no open|no result/i.test(event.summary);
+}
+
+function isGenericSlackTitle(value: string): boolean {
+  return /^Slack (user|bot)\b/i.test(value.trim());
+}
+
+function firstLine(value: string, maxLength: number): string {
+  const line = value.replace(/\s+/g, " ").trim();
+  return line.length > maxLength ? `${line.slice(0, maxLength - 1)}…` : line;
+}
+
+function byCreatedAtAsc(
+  left: FactoryAuditEventRecord,
+  right: FactoryAuditEventRecord,
+): number {
+  return (
+    new Date(left.createdAt).getTime() - new Date(right.createdAt).getTime()
+  );
+}
+
+function readBooleanDetail(
+  details: Record<string, unknown> | undefined,
+  key: string,
+): boolean | null {
+  const value = details?.[key];
+  return typeof value === "boolean" ? value : null;
+}
+
+function readStringDetail(
+  details: Record<string, unknown> | undefined,
+  key: string,
+): string | null {
+  const value = details?.[key];
+  return typeof value === "string" && value ? value : null;
+}
+
+function readGuardSummary(value: unknown): string | null {
+  if (!Array.isArray(value) || value.length === 0) return null;
+  const passed = value.filter(
+    (guard): guard is { passed: boolean } =>
+      typeof guard === "object" &&
+      guard !== null &&
+      "passed" in guard &&
+      typeof (guard as { passed: unknown }).passed === "boolean" &&
+      (guard as { passed: boolean }).passed,
+  ).length;
+  return `${passed}/${value.length} passed`;
+}
diff --git a/templates/factory/server/lib/factory-config-reconcile.spec.ts b/templates/factory/server/lib/factory-config-reconcile.spec.ts
new file mode 100644
index 0000000000..9cf2f0fcae
--- /dev/null
+++ b/templates/factory/server/lib/factory-config-reconcile.spec.ts
@@ -0,0 +1,160 @@
+import { describe, expect, it } from "vitest";
+
+import {
+  mergeFactoryConfigRows,
+  planDefaultFactoryConfigReconciliation,
+  planSlackChannelConflictClears,
+  type FactoryConfigSqlRow,
+} from "./factory-config-reconcile.js";
+
+function row(
+  overrides: Partial<FactoryConfigSqlRow> & Pick<FactoryConfigSqlRow, "id">,
+): FactoryConfigSqlRow {
+  return {
+    org_id: "org-1",
+    factory_id: "product-feedback",
+    slack_workspace: "primary",
+    slack_channel_id: null,
+    slack_channel_name: null,
+    builder_slack_user_id: null,
+    polling_enabled: 0,
+    last_slack_ts: null,
+    slack_history_cursor: null,
+    repository: null,
+    github_polling_enabled: 0,
+    sentry_polling_enabled: 0,
+    sentry_org_slug: null,
+    sentry_project_slug: null,
+    sentry_environment: null,
+    last_sentry_seen_at: null,
+    automation_failure_alerts_enabled: 1,
+    automation_failure_alert_email: null,
+    last_automation_failure_alert_key: null,
+    last_automation_failure_alert_at: null,
+    owner_email: "owner@example.com",
+    created_at: "2026-08-01T00:00:00.000Z",
+    updated_at: "2026-08-01T00:00:00.000Z",
+    ...overrides,
+  };
+}
+
+describe("planDefaultFactoryConfigReconciliation", () => {
+  it("merges leftover legacy settings into the scoped row before deleting", () => {
+    const plans = planDefaultFactoryConfigReconciliation([
+      row({
+        id: "org-1:product-feedback",
+        slack_channel_id: null,
+        last_slack_ts: "100.1",
+        polling_enabled: 0,
+      }),
+      row({
+        id: "org-1",
+        slack_channel_id: "C123",
+        last_slack_ts: "200.2",
+        polling_enabled: 1,
+        slack_history_cursor: "cursor-1",
+      }),
+    ]);
+
+    expect(plans).toHaveLength(1);
+    expect(plans[0]?.fromId).toBe("org-1:product-feedback");
+    expect(plans[0]?.deleteIds).toEqual(["org-1"]);
+    expect(plans[0]?.row).toMatchObject({
+      id: "org-1:product-feedback",
+      slack_channel_id: "C123",
+      last_slack_ts: "200.2",
+      polling_enabled: 1,
+      slack_history_cursor: "cursor-1",
+    });
+  });
+
+  it("rewrites a leftover unscoped id when no scoped row exists", () => {
+    const plans = planDefaultFactoryConfigReconciliation([
+      row({ id: "org-1", slack_channel_id: "C9" }),
+    ]);
+
+    expect(plans[0]).toMatchObject({
+      fromId: "org-1",
+      deleteIds: [],
+      row: {
+        id: "org-1:product-feedback",
+        factory_id: "product-feedback",
+        slack_channel_id: "C9",
+      },
+    });
+  });
+});
+
+describe("mergeFactoryConfigRows", () => {
+  it("keeps the later Slack cursor and turns polling on if either row is enabled", () => {
+    const merged = mergeFactoryConfigRows(
+      row({ id: "keep", last_slack_ts: "10.0", polling_enabled: 0 }),
+      row({ id: "other", last_slack_ts: "9.0", polling_enabled: 1 }),
+    );
+    expect(merged.last_slack_ts).toBe("10.0");
+    expect(merged.polling_enabled).toBe(1);
+  });
+
+  it("keeps checkpoints with the winning Slack channel", () => {
+    const merged = mergeFactoryConfigRows(
+      row({
+        id: "keep",
+        slack_channel_id: "C-A",
+        last_slack_ts: "100.1",
+        slack_history_cursor: "cursor-a",
+      }),
+      row({
+        id: "other",
+        slack_channel_id: "C-B",
+        last_slack_ts: "999.9",
+        slack_history_cursor: "cursor-b",
+      }),
+    );
+    expect(merged.slack_channel_id).toBe("C-A");
+    expect(merged.last_slack_ts).toBe("100.1");
+    expect(merged.slack_history_cursor).toBe("cursor-a");
+  });
+
+  it("keeps the Slack workspace with the adopted channel", () => {
+    const merged = mergeFactoryConfigRows(
+      row({
+        id: "keep",
+        slack_workspace: "primary",
+        slack_channel_id: null,
+      }),
+      row({
+        id: "other",
+        slack_workspace: "secondary",
+        slack_channel_id: "C-SEC",
+        last_slack_ts: "9.0",
+        slack_history_cursor: "cursor-sec",
+      }),
+    );
+    expect(merged.slack_workspace).toBe("secondary");
+    expect(merged.slack_channel_id).toBe("C-SEC");
+    expect(merged.last_slack_ts).toBe("9.0");
+    expect(merged.slack_history_cursor).toBe("cursor-sec");
+  });
+});
+
+describe("planSlackChannelConflictClears", () => {
+  it("clears every extra factory sharing a Slack channel in the same org", () => {
+    const clears = planSlackChannelConflictClears([
+      row({
+        id: "org-1:factory-a",
+        factory_id: "factory-a",
+        slack_channel_id: "C123",
+        polling_enabled: 1,
+        updated_at: "2026-08-21T00:00:00.000Z",
+      }),
+      row({
+        id: "org-1:factory-b",
+        factory_id: "factory-b",
+        slack_channel_id: "C123",
+        polling_enabled: 0,
+        updated_at: "2026-08-22T00:00:00.000Z",
+      }),
+    ]);
+    expect(clears).toEqual([{ id: "org-1:factory-b", org_id: "org-1" }]);
+  });
+});
diff --git a/templates/factory/server/lib/factory-config-reconcile.ts b/templates/factory/server/lib/factory-config-reconcile.ts
new file mode 100644
index 0000000000..12d986d144
--- /dev/null
+++ b/templates/factory/server/lib/factory-config-reconcile.ts
@@ -0,0 +1,321 @@
+import { DEFAULT_FACTORY_ID } from "../factory-graph/store.js";
+import { factoryConfigRowId } from "./factory-scope.js";
+
+export type FactoryConfigSqlRow = {
+  id: string;
+  org_id: string | null;
+  factory_id: string | null;
+  slack_workspace: string | null;
+  slack_channel_id: string | null;
+  slack_channel_name: string | null;
+  builder_slack_user_id: string | null;
+  polling_enabled: number | null;
+  last_slack_ts: string | null;
+  slack_history_cursor: string | null;
+  repository: string | null;
+  github_polling_enabled: number | null;
+  sentry_polling_enabled: number | null;
+  sentry_org_slug: string | null;
+  sentry_project_slug: string | null;
+  sentry_environment: string | null;
+  last_sentry_seen_at: string | null;
+  automation_failure_alerts_enabled: number | null;
+  automation_failure_alert_email: string | null;
+  last_automation_failure_alert_key: string | null;
+  last_automation_failure_alert_at: string | null;
+  owner_email: string | null;
+  created_at: string | null;
+  updated_at: string | null;
+};
+
+export type FactoryConfigReconcilePlan = {
+  fromId: string;
+  row: FactoryConfigSqlRow;
+  deleteIds: string[];
+};
+
+function rowText(row: Record<string, unknown>, key: string): string | null {
+  return asText(row[key]);
+}
+
+function rowFlag(row: Record<string, unknown>, key: string): number | null {
+  const value = row[key];
+  if (value === null || value === undefined || value === "") return null;
+  return Number(value) === 1 ? 1 : 0;
+}
+
+export function factoryConfigSqlRowFromQuery(
+  row: Record<string, unknown>,
+): FactoryConfigSqlRow | null {
+  const id = rowText(row, "id");
+  if (!id) return null;
+  return {
+    id,
+    org_id: rowText(row, "org_id"),
+    factory_id: rowText(row, "factory_id"),
+    slack_workspace: rowText(row, "slack_workspace"),
+    slack_channel_id: rowText(row, "slack_channel_id"),
+    slack_channel_name: rowText(row, "slack_channel_name"),
+    builder_slack_user_id: rowText(row, "builder_slack_user_id"),
+    polling_enabled: rowFlag(row, "polling_enabled"),
+    last_slack_ts: rowText(row, "last_slack_ts"),
+    slack_history_cursor: rowText(row, "slack_history_cursor"),
+    repository: rowText(row, "repository"),
+    github_polling_enabled: rowFlag(row, "github_polling_enabled"),
+    sentry_polling_enabled: rowFlag(row, "sentry_polling_enabled"),
+    sentry_org_slug: rowText(row, "sentry_org_slug"),
+    sentry_project_slug: rowText(row, "sentry_project_slug"),
+    sentry_environment: rowText(row, "sentry_environment"),
+    last_sentry_seen_at: rowText(row, "last_sentry_seen_at"),
+    automation_failure_alerts_enabled: rowFlag(
+      row,
+      "automation_failure_alerts_enabled",
+    ),
+    automation_failure_alert_email: rowText(
+      row,
+      "automation_failure_alert_email",
+    ),
+    last_automation_failure_alert_key: rowText(
+      row,
+      "last_automation_failure_alert_key",
+    ),
+    last_automation_failure_alert_at: rowText(
+      row,
+      "last_automation_failure_alert_at",
+    ),
+    owner_email: rowText(row, "owner_email"),
+    created_at: rowText(row, "created_at"),
+    updated_at: rowText(row, "updated_at"),
+  };
+}
+
+function asText(value: unknown): string | null {
+  if (typeof value === "string") {
+    const text = value.trim();
+    return text.length > 0 ? text : null;
+  }
+  if (typeof value === "number" && Number.isFinite(value)) return String(value);
+  return null;
+}
+
+function asFlag(value: unknown): number {
+  return Number(value) === 1 ? 1 : 0;
+}
+
+function pickText(
+  keep: string | null | undefined,
+  other: string | null | undefined,
+): string | null {
+  return asText(keep) ?? asText(other);
+}
+
+function pickLater(
+  keep: string | null | undefined,
+  other: string | null | undefined,
+): string | null {
+  const left = asText(keep);
+  const right = asText(other);
+  if (!left) return right;
+  if (!right) return left;
+  const leftNum = Number(left);
+  const rightNum = Number(right);
+  if (Number.isFinite(leftNum) && Number.isFinite(rightNum)) {
+    return leftNum >= rightNum ? left : right;
+  }
+  return left >= right ? left : right;
+}
+
+export function isUniqueConstraintError(error: unknown): boolean {
+  const message = error instanceof Error ? error.message : String(error);
+  return /unique constraint failed|duplicate key|primary key/i.test(message);
+}
+
+export function mergeFactoryConfigRows(
+  keep: FactoryConfigSqlRow,
+  other: FactoryConfigSqlRow,
+): FactoryConfigSqlRow {
+  const slackIdentity = mergeSlackIdentity(keep, other);
+  return {
+    ...keep,
+    slack_workspace: slackIdentity.slack_workspace,
+    slack_channel_id: slackIdentity.slack_channel_id,
+    slack_channel_name: slackIdentity.slack_channel_name,
+    builder_slack_user_id: pickText(
+      keep.builder_slack_user_id,
+      other.builder_slack_user_id,
+    ),
+    polling_enabled: Math.max(
+      asFlag(keep.polling_enabled),
+      asFlag(other.polling_enabled),
+    ),
+    last_slack_ts: slackIdentity.last_slack_ts,
+    slack_history_cursor: slackIdentity.slack_history_cursor,
+    repository: pickText(keep.repository, other.repository),
+    github_polling_enabled: Math.max(
+      asFlag(keep.github_polling_enabled),
+      asFlag(other.github_polling_enabled),
+    ),
+    sentry_polling_enabled: Math.max(
+      asFlag(keep.sentry_polling_enabled),
+      asFlag(other.sentry_polling_enabled),
+    ),
+    sentry_org_slug: pickText(keep.sentry_org_slug, other.sentry_org_slug),
+    sentry_project_slug: pickText(
+      keep.sentry_project_slug,
+      other.sentry_project_slug,
+    ),
+    sentry_environment: pickText(
+      keep.sentry_environment,
+      other.sentry_environment,
+    ),
+    last_sentry_seen_at: pickLater(
+      keep.last_sentry_seen_at,
+      other.last_sentry_seen_at,
+    ),
+    automation_failure_alerts_enabled: Math.max(
+      asFlag(keep.automation_failure_alerts_enabled),
+      asFlag(other.automation_failure_alerts_enabled),
+    ),
+    automation_failure_alert_email: pickText(
+      keep.automation_failure_alert_email,
+      other.automation_failure_alert_email,
+    ),
+    last_automation_failure_alert_key: pickText(
+      keep.last_automation_failure_alert_key,
+      other.last_automation_failure_alert_key,
+    ),
+    last_automation_failure_alert_at: pickLater(
+      keep.last_automation_failure_alert_at,
+      other.last_automation_failure_alert_at,
+    ),
+    owner_email: pickText(keep.owner_email, other.owner_email),
+    created_at: pickText(keep.created_at, other.created_at) ?? keep.created_at,
+    updated_at: pickLater(keep.updated_at, other.updated_at),
+    org_id: keep.org_id || other.org_id,
+  };
+}
+
+export function planDefaultFactoryConfigReconciliation(
+  rows: FactoryConfigSqlRow[],
+  defaultFactoryId = DEFAULT_FACTORY_ID,
+): FactoryConfigReconcilePlan[] {
+  const byOrg = new Map<string, FactoryConfigSqlRow[]>();
+  for (const row of rows) {
+    const orgId = asText(row.org_id);
+    const id = asText(row.id);
+    if (!orgId || !id) continue;
+    const group = byOrg.get(orgId) ?? [];
+    group.push({ ...row, id, org_id: orgId });
+    byOrg.set(orgId, group);
+  }
+
+  const plans: FactoryConfigReconcilePlan[] = [];
+  for (const [orgId, group] of byOrg) {
+    const canonicalId = factoryConfigRowId(orgId, defaultFactoryId);
+    const keepSource = group.find((row) => row.id === canonicalId) ?? group[0]!;
+    let merged: FactoryConfigSqlRow = {
+      ...keepSource,
+      id: canonicalId,
+      org_id: orgId,
+      factory_id: defaultFactoryId,
+    };
+    const deleteIds: string[] = [];
+    for (const row of group) {
+      if (row.id === keepSource.id) continue;
+      merged = mergeFactoryConfigRows(merged, row);
+      deleteIds.push(row.id);
+    }
+    plans.push({
+      fromId: keepSource.id,
+      row: merged,
+      deleteIds,
+    });
+  }
+  return plans;
+}
+
+export type SlackChannelConflictClear = {
+  id: string;
+  org_id: string;
+};
+
+function mergeSlackIdentity(
+  keep: FactoryConfigSqlRow,
+  other: FactoryConfigSqlRow,
+): Pick<
+  FactoryConfigSqlRow,
+  | "slack_workspace"
+  | "slack_channel_id"
+  | "slack_channel_name"
+  | "last_slack_ts"
+  | "slack_history_cursor"
+> {
+  const keepChannel = asText(keep.slack_channel_id);
+  const otherChannel = asText(other.slack_channel_id);
+  if (!otherChannel || keepChannel === otherChannel) {
+    return {
+      slack_workspace: pickText(keep.slack_workspace, other.slack_workspace),
+      slack_channel_id: keepChannel ?? otherChannel,
+      slack_channel_name: pickText(
+        keep.slack_channel_name,
+        other.slack_channel_name,
+      ),
+      last_slack_ts: pickLater(keep.last_slack_ts, other.last_slack_ts),
+      slack_history_cursor: pickText(
+        keep.slack_history_cursor,
+        other.slack_history_cursor,
+      ),
+    };
+  }
+  if (!keepChannel) {
+    return {
+      slack_workspace: other.slack_workspace,
+      slack_channel_id: other.slack_channel_id,
+      slack_channel_name: other.slack_channel_name,
+      last_slack_ts: other.last_slack_ts,
+      slack_history_cursor: other.slack_history_cursor,
+    };
+  }
+  return {
+    slack_workspace: keep.slack_workspace,
+    slack_channel_id: keep.slack_channel_id,
+    slack_channel_name: keep.slack_channel_name,
+    last_slack_ts: keep.last_slack_ts,
+    slack_history_cursor: keep.slack_history_cursor,
+  };
+}
+
+export function planSlackChannelConflictClears(
+  rows: FactoryConfigSqlRow[],
+): SlackChannelConflictClear[] {
+  const groups = new Map<string, FactoryConfigSqlRow[]>();
+  for (const row of rows) {
+    const orgId = asText(row.org_id);
+    const channelId = asText(row.slack_channel_id);
+    const id = asText(row.id);
+    if (!orgId || !channelId || !id) continue;
+    const key = `${orgId}\0${channelId}`;
+    const group = groups.get(key) ?? [];
+    group.push({ ...row, id, org_id: orgId });
+    groups.set(key, group);
+  }
+
+  const clears: SlackChannelConflictClear[] = [];
+  for (const group of groups.values()) {
+    if (group.length < 2) continue;
+    const ranked = [...group].sort((left, right) => {
+      const polling =
+        asFlag(right.polling_enabled) - asFlag(left.polling_enabled);
+      if (polling !== 0) return polling;
+      const updated = (right.updated_at ?? "").localeCompare(
+        left.updated_at ?? "",
+      );
+      if (updated !== 0) return updated;
+      return left.id.localeCompare(right.id);
+    });
+    for (const row of ranked.slice(1)) {
+      clears.push({ id: row.id, org_id: row.org_id! });
+    }
+  }
+  return clears;
+}
diff --git a/templates/factory/server/lib/factory-scope-config-row.spec.ts b/templates/factory/server/lib/factory-scope-config-row.spec.ts
index 1563bdf851..cbf595fc64 100644
--- a/templates/factory/server/lib/factory-scope-config-row.spec.ts
+++ b/templates/factory/server/lib/factory-scope-config-row.spec.ts
@@ -1,7 +1,11 @@
-import { describe, expect, it } from "vitest";
+import { describe, expect, it, vi } from "vitest";
 
 import {
+  assertUniqueSlackChannelForFactory,
+  builderSlackUserIdSchema,
+  factoryAutomationLeafName,
   factoryConfigRowId,
+  readAutomationFactoryId,
   triageConfigUpdateRowId,
 } from "./factory-scope.js";
 
@@ -18,3 +22,104 @@ describe("triageConfigUpdateRowId", () => {
     ).toBe(factoryConfigRowId("org-1", "product-feedback"));
   });
 });
+
+describe("assertUniqueSlackChannelForFactory", () => {
+  function dbWithFactoryIds(factoryIds: Array<string | null>) {
+    return {
+      select: vi.fn(() => ({
+        from: vi.fn(() => ({
+          where: vi.fn(async () =>
+            factoryIds.map((factoryId) => ({ factoryId })),
+          ),
+        })),
+      })),
+    };
+  }
+
+  it("rejects a channel held by an unscoped legacy row", async () => {
+    await expect(
+      assertUniqueSlackChannelForFactory(
+        dbWithFactoryIds([null]) as never,
+        "org-1",
+        "product-feedback",
+        "C123",
+      ),
+    ).rejects.toThrow(
+      "That Slack channel is already used by another Factory in this workspace.",
+    );
+  });
+
+  it("allows the channel already held by the selected factory", async () => {
+    await expect(
+      assertUniqueSlackChannelForFactory(
+        dbWithFactoryIds(["product-feedback"]) as never,
+        "org-1",
+        "product-feedback",
+        "C123",
+      ),
+    ).resolves.toBeUndefined();
+  });
+});
+
+describe("readAutomationFactoryId", () => {
+  it("uses the nested resource path when frontmatter was stripped", () => {
+    expect(
+      readAutomationFactoryId(
+        {},
+        "---\ndomain: factory\n---\n",
+        "jobs/factories/enzo-test-factory-3/factory-slack-feedback.md",
+      ),
+    ).toBe("enzo-test-factory-3");
+  });
+
+  it("uses the path when stale frontmatter names another factory", () => {
+    expect(
+      readAutomationFactoryId(
+        {},
+        "---\nfactoryId: product-feedback\n---\n",
+        "jobs/factories/enzo-test-factory-3/factory-slack-feedback.md",
+      ),
+    ).toBe("enzo-test-factory-3");
+  });
+
+  it("keeps frontmatter fallback for legacy flat paths", () => {
+    expect(
+      readAutomationFactoryId(
+        {},
+        "---\nfactoryId: support-triage\n---\n",
+        "jobs/factory-slack-feedback.md",
+      ),
+    ).toBe("support-triage");
+  });
+});
+
+describe("factoryAutomationLeafName", () => {
+  it("keeps the leaf of a nested Factory trigger name", () => {
+    expect(
+      factoryAutomationLeafName(
+        "factories/enzo-test-factory-3/factory-slack-feedback",
+      ),
+    ).toBe("factory-slack-feedback");
+  });
+
+  it("keeps a flat Factory trigger name", () => {
+    expect(factoryAutomationLeafName("factory-slack-feedback")).toBe(
+      "factory-slack-feedback",
+    );
+  });
+});
+
+describe("builderSlackUserIdSchema", () => {
+  it("accepts empty, user, and workspace Slack member ids", () => {
+    expect(builderSlackUserIdSchema.parse("")).toBe("");
+    expect(builderSlackUserIdSchema.parse("U096KN3EL2Y")).toBe("U096KN3EL2Y");
+    expect(builderSlackUserIdSchema.parse("W01234567")).toBe("W01234567");
+  });
+
+  it("rejects values that later Settings saves would also reject", () => {
+    expect(() => builderSlackUserIdSchema.parse("not-a-slack-id")).toThrow(
+      /U01234567/,
+    );
+    expect(() => builderSlackUserIdSchema.parse("U".padEnd(33, "0"))).toThrow();
+  });
+});
diff --git a/templates/factory/server/lib/factory-scope.ts b/templates/factory/server/lib/factory-scope.ts
index ee517fd774..f57f3a87ac 100644
--- a/templates/factory/server/lib/factory-scope.ts
+++ b/templates/factory/server/lib/factory-scope.ts
@@ -23,6 +23,14 @@ export const factoryIdSchema = z
   .max(120)
   .regex(/^[a-z0-9][a-z0-9-]*$/);
 
+export const builderSlackUserIdSchema = z
+  .string()
+  .trim()
+  .max(32)
+  .refine((value) => value === "" || /^[UW][A-Z0-9]+$/i.test(value), {
+    message: "Builder Slack member id must look like U01234567.",
+  });
+
 export function factoryConfigRowId(orgId: string, factoryId: string): string {
   return `${orgId}:${factoryId}`;
 }
@@ -222,7 +230,13 @@ function readFrontmatterFactoryId(content: string): string | undefined {
   return value.replace(/^(\"|')|((\"|')$)/g, "");
 }
 
-export function readAutomationFactoryId(meta: object, content: string): string {
+export function readAutomationFactoryId(
+  meta: object,
+  content: string,
+  path: string,
+): string {
+  const fromPath = readFactoryIdFromAutomationPath(path);
+  if (fromPath) return fromPath;
   const fromContent = readFrontmatterFactoryId(content);
   return resolveAutomationFactoryId(
     fromContent ? { ...meta, factoryId: fromContent } : meta,
@@ -247,6 +261,15 @@ export function isLegacyFactoryAutomationPath(path: string): boolean {
   return /^jobs\/factory-[^/]+\.md$/.test(path);
 }
 
+/** Scheduler trigger names keep the nested path; role allowlists use the leaf. */
+export function factoryAutomationLeafName(nameOrPath: string): string {
+  const withoutJobsPrefix = nameOrPath
+    .replace(/^jobs\//, "")
+    .replace(/\.md$/, "");
+  const slash = withoutJobsPrefix.lastIndexOf("/");
+  return slash === -1 ? withoutJobsPrefix : withoutJobsPrefix.slice(slash + 1);
+}
+
 export function readFactoryIdFromAutomationPath(path: string): string | null {
   const match = path.match(/^jobs\/factories\/([^/]+)\/factory-[^/]+\.md$/);
   return match?.[1] ?? null;
@@ -294,7 +317,7 @@ export async function assertUniqueSlackChannelForFactory(
           eq(triageConfig.slackChannelId, normalized),
         ),
       )
-  ).find((row) => row.factoryId && row.factoryId !== factoryId);
+  ).find((row) => row.factoryId !== factoryId);
   if (conflict) {
     throw new Error(
       "That Slack channel is already used by another Factory in this workspace.",
diff --git a/templates/factory/server/lib/require-factory-automation.spec.ts b/templates/factory/server/lib/require-factory-automation.spec.ts
new file mode 100644
index 0000000000..1acd5c0832
--- /dev/null
+++ b/templates/factory/server/lib/require-factory-automation.spec.ts
@@ -0,0 +1,74 @@
+import { beforeEach, describe, expect, it, vi } from "vitest";
+
+const listAutomationDefinitionsMock = vi.hoisted(() => vi.fn());
+
+vi.mock("@agent-native/core/triggers", () => ({
+  listAutomationDefinitions: listAutomationDefinitionsMock,
+}));
+
+import { requireFactoryAutomation } from "./require-factory-automation.js";
+
+const ownerEmail = "owner@example.com";
+const nestedName = "factories/enzo-test-factory-3/factory-slack-feedback";
+const nestedPath = `jobs/${nestedName}.md`;
+
+function nestedDefinition() {
+  return {
+    name: nestedName,
+    resource: {
+      id: "resource-nested",
+      path: nestedPath,
+      content: "---\ndomain: factory\n---\n",
+    },
+    meta: {
+      domain: "factory",
+      orgId: "org-1",
+      runAs: "creator",
+      createdBy: ownerEmail,
+    },
+  };
+}
+
+describe("requireFactoryAutomation", () => {
+  beforeEach(() => {
+    vi.clearAllMocks();
+    process.env.WORKSPACE_OWNER_EMAIL = ownerEmail;
+    listAutomationDefinitionsMock.mockResolvedValue([nestedDefinition()]);
+  });
+
+  it("accepts nested Factory Slack automations for source polling", async () => {
+    await expect(
+      requireFactoryAutomation(
+        {
+          caller: "automation",
+          automation: {
+            triggerId: "resource-nested",
+            triggerName: nestedName,
+          },
+        },
+        { userEmail: ownerEmail, orgId: "org-1" },
+        "sourcePolling",
+        "enzo-test-factory-3",
+      ),
+    ).resolves.toBeUndefined();
+  });
+
+  it("rejects a nested name that is not a Factory source automation", async () => {
+    await expect(
+      requireFactoryAutomation(
+        {
+          caller: "automation",
+          automation: {
+            triggerId: "resource-nested",
+            triggerName: "factories/enzo-test-factory-3/not-a-factory-job",
+          },
+        },
+        { userEmail: ownerEmail, orgId: "org-1" },
+        "sourcePolling",
+        "enzo-test-factory-3",
+      ),
+    ).rejects.toThrow(
+      "The action was not invoked by a governed Factory automation.",
+    );
+  });
+});
diff --git a/templates/factory/server/lib/require-factory-automation.ts b/templates/factory/server/lib/require-factory-automation.ts
index f1d9f8f8c8..96e1defcb6 100644
--- a/templates/factory/server/lib/require-factory-automation.ts
+++ b/templates/factory/server/lib/require-factory-automation.ts
@@ -1,7 +1,10 @@
 import type { ActionRunContext } from "@agent-native/core/action";
 import { listAutomationDefinitions } from "@agent-native/core/triggers";
 
-import { readAutomationFactoryId } from "./factory-scope.js";
+import {
+  factoryAutomationLeafName,
+  readAutomationFactoryId,
+} from "./factory-scope.js";
 import type { WorkspaceMemberIdentity } from "./require-workspace-member.js";
 
 const FACTORY_AUTOMATION_NAMES = {
@@ -39,7 +42,10 @@ export async function requireFactoryAutomation(
   }
   const lineage = context.automation;
   const expectedNames = FACTORY_AUTOMATION_NAMES[role];
-  if (!lineage || !expectedNames.has(lineage.triggerName)) {
+  if (
+    !lineage ||
+    !expectedNames.has(factoryAutomationLeafName(lineage.triggerName))
+  ) {
     throw new Error(
       "The action was not invoked by a governed Factory automation.",
     );
@@ -71,8 +77,11 @@ export async function requireFactoryAutomation(
   }
   if (
     expectedFactoryId &&
-    readAutomationFactoryId(definition.meta, definition.resource.content) !==
-      expectedFactoryId
+    readAutomationFactoryId(
+      definition.meta,
+      definition.resource.content,
+      definition.resource.path,
+    ) !== expectedFactoryId
   ) {
     throw new Error(
       "The action was not invoked by a governed Factory automation.",
diff --git a/templates/factory/server/plugins/factory-migrations.layout.test.ts b/templates/factory/server/plugins/factory-migrations.layout.test.ts
new file mode 100644
index 0000000000..9aee862236
--- /dev/null
+++ b/templates/factory/server/plugins/factory-migrations.layout.test.ts
@@ -0,0 +1,32 @@
+import { readFileSync } from "node:fs";
+
+import { describe, expect, it } from "vitest";
+
+function readSource() {
+  return readFileSync(
+    new URL("./factory-migrations.ts", import.meta.url),
+    "utf8",
+  );
+}
+
+describe("factory config Slack uniqueness migration order", () => {
+  it("reconciles duplicate config rows before creating the unique Slack index", () => {
+    const source = readSource();
+    const version24 = source.slice(
+      source.indexOf("version: 24"),
+      source.indexOf("version: 25"),
+    );
+    const reconcileAt = version24.indexOf("reconcileDefaultFactoryConfigRows");
+    const duplicateAt = version24.indexOf(
+      "clearDuplicateSlackChannelAssignments",
+    );
+    const indexAt = version24.indexOf("CREATE UNIQUE INDEX");
+    expect(reconcileAt).toBeGreaterThan(-1);
+    expect(duplicateAt).toBeGreaterThan(reconcileAt);
+    expect(indexAt).toBeGreaterThan(duplicateAt);
+    expect(version24).toMatch(
+      /sql:\s*`[\s\S]*CREATE UNIQUE INDEX IF NOT EXISTS factory_config_org_slack_channel_idx/,
+    );
+    expect(version24).not.toContain("getDbExec");
+  });
+});
diff --git a/templates/factory/server/plugins/factory-migrations.ts b/templates/factory/server/plugins/factory-migrations.ts
index e885d83a01..f7dc5da295 100644
--- a/templates/factory/server/plugins/factory-migrations.ts
+++ b/templates/factory/server/plugins/factory-migrations.ts
@@ -1,6 +1,128 @@
-import { runMigrations } from "@agent-native/core/db";
+import { runMigrations, type DbExec } from "@agent-native/core/db";
 import { defineNitroPlugin } from "@agent-native/core/server";
 
+import {
+  factoryConfigSqlRowFromQuery,
+  isUniqueConstraintError,
+  planDefaultFactoryConfigReconciliation,
+  planSlackChannelConflictClears,
+  type FactoryConfigSqlRow,
+} from "../lib/factory-config-reconcile.js";
+
+async function writeReconciledFactoryConfig(
+  exec: DbExec,
+  plan: {
+    fromId: string;
+    row: FactoryConfigSqlRow;
+    deleteIds: string[];
+  },
+): Promise<void> {
+  const { row } = plan;
+  await exec.execute({
+    sql: `UPDATE factory_config SET
+      id = ?,
+      factory_id = ?,
+      slack_workspace = ?,
+      slack_channel_id = ?,
+      slack_channel_name = ?,
+      builder_slack_user_id = ?,
+      polling_enabled = ?,
+      last_slack_ts = ?,
+      slack_history_cursor = ?,
+      repository = ?,
+      github_polling_enabled = ?,
+      sentry_polling_enabled = ?,
+      sentry_org_slug = ?,
+      sentry_project_slug = ?,
+      sentry_environment = ?,
+      last_sentry_seen_at = ?,
+      automation_failure_alerts_enabled = ?,
+      automation_failure_alert_email = ?,
+      last_automation_failure_alert_key = ?,
+      last_automation_failure_alert_at = ?,
+      owner_email = ?,
+      created_at = ?,
+      updated_at = ?
+      WHERE id = ? AND org_id = ?`,
+    args: [
+      row.id,
+      row.factory_id,
+      row.slack_workspace ?? "primary",
+      row.slack_channel_id,
+      row.slack_channel_name,
+      row.builder_slack_user_id,
+      row.polling_enabled ?? 0,
+      row.last_slack_ts,
+      row.slack_history_cursor,
+      row.repository,
+      row.github_polling_enabled ?? 0,
+      row.sentry_polling_enabled ?? 0,
+      row.sentry_org_slug,
+      row.sentry_project_slug,
+      row.sentry_environment,
+      row.last_sentry_seen_at,
+      row.automation_failure_alerts_enabled ?? 1,
+      row.automation_failure_alert_email,
+      row.last_automation_failure_alert_key,
+      row.last_automation_failure_alert_at,
+      row.owner_email ?? "",
+      row.created_at ?? new Date().toISOString(),
+      row.updated_at ?? new Date().toISOString(),
+      plan.fromId,
+      row.org_id,
+    ],
+  });
+  for (const deleteId of plan.deleteIds) {
+    await exec.execute({
+      sql: `DELETE FROM factory_config WHERE id = ? AND org_id = ?`,
+      args: [deleteId, row.org_id],
+    });
+  }
+}
+
+async function reconcileDefaultFactoryConfigRows(): Promise<void> {
+  const { getDbExec } = await import("@agent-native/core/db");
+  const exec = getDbExec();
+  const defaultFactoryId = "product-feedback";
+  const configRows = await exec.execute({
+    sql: `SELECT * FROM factory_config
+          WHERE factory_id IS NULL OR factory_id = '' OR factory_id = ?`,
+    args: [defaultFactoryId],
+  });
+  const rows = (configRows.rows ?? [])
+    .map((row) => factoryConfigSqlRowFromQuery(row as Record<string, unknown>))
+    .filter((row): row is FactoryConfigSqlRow => row !== null);
+  for (const plan of planDefaultFactoryConfigReconciliation(
+    rows,
+    defaultFactoryId,
+  )) {
+    await writeReconciledFactoryConfig(exec, plan);
+  }
+}
+
+async function clearDuplicateSlackChannelAssignments(): Promise<void> {
+  const { getDbExec } = await import("@agent-native/core/db");
+  const exec = getDbExec();
+  const configRows = await exec.execute({
+    sql: `SELECT * FROM factory_config`,
+    args: [],
+  });
+  const rows = (configRows.rows ?? [])
+    .map((row) => factoryConfigSqlRowFromQuery(row as Record<string, unknown>))
+    .filter((row): row is FactoryConfigSqlRow => row !== null);
+  for (const clear of planSlackChannelConflictClears(rows)) {
+    await exec.execute({
+      sql: `UPDATE factory_config SET
+        slack_channel_id = NULL,
+        slack_channel_name = NULL,
+        last_slack_ts = NULL,
+        slack_history_cursor = NULL
+        WHERE id = ? AND org_id = ?`,
+      args: [clear.id, clear.org_id],
+    });
+  }
+}
+
 const migrations = [
   {
     version: 1,
@@ -339,10 +461,20 @@ const migrations = [
         const id = String(row.id ?? "");
         if (!orgId || id.includes(":")) continue;
         const nextId = `${orgId}:${defaultFactoryId}`;
-        await exec.execute({
-          sql: `UPDATE factory_config SET id = ? WHERE id = ? AND org_id = ?`,
-          args: [nextId, id, orgId],
+        const existing = await exec.execute({
+          sql: `SELECT id FROM factory_config WHERE id = ? AND org_id = ?`,
+          args: [nextId, orgId],
         });
+        if ((existing.rows?.length ?? 0) > 0) continue;
+        try {
+          await exec.execute({
+            sql: `UPDATE factory_config SET id = ? WHERE id = ? AND org_id = ?`,
+            args: [nextId, id, orgId],
+          });
+        } catch (error) {
+          if (isUniqueConstraintError(error)) continue;
+          throw error;
+        }
       }
     },
   },
@@ -368,12 +500,24 @@ const migrations = [
   {
     version: 24,
     name: "factory-config-org-slack-channel-unique",
+    run: async () => {
+      await reconcileDefaultFactoryConfigRows();
+      await clearDuplicateSlackChannelAssignments();
+    },
     sql: `
       CREATE UNIQUE INDEX IF NOT EXISTS factory_config_org_slack_channel_idx
         ON factory_config (org_id, slack_channel_id)
         WHERE slack_channel_id IS NOT NULL AND slack_channel_id != '';
     `,
   },
+  {
+    version: 25,
+    name: "factory-config-reconcile-legacy-rows",
+    sql: {},
+    run: async () => {
+      await reconcileDefaultFactoryConfigRows();
+    },
+  },
 ];
 
 export const runFactoryMigrations = runMigrations(migrations, {
diff --git a/templates/factory/server/plugins/factory-scheduler-job.ts b/templates/factory/server/plugins/factory-scheduler-job.ts
index c5009cfbce..1dccf3face 100644
--- a/templates/factory/server/plugins/factory-scheduler-job.ts
+++ b/templates/factory/server/plugins/factory-scheduler-job.ts
@@ -39,8 +39,6 @@ import {
 } from "../triage/review-skill-alignment.js";
 
 const LEGACY_JOB_PATH = "jobs/factory-observation-scheduler.md";
-const DEFAULT_SLACK_CHANNEL_ID = "C0ATH3CCZT4";
-const DEFAULT_SLACK_CHANNEL_NAME = "product-agent-native-feedback";
 const FAILURE_ALERT_COOLDOWN_MS = 15 * 60_000;
 
 type AutomationRunFinishedEvent = {
@@ -627,6 +625,7 @@ export async function syncFactoryAutomationEnabledStates(
           readAutomationFactoryId(
             definition.meta,
             definition.resource.content,
+            definition.resource.path,
           ) === factoryId,
       )
       .map(async (definition) => {
@@ -687,16 +686,15 @@ async function ensureDefaultTriageConfig(
   }
   const now = new Date().toISOString();
   const repository = defaultRepository();
-  const pollingEnabled = 1;
   const githubPollingEnabled = defaultGithubPollingEnabled() ? 1 : 0;
   await db.insert(triageConfig).values({
     id: factoryConfigRowId(orgId, factoryId),
     factoryId,
     slackWorkspace: "primary",
-    slackChannelId: DEFAULT_SLACK_CHANNEL_ID,
-    slackChannelName: DEFAULT_SLACK_CHANNEL_NAME,
+    slackChannelId: null,
+    slackChannelName: null,
     builderSlackUserId: null,
-    pollingEnabled,
+    pollingEnabled: 0,
     githubPollingEnabled,
     sentryPollingEnabled: 0,
     lastSlackTs: null,