@agent-native/core 0.134.1 → 0.135.1

package/dist/vitest-config.js

@@ -0,0 +1,55 @@
+/**
+ * Base vitest config that caps a suite's worker pool at a share of the machine.
+ *
+ * Vitest sizes its pool at `cores - 1` with no awareness of peer processes, so
+ * several suites running at once — concurrent agent sessions, or a workspace
+ * running packages in parallel — each try to claim the whole box. Set
+ * `VITEST_CONCURRENCY` to a percentage or a worker count to change the lid; a
+ * package that needs its own value sets `test.maxWorkers` in its own config,
+ * which wins the merge.
+ *
+ * This ships from core rather than living at the monorepo root because template
+ * directories are scaffolded out verbatim as standalone apps — a config that
+ * reaches above the template would resolve to nothing in the generated app.
+ *
+ * Keep this module free of runtime imports so loading it costs a config file
+ * nothing beyond reading the environment.
+ */
+const DEFAULT_MAX_WORKERS = "25%";
+const ENV_KEYS = ["VITEST_CONCURRENCY", "AGENT_NATIVE_VITEST_CONCURRENCY"];
+/**
+ * Resolve the worker lid from the environment, throwing on anything that is
+ * neither a percentage nor a worker count. A bad value must not quietly become
+ * the default — that reads as "configured" while running at some other size.
+ */
+export function resolveMaxWorkers(env = process.env) {
+    const rawMaxWorkers = env.VITEST_MAX_WORKERS;
+    if (rawMaxWorkers?.includes("%")) {
+        throw new Error(`VITEST_MAX_WORKERS=${rawMaxWorkers} is not a percentage to vitest — it parses as ` +
+            `${Number.parseInt(rawMaxWorkers)} workers. Use VITEST_CONCURRENCY for percentages, ` +
+            `or an integer for VITEST_MAX_WORKERS.`);
+    }
+    const key = ENV_KEYS.find((name) => env[name]);
+    if (!key)
+        return DEFAULT_MAX_WORKERS;
+    const value = env[key].trim();
+    if (/^\d+%$/.test(value)) {
+        const percent = Number.parseInt(value);
+        if (percent < 1 || percent > 100) {
+            throw new Error(`${key}=${value} is out of range — use 1% to 100%.`);
+        }
+        return value;
+    }
+    const count = Number(value);
+    if (!Number.isInteger(count) || count < 1) {
+        throw new Error(`${key}=${value} is not a percentage like "25%" or a worker count like "2".`);
+    }
+    return count;
+}
+const vitestBaseConfig = {
+    test: {
+        maxWorkers: resolveMaxWorkers(),
+    },
+};
+export default vitestBaseConfig;
+//# sourceMappingURL=vitest-config.js.map

package/dist/vitest-config.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"vitest-config.js","sourceRoot":"","sources":["../src/vitest-config.ts"],"names":[],"mappings":"AAEA;;;;;;;;;;;;;;;;GAgBG;AAEH,MAAM,mBAAmB,GAAG,KAAK,CAAC;AAClC,MAAM,QAAQ,GAAG,CAAC,oBAAoB,EAAE,iCAAiC,CAAC,CAAC;AAE3E;;;;GAIG;AACH,MAAM,UAAU,iBAAiB,CAC/B,GAAG,GAAsB,OAAO,CAAC,GAAG;IAEpC,MAAM,aAAa,GAAG,GAAG,CAAC,kBAAkB,CAAC;IAC7C,IAAI,aAAa,EAAE,QAAQ,CAAC,GAAG,CAAC,EAAE,CAAC;QACjC,MAAM,IAAI,KAAK,CACb,sBAAsB,aAAa,gDAAgD;YACjF,GAAG,MAAM,CAAC,QAAQ,CAAC,aAAa,CAAC,oDAAoD;YACrF,uCAAuC,CAC1C,CAAC;IACJ,CAAC;IAED,MAAM,GAAG,GAAG,QAAQ,CAAC,IAAI,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC,CAAC;IAC/C,IAAI,CAAC,GAAG;QAAE,OAAO,mBAAmB,CAAC;IAErC,MAAM,KAAK,GAAG,GAAG,CAAC,GAAG,CAAE,CAAC,IAAI,EAAE,CAAC;IAC/B,IAAI,QAAQ,CAAC,IAAI,CAAC,KAAK,CAAC,EAAE,CAAC;QACzB,MAAM,OAAO,GAAG,MAAM,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC;QACvC,IAAI,OAAO,GAAG,CAAC,IAAI,OAAO,GAAG,GAAG,EAAE,CAAC;YACjC,MAAM,IAAI,KAAK,CAAC,GAAG,GAAG,IAAI,KAAK,oCAAoC,CAAC,CAAC;QACvE,CAAC;QACD,OAAO,KAAK,CAAC;IACf,CAAC;IAED,MAAM,KAAK,GAAG,MAAM,CAAC,KAAK,CAAC,CAAC;IAC5B,IAAI,CAAC,MAAM,CAAC,SAAS,CAAC,KAAK,CAAC,IAAI,KAAK,GAAG,CAAC,EAAE,CAAC;QAC1C,MAAM,IAAI,KAAK,CACb,GAAG,GAAG,IAAI,KAAK,6DAA6D,CAC7E,CAAC;IACJ,CAAC;IACD,OAAO,KAAK,CAAC;AACf,CAAC;AAED,MAAM,gBAAgB,GAAmB;IACvC,IAAI,EAAE;QACJ,UAAU,EAAE,iBAAiB,EAAE;KAChC;CACF,CAAC;AAEF,eAAe,gBAAgB,CAAC","sourcesContent":["import type { ViteUserConfig } from \"vitest/config\";\n\n/**\n * Base vitest config that caps a suite's worker pool at a share of the machine.\n *\n * Vitest sizes its pool at `cores - 1` with no awareness of peer processes, so\n * several suites running at once — concurrent agent sessions, or a workspace\n * running packages in parallel — each try to claim the whole box. Set\n * `VITEST_CONCURRENCY` to a percentage or a worker count to change the lid; a\n * package that needs its own value sets `test.maxWorkers` in its own config,\n * which wins the merge.\n *\n * This ships from core rather than living at the monorepo root because template\n * directories are scaffolded out verbatim as standalone apps — a config that\n * reaches above the template would resolve to nothing in the generated app.\n *\n * Keep this module free of runtime imports so loading it costs a config file\n * nothing beyond reading the environment.\n */\n\nconst DEFAULT_MAX_WORKERS = \"25%\";\nconst ENV_KEYS = [\"VITEST_CONCURRENCY\", \"AGENT_NATIVE_VITEST_CONCURRENCY\"];\n\n/**\n * Resolve the worker lid from the environment, throwing on anything that is\n * neither a percentage nor a worker count. A bad value must not quietly become\n * the default — that reads as \"configured\" while running at some other size.\n */\nexport function resolveMaxWorkers(\n  env: NodeJS.ProcessEnv = process.env,\n): string | number {\n  const rawMaxWorkers = env.VITEST_MAX_WORKERS;\n  if (rawMaxWorkers?.includes(\"%\")) {\n    throw new Error(\n      `VITEST_MAX_WORKERS=${rawMaxWorkers} is not a percentage to vitest — it parses as ` +\n        `${Number.parseInt(rawMaxWorkers)} workers. Use VITEST_CONCURRENCY for percentages, ` +\n        `or an integer for VITEST_MAX_WORKERS.`,\n    );\n  }\n\n  const key = ENV_KEYS.find((name) => env[name]);\n  if (!key) return DEFAULT_MAX_WORKERS;\n\n  const value = env[key]!.trim();\n  if (/^\\d+%$/.test(value)) {\n    const percent = Number.parseInt(value);\n    if (percent < 1 || percent > 100) {\n      throw new Error(`${key}=${value} is out of range — use 1% to 100%.`);\n    }\n    return value;\n  }\n\n  const count = Number(value);\n  if (!Number.isInteger(count) || count < 1) {\n    throw new Error(\n      `${key}=${value} is not a percentage like \"25%\" or a worker count like \"2\".`,\n    );\n  }\n  return count;\n}\n\nconst vitestBaseConfig: ViteUserConfig = {\n  test: {\n    maxWorkers: resolveMaxWorkers(),\n  },\n};\n\nexport default vitestBaseConfig;\n"]}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@agent-native/core",
-  "version": "0.134.1",
+  "version": "0.135.1",
   "description": "Framework for agent-native application development — where AI agents and UI share SQL state, actions, and context",
   "homepage": "https://github.com/BuilderIO/agent-native#readme",
   "bugs": {
@@ -61,6 +61,7 @@
       "default": "./dist/index.js"
     },
     "./vite": "./dist/vite/index.js",
+    "./vitest-config": "./dist/vitest-config.js",
     "./server": "./dist/server/index.js",
     "./server/edge": "./dist/server/edge.js",
     "./server/entry-server": "./dist/server/entry-server.js",
@@ -395,8 +396,8 @@
     "y-protocols": "^1.0.7",
     "yjs": "^13.6.31",
     "zod": "^4.3.6",
-    "@agent-native/recap-cli": "0.5.1",
-    "@agent-native/toolkit": "^0.12.1"
+    "@agent-native/recap-cli": "0.5.2",
+    "@agent-native/toolkit": "^0.12.2"
   },
   "devDependencies": {
     "@ai-sdk/anthropic": "^3.0.71",
@@ -586,6 +587,6 @@
     "build": "tsc && tsc -p tsconfig.cli.json && node scripts/finalize-build.mjs && node scripts/check-dist-imports.mjs",
     "dev": "tsc --watch",
     "typecheck": "tsc --noEmit",
-    "test": "vitest --run --dir src --maxWorkers=25%"
+    "test": "vitest --run --dir src"
   }
 }

package/src/automations/service.ts

@@ -1,11 +1,13 @@
 import { getDbExec } from "../db/client.js";
-import { isValidCron, nextOccurrence } from "../jobs/cron.js";
+import { isValidCron, isValidTimezone, nextOccurrence } from "../jobs/cron.js";
 import {
   buildJobResourceContent,
   normalizeJobMcpTools,
   parseJobResource,
   type JobFrontmatter,
 } from "../jobs/frontmatter.js";
+import { deleteAutomationRuns } from "../jobs/run-history.js";
+import { resolveUserSchedulingTimezone } from "../localization/user-timezone.js";
 import {
   organizationIdFromResourceOwner,
   organizationResourceOwner,
@@ -49,6 +51,7 @@ export interface DefineAutomationInput {
   triggerType: "schedule" | "event";
   body: string;
   schedule?: string;
+  timezone?: string;
   event?: string;
   condition?: string;
   domain?: string;
@@ -68,6 +71,7 @@ export interface UpdateAutomationInput {
   condition?: string | null;
   delegatedPolicyId?: string | null;
   schedule?: string;
+  timezone?: string;
   model?: string | null;
   mcpTools?: unknown;
 }
@@ -309,9 +313,20 @@ export async function defineAutomation(
     throw httpError("event is required for event-triggered automations.", 400);
   }
 
+  if (input.timezone && !isValidTimezone(input.timezone)) {
+    throw httpError(`Unknown timezone "${input.timezone}".`, 400);
+  }
+  // Resolve now and persist it: a schedule whose zone is implicit means
+  // something different the moment it is read on a differently-zoned host.
+  const timezone =
+    input.triggerType === "schedule"
+      ? input.timezone || (await resolveUserSchedulingTimezone(actor.userEmail))
+      : undefined;
+
   const mcpTools = normalizeJobMcpTools(input.mcpTools);
   const meta: JobFrontmatter = {
     schedule: input.triggerType === "schedule" ? schedule : "",
+    timezone,
     enabled: true,
     triggerType: input.triggerType,
     event: input.triggerType === "event" ? event : undefined,
@@ -324,7 +339,7 @@ export async function defineAutomation(
     runAs: "creator",
     nextRun:
       input.triggerType === "schedule"
-        ? nextOccurrence(schedule).toISOString()
+        ? nextOccurrence(schedule, undefined, timezone).toISOString()
         : undefined,
     model: input.model?.trim() || undefined,
     mcpTools: mcpTools?.length ? mcpTools : undefined,
@@ -365,7 +380,22 @@ export async function updateAutomation(
       throw httpError(`Invalid cron expression "${input.schedule}".`, 400);
     }
     meta.schedule = input.schedule;
-    meta.nextRun = nextOccurrence(input.schedule).toISOString();
+  }
+  if (input.timezone !== undefined) {
+    if (!isValidTimezone(input.timezone)) {
+      throw httpError(`Unknown timezone "${input.timezone}".`, 400);
+    }
+    if (meta.triggerType !== "schedule") {
+      throw httpError("Event automations do not have a timezone.", 400);
+    }
+    meta.timezone = input.timezone;
+  }
+  if (input.schedule !== undefined || input.timezone !== undefined) {
+    meta.nextRun = nextOccurrence(
+      meta.schedule,
+      undefined,
+      meta.timezone,
+    ).toISOString();
   }
   if (input.enabled !== undefined) {
     meta.enabled = input.enabled;
@@ -374,7 +404,11 @@ export async function updateAutomation(
       meta.triggerType === "schedule" &&
       isValidCron(meta.schedule)
     ) {
-      meta.nextRun = nextOccurrence(meta.schedule).toISOString();
+      meta.nextRun = nextOccurrence(
+        meta.schedule,
+        undefined,
+        meta.timezone,
+      ).toISOString();
     }
   }
   if (input.condition !== undefined) {
@@ -417,6 +451,9 @@ export async function deleteAutomation(
     );
   }
   await resourceDelete(definition.resource.id);
+  // Names are reusable, so leaving history behind would attach these runs to
+  // whatever automation is created under the same name next.
+  await deleteAutomationRuns(definition.resource.owner, name);
 }
 
 export interface AutomationExecutionIdentity {

package/src/cli/mcp-config-writers.ts

@@ -259,6 +259,24 @@ export function configPathFor(
 // JSON client configs (Claude Code, Claude Code CLI, Cowork)
 // ---------------------------------------------------------------------------
 
+/**
+ * Read an existing MCP config without conflating missing and unreadable files.
+ * Only ENOENT means the config is absent; any other read failure must abort
+ * before a caller can overwrite existing user configuration.
+ */
+function readExistingConfigFile(file: string): string | undefined {
+  try {
+    return fs.readFileSync(file, "utf-8");
+  } catch (error) {
+    if ((error as NodeJS.ErrnoException).code === "ENOENT") return undefined;
+    const detail = error instanceof Error ? ` (${error.message})` : "";
+    throw new Error(
+      `Cannot read MCP config file: ${file}\n` +
+        `Check that the file is readable and re-run. The file has not been modified.${detail}`,
+    );
+  }
+}
+
 /**
  * Read and parse a JSON config file.
  *
@@ -269,13 +287,8 @@ export function configPathFor(
  *   file with only the new MCP entry (data-loss hazard).
  */
 function readJsonFile(file: string): Record<string, any> {
-  let raw: string;
-  try {
-    raw = fs.readFileSync(file, "utf-8");
-  } catch {
-    // Missing (ENOENT) or unreadable file — treat as empty.
-    return {};
-  }
+  const raw = readExistingConfigFile(file);
+  if (raw === undefined) return {};
   if (!raw.trim()) return {};
   try {
     const parsed = JSON.parse(raw);
@@ -576,12 +589,7 @@ export function writeCodexBlock(
   name: string,
   block: string | null,
 ): void {
-  let content = "";
-  try {
-    content = fs.readFileSync(file, "utf-8");
-  } catch {
-    content = "";
-  }
+  const content = readExistingConfigFile(file) ?? "";
 
   const lines = content.split(/\r?\n/);
   const out: string[] = [];
@@ -616,14 +624,12 @@ export function writeCodexBlock(
 }
 
 export function codexHasBlock(file: string, name: string): boolean {
-  try {
-    const content = fs.readFileSync(file, "utf-8");
-    return content
-      .split(/\r?\n/)
-      .some((line) => codexServerNameOfHeader(line) === name);
-  } catch {
-    return false;
-  }
+  const content = readExistingConfigFile(file);
+  return (
+    content
+      ?.split(/\r?\n/)
+      .some((line) => codexServerNameOfHeader(line) === name) ?? false
+  );
 }
 
 // ---------------------------------------------------------------------------

package/src/client/agent-page/AgentJobsTab.tsx

@@ -3,8 +3,10 @@ import {
   IconBolt,
   IconCalendarEvent,
   IconClock,
+  IconAlertTriangle,
   IconEye,
   IconLoader2,
+  IconPencil,
   IconPlayerPause,
   IconPlayerPlay,
   IconTrash,
@@ -24,6 +26,11 @@ import { useFormatters, useT } from "../i18n.js";
 import { automationCreationContext } from "../settings/AutomationsSection.js";
 import { AgentEmptyState } from "./AgentEmptyState.js";
 import { AgentTabFrame } from "./AgentTabFrame.js";
+import {
+  AutomationDetailsDialog,
+  type AutomationDetailsField,
+} from "./AutomationDetailsDialog.js";
+import { AutomationScheduleDialog } from "./AutomationScheduleDialog.js";
 import type { AgentPageTabProps } from "./types.js";
 import {
   useAutomations,
@@ -62,6 +69,101 @@ function listAutomations(automations: Automation[]): ListedAutomation[] {
   }));
 }
 
+type Translate = ReturnType<typeof useT>;
+
+function describeTrigger(entry: ListedAutomation, t: Translate): string {
+  if (entry.kind === "automation" && entry.triggerType === "event") {
+    return t("jobs.automationEventDetails", {
+      defaultValue: "Runs when {{event}}.",
+      event: entry.resource.event ?? "an event fires",
+    });
+  }
+  return (
+    entry.resource.scheduleDescription ||
+    entry.resource.schedule ||
+    t("jobs.scheduledTrigger", { defaultValue: "Scheduled" })
+  );
+}
+
+function detailsFields(
+  entry: ListedAutomation,
+  t: Translate,
+  formatDateTime: (value: string | null) => string | null,
+): AutomationDetailsField[] {
+  const resource = entry.resource;
+  const unset = t("jobs.notSet", { defaultValue: "—" });
+  const fields: AutomationDetailsField[] = [
+    {
+      label: t("jobs.status", { defaultValue: "Status" }),
+      value: resource.enabled
+        ? t("jobs.enabled", { defaultValue: "Enabled" })
+        : t("jobs.paused", { defaultValue: "Paused" }),
+    },
+    {
+      label: t("jobs.trigger", { defaultValue: "Trigger" }),
+      value:
+        entry.triggerType === "event"
+          ? t("jobs.eventTrigger", { defaultValue: "Event-triggered" })
+          : t("jobs.scheduledTrigger", { defaultValue: "Scheduled" }),
+    },
+  ];
+
+  if (entry.triggerType === "schedule") {
+    fields.push(
+      {
+        label: t("jobs.cronExpression", { defaultValue: "Cron expression" }),
+        value: resource.schedule || unset,
+        mono: true,
+      },
+      {
+        label: t("jobs.timezone", { defaultValue: "Timezone" }),
+        value: resource.timezone || unset,
+      },
+    );
+  }
+
+  fields.push(
+    {
+      label: t("jobs.nextRun", { defaultValue: "Next run" }),
+      value: formatDateTime(resource.nextRun) ?? unset,
+    },
+    {
+      label: t("jobs.lastRun", { defaultValue: "Last run" }),
+      value:
+        formatDateTime(resource.lastRun) ??
+        t("jobs.neverRan", { defaultValue: "Never" }),
+    },
+    {
+      label: t("jobs.lastChecked", { defaultValue: "Last checked" }),
+      value: formatDateTime(resource.lastCheck) ?? unset,
+    },
+    {
+      label: t("jobs.lastStatus", { defaultValue: "Last status" }),
+      value: resource.lastStatus || unset,
+    },
+    {
+      label: t("jobs.scope", { defaultValue: "Scope" }),
+      value:
+        resource.scope === "organization"
+          ? t("jobs.organization", { defaultValue: "Organization" })
+          : t("jobs.personal", { defaultValue: "Personal" }),
+    },
+    {
+      label: t("jobs.createdBy", { defaultValue: "Created by" }),
+      value: resource.createdBy || unset,
+    },
+  );
+
+  if (entry.kind === "automation") {
+    fields.push({
+      label: t("jobs.model", { defaultValue: "Model" }),
+      value: entry.resource.model || unset,
+    });
+  }
+
+  return fields;
+}
+
 export function organizationAutomationCreationContext(): string {
   return "The user wants to create a new organization automation. Use manage-automations with action=define and scope=organization to create it. Ask clarifying questions if needed about whether it runs on a schedule or event, any conditions, and what actions to take.";
 }
@@ -83,6 +185,9 @@ export function AgentJobsTab({ canManageOrg = false }: AgentPageTabProps) {
   const [detailsTarget, setDetailsTarget] = useState<ListedAutomation | null>(
     null,
   );
+  const [scheduleTarget, setScheduleTarget] = useState<ListedAutomation | null>(
+    null,
+  );
 
   const formatDateTime = (value: string | null) => {
     if (!value || Number.isNaN(new Date(value).getTime())) return null;
@@ -111,14 +216,14 @@ export function AgentJobsTab({ canManageOrg = false }: AgentPageTabProps) {
   const mutateEntry = (
     entry: ListedAutomation,
     operation: "update" | "delete",
-    enabled?: boolean,
+    patch?: { enabled?: boolean; schedule?: string },
     onSuccess?: () => void,
   ) => {
     const input = {
       operation,
       name: entry.resource.name,
       scope: entry.resource.scope,
-      ...(enabled === undefined ? {} : { enabled }),
+      ...patch,
     };
     const options = onSuccess ? { onSuccess } : undefined;
 
@@ -243,6 +348,7 @@ export function AgentJobsTab({ canManageOrg = false }: AgentPageTabProps) {
           {entries.map((entry) => {
             const resource = entry.resource;
             const lastRun = formatDateTime(resource.lastRun);
+            const lastCheck = formatDateTime(resource.lastCheck);
             const nextRun = formatDateTime(resource.nextRun);
             const triggerDescription =
               entry.kind === "automation" && entry.triggerType === "event"
@@ -310,7 +416,7 @@ export function AgentJobsTab({ canManageOrg = false }: AgentPageTabProps) {
                     <p className="mt-1 line-clamp-2 text-xs text-muted-foreground/80">
                       {instructions}
                     </p>
-                    {lastRun || nextRun ? (
+                    {lastRun || nextRun || lastCheck ? (
                       <div className="mt-2 flex flex-wrap gap-x-4 gap-y-1 text-[11px] text-muted-foreground">
                         {nextRun ? (
                           <span>
@@ -318,14 +424,29 @@ export function AgentJobsTab({ canManageOrg = false }: AgentPageTabProps) {
                             {nextRun}
                           </span>
                         ) : null}
-                        {lastRun ? (
+                        <span>
+                          {t("jobs.lastRun", { defaultValue: "Last run" })}:{" "}
+                          {lastRun ??
+                            t("jobs.neverRan", { defaultValue: "Never" })}
+                        </span>
+                        {!lastRun && lastCheck ? (
                           <span>
-                            {t("jobs.lastRun", { defaultValue: "Last run" })}:{" "}
-                            {lastRun}
+                            {t("jobs.lastChecked", {
+                              defaultValue: "Last checked",
+                            })}
+                            : {lastCheck}
                           </span>
                         ) : null}
                       </div>
                     ) : null}
+                    {resource.lastError ? (
+                      <p className="mt-2 flex items-start gap-1.5 text-[11px] text-destructive">
+                        <IconAlertTriangle className="mt-px size-3 shrink-0" />
+                        <span className="min-w-0 break-words">
+                          {resource.lastError}
+                        </span>
+                      </p>
+                    ) : null}
                   </div>
                   <div className="flex shrink-0 items-center gap-1">
                     <Button
@@ -340,6 +461,19 @@ export function AgentJobsTab({ canManageOrg = false }: AgentPageTabProps) {
                     </Button>
                     {resource.canUpdate ? (
                       <>
+                        {entry.triggerType === "schedule" ? (
+                          <Button
+                            type="button"
+                            variant="ghost"
+                            size="sm"
+                            className="cursor-pointer px-2 text-xs"
+                            disabled={mutationPending}
+                            onClick={() => setScheduleTarget(entry)}
+                          >
+                            <IconPencil className="size-3.5" />
+                            {t("jobs.edit", { defaultValue: "Edit" })}
+                          </Button>
+                        ) : null}
                         <Button
                           type="button"
                           variant="ghost"
@@ -347,7 +481,9 @@ export function AgentJobsTab({ canManageOrg = false }: AgentPageTabProps) {
                           className="cursor-pointer px-2 text-xs"
                           disabled={mutationPending}
                           onClick={() =>
-                            mutateEntry(entry, "update", !resource.enabled)
+                            mutateEntry(entry, "update", {
+                              enabled: !resource.enabled,
+                            })
                           }
                         >
                           {resource.enabled ? (
@@ -505,84 +641,50 @@ export function AgentJobsTab({ canManageOrg = false }: AgentPageTabProps) {
         </DialogContent>
       </Dialog>
 
-      <Dialog
-        open={detailsTarget !== null}
-        onOpenChange={(open) => {
-          if (!open) setDetailsTarget(null);
-        }}
-      >
-        <DialogContent className="max-w-2xl">
-          <DialogHeader>
-            <DialogTitle>
-              {detailsTarget?.resource.name.replace(/-/g, " ") ??
-                t("jobs.automationDetails", {
-                  defaultValue: "Automation details",
-                })}
-            </DialogTitle>
-            <DialogDescription>
-              {detailsTarget
-                ? detailsTarget.triggerType === "event"
-                  ? t("jobs.automationEventDetails", {
-                      defaultValue: "Runs when {{event}}.",
-                      event:
-                        detailsTarget.kind === "automation"
-                          ? (detailsTarget.resource.event ?? "an event fires")
-                          : "an event fires",
-                    })
-                  : detailsTarget.resource.scheduleDescription ||
-                    detailsTarget.resource.schedule ||
-                    t("jobs.scheduledTrigger", {
-                      defaultValue: "Scheduled",
-                    })
-                : null}
-            </DialogDescription>
-          </DialogHeader>
-          {detailsTarget ? (
-            <div className="space-y-3">
-              {detailsTarget.kind === "automation" &&
-              detailsTarget.resource.condition ? (
-                <div>
-                  <p className="text-xs font-medium text-foreground">
-                    {t("jobs.condition", { defaultValue: "Condition" })}
-                  </p>
-                  <p className="mt-1 text-sm text-muted-foreground">
-                    {detailsTarget.resource.condition}
-                  </p>
-                </div>
-              ) : null}
-              <div>
-                <p className="text-xs font-medium text-foreground">
-                  {t("jobs.instructions", { defaultValue: "Instructions" })}
-                </p>
-                <p className="mt-1 whitespace-pre-wrap text-sm text-muted-foreground">
-                  {detailsTarget.kind === "automation"
-                    ? detailsTarget.resource.body
-                    : detailsTarget.resource.instructions}
-                </p>
-              </div>
-              {(detailsTarget.resource.mcpTools ?? []).length > 0 ? (
-                <div>
-                  <p className="text-xs font-medium text-foreground">
-                    {t("jobs.mcpTools", {
-                      defaultValue: "Connected MCP tools",
-                    })}
-                  </p>
-                  <div className="mt-1 flex flex-wrap gap-1.5">
-                    {(detailsTarget.resource.mcpTools ?? []).map((toolName) => (
-                      <code
-                        key={toolName}
-                        className="rounded bg-muted px-1.5 py-0.5 text-[11px] text-muted-foreground"
-                      >
-                        {toolName}
-                      </code>
-                    ))}
-                  </div>
-                </div>
-              ) : null}
-            </div>
-          ) : null}
-        </DialogContent>
-      </Dialog>
+      {detailsTarget ? (
+        <AutomationDetailsDialog
+          open
+          name={detailsTarget.resource.name}
+          scope={
+            detailsTarget.resource.scope === "organization" ? "org" : "user"
+          }
+          triggerSummary={describeTrigger(detailsTarget, t)}
+          fields={detailsFields(detailsTarget, t, formatDateTime)}
+          condition={
+            detailsTarget.kind === "automation"
+              ? detailsTarget.resource.condition
+              : null
+          }
+          instructions={
+            detailsTarget.kind === "automation"
+              ? detailsTarget.resource.body
+              : detailsTarget.resource.instructions
+          }
+          mcpTools={detailsTarget.resource.mcpTools ?? []}
+          lastError={detailsTarget.resource.lastError}
+          formatTimestamp={(value) =>
+            formatDateTime(new Date(value).toISOString()) ?? String(value)
+          }
+          onClose={() => setDetailsTarget(null)}
+        />
+      ) : null}
+
+      {scheduleTarget ? (
+        <AutomationScheduleDialog
+          open
+          name={scheduleTarget.resource.name}
+          schedule={scheduleTarget.resource.schedule ?? ""}
+          timezone={scheduleTarget.resource.timezone ?? null}
+          saving={mutationPending}
+          error={mutationError ? mutationError.message : null}
+          onCancel={() => setScheduleTarget(null)}
+          onSave={(next) =>
+            mutateEntry(scheduleTarget, "update", next, () =>
+              setScheduleTarget(null),
+            )
+          }
+        />
+      ) : null}
     </AgentTabFrame>
   );
 }