@agent-native/core 0.146.3 → 0.146.4

package/dist/automations/service.d.ts

@@ -4,6 +4,7 @@ export type AutomationScope = "personal" | "organization";
 export interface AutomationActor {
     userEmail: string;
     orgId?: string | null;
+    appId?: string | null;
 }
 export interface AutomationDefinition {
     resource: Resource;

package/dist/automations/service.js

@@ -11,7 +11,11 @@ function normalizeActor(actor) {
     const userEmail = actor.userEmail.trim().toLowerCase();
     if (!userEmail)
         throw httpError("Not authenticated.", 401);
-    return { userEmail, orgId: actor.orgId?.trim() || null };
+    return {
+        userEmail,
+        orgId: actor.orgId?.trim() || null,
+        appId: actor.appId?.trim() || null,
+    };
 }
 function automationName(path) {
     return path.replace(/^jobs\//, "").replace(/\.md$/, "");
@@ -56,6 +60,12 @@ async function requireOrganizationMembership(actor) {
 function isOrganizationAdmin(membership) {
     return membership.role === "owner" || membership.role === "admin";
 }
+function automationBelongsToApp(meta, appId) {
+    const ownerAppId = meta.appId?.trim();
+    if (!ownerAppId || !appId?.trim())
+        return true;
+    return ownerAppId === appId.trim();
+}
 async function mutationAccess(actorInput, resource, meta) {
     const actor = normalizeActor(actorInput);
     const resourceOrgId = organizationIdFromResourceOwner(resource.owner);
@@ -83,7 +93,10 @@ async function mutationAccess(actorInput, resource, meta) {
  */
 export async function canUpdateAutomationResource(actorInput, resource) {
     const { meta } = parseJobResource(resource.content);
-    return (await mutationAccess(actorInput, resource, meta)).canUpdate;
+    const actor = normalizeActor(actorInput);
+    if (!automationBelongsToApp(meta, actor.appId))
+        return false;
+    return (await mutationAccess(actor, resource, meta)).canUpdate;
 }
 function assertExplicitAutomation(resource) {
     const parsed = parseJobResource(resource.content);
@@ -111,6 +124,9 @@ async function readDefinition(actorInput, scope, name) {
         throw httpError(`Automation "${automationName(path)}" not found.`, 404);
     }
     const definition = assertExplicitAutomation(resource);
+    if (!automationBelongsToApp(definition.meta, actor.appId)) {
+        throw httpError(`Automation "${automationName(path)}" not found.`, 404);
+    }
     const access = await mutationAccess(actor, resource, definition.meta);
     return {
         ...definition,
@@ -138,6 +154,8 @@ export async function listAutomationDefinitions(actorInput, scope) {
         const parsed = parseJobResource(resource.content);
         if (parsed.classification.kind !== "automation")
             continue;
+        if (!automationBelongsToApp(parsed.meta, actor.appId))
+            continue;
         const isCreator = parsed.meta.createdBy?.trim().toLowerCase() === actor.userEmail;
         automations.push({
             resource,
@@ -197,6 +215,7 @@ export async function defineAutomation(actorInput, input) {
         condition: input.condition?.trim() || undefined,
         mode: "agentic",
         domain: input.domain?.trim() || undefined,
+        appId: actor.appId || undefined,
         delegatedPolicyId: input.delegatedPolicyId?.trim() || undefined,
         createdBy: actor.userEmail,
         orgId: input.scope === "organization" ? actor.orgId : undefined,

package/dist/cli/create.js

@@ -2593,7 +2593,11 @@ function rewriteNetlifyToml(appDir, appName, mode) {
         return;
     try {
         let content = fs.readFileSync(netlifyPath, "utf-8");
-        const originalCommand = content.match(/^\s*command = "([^"]*)"$/m)?.[1];
+        // Tolerate escaped quotes inside the command. Every template's build
+        // command now contains `\"` (the release-migration step's CONTEXT test),
+        // and a naive [^"]* stops at the first one — which silently dropped the
+        // NETLIFY_DATABASE_URL_UNPOOLED override for the four templates that use it.
+        const originalCommand = content.match(/^\s*command = "((?:[^"\\]|\\.)*)"$/m)?.[1];
         const usesUnpooledDatabase = originalCommand?.includes("NETLIFY_DATABASE_URL_UNPOOLED") ?? false;
         const buildCommand = mode === "workspace"
             ? `APP_BASE_PATH=/${appName} VITE_APP_BASE_PATH=/${appName} NITRO_PRESET=netlify pnpm --filter ${appName} build`
@@ -2602,7 +2606,21 @@ function rewriteNetlifyToml(appDir, appName, mode) {
         const buildDatabasePrefix = usesUnpooledDatabase
             ? 'DATABASE_URL=\\"${NETLIFY_DATABASE_URL_UNPOOLED:-$DATABASE_URL}\\" '
             : "";
-        const command = `${databaseSetup} && ${buildDatabasePrefix}${buildCommand}`;
+        const releaseDatabasePrefix = usesUnpooledDatabase
+            ? 'DATABASE_URL=\\"${NETLIFY_DATABASE_URL_UNPOOLED:-$DATABASE_URL}\\" '
+            : "";
+        // Migrate at RELEASE, never on the request path. On serverless "migrate on
+        // first use" means migrate on every cold start; a production incident
+        // traced a multi-hour outage to schema introspection running concurrently
+        // on requests. Generated for every app so a fresh `create` + Netlify
+        // connect just works, with no flag to remember.
+        const releaseMigrations = ' && if [ \\"${CONTEXT:-}\\" = \\"production\\" ]; then ' +
+            releaseDatabasePrefix +
+            (mode === "workspace"
+                ? `pnpm --filter ${appName} migrate:production`
+                : "pnpm migrate:production") +
+            "; fi";
+        const command = `${databaseSetup} && ${buildDatabasePrefix}${buildCommand}${releaseMigrations}`;
         const publishPath = mode === "workspace" ? `apps/${appName}/dist` : "dist";
         const functionsPath = mode === "workspace"
             ? `apps/${appName}/.netlify/functions-internal`

package/dist/client/agent-page/AgentJobsTab.js

@@ -213,7 +213,9 @@ export function AgentJobsTab({ canManageOrg = false, hideHeader = false, }) {
                                                             : t("jobs.paused", { defaultValue: "Paused" }) }), resource.lastStatus ? (_jsx("span", { className: "rounded-full bg-muted px-2 py-0.5 text-[10px] font-medium text-muted-foreground", children: resource.lastStatus })) : null] }), _jsx("p", { className: "mt-1 text-sm text-muted-foreground", children: triggerDescription }), _jsx("p", { className: "hidden", children: instructions }), lastRun || nextRun || lastCheck ? (_jsxs("div", { className: "hidden", children: [nextRun ? (_jsxs("span", { children: [t("jobs.nextRun", { defaultValue: "Next run" }), ":", " ", nextRun] })) : null, _jsxs("span", { children: [t("jobs.lastRun", { defaultValue: "Last run" }), ":", " ", lastRun ??
                                                                 t("jobs.neverRan", { defaultValue: "Never" })] }), !lastRun && lastCheck ? (_jsxs("span", { children: [t("jobs.lastChecked", {
                                                                 defaultValue: "Last checked",
-                                                            }), ": ", lastCheck] })) : null] })) : null, resource.lastError ? (_jsxs("p", { className: "mt-2 flex items-start gap-1.5 text-[11px] text-destructive", children: [_jsx(IconAlertTriangle, { className: "mt-px size-3 shrink-0" }), _jsx("span", { className: "min-w-0 break-words", children: resource.lastError })] })) : null] }), _jsxs("div", { className: "flex shrink-0 items-center gap-2", children: [resource.canUpdate ? (_jsx("button", { type: "button", role: "switch", "aria-checked": resource.enabled, "aria-label": resource.enabled
+                                                            }), ": ", lastCheck] })) : null] })) : null, resource.lastError ? (_jsxs("div", { className: "mt-2 flex items-start gap-1.5 text-[11px] text-destructive", children: [_jsx(IconAlertTriangle, { className: "mt-px size-3 shrink-0" }), _jsx("span", { className: "min-w-0 break-words", children: resource.lastError }), _jsx("button", { type: "button", className: "shrink-0 font-medium text-foreground underline-offset-4 hover:underline", onClick: () => setDetailsTarget(entry), children: t("jobs.viewDetails", {
+                                                            defaultValue: "View details",
+                                                        }) })] })) : null] }), _jsxs("div", { className: "flex shrink-0 items-center gap-2", children: [resource.canUpdate ? (_jsx("button", { type: "button", role: "switch", "aria-checked": resource.enabled, "aria-label": resource.enabled
                                                     ? "Pause automation"
                                                     : "Resume automation", disabled: mutationPending, onClick: () => mutateEntry(entry, "update", {
                                                     enabled: !resource.enabled,

package/dist/client/agent-page/AutomationDetailsDialog.js

@@ -1,5 +1,7 @@
 import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
-import { IconAlertTriangle, IconLoader2 } from "@tabler/icons-react";
+import { Button } from "@agent-native/toolkit/ui/button";
+import { IconAlertTriangle, IconExternalLink, IconLoader2, } from "@tabler/icons-react";
+import { requestAgentChatThreadOpen } from "../agent-chat.js";
 import { Dialog, DialogContent, DialogDescription, DialogHeader, DialogTitle, } from "../components/ui/dialog.js";
 import { useT } from "../i18n.js";
 import { useAutomationRuns } from "./use-jobs.js";
@@ -28,5 +30,10 @@ export function AutomationDetailsDialog({ open, name, triggerSummary, fields, co
                                         defaultValue: "Could not load run history.",
                                     }) })) : runs.length === 0 ? (_jsx("p", { className: "mt-1 text-xs text-muted-foreground", children: t("jobs.noRuns", {
                                         defaultValue: "This automation has not executed yet. Only real executions are recorded here.",
-                                    }) })) : (_jsx("ul", { className: "mt-2 divide-y divide-border/60 border-y border-border/60", children: runs.map((run) => (_jsxs("li", { className: "flex items-center gap-2 py-1.5 text-xs", children: [_jsx(RunStatusDot, { status: run.status }), _jsx("span", { className: "shrink-0 text-muted-foreground", children: formatTimestamp(run.startedAt) }), _jsx("span", { className: "shrink-0 font-medium", children: run.status }), run.error ? (_jsx("span", { className: "min-w-0 flex-1 truncate text-muted-foreground", title: run.error, children: run.error })) : (_jsx("span", { className: "min-w-0 flex-1" })), run.finishedAt ? (_jsxs("span", { className: "shrink-0 tabular-nums text-muted-foreground", children: [Math.round((run.finishedAt - run.startedAt) / 1000), "s"] })) : null] }, run.id))) }))] })] })] }) }));
+                                    }) })) : (_jsx("ul", { className: "mt-2 divide-y divide-border/60 border-y border-border/60", children: runs.map((run) => (_jsxs("li", { className: "flex items-center gap-2 py-1.5 text-xs", children: [_jsx(RunStatusDot, { status: run.status }), _jsx("span", { className: "shrink-0 text-muted-foreground", children: formatTimestamp(run.startedAt) }), _jsx("span", { className: "shrink-0 font-medium", children: run.status }), run.error ? (_jsx("span", { className: "min-w-0 flex-1 truncate text-muted-foreground", title: run.error, children: run.error })) : (_jsx("span", { className: "min-w-0 flex-1" })), run.finishedAt ? (_jsxs("span", { className: "shrink-0 tabular-nums text-muted-foreground", children: [Math.round((run.finishedAt - run.startedAt) / 1000), "s"] })) : null, run.error && run.threadId ? (_jsxs(Button, { type: "button", variant: "ghost", size: "sm", className: "h-6 shrink-0 gap-1 px-1.5 text-[11px]", onClick: () => {
+                                                    requestAgentChatThreadOpen({
+                                                        threadId: run.threadId,
+                                                    });
+                                                    onClose();
+                                                }, children: [_jsx(IconExternalLink, { className: "size-3" }), "Open thread"] })) : null] }, run.id))) }))] })] })] }) }));
 }

package/dist/collab/awareness.d.ts

@@ -62,11 +62,11 @@ export declare const postAwareness: import("h3").EventHandlerWithFetch<import("h
     error: string;
     states?: undefined;
 } | {
+    error?: undefined;
     states: {
         clientId: number;
         state: string;
     }[];
-    error?: undefined;
 }>>;
 /**
  * GET /_agent-native/collab/:docId/users
@@ -77,9 +77,9 @@ export declare const getActiveUsers: import("h3").EventHandlerWithFetch<import("
     error: string;
     users?: undefined;
 } | {
+    error?: undefined;
     users: {
         clientId: number;
         lastSeen: number;
     }[];
-    error?: undefined;
 }>>;

package/dist/collab/struct-routes.d.ts

@@ -13,8 +13,8 @@
  * Body: { json: any, fieldName?: string, type?: "map"|"array", requestSource?: string }
  */
 export declare const postCollabJson: import("h3").EventHandlerWithFetch<import("h3").EventHandlerRequest, Promise<{
-    ok?: undefined;
     error: string;
+    ok?: undefined;
 } | {
     error?: undefined;
     ok: boolean;

package/dist/db/migrations.js

@@ -245,19 +245,8 @@ function isServerlessRequestRuntime() {
         process.env.VERCEL === "1");
 }
 /**
- * Whether this app migrates at RELEASE time, so skipping on the request path
- * is safe.
- *
- * Without this, "skip in serverless" silently means "never migrate" for any app
- * that has no release entrypoint — and at the time this was written exactly one
- * of seventeen templates had one. Existing tables keep working, so nothing
- * fails; a newly added migration just never applies, and a fresh deploy comes
- * up with missing tables. That is a skip indistinguishable from success, which
- * is the failure mode this repo bans.
- *
- * So the request-path skip is opt-in per app. An app sets this once it owns a
- * release migration step (see templates/analytics/scripts/migrate-production.ts
- * and the `migrate:production` build step in its netlify.toml).
+ * Whether this deployment has a release-time migration runner. Request-path
+ * migration skipping is safe only when that runner owns schema setup.
  */
 function appMigratesAtRelease() {
     const raw = process.env.AGENT_NATIVE_RELEASE_MIGRATIONS?.trim();
@@ -675,6 +664,11 @@ export function runMigrations(migrations, options) {
                 !!globalThis.process?.env?.VERCEL ||
                 "__cf_env" in globalThis ||
                 "__env__" in globalThis;
+            // A release migration runs in the same Netlify environment as a request,
+            // but it must fail the deploy when DDL fails instead of publishing an
+            // app against an incomplete schema.
+            if (isMigrationAuthorizedRuntime())
+                throw err;
             if (typeof globalThis.process?.exit === "function" && !isServerless) {
                 process.exit(1);
             }

package/dist/file-upload/actions/upload-image.d.ts

@@ -17,11 +17,11 @@ declare const _default: import("../../action.js").ActionDefinition<{
     id?: undefined;
     provider?: undefined;
 } | {
+    error?: undefined;
     configured?: undefined;
     connectPath?: undefined;
     url: string;
     id: string;
     provider: string;
-    error?: undefined;
 }>;
 export default _default;

package/dist/jobs/actions/list-automation-runs.d.ts

@@ -2,6 +2,7 @@ import { type AutomationRun } from "../run-history.js";
 declare const _default: import("../../action.js").ActionDefinition<{
     name: string;
     scope?: "organization" | "personal";
+    appId?: string;
     limit?: number;
 }, AutomationRun[]>;
 export default _default;

package/dist/jobs/actions/list-automation-runs.js

@@ -9,12 +9,13 @@ export default defineAction({
     schema: z.object({
         name: z.string().min(1),
         scope: scopeSchema.default("personal"),
+        appId: z.string().trim().min(1).optional(),
         limit: z.number().int().min(1).max(100).optional(),
     }),
     http: { method: "GET" },
     readOnly: true,
     parallelSafe: true,
-    run: async ({ name, scope, limit }, ctx) => {
+    run: async ({ name, scope, appId: requestedAppId, limit }, ctx) => {
         const userEmail = ctx?.userEmail;
         if (!userEmail)
             throw new Error("Not authenticated.");
@@ -23,6 +24,12 @@ export default defineAction({
         const owner = scope === "organization"
             ? organizationResourceOwner(ctx.orgId)
             : userEmail;
-        return listAutomationRuns({ owners: [owner], automation: name, limit });
+        const appId = ctx?.appId === "dispatch" ? requestedAppId : ctx?.appId;
+        return listAutomationRuns({
+            owners: [owner],
+            automation: name,
+            appId,
+            limit,
+        });
     },
 });

package/dist/jobs/actions/list-recurring-jobs.js

@@ -4,7 +4,7 @@ import { organizationResourceOwner, resourceGetByPath, resourceList, } from "../
 import { describeCron, effectiveTimezone, isValidCron, nextOccurrence, } from "../cron.js";
 import { classifyJobResource } from "../frontmatter.js";
 import { parseJobFrontmatter } from "../scheduler.js";
-import { authorizeJobMutation } from "../tools.js";
+import { authorizeJobMutation, jobBelongsToApp } from "../tools.js";
 const scopeSchema = z.enum(["personal", "organization"]);
 function jobName(path) {
     return path.replace(/^jobs\//, "").replace(/\.md$/, "");
@@ -57,6 +57,8 @@ export default defineAction({
                 continue;
             }
             const { meta, body } = parseJobFrontmatter(full.content);
+            if (!jobBelongsToApp(meta, ctx?.appId))
+                continue;
             const canUpdate = scope === "personal" || !(await authorizeJobMutation(owner, meta));
             jobs.push({
                 id: full.id,

package/dist/jobs/actions/manage-recurring-job.js

@@ -41,7 +41,7 @@ export default defineAction({
                 statusCode: 400,
             });
         }
-        const denied = await authorizeJobMutation(resource.owner, meta);
+        const denied = await authorizeJobMutation(resource.owner, meta, ctx.appId);
         if (denied)
             throw Object.assign(new Error(denied), { statusCode: 403 });
         if (operation === "delete") {

package/dist/jobs/actions/run-automation-now.js

@@ -14,6 +14,7 @@ export default defineAction({
         return queueAutomationRunNow({
             userEmail: ctx.userEmail,
             orgId: ctx.orgId,
+            appId: ctx.appId,
             scope,
             name,
         });

package/dist/jobs/background-automation-runner.js

@@ -168,6 +168,7 @@ export async function runBackgroundAutomation(options, deps) {
                 path: automation.resource.path,
                 scope: options.orgId ? "organization" : "personal",
                 orgId: options.orgId ?? null,
+                appId: deps.appId,
             });
         }
         catch (err) {
@@ -307,6 +308,7 @@ async function executeBackgroundAutomation(options, deps, historyId) {
                     threadId: thread.id,
                     ownerEmail,
                     orgId,
+                    appId: deps.appId,
                     actionCaller: options.actionCaller,
                     automation: options.actionAutomation,
                     runId,

package/dist/jobs/frontmatter.d.ts

@@ -46,6 +46,8 @@ export interface JobFrontmatter {
     mode?: JobExecutionMode;
     /** Domain tag for filtering in per-template UIs. */
     domain?: string;
+    /** Explicit application owner used by the recurring-job scheduler. */
+    appId?: string;
     /**
      * Optional application-owned policy id carried into actions by the trusted
      * trigger dispatcher. It is not model-supplied action input.

package/dist/jobs/frontmatter.js

@@ -130,6 +130,9 @@ function parseKnownField(meta, key, rawValue) {
         case "domain":
             meta.domain = value;
             break;
+        case "appId":
+            meta.appId = value || undefined;
+            break;
         case "delegatedPolicyId":
             meta.delegatedPolicyId = value || undefined;
             break;
@@ -194,6 +197,7 @@ export function buildJobResourceContent(meta, body) {
     if (meta.mode)
         lines.push(`mode: ${meta.mode}`);
     pushString(lines, "domain", meta.domain);
+    pushString(lines, "appId", meta.appId);
     pushString(lines, "delegatedPolicyId", meta.delegatedPolicyId);
     // Keep the long-standing human-readable owner shape used by existing
     // resources and diagnostics; values that can contain free-form text use

package/dist/jobs/run-history.d.ts

@@ -13,6 +13,7 @@ export interface AutomationRun {
     path: string;
     scope: string | null;
     orgId: string | null;
+    appId: string | null;
     runId: string | null;
     threadId: string | null;
     status: AutomationRunStatus;
@@ -26,6 +27,7 @@ export interface StartAutomationRunInput {
     path: string;
     scope?: string | null;
     orgId?: string | null;
+    appId?: string | null;
     runId?: string | null;
     threadId?: string | null;
     /** A pre-created row still waiting for its background worker handoff. */
@@ -49,6 +51,7 @@ export declare function claimAutomationRun(id: string): Promise<boolean>;
  * redeliver it because claimAutomationRun is an atomic CAS.
  */
 export declare function listUnclaimedAutomationRuns(options?: {
+    appId?: string | null;
     olderThanMs?: number;
     limit?: number;
 }): Promise<AutomationRun[]>;
@@ -69,5 +72,6 @@ export declare function deleteAutomationRuns(owner: string, automation: string):
 export declare function listAutomationRuns(options: {
     owners: string[];
     automation: string;
+    appId?: string | null;
     limit?: number;
 }): Promise<AutomationRun[]>;

package/dist/jobs/run-history.js

@@ -46,6 +46,7 @@ export const AUTOMATION_RUN_MIGRATIONS = [
         path TEXT NOT NULL,
         scope TEXT,
         org_id TEXT,
+        app_id TEXT,
         run_id TEXT,
         thread_id TEXT,
         status TEXT NOT NULL DEFAULT 'running',
@@ -70,6 +71,11 @@ export const AUTOMATION_RUN_MIGRATIONS = [
         sql: `ALTER TABLE ${TABLE}
       ADD COLUMN IF NOT EXISTS dispatch_pending INTEGER NOT NULL DEFAULT 0`,
     },
+    {
+        version: 4,
+        name: "automation-runs-app-id",
+        sql: `ALTER TABLE ${TABLE} ADD COLUMN IF NOT EXISTS app_id TEXT`,
+    },
 ];
 export async function runAutomationRunMigrations(nitroApp) {
     await runMigrations(AUTOMATION_RUN_MIGRATIONS, {
@@ -86,10 +92,11 @@ async function ensureTable() {
           id TEXT PRIMARY KEY,
           owner TEXT NOT NULL,
           automation TEXT NOT NULL,
-          path TEXT NOT NULL,
-          scope TEXT,
-          org_id TEXT,
-          run_id TEXT,
+            path TEXT NOT NULL,
+            scope TEXT,
+            org_id TEXT,
+            app_id TEXT,
+            run_id TEXT,
           thread_id TEXT,
           status TEXT NOT NULL DEFAULT 'running',
           started_at ${intType()} NOT NULL,
@@ -113,6 +120,7 @@ async function ensureTable() {
             for (const [name, definition] of [
                 ["claimed_at", `${intType()}`],
                 ["dispatch_pending", `${intType()} NOT NULL DEFAULT 0`],
+                ["app_id", "TEXT"],
             ]) {
                 if (columns.has(name))
                     continue;
@@ -148,6 +156,7 @@ function toRun(row, now) {
         path: String(row.path),
         scope: row.scope == null ? null : String(row.scope),
         orgId: row.org_id == null ? null : String(row.org_id),
+        appId: row.app_id == null ? null : String(row.app_id),
         runId: row.run_id == null ? null : String(row.run_id),
         threadId: row.thread_id == null ? null : String(row.thread_id),
         status,
@@ -169,8 +178,8 @@ export async function startAutomationRun(input) {
     await ensureTable();
     const id = randomUUID();
     await getDbExec().execute({
-        sql: `INSERT INTO ${TABLE} (id, owner, automation, path, scope, org_id, run_id, thread_id, status, started_at, dispatch_pending)
-          VALUES (?, ?, ?, ?, ?, ?, ?, ?, 'running', ?, ?)`,
+        sql: `INSERT INTO ${TABLE} (id, owner, automation, path, scope, org_id, app_id, run_id, thread_id, status, started_at, dispatch_pending)
+          VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, 'running', ?, ?)`,
         args: [
             id,
             input.owner,
@@ -178,6 +187,7 @@ export async function startAutomationRun(input) {
             input.path,
             input.scope ?? null,
             input.orgId ?? null,
+            input.appId ?? null,
             input.runId ?? null,
             input.threadId ?? null,
             Date.now(),
@@ -213,14 +223,21 @@ export async function claimAutomationRun(id) {
  */
 export async function listUnclaimedAutomationRuns(options) {
     await ensureTable();
+    const appId = options?.appId?.trim() || null;
     const olderThanMs = Math.max(options?.olderThanMs ?? 10_000, 0);
     const limit = Math.min(Math.max(options?.limit ?? 50, 1), 100);
+    const appFilter = appId ? " AND (app_id = ? OR app_id IS NULL)" : "";
     const result = await getDbExec().execute({
         sql: `SELECT * FROM ${TABLE}
           WHERE dispatch_pending = 1 AND (claimed_at IS NULL OR claimed_at <= ?) AND status = 'running'
+            ${appFilter}
             AND started_at <= ?
           ORDER BY started_at ASC LIMIT ${limit}`,
-        args: [Date.now() - CLAIM_LEASE_MS, Date.now() - olderThanMs],
+        args: [
+            Date.now() - CLAIM_LEASE_MS,
+            ...(appId ? [appId] : []),
+            Date.now() - olderThanMs,
+        ],
     });
     const now = Date.now();
     return (result.rows ?? []).map((row) => toRun(row, now));
@@ -314,11 +331,14 @@ export async function listAutomationRuns(options) {
     if (!owners.length)
         return [];
     const limit = Math.min(Math.max(options.limit ?? 20, 1), 100);
+    const appId = options.appId?.trim() || null;
     const placeholders = owners.map(() => "?").join(", ");
+    const appFilter = appId ? " AND (app_id = ? OR app_id IS NULL)" : "";
     const result = await getDbExec().execute({
         sql: `SELECT * FROM ${TABLE} WHERE owner IN (${placeholders}) AND automation = ?
+          ${appFilter}
           ORDER BY started_at DESC LIMIT ${limit}`,
-        args: [...owners, options.automation],
+        args: [...owners, options.automation, ...(appId ? [appId] : [])],
     });
     const now = Date.now();
     return (result.rows ?? []).map((row) => toRun(row, now));

package/dist/jobs/run-now.d.ts

@@ -2,6 +2,7 @@ import { type AutomationScope } from "../automations/service.js";
 export interface RunAutomationNowInput {
     userEmail: string;
     orgId?: string | null;
+    appId?: string | null;
     scope: AutomationScope;
     name: string;
 }
@@ -16,4 +17,6 @@ export declare function queueAutomationRunNow(input: RunAutomationNowInput): Pro
  * This is intentionally a redelivery, not a second execution: the worker's
  * claim CAS decides which request owns the run.
  */
-export declare function redispatchUnclaimedAutomationRuns(): Promise<number>;
+export declare function redispatchUnclaimedAutomationRuns(options?: {
+    appId?: string | null;
+}): Promise<number>;

package/dist/jobs/run-now.js

@@ -56,7 +56,7 @@ export async function queueAutomationRunNow(input) {
     }
     // 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().catch((error) => {
+    await redispatchUnclaimedAutomationRuns({ appId: input.appId }).catch((error) => {
         console.warn("[automations] Could not sweep queued runs before run-now:", error);
     });
     const historyId = await startAutomationRun({
@@ -65,6 +65,7 @@ export async function queueAutomationRunNow(input) {
         path: resource.path,
         scope: input.scope,
         orgId: input.scope === "organization" ? input.orgId : null,
+        appId: input.appId,
         dispatchPending: true,
     });
     try {
@@ -82,8 +83,8 @@ export async function queueAutomationRunNow(input) {
  * This is intentionally a redelivery, not a second execution: the worker's
  * claim CAS decides which request owns the run.
  */
-export async function redispatchUnclaimedAutomationRuns() {
-    const runs = await listUnclaimedAutomationRuns();
+export async function redispatchUnclaimedAutomationRuns(options) {
+    const runs = await listUnclaimedAutomationRuns({ appId: options?.appId });
     let attempted = 0;
     for (const run of runs) {
         try {

package/dist/jobs/scheduler.js

@@ -18,6 +18,13 @@ const MAX_IDENTITY_PREFLIGHTS_PER_TICK = MAX_CONCURRENT_SCHEDULED_JOBS * 4;
 const IDENTITY_FAILURE_RETRY_MS = 5 * 60_000;
 const _activeScheduledJobs = new Set();
 const _preflightingScheduledJobs = new Set();
+function jobBelongsToApp(meta, appId) {
+    const ownerAppId = meta.appId?.trim();
+    if (!ownerAppId)
+        return true;
+    const schedulerAppId = appId?.trim();
+    return Boolean(schedulerAppId && ownerAppId === schedulerAppId);
+}
 // Skip the DB query on every tick if we recently confirmed no jobs exist.
 // `_hasJobsCache` is invalidated whenever a `jobs/*` resource is written or
 // deleted (subscribed below), and refreshed at most every 5 minutes.
@@ -106,6 +113,12 @@ export async function processRecurringJobs(deps) {
             if (resource.path.endsWith(".keep"))
                 continue;
             const { meta, body } = parseJobFrontmatter(resource.content);
+            // Jobs written before app ownership was persisted remain compatible with
+            // the shared scheduler. Once a job declares an owner, only that app may
+            // evaluate or execute it. Without this boundary every app's scheduled
+            // worker can claim the same organization resource.
+            if (!jobBelongsToApp(meta, deps.appId))
+                continue;
             healthOrgIds.add(meta.orgId ?? null);
             // Skip disabled or missing schedule
             if (!meta.enabled || !meta.schedule)
@@ -422,6 +435,11 @@ export async function runQueuedAutomation(historyId, deps) {
     const queued = await getAutomationRun(historyId);
     if (!queued)
         throw new Error(`Automation run "${historyId}" not found.`);
+    const queuedAppId = queued.appId?.trim() || null;
+    const workerAppId = deps.appId?.trim() || null;
+    if (queuedAppId && queuedAppId !== workerAppId) {
+        return { skipped: true };
+    }
     if (!(await claimAutomationRun(historyId))) {
         return { skipped: true };
     }

package/dist/jobs/tools.d.ts

@@ -1,5 +1,6 @@
 import type { ActionEntry } from "../agent/production-agent.js";
 import { type JobFrontmatter } from "./scheduler.js";
+export declare function jobBelongsToApp(meta: JobFrontmatter, appId?: string): boolean;
 /**
  * Authorise a mutation (update / delete) against a job resource. When the
  * job is in the SHARED scope the caller must either be the original
@@ -11,5 +12,5 @@ import { type JobFrontmatter } from "./scheduler.js";
  * Returns null when the mutation is allowed, or an error string suitable
  * for returning to the caller when not.
  */
-export declare function authorizeJobMutation(resourceOwner: string, meta: JobFrontmatter): Promise<string | null>;
-export declare function createJobTools(): Record<string, ActionEntry>;
+export declare function authorizeJobMutation(resourceOwner: string, meta: JobFrontmatter, appId?: string): Promise<string | null>;
+export declare function createJobTools(appId?: string): Record<string, ActionEntry>;