@agent-native/core 0.168.6 → 0.168.9

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,

package/corpus/templates/factory/actions/reconcile-triage-run.ts

@@ -4,6 +4,11 @@ import { z } from "zod";
 
 import { getDb } from "../server/db/index.js";
 import { triageItems, triageRuns } from "../server/db/schema.js";
+import { DEFAULT_FACTORY_ID } from "../server/factory-graph/store.js";
+import {
+  factoryIdSchema,
+  orgFactoryScopedItemWhere,
+} from "../server/lib/factory-scope.js";
 import {
   requireWorkspaceMember,
   workspaceMemberIdentityFromContext,
@@ -48,6 +53,7 @@ export default defineAction({
     "Reconcile an observe-only pull-request monitoring run from ai-services callback and provider observations. Missing callbacks or provider reads remain typed failure states; no executor or GitHub write occurs.",
   schema: z.object({
     itemId: z.string().min(1),
+    factoryId: factoryIdSchema.optional(),
     runId: z.string().min(1),
     source: triageSourceSchema.default("github"),
     callback: z
@@ -70,6 +76,7 @@ export default defineAction({
   run: async (
     {
       itemId,
+      factoryId: factoryIdInput,
       runId,
       source,
       callback,
@@ -82,8 +89,25 @@ export default defineAction({
     const { userEmail, orgId } = await requireWorkspaceMember(
       workspaceMemberIdentityFromContext(context),
     );
+    const db = getDb();
+    const item = (
+      await db
+        .select({ factoryId: triageItems.factoryId })
+        .from(triageItems)
+        .where(and(eq(triageItems.id, itemId), eq(triageItems.orgId, orgId)))
+        .limit(1)
+    )[0];
+    if (!item)
+      throw new Error("Factory item not found for run reconciliation.");
+    const itemFactoryId = item.factoryId ?? DEFAULT_FACTORY_ID;
+    if (factoryIdInput && factoryIdInput !== itemFactoryId) {
+      throw new Error("Factory item does not belong to this factory.");
+    }
+    const factoryId = itemFactoryId;
     const now = new Date().toISOString();
-    const databaseRunId = stableId("run", orgId, runId);
+    const scopedRunId = stableId("run", orgId, factoryId, runId);
+    const legacyRunId =
+      factoryId === DEFAULT_FACTORY_ID ? stableId("run", orgId, runId) : null;
     const result = reconcilePullRequestRun({
       triageItemId: itemId,
       runId,
@@ -93,17 +117,42 @@ export default defineAction({
       now,
       timeoutMs,
     });
-    const db = getDb();
     const existingRun = (
       await db
-        .select({ progressLogJson: triageRuns.progressLogJson })
+        .select({
+          id: triageRuns.id,
+          progressLogJson: triageRuns.progressLogJson,
+          factoryId: triageRuns.factoryId,
+        })
         .from(triageRuns)
-        .where(
-          and(eq(triageRuns.id, databaseRunId), eq(triageRuns.orgId, orgId)),
-        )
+        .where(and(eq(triageRuns.id, scopedRunId), eq(triageRuns.orgId, orgId)))
         .limit(1)
     )[0];
-    const progressLog = appendProgressLog(existingRun?.progressLogJson, {
+    let databaseRunId = scopedRunId;
+    let existing = existingRun;
+    if (!existing && legacyRunId) {
+      const legacyRun = (
+        await db
+          .select({
+            id: triageRuns.id,
+            progressLogJson: triageRuns.progressLogJson,
+            factoryId: triageRuns.factoryId,
+          })
+          .from(triageRuns)
+          .where(
+            and(eq(triageRuns.id, legacyRunId), eq(triageRuns.orgId, orgId)),
+          )
+          .limit(1)
+      )[0];
+      if (legacyRun) {
+        existing = legacyRun;
+        databaseRunId = legacyRunId;
+      }
+    }
+    if (existing && (existing.factoryId ?? DEFAULT_FACTORY_ID) !== factoryId) {
+      throw new Error("Run id is already used by another factory.");
+    }
+    const progressLog = appendProgressLog(existing?.progressLogJson, {
       at: now,
       state: result.state,
       reason: result.reason,
@@ -131,6 +180,7 @@ export default defineAction({
               : null,
           ownerEmail: userEmail,
           orgId,
+          factoryId,
         })
         .onConflictDoUpdate({
           target: triageRuns.id,
@@ -154,12 +204,12 @@ export default defineAction({
         await tx
           .update(triageItems)
           .set(result.triageItemPatch)
-          .where(and(eq(triageItems.id, itemId), eq(triageItems.orgId, orgId)));
+          .where(orgFactoryScopedItemWhere(itemId, orgId, factoryId));
       } else if (result.state === "reconciliation_required") {
         await tx
           .update(triageItems)
           .set({ status: "reconciliation_required", updatedAt: now })
-          .where(and(eq(triageItems.id, itemId), eq(triageItems.orgId, orgId)));
+          .where(orgFactoryScopedItemWhere(itemId, orgId, factoryId));
       }
     });
 

package/corpus/templates/factory/actions/record-triage-feedback.ts

@@ -6,6 +6,11 @@ import { z } from "zod";
 
 import { getDb } from "../server/db/index.js";
 import { triageDecisions, triageFeedback } from "../server/db/schema.js";
+import { DEFAULT_FACTORY_ID } from "../server/factory-graph/store.js";
+import {
+  factoryIdSchema,
+  orgFactoryDecisionFilter,
+} from "../server/lib/factory-scope.js";
 import {
   requireWorkspaceMember,
   workspaceMemberIdentityFromContext,
@@ -18,27 +23,32 @@ export default defineAction({
     "Record human feedback on a Factory shadow decision. Feedback is append-only and changes no provider or executor state.",
   schema: z.object({
     decisionId: z.string().min(1),
+    factoryId: factoryIdSchema.default(DEFAULT_FACTORY_ID),
     verdict: verdictSchema,
     note: z.string().trim().max(2_000).optional(),
   }),
   http: { method: "POST" },
-  run: async ({ decisionId, verdict, note }, context) => {
+  run: async ({ decisionId, factoryId, verdict, note }, context) => {
     const { userEmail, orgId } = await requireWorkspaceMember(
       workspaceMemberIdentityFromContext(context),
     );
     const decision = (
       await getDb()
-        .select({ id: triageDecisions.id })
+        .select({
+          id: triageDecisions.id,
+          factoryId: triageDecisions.factoryId,
+        })
         .from(triageDecisions)
         .where(
           and(
             eq(triageDecisions.id, decisionId),
-            eq(triageDecisions.orgId, orgId),
+            orgFactoryDecisionFilter(orgId, factoryId),
           ),
         )
         .limit(1)
     )[0];
     if (!decision) throw new Error("Triage decision not found");
+    const resolvedFactoryId = decision.factoryId ?? factoryId;
 
     const createdAt = new Date().toISOString();
     const id = randomUUID();
@@ -52,6 +62,7 @@ export default defineAction({
         createdAt,
         ownerEmail: userEmail,
         orgId,
+        factoryId: resolvedFactoryId,
       });
     return { ok: true, id };
   },