@agent-native/core 0.130.1 → 0.131.2

package/src/triggers/routes.ts

@@ -5,10 +5,18 @@ import {
   type H3Event,
 } from "h3";
 
+import { canUpdateAutomationResource } from "../automations/service.js";
 import { getDbExec } from "../db/client.js";
 import { nextOccurrence, describeCron, isValidCron } from "../jobs/cron.js";
+import {
+  buildJobResourceContent,
+  parseJobResource,
+  type JobFrontmatter,
+} from "../jobs/frontmatter.js";
 import { getOrgContext } from "../org/context.js";
 import {
+  organizationIdFromResourceOwner,
+  organizationResourceOwner,
   resourceGetByPath,
   resourceListAllOwners,
   resourcePut,
@@ -17,11 +25,7 @@ import {
 } from "../resources/store.js";
 import { getSession } from "../server/auth.js";
 import { readBody } from "../server/h3-helpers.js";
-import {
-  buildTriggerContent,
-  parseTriggerFrontmatter,
-  refreshEventSubscriptions,
-} from "./dispatcher.js";
+import { refreshEventSubscriptions } from "./dispatcher.js";
 import type { TriggerFrontmatter } from "./types.js";
 
 export interface AutomationRouteItem {
@@ -57,6 +61,14 @@ function automationName(path: string): string {
   return path.replace(/^jobs\//, "").replace(/\.md$/, "");
 }
 
+function asTriggerFrontmatter(meta: JobFrontmatter): TriggerFrontmatter {
+  return {
+    ...meta,
+    triggerType: meta.triggerType ?? "schedule",
+    mode: meta.mode ?? "agentic",
+  };
+}
+
 function normalizeAutomationPath(input: SetAutomationEnabledInput): string {
   const rawPath = input.path ?? (input.name ? `jobs/${input.name}.md` : "");
   const path = rawPath.replace(/^\/+/, "");
@@ -105,12 +117,33 @@ function nextRunForMeta(meta: TriggerFrontmatter): string | undefined {
 async function currentUserCanUpdateAutomation(
   event: H3Event,
   userEmail: string,
-  resourceOwner: string,
+  resource: Resource,
   meta: TriggerFrontmatter,
 ): Promise<boolean> {
+  const resourceOwner = resource.owner;
   if (resourceOwner === userEmail) return true;
+  const resourceOrgId = organizationIdFromResourceOwner(resourceOwner);
+  if (resourceOrgId) {
+    try {
+      const org = await getOrgContext(event);
+      if (org.orgId !== resourceOrgId) return false;
+      return await canUpdateAutomationResource(
+        { userEmail, orgId: resourceOrgId },
+        resource,
+      );
+    } catch {
+      return false;
+    }
+  }
   if (resourceOwner !== SHARED_OWNER) return false;
 
+  if (meta.orgId) {
+    const activeOrgId = await getOrgContext(event)
+      .then((context) => context.orgId)
+      .catch(() => null);
+    if (activeOrgId !== meta.orgId) return false;
+  }
+
   if (
     meta.createdBy &&
     meta.createdBy.toLowerCase() === userEmail.toLowerCase()
@@ -145,7 +178,8 @@ async function resourceToAutomationItem(
   userEmail: string,
   resource: Resource,
 ): Promise<AutomationRouteItem> {
-  const { meta, body } = parseTriggerFrontmatter(resource.content);
+  const parsed = parseJobResource(resource.content);
+  const meta = asTriggerFrontmatter(parsed.meta);
   return {
     id: resource.id,
     name: automationName(resource.path),
@@ -154,7 +188,7 @@ async function resourceToAutomationItem(
     canUpdate: await currentUserCanUpdateAutomation(
       event,
       userEmail,
-      resource.owner,
+      resource,
       meta,
     ),
     triggerType: meta.triggerType,
@@ -170,7 +204,7 @@ async function resourceToAutomationItem(
     lastError: meta.lastError,
     nextRun: nextRunForMeta(meta),
     createdBy: meta.createdBy,
-    body,
+    body: parsed.body,
   };
 }
 
@@ -179,12 +213,27 @@ export async function listAutomationsForOwner(
   userEmail: string,
 ): Promise<AutomationRouteItem[]> {
   const allResources = await resourceListAllOwners("jobs/");
-  const resources = allResources.filter(
-    (resource) =>
-      (resource.owner === userEmail || resource.owner === SHARED_OWNER) &&
-      resource.path.endsWith(".md") &&
-      !resource.path.endsWith(".keep"),
-  );
+  const activeOrgId = await getOrgContext(event)
+    .then((context) => context.orgId)
+    .catch(() => null);
+  const activeOrgOwner = activeOrgId
+    ? organizationResourceOwner(activeOrgId)
+    : null;
+  const resources = allResources.filter((resource) => {
+    if (!resource.path.endsWith(".md") || resource.path.endsWith(".keep")) {
+      return false;
+    }
+    if (
+      resource.owner !== userEmail &&
+      resource.owner !== SHARED_OWNER &&
+      resource.owner !== activeOrgOwner
+    ) {
+      return false;
+    }
+    if (resource.owner !== SHARED_OWNER) return true;
+    const { meta } = parseJobResource(resource.content);
+    return !meta.orgId || meta.orgId === activeOrgId;
+  });
   return Promise.all(
     resources.map((resource) =>
       resourceToAutomationItem(event, userEmail, resource),
@@ -204,18 +253,29 @@ export async function setAutomationEnabledForOwner(
   }
 
   const path = normalizeAutomationPath(input);
+  const activeOrgId = await getOrgContext(event)
+    .then((context) => context.orgId)
+    .catch(() => null);
+  const activeOrgOwner = activeOrgId
+    ? organizationResourceOwner(activeOrgId)
+    : null;
   const requestedOwner =
-    input.owner === SHARED_OWNER ? SHARED_OWNER : userEmail;
+    input.owner === SHARED_OWNER
+      ? SHARED_OWNER
+      : input.owner === activeOrgOwner
+        ? activeOrgOwner
+        : userEmail;
   const resource = await resourceGetByPath(requestedOwner, path);
   if (!resource) {
     throw Object.assign(new Error("Automation not found"), { statusCode: 404 });
   }
 
-  const { meta, body } = parseTriggerFrontmatter(resource.content);
+  const parsed = parseJobResource(resource.content);
+  const meta = asTriggerFrontmatter(parsed.meta);
   const allowed = await currentUserCanUpdateAutomation(
     event,
     userEmail,
-    resource.owner,
+    resource,
     meta,
   );
   if (!allowed) {
@@ -225,26 +285,23 @@ export async function setAutomationEnabledForOwner(
     );
   }
 
-  meta.enabled = input.enabled;
+  parsed.meta.enabled = input.enabled;
   if (
-    meta.enabled &&
+    parsed.meta.enabled &&
     meta.triggerType !== "event" &&
     meta.schedule &&
     isValidCron(meta.schedule)
   ) {
-    meta.nextRun = nextOccurrence(meta.schedule).toISOString();
+    parsed.meta.nextRun = nextOccurrence(meta.schedule).toISOString();
   }
 
-  await resourcePut(
-    resource.owner,
-    resource.path,
-    buildTriggerContent(meta, body),
-  );
+  const updatedContent = buildJobResourceContent(parsed.meta, parsed.body);
+  await resourcePut(resource.owner, resource.path, updatedContent);
   await refreshEventSubscriptions();
 
   return resourceToAutomationItem(event, userEmail, {
     ...resource,
-    content: buildTriggerContent(meta, body),
+    content: updatedContent,
   });
 }
 

package/src/triggers/types.ts

@@ -6,15 +6,15 @@
  * cron scheduler and dispatched by the event bus instead.
  */
 
-export interface TriggerFrontmatter {
-  schedule: string;
-  enabled: boolean;
+import type {
+  JobExecutionMode,
+  JobFrontmatter,
+  JobTriggerType,
+} from "../jobs/frontmatter.js";
+
+export interface TriggerFrontmatter extends JobFrontmatter {
   /** "schedule" = cron-based (legacy jobs). "event" = fires on bus event. */
-  triggerType: "schedule" | "event";
-  /** For event triggers: the event name to subscribe to. */
-  event?: string;
-  /** Natural-language condition evaluated by Haiku before dispatch. */
-  condition?: string;
+  triggerType: JobTriggerType;
   /**
    * "agentic" = full runAgentLoop; the only mode `manage-automations` will
    * define/update going forward. "deterministic" was removed from the
@@ -22,21 +22,7 @@ export interface TriggerFrontmatter {
    * before the removal may still carry it, and the dispatcher's
    * warn-and-skip branch keeps them inert by design — do not make them fire.
    */
-  mode: "agentic" | "deterministic";
-  /** Domain tag for filtering in per-template UIs. */
-  domain?: string;
-  /**
-   * Optional application-owned policy id carried into actions by the trusted
-   * trigger dispatcher. It is not model-supplied action input.
-   */
-  delegatedPolicyId?: string;
-  createdBy?: string;
-  orgId?: string;
-  runAs?: "creator" | "shared";
-  lastRun?: string;
-  lastStatus?: "success" | "error" | "running" | "skipped";
-  lastError?: string;
-  nextRun?: string;
+  mode: JobExecutionMode;
 }
 
 export interface TriggerDispatchContext {

package/corpus/templates/clips/app/routes/_app.settings.organization.tsx

@@ -1,232 +0,0 @@
-import { useActionQuery, useSession } from "@agent-native/core/client/hooks";
-import { useT } from "@agent-native/core/client/i18n";
-import { IconMailFast, IconUsers } from "@tabler/icons-react";
-import { useMemo } from "react";
-
-import { PageHeader } from "@/components/library/page-header";
-import { Badge } from "@/components/ui/badge";
-import { Card, CardContent, CardHeader, CardTitle } from "@/components/ui/card";
-import { Skeleton } from "@/components/ui/skeleton";
-import {
-  Table,
-  TableBody,
-  TableCell,
-  TableHead,
-  TableHeader,
-  TableRow,
-} from "@/components/ui/table";
-import {
-  BrandingEditor,
-  type RecordingVisibility,
-} from "@/components/workspace/branding-editor";
-import { InviteDialog } from "@/components/workspace/invite-dialog";
-import {
-  MembersList,
-  type MemberRole,
-} from "@/components/workspace/members-list";
-import enMessages from "@/i18n/en-US";
-
-export function meta() {
-  return [{ title: enMessages.organizationSettings.pageTitle }];
-}
-
-interface OrganizationStateResponse {
-  organization: {
-    id: string;
-    name: string;
-    brandColor: string;
-    brandLogoUrl: string | null;
-    defaultVisibility: RecordingVisibility;
-    ownerEmail?: string;
-  } | null;
-  members: {
-    id: string;
-    email: string;
-    role: MemberRole;
-    joinedAt: string | null;
-    invitedAt: string | null;
-  }[];
-  invites: {
-    id: string;
-    email: string;
-    role: MemberRole;
-    createdAt: string;
-  }[];
-}
-
-export default function OrganizationSettingsRoute() {
-  const t = useT();
-  const { session } = useSession();
-  const email = session?.email ?? "";
-
-  const { data, isLoading } = useActionQuery<OrganizationStateResponse>(
-    "list-organization-state",
-    undefined,
-  );
-
-  const organization = data?.organization ?? null;
-  const members = data?.members ?? [];
-  const invites = data?.invites ?? [];
-
-  const isOwner = !!(
-    organization?.ownerEmail && organization.ownerEmail === email
-  );
-  const currentRole: MemberRole = useMemo(() => {
-    const me = members.find((m) => m.email === email);
-    if (me) return me.role;
-    if (isOwner) return "admin";
-    return "member";
-  }, [members, email, isOwner]);
-
-  const isAdmin = currentRole === "admin" || currentRole === "owner" || isOwner;
-
-  if (isLoading) {
-    return (
-      <>
-        <PageHeader>
-          <h1 className="text-base font-semibold tracking-tight truncate">
-            {t("organizationSettings.title")}
-          </h1>
-        </PageHeader>
-        <div className="p-6 max-w-3xl mx-auto space-y-4">
-          <Skeleton className="h-10 w-64" />
-          <Skeleton className="h-32 w-full" />
-          <Skeleton className="h-48 w-full" />
-        </div>
-      </>
-    );
-  }
-
-  if (!organization) {
-    return (
-      <>
-        <PageHeader>
-          <h1 className="text-base font-semibold tracking-tight truncate">
-            {t("organizationSettings.title")}
-          </h1>
-        </PageHeader>
-        <div className="p-6 max-w-2xl mx-auto">
-          <Card>
-            <CardContent className="py-12 text-center text-sm text-muted-foreground">
-              {t("organizationSettings.noOrganization")}
-            </CardContent>
-          </Card>
-        </div>
-      </>
-    );
-  }
-
-  return (
-    <>
-      <PageHeader>
-        <h1 className="text-base font-semibold tracking-tight truncate">
-          {t("organizationSettings.namedTitle", { name: organization.name })}
-        </h1>
-      </PageHeader>
-      <div className="p-6 max-w-3xl mx-auto space-y-6">
-        <p className="text-sm text-muted-foreground">
-          {t("organizationSettings.description")}
-        </p>
-
-        {isAdmin ? (
-          <BrandingEditor
-            organizationId={organization.id}
-            initialName={organization.name}
-            initialBrandColor={organization.brandColor}
-            initialBrandLogoUrl={organization.brandLogoUrl}
-            initialDefaultVisibility={organization.defaultVisibility}
-          />
-        ) : (
-          <Card>
-            <CardHeader>
-              <CardTitle className="text-base">
-                {t("brandingEditor.title")}
-              </CardTitle>
-            </CardHeader>
-            <CardContent>
-              <div className="flex items-center gap-3">
-                <div
-                  className="h-10 w-10 rounded"
-                  style={{ background: organization.brandColor }}
-                />
-                <div>
-                  <div className="font-medium">{organization.name}</div>
-                  <div className="text-xs text-muted-foreground">
-                    {t("organizationSettings.adminsOnlyBranding")}
-                  </div>
-                </div>
-              </div>
-            </CardContent>
-          </Card>
-        )}
-
-        <Card>
-          <CardHeader className="flex flex-row items-center justify-between">
-            <CardTitle className="text-base flex items-center gap-2">
-              <IconUsers className="size-4 text-primary" />
-              {t("organizationSettings.members")}
-            </CardTitle>
-            {isAdmin ? <InviteDialog organizationId={organization.id} /> : null}
-          </CardHeader>
-          <CardContent>
-            <MembersList
-              organizationId={organization.id}
-              members={members}
-              currentUserEmail={email}
-              currentUserRole={currentRole}
-            />
-          </CardContent>
-        </Card>
-
-        <Card>
-          <CardHeader>
-            <CardTitle className="text-base flex items-center gap-2">
-              <IconMailFast className="size-4 text-primary" />
-              {t("organizationSettings.pendingInvites")}
-            </CardTitle>
-          </CardHeader>
-          <CardContent>
-            {invites.length === 0 ? (
-              <div className="py-4 text-center text-sm text-muted-foreground">
-                {t("organizationSettings.noPendingInvites")}
-              </div>
-            ) : (
-              <div className="rounded-md border">
-                <Table>
-                  <TableHeader>
-                    <TableRow>
-                      <TableHead>{t("organizationSettings.email")}</TableHead>
-                      <TableHead className="w-32">
-                        {t("organizationSettings.role")}
-                      </TableHead>
-                      <TableHead className="w-32">
-                        {t("organizationSettings.sent")}
-                      </TableHead>
-                    </TableRow>
-                  </TableHeader>
-                  <TableBody>
-                    {invites.map((inv) => (
-                      <TableRow key={inv.id}>
-                        <TableCell className="font-medium">
-                          {inv.email}
-                        </TableCell>
-                        <TableCell>
-                          <Badge variant="outline" className="capitalize">
-                            {inv.role.replace("-", " ")}
-                          </Badge>
-                        </TableCell>
-                        <TableCell className="text-muted-foreground text-sm">
-                          {new Date(inv.createdAt).toLocaleDateString()}
-                        </TableCell>
-                      </TableRow>
-                    ))}
-                  </TableBody>
-                </Table>
-              </div>
-            )}
-          </CardContent>
-        </Card>
-      </div>
-    </>
-  );
-}