@agent-native/core 0.168.7 → 0.168.10

package/corpus/templates/factory/actions/ingest-github-observation.ts

@@ -3,6 +3,8 @@ import { z } from "zod";
 
 import { getDb } from "../server/db/index.js";
 import { triageItems } from "../server/db/schema.js";
+import { DEFAULT_FACTORY_ID } from "../server/factory-graph/store.js";
+import { factoryIdSchema } from "../server/lib/factory-scope.js";
 import {
   requireWorkspaceMember,
   workspaceMemberIdentityFromContext,
@@ -31,6 +33,7 @@ export default defineAction({
   description:
     "Ingest one read-only GitHub pull-request observation from the existing ai-services boundary into Factory. This action records evidence only and never writes to GitHub.",
   schema: z.object({
+    factoryId: factoryIdSchema.default(DEFAULT_FACTORY_ID),
     repo: z.string().trim().min(1).max(256),
     pullRequestNumber: z.number().int().positive(),
     headSha: z.string().trim().min(1).max(128),
@@ -50,8 +53,9 @@ export default defineAction({
     const { userEmail, orgId } = await requireWorkspaceMember(
       workspaceMemberIdentityFromContext(context),
     );
-    const envelope = pullRequestSnapshotToEnvelope(input);
-    const id = itemDedupeKey(envelope, orgId);
+    const { factoryId, ...observation } = input;
+    const envelope = pullRequestSnapshotToEnvelope(observation);
+    const id = itemDedupeKey(envelope, orgId, factoryId);
     const now = new Date().toISOString();
     const db = getDb();
 
@@ -77,6 +81,7 @@ export default defineAction({
         updatedAt: now,
         ownerEmail: userEmail,
         orgId,
+        factoryId,
       })
       .onConflictDoUpdate({
         target: triageItems.id,
@@ -105,10 +110,11 @@ export default defineAction({
           repository: envelope.repository,
           pullRequestNumber: envelope.pullRequestNumber,
           coverage: envelope.coverage,
-          reviewCount: input.reviews.length,
-          checkCount: input.checks.length,
+          reviewCount: observation.reviews.length,
+          checkCount: observation.checks.length,
         },
       },
+      factoryId,
     );
 
     return {

package/corpus/templates/factory/actions/list-factory-audit.ts

@@ -8,6 +8,10 @@ import { z } from "zod";
 
 import { getDb } from "../server/db/index.js";
 import { factoryAuditEvents } from "../server/db/schema.js";
+import {
+  factoryIdSchema,
+  readAutomationFactoryId,
+} from "../server/lib/factory-scope.js";
 import {
   requireWorkspaceMember,
   workspaceMemberIdentityFromContext,
@@ -18,13 +22,13 @@ export default defineAction({
     "List recent Factory automation runs with the bounded source observations, decisions, and external actions recorded for each run.",
   agentTool: false,
   schema: z.object({
-    factoryId: z.string().trim().min(1).optional(),
+    factoryId: factoryIdSchema,
     automation: z.string().trim().min(1).optional(),
     limit: z.coerce.number().int().min(1).max(50).default(20),
   }),
   http: { method: "GET" },
   readOnly: true,
-  run: async ({ automation, limit }, context) => {
+  run: async ({ factoryId, automation, limit }, context) => {
     const { userEmail, orgId } = await requireWorkspaceMember(
       workspaceMemberIdentityFromContext(context),
     );
@@ -33,8 +37,10 @@ export default defineAction({
       "organization",
     );
     const factoryDefinitions = definitions.filter(
-      ({ meta, name }) =>
-        meta.domain === "factory" && (!automation || name === automation),
+      ({ meta, name, resource }) =>
+        meta.domain === "factory" &&
+        readAutomationFactoryId(meta, resource.content) === factoryId &&
+        (!automation || name === automation),
     );
     const runGroups = await Promise.all(
       factoryDefinitions.map(async ({ name, resource }) =>
@@ -60,6 +66,7 @@ export default defineAction({
           .where(
             and(
               eq(factoryAuditEvents.orgId, orgId),
+              eq(factoryAuditEvents.factoryId, factoryId),
               inArray(factoryAuditEvents.automationRunId, runIds),
             ),
           )

package/corpus/templates/factory/actions/list-factory-automations.ts

@@ -5,32 +5,58 @@ import {
 } from "@agent-native/core/triggers";
 import { z } from "zod";
 
+import { readFactoryDefinition } from "../server/factory-graph/store.js";
+import {
+  DEFAULT_FACTORY_ID,
+  factoryIdSchema,
+  readAutomationFactoryId,
+  resolveAutomationDisplayName,
+} from "../server/lib/factory-scope.js";
 import {
   requireWorkspaceMember,
   workspaceMemberIdentityFromContext,
 } from "../server/lib/require-workspace-member.js";
 
+function automationRunHistoryKey(path: string): string {
+  return path.replace(/^jobs\//, "").replace(/\.md$/, "");
+}
+
 export default defineAction({
   description:
     "List the organization-scoped Factory automations with their trigger, editable prompt, model, schedule, enabled state, and recent runs.",
   agentTool: false,
-  schema: z.object({ factoryId: z.string().trim().min(1).optional() }),
+  schema: z.object({ factoryId: factoryIdSchema }),
   http: { method: "GET" },
   readOnly: true,
-  run: async (_, context) => {
+  run: async ({ factoryId }, context) => {
     const { userEmail, orgId } = await requireWorkspaceMember(
       workspaceMemberIdentityFromContext(context),
     );
+    const factory = await readFactoryDefinition(orgId, factoryId);
+    if (!factory && factoryId !== DEFAULT_FACTORY_ID) {
+      throw new Error("Factory not found.");
+    }
     const definitions = await listAutomationDefinitions(
       { userEmail, orgId, appId: "factory" },
       "organization",
     );
+    const scoped = definitions.filter(
+      ({ meta, resource }) =>
+        meta.domain === "factory" &&
+        readAutomationFactoryId(meta, resource.content) === factoryId,
+    );
     return Promise.all(
-      definitions
-        .filter(({ meta }) => meta.domain === "factory")
-        .map(async ({ resource, name, meta, body, canUpdate }) => ({
+      scoped.map(async ({ resource, name, meta, body, canUpdate }) => {
+        const runs = await listAutomationRuns({
+          owners: [resource.owner],
+          automation: automationRunHistoryKey(resource.path),
+          appId: "factory",
+          limit: 20,
+        });
+        return {
           id: resource.id,
           name,
+          displayName: resolveAutomationDisplayName(name, resource.content),
           prompt: body,
           body,
           model: meta.model ?? null,
@@ -46,13 +72,9 @@ export default defineAction({
               ? new Date(resource.updatedAt).toISOString()
               : null,
           canUpdate,
-          runs: await listAutomationRuns({
-            owners: [resource.owner],
-            automation: name,
-            appId: "factory",
-            limit: 20,
-          }),
-        })),
+          runs: runs.filter((run) => run.path === resource.path),
+        };
+      }),
     );
   },
 });

package/corpus/templates/factory/actions/list-triage-items.ts

@@ -4,6 +4,12 @@ import { z } from "zod";
 
 import { getDb } from "../server/db/index.js";
 import { triageItems, triageDecisions } from "../server/db/schema.js";
+import { DEFAULT_FACTORY_ID } from "../server/factory-graph/store.js";
+import {
+  factoryIdSchema,
+  orgFactoryDecisionFilter,
+  orgFactoryItemFilter,
+} from "../server/lib/factory-scope.js";
 import {
   requireWorkspaceMember,
   workspaceMemberIdentityFromContext,
@@ -18,6 +24,7 @@ export default defineAction({
   description:
     "List the Factory observation queue. Results are scoped to the active workspace and include the latest shadow decision summary. Scheduled reviewers must pass needsReview true with a bounded source and limit so unchanged items are not re-reviewed.",
   schema: z.object({
+    factoryId: factoryIdSchema.default(DEFAULT_FACTORY_ID),
     status: triageItemStatusSchema.optional(),
     source: triageSourceSchema.optional(),
     needsReview: z.boolean().default(false),
@@ -25,7 +32,7 @@ export default defineAction({
   }),
   http: { method: "GET" },
   readOnly: true,
-  run: async ({ status, source, needsReview, limit }, context) => {
+  run: async ({ factoryId, status, source, needsReview, limit }, context) => {
     const { userEmail, orgId } = await requireWorkspaceMember(
       workspaceMemberIdentityFromContext(context),
     );
@@ -41,7 +48,7 @@ export default defineAction({
       .from(triageItems)
       .where(
         and(
-          eq(triageItems.orgId, orgId),
+          orgFactoryItemFilter(orgId, factoryId),
           needsReview
             ? inArray(triageItems.status, reviewStatuses)
             : status
@@ -56,7 +63,7 @@ export default defineAction({
     const decisions = await db
       .select()
       .from(triageDecisions)
-      .where(eq(triageDecisions.orgId, orgId))
+      .where(orgFactoryDecisionFilter(orgId, factoryId))
       .orderBy(desc(triageDecisions.createdAt))
       .limit(500);
     const latestByItem = new Map<string, (typeof decisions)[number]>();
@@ -116,6 +123,7 @@ export default defineAction({
             decision: item.latestDecision?.outcome ?? null,
           },
         },
+        factoryId,
       );
     }
     return listedItems;

package/corpus/templates/factory/actions/list-triage-rules.ts

@@ -1,9 +1,14 @@
 import { defineAction } from "@agent-native/core/action";
-import { desc, eq } from "drizzle-orm";
+import { desc } from "drizzle-orm";
 import { z } from "zod";
 
 import { getDb } from "../server/db/index.js";
 import { triageRules } from "../server/db/schema.js";
+import { DEFAULT_FACTORY_ID } from "../server/factory-graph/store.js";
+import {
+  factoryIdSchema,
+  orgFactoryRuleFilter,
+} from "../server/lib/factory-scope.js";
 import {
   requireWorkspaceMember,
   workspaceMemberIdentityFromContext,
@@ -13,17 +18,19 @@ import { normalizeTriagePolicyGuards } from "../server/triage/contracts.js";
 export default defineAction({
   description:
     "List editable Factory rules for the active workspace. Rules are disabled or shadow-only until the owner explicitly promotes them.",
-  schema: z.object({}),
+  schema: z.object({
+    factoryId: factoryIdSchema.default(DEFAULT_FACTORY_ID),
+  }),
   http: { method: "GET" },
   readOnly: true,
-  run: async (_, context) => {
+  run: async ({ factoryId }, context) => {
     const { orgId } = await requireWorkspaceMember(
       workspaceMemberIdentityFromContext(context),
     );
     const rows = await getDb()
       .select()
       .from(triageRules)
-      .where(eq(triageRules.orgId, orgId))
+      .where(orgFactoryRuleFilter(orgId, factoryId))
       .orderBy(desc(triageRules.updatedAt));
     return rows.map((row) => ({
       ...row,

package/corpus/templates/factory/actions/poll-github-sources.ts

@@ -3,7 +3,12 @@ import { and, eq } from "drizzle-orm";
 import { z } from "zod";
 
 import { getDb } from "../server/db/index.js";
-import { triageConfig, triageItems } from "../server/db/schema.js";
+import { triageItems } from "../server/db/schema.js";
+import { repairFactoryAutomationsFromConfig } from "../server/lib/factory-automation-repair.js";
+import {
+  factoryIdSchema,
+  readTriageConfigRow,
+} from "../server/lib/factory-scope.js";
 import { requireFactoryAutomation } from "../server/lib/require-factory-automation.js";
 import {
   requireWorkspaceMember,
@@ -30,11 +35,12 @@ export default defineAction({
   description:
     "Poll the configured GitHub repository for bounded open issues and pull requests and record them in the Factory queue. This does not write to GitHub.",
   schema: z.object({
+    factoryId: factoryIdSchema,
     includeIssues: z.boolean().default(true),
     includePullRequests: z.boolean().default(true),
   }),
   http: false,
-  run: async ({ includeIssues, includePullRequests }, context) => {
+  run: async ({ factoryId, includeIssues, includePullRequests }, context) => {
     const { userEmail, orgId } = await requireWorkspaceMember(
       workspaceMemberIdentityFromContext(context),
     );
@@ -42,14 +48,11 @@ export default defineAction({
       context,
       { userEmail, orgId },
       "sourcePolling",
+      factoryId,
     );
-    const config = (
-      await getDb()
-        .select()
-        .from(triageConfig)
-        .where(and(eq(triageConfig.id, orgId), eq(triageConfig.orgId, orgId)))
-        .limit(1)
-    )[0];
+    const db = getDb();
+    const config = await readTriageConfigRow(db, orgId, factoryId);
+    await repairFactoryAutomationsFromConfig(userEmail, orgId, factoryId);
     if (config?.githubPollingEnabled !== 1) {
       throw new Error("Enable GitHub polling before polling GitHub sources.");
     }
@@ -68,7 +71,6 @@ export default defineAction({
         ? client.listOpenPullRequests(repository, 50)
         : Promise.resolve([]),
     ]);
-    const db = getDb();
     const now = new Date().toISOString();
     let issueCount = 0;
     let pullRequestCount = 0;
@@ -81,6 +83,7 @@ export default defineAction({
             externalId: `${repositoryName}#${issue.number}`,
           },
           orgId,
+          factoryId,
         );
         const existing = (
           await tx
@@ -133,6 +136,7 @@ export default defineAction({
             updatedAt,
             ownerEmail: existing?.ownerEmail ?? userEmail,
             orgId,
+            factoryId,
           })
           .onConflictDoUpdate({
             target: triageItems.id,
@@ -144,6 +148,7 @@ export default defineAction({
               metadataJson: metadata,
               lastSeenAt,
               updatedAt,
+              factoryId,
             },
           });
         issueCount += 1;
@@ -158,6 +163,7 @@ export default defineAction({
             pullRequestNumber: pullRequest.number,
           },
           orgId,
+          factoryId,
         );
         const existing = (
           await tx
@@ -213,6 +219,7 @@ export default defineAction({
             updatedAt,
             ownerEmail: existing?.ownerEmail ?? userEmail,
             orgId,
+            factoryId,
           })
           .onConflictDoUpdate({
             target: triageItems.id,
@@ -227,6 +234,7 @@ export default defineAction({
               metadataJson: metadata,
               lastSeenAt,
               updatedAt,
+              factoryId,
             },
           });
         pullRequestCount += 1;
@@ -244,6 +252,7 @@ export default defineAction({
           summary: "No open GitHub issues or pull requests were observed.",
           details: { repository: repositoryName },
         },
+        factoryId,
       );
     } else {
       for (const issue of issues) {
@@ -259,12 +268,14 @@ export default defineAction({
                 externalId: `${repositoryName}#${issue.number}`,
               },
               orgId,
+              factoryId,
             ),
             source: "github_issue",
             sourceUrl: issue.htmlUrl,
             summary: issue.title,
             details: { repository: repositoryName, number: issue.number },
           },
+          factoryId,
         );
       }
       for (const pullRequest of pullRequests) {
@@ -282,18 +293,21 @@ export default defineAction({
                 pullRequestNumber: pullRequest.number,
               },
               orgId,
+              factoryId,
             ),
             source: "github",
             sourceUrl: pullRequest.htmlUrl,
             summary: pullRequest.title,
             details: { repository: repositoryName, number: pullRequest.number },
           },
+          factoryId,
         );
       }
     }
 
     return {
       ok: true,
+      factoryId,
       repository: repositoryName,
       issues: issueCount,
       pullRequests: pullRequestCount,

package/corpus/templates/factory/actions/poll-sentry-errors.ts

@@ -4,6 +4,12 @@ import { z } from "zod";
 
 import { getDb } from "../server/db/index.js";
 import { triageConfig, triageItems } from "../server/db/schema.js";
+import { repairFactoryAutomationsFromConfig } from "../server/lib/factory-automation-repair.js";
+import {
+  factoryIdSchema,
+  readTriageConfigRow,
+  triageConfigUpdateRowId,
+} from "../server/lib/factory-scope.js";
 import { requireFactoryAutomation } from "../server/lib/require-factory-automation.js";
 import {
   requireWorkspaceMember,
@@ -21,9 +27,12 @@ import { createSentryClient } from "../server/triage/sentry-client.js";
 export default defineAction({
   description:
     "Poll bounded unresolved Sentry issues for the configured organization and record them in the Factory queue. This does not change Sentry.",
-  schema: z.object({ limit: z.number().int().min(1).max(50).default(25) }),
+  schema: z.object({
+    factoryId: factoryIdSchema,
+    limit: z.number().int().min(1).max(50).default(25),
+  }),
   http: false,
-  run: async ({ limit }, context) => {
+  run: async ({ factoryId, limit }, context) => {
     const { userEmail, orgId } = await requireWorkspaceMember(
       workspaceMemberIdentityFromContext(context),
     );
@@ -31,14 +40,11 @@ export default defineAction({
       context,
       { userEmail, orgId },
       "sourcePolling",
+      factoryId,
     );
-    const config = (
-      await getDb()
-        .select()
-        .from(triageConfig)
-        .where(and(eq(triageConfig.id, orgId), eq(triageConfig.orgId, orgId)))
-        .limit(1)
-    )[0];
+    const db = getDb();
+    const config = await readTriageConfigRow(db, orgId, factoryId);
+    await repairFactoryAutomationsFromConfig(userEmail, orgId, factoryId);
     if (config?.sentryPollingEnabled !== 1) {
       throw new Error("Enable Sentry polling before polling Sentry.");
     }
@@ -74,14 +80,15 @@ export default defineAction({
         );
     }
     const observedIssues = issues;
-    const db = getDb();
     const now = new Date().toISOString();
+    const configRowId = triageConfigUpdateRowId(config, orgId, factoryId);
 
     await db.transaction(async (tx) => {
       for (const issue of observedIssues) {
         const id = itemDedupeKey(
           { source: "sentry", externalId: issue.id },
           orgId,
+          factoryId,
         );
         const existing = (
           await tx
@@ -140,6 +147,7 @@ export default defineAction({
             updatedAt,
             ownerEmail: existing?.ownerEmail ?? userEmail,
             orgId,
+            factoryId,
           })
           .onConflictDoUpdate({
             target: triageItems.id,
@@ -151,6 +159,7 @@ export default defineAction({
               metadataJson: metadata,
               lastSeenAt,
               updatedAt,
+              factoryId,
             },
           });
       }
@@ -167,7 +176,9 @@ export default defineAction({
             }, config.lastSentrySeenAt) ?? config.lastSentrySeenAt,
           updatedAt: now,
         })
-        .where(and(eq(triageConfig.id, orgId), eq(triageConfig.orgId, orgId)));
+        .where(
+          and(eq(triageConfig.id, configRowId), eq(triageConfig.orgId, orgId)),
+        );
     });
 
     if (observedIssues.length === 0) {
@@ -181,6 +192,7 @@ export default defineAction({
           summary: "No unresolved Sentry errors were observed.",
           details: { sentryOrgSlug: config.sentryOrgSlug },
         },
+        factoryId,
       );
     } else {
       for (const issue of observedIssues) {
@@ -193,6 +205,7 @@ export default defineAction({
             itemId: itemDedupeKey(
               { source: "sentry", externalId: issue.id },
               orgId,
+              factoryId,
             ),
             source: "sentry",
             sourceUrl: issue.permalink,
@@ -204,12 +217,14 @@ export default defineAction({
               projectSlug: issue.projectSlug,
             },
           },
+          factoryId,
         );
       }
     }
 
     return {
       ok: true,
+      factoryId,
       observed: observedIssues.length,
       fetched: issues.length,
       sentryOrgSlug: config.sentryOrgSlug,

package/corpus/templates/factory/actions/poll-slack-channel.ts

@@ -4,6 +4,12 @@ import { z } from "zod";
 
 import { getDb } from "../server/db/index.js";
 import { triageConfig, triageItems } from "../server/db/schema.js";
+import { repairFactoryAutomationsFromConfig } from "../server/lib/factory-automation-repair.js";
+import {
+  factoryIdSchema,
+  readTriageConfigRow,
+  triageConfigUpdateRowId,
+} from "../server/lib/factory-scope.js";
 import { requireFactoryAutomation } from "../server/lib/require-factory-automation.js";
 import {
   requireWorkspaceMember,
@@ -21,10 +27,11 @@ export default defineAction({
   description:
     "Poll the configured Slack channel and append new messages to the Factory queue. This action only observes and never posts, replies, starts work, or changes a provider.",
   schema: z.object({
+    factoryId: factoryIdSchema,
     channelId: z.string().trim().min(1).max(128).optional(),
   }),
   http: false,
-  run: async ({ channelId: requestedChannelId }, context) => {
+  run: async ({ factoryId, channelId: requestedChannelId }, context) => {
     const { userEmail, orgId } = await requireWorkspaceMember(
       workspaceMemberIdentityFromContext(context),
     );
@@ -32,22 +39,24 @@ export default defineAction({
       context,
       { userEmail, orgId },
       "sourcePolling",
+      factoryId,
     );
     const db = getDb();
-    const config = (
-      await db
-        .select()
-        .from(triageConfig)
-        .where(and(eq(triageConfig.id, orgId), eq(triageConfig.orgId, orgId)))
-        .limit(1)
-    )[0];
+    const config = await readTriageConfigRow(db, orgId, factoryId);
+    await repairFactoryAutomationsFromConfig(userEmail, orgId, factoryId);
     if (config?.pollingEnabled !== 1) {
       throw new Error("Enable Slack polling before polling Slack.");
     }
-    const channelId = requestedChannelId ?? config?.slackChannelId;
-    if (!channelId) {
+    const configuredChannelId = config?.slackChannelId;
+    if (!configuredChannelId) {
       throw new Error("Configure a Slack channel before polling.");
     }
+    if (requestedChannelId && requestedChannelId !== configuredChannelId) {
+      throw new Error(
+        "Poll only the Slack channel configured for this factory.",
+      );
+    }
+    const channelId = configuredChannelId;
 
     const result = await pollSlackChannel({
       workspace:
@@ -59,10 +68,11 @@ export default defineAction({
       orgId,
     });
     const now = new Date().toISOString();
+    const configRowId = triageConfigUpdateRowId(config, orgId, factoryId);
 
     await db.transaction(async (tx) => {
       for (const envelope of result.envelopes) {
-        const id = itemDedupeKey(envelope, orgId);
+        const id = itemDedupeKey(envelope, orgId, factoryId);
         const existing = (
           await tx
             .select()
@@ -117,6 +127,7 @@ export default defineAction({
             updatedAt,
             ownerEmail: userEmail,
             orgId,
+            factoryId,
           })
           .onConflictDoUpdate({
             target: triageItems.id,
@@ -131,6 +142,7 @@ export default defineAction({
               status,
               lastSeenAt,
               updatedAt,
+              factoryId,
             },
           });
       }
@@ -144,7 +156,10 @@ export default defineAction({
             updatedAt: now,
           })
           .where(
-            and(eq(triageConfig.id, orgId), eq(triageConfig.orgId, orgId)),
+            and(
+              eq(triageConfig.id, configRowId),
+              eq(triageConfig.orgId, orgId),
+            ),
           );
       }
     });
@@ -163,6 +178,7 @@ export default defineAction({
             coverage: result.hasMore ? "partial" : "complete",
           },
         },
+        factoryId,
       );
     } else {
       for (const envelope of result.envelopes) {
@@ -172,7 +188,7 @@ export default defineAction({
           {
             action: "poll-slack-channel",
             kind: "observed",
-            itemId: itemDedupeKey(envelope, orgId),
+            itemId: itemDedupeKey(envelope, orgId, factoryId),
             source: envelope.source,
             sourceUrl: envelope.sourceUrl ?? null,
             summary: envelope.summary ?? envelope.title,
@@ -182,6 +198,7 @@ export default defineAction({
               coverage: envelope.coverage,
             },
           },
+          factoryId,
         );
       }
     }
@@ -189,6 +206,7 @@ export default defineAction({
     return {
       ok: true,
       source: "slack",
+      factoryId,
       channelId,
       observed: result.envelopes.length,
       hasMore: result.hasMore,