@elizaos/agent 2.0.0-alpha.98 → 2.0.0-beta.2

package/packages/agent/src/triggers/runtime.js

@@ -1,8 +1,14 @@
 import crypto from "node:crypto";
 import { stringToUuid } from "@elizaos/core";
-import { buildTriggerMetadata, DISABLED_TRIGGER_INTERVAL_MS, MAX_TRIGGER_RUN_HISTORY, } from "./scheduling";
+import { buildTriggerMetadata, DISABLED_TRIGGER_INTERVAL_MS, MAX_TRIGGER_RUN_HISTORY, } from "./scheduling.js";
+// Phase 2E: triggers always dispatch through the workflow service. The
+// previous autonomy-room memory injection path has been removed; every
+// persisted trigger is `kind: "workflow"`. Any stale `kind: "text"`
+// record we encounter at dispatch time is logged and skipped — the boot
+// migration rewrites it on the next cycle.
 export const TRIGGER_TASK_NAME = "TRIGGER_DISPATCH";
 export const TRIGGER_TASK_TAGS = ["queue", "repeat", "trigger"];
+const HEARTBEAT_TASK_TAGS = ["queue", "repeat", "heartbeat"];
 const DEFAULT_MAX_ACTIVE_TRIGGERS = 100;
 const metricsByAgent = new Map();
 function getMetrics(agentId) {
@@ -78,30 +84,28 @@ export function getTriggerLimit(runtime) {
     }
     return DEFAULT_MAX_ACTIVE_TRIGGERS;
 }
-async function isAutonomyServiceAvailable(runtime) {
-    const svc = runtime.getService("autonomy") ??
-        runtime.getService("AUTONOMY");
-    return typeof svc?.injectAutonomousInstruction === "function";
-}
-async function dispatchInstruction(runtime, taskId, trigger) {
-    const autonomyService = runtime.getService("autonomy") ??
-        runtime.getService("AUTONOMY");
-    if (!autonomyService?.injectAutonomousInstruction) {
-        runtime.logger.warn?.(`Autonomy service missing injectAutonomousInstruction (taskId=${taskId}, triggerId=${trigger.triggerId})`);
-        throw new Error("Autonomy service unavailable for trigger dispatch");
+async function dispatchWorkflow(runtime, trigger, event) {
+    if (!trigger.workflowId) {
+        return { ok: false, error: "workflow trigger missing workflowId" };
     }
-    const roomId = typeof autonomyService.getAutonomousRoomId === "function"
-        ? autonomyService.getAutonomousRoomId()
-        : undefined;
-    await autonomyService.injectAutonomousInstruction({
-        instructions: trigger.instructions,
-        source: "trigger-runtime",
-        wakeMode: trigger.wakeMode,
-        triggerId: trigger.triggerId,
-        triggerTaskId: taskId,
-        taskId,
-        roomId,
-    });
+    const svc = runtime.getService("WORKFLOW_DISPATCH");
+    if (!svc) {
+        runtime.logger.warn?.({
+            src: "trigger-runtime",
+            triggerId: trigger.triggerId,
+            workflowId: trigger.workflowId,
+        }, "[triggers] workflow dispatch requested but WORKFLOW_DISPATCH service not registered");
+        return { ok: false, error: "WORKFLOW_DISPATCH service not registered" };
+    }
+    const result = event
+        ? await svc.execute(trigger.workflowId, {
+            eventKind: event.kind,
+            eventPayload: event.payload ?? {},
+        })
+        : await svc.execute(trigger.workflowId);
+    return result.ok
+        ? { ok: true, executionId: result.executionId }
+        : { ok: false, error: result.error ?? "workflow execution failed" };
 }
 export async function executeTriggerTask(runtime, task, options) {
     if (!task.id) {
@@ -116,39 +120,63 @@ export async function executeTriggerTask(runtime, task, options) {
         recordExecutionMetric(runtime.agentId, "skipped", Date.now());
         return { status: "skipped", taskDeleted: false };
     }
+    if (options.source === "event" &&
+        trigger.triggerType !== "event" &&
+        !options.force) {
+        recordExecutionMetric(runtime.agentId, "skipped", Date.now());
+        return { status: "skipped", taskDeleted: false };
+    }
+    if (options.source === "event" &&
+        trigger.triggerType === "event" &&
+        trigger.eventKind !== options.event?.kind &&
+        !options.force) {
+        recordExecutionMetric(runtime.agentId, "skipped", Date.now());
+        return { status: "skipped", taskDeleted: false };
+    }
     if (typeof trigger.maxRuns === "number" &&
         trigger.maxRuns > 0 &&
         trigger.runCount >= trigger.maxRuns) {
         await runtime.deleteTask(task.id);
         recordExecutionMetric(runtime.agentId, "skipped", Date.now());
-        return { status: "skipped", taskDeleted: true };
+        return {
+            status: "skipped",
+            taskDeleted: true,
+            trigger: taskToTriggerSummary(task),
+        };
     }
-    if (!(await isAutonomyServiceAvailable(runtime)) &&
-        options.source !== "manual") {
+    // Phase 2E: every trigger that reaches dispatch is `kind: "workflow"`.
+    // Stale on-disk text triggers are migrated by the boot migration; if we
+    // encounter one before that runs, log a warning and skip — re-dispatch
+    // will pick it up after migration without crashing the loop.
+    if (trigger.kind !== "workflow") {
         runtime.logger.warn?.({
             src: "trigger-runtime",
             taskId: task.id,
             triggerId: trigger.triggerId,
-        }, "Autonomy service unavailable — skipping trigger (will retry next cycle)");
+            kind: trigger.kind,
+        }, "Trigger is not workflow-kind; skipping (boot migration will convert it)");
         recordExecutionMetric(runtime.agentId, "skipped", Date.now());
         return { status: "skipped", taskDeleted: false };
     }
     const startedAt = Date.now();
     let status = "success";
     let errorMessage = "";
-    try {
-        await dispatchInstruction(runtime, task.id, trigger);
+    let workflowExecutionId;
+    const result = await dispatchWorkflow(runtime, trigger, options.event);
+    if (result.ok === true) {
+        workflowExecutionId = result.executionId;
     }
-    catch (error) {
+    else {
         status = "error";
-        errorMessage = error instanceof Error ? error.message : String(error);
+        errorMessage = result.error;
         runtime.logger.error({
             src: "trigger-runtime",
             agentId: runtime.agentId,
             taskId: task.id,
             triggerId: trigger.triggerId,
+            workflowId: trigger.workflowId,
             error: errorMessage,
-        }, "Trigger execution failed");
+        }, "Workflow trigger dispatch failed");
     }
     if (status === "success") {
         runtime.logger.info({
@@ -171,6 +199,7 @@ export async function executeTriggerTask(runtime, task, options) {
         error: errorMessage || undefined,
         latencyMs: finishedAt - startedAt,
         source: options.source,
+        eventKind: options.event?.kind,
     };
     const updatedTrigger = {
         ...trigger,
@@ -179,19 +208,10 @@ export async function executeTriggerTask(runtime, task, options) {
         lastStatus: status,
         lastError: errorMessage || undefined,
     };
-    if (updatedTrigger.triggerType === "once" ||
+    const shouldDeleteTask = updatedTrigger.triggerType === "once" ||
         (typeof updatedTrigger.maxRuns === "number" &&
             updatedTrigger.maxRuns > 0 &&
-            updatedTrigger.runCount >= updatedTrigger.maxRuns)) {
-        await runtime.deleteTask(task.id);
-        recordExecutionMetric(runtime.agentId, status, finishedAt);
-        return {
-            status,
-            error: errorMessage || undefined,
-            runRecord,
-            taskDeleted: true,
-        };
-    }
+            updatedTrigger.runCount >= updatedTrigger.maxRuns);
     const existingMetadata = taskMetadata(task);
     const nextMetadata = buildTriggerMetadata({
         existingMetadata,
@@ -223,12 +243,32 @@ export async function executeTriggerTask(runtime, task, options) {
         description: metadataToPersist.trigger?.displayName ?? task.description,
         metadata: metadataToPersist,
     });
+    const updatedTask = {
+        ...task,
+        description: metadataToPersist.trigger?.displayName ?? task.description,
+        metadata: metadataToPersist,
+    };
+    const triggerSummary = taskToTriggerSummary(updatedTask);
+    if (shouldDeleteTask) {
+        await runtime.deleteTask(task.id);
+        recordExecutionMetric(runtime.agentId, status, finishedAt);
+        return {
+            status,
+            error: errorMessage || undefined,
+            runRecord,
+            taskDeleted: true,
+            trigger: triggerSummary,
+            executionId: workflowExecutionId,
+        };
+    }
     recordExecutionMetric(runtime.agentId, status, finishedAt);
     return {
         status,
         error: errorMessage || undefined,
         runRecord,
         taskDeleted: false,
+        trigger: triggerSummary,
+        executionId: workflowExecutionId,
     };
 }
 export function registerTriggerTaskWorker(runtime) {
@@ -236,52 +276,137 @@ export function registerTriggerTaskWorker(runtime) {
         return;
     runtime.registerTaskWorker({
         name: TRIGGER_TASK_NAME,
-        validate: async () => true,
+        shouldRun: async () => true,
         execute: async (rt, options, task) => {
+            // Return the full result so callers (tests, dashboards) can inspect
+            // trigger-specific fields like taskDeleted and runRecord.
+            // TaskWorker.execute is typed as returning only scheduling metadata; trigger
+            // workers return TriggerExecutionResult for tests and dashboards.
             await executeTriggerTask(rt, task, {
                 source: options.source === "manual" ? "manual" : "scheduler",
                 force: options.force === true,
             });
-            return {};
+            return undefined;
         },
     });
 }
 export async function listTriggerTasks(runtime) {
     if (!triggersFeatureEnabled(runtime))
         return [];
-    return runtime.getTasks({
-        tags: [...TRIGGER_TASK_TAGS],
-        agentIds: [runtime.agentId],
-    });
+    const agentIds = [runtime.agentId];
+    const [triggerTasks, heartbeatTasks] = await Promise.all([
+        runtime.getTasks({
+            agentIds,
+            tags: ["repeat", "trigger"],
+        }),
+        runtime.getTasks({
+            agentIds,
+            tags: ["repeat", "heartbeat"],
+        }),
+    ]);
+    const merged = new Map();
+    for (const task of [...triggerTasks, ...heartbeatTasks]) {
+        const key = task.id ??
+            `${task.name ?? ""}:${task.description ?? ""}:${(task.tags ?? []).join(",")}`;
+        if (!merged.has(key)) {
+            merged.set(key, task);
+        }
+    }
+    return [...merged.values()];
 }
-export function taskToTriggerSummary(task) {
-    const trigger = readTriggerConfig(task);
-    if (!trigger || !task.id)
+function isExplicitHeartbeatTask(task) {
+    const tags = task.tags ?? [];
+    return HEARTBEAT_TASK_TAGS.every((tag) => tags.includes(tag));
+}
+/**
+ * Derive a friendly display name for a plugin-owned repeat task that
+ * doesn't carry explicit trigger metadata. Prefers the task's own
+ * `name` (e.g. "IMESSAGE_HEARTBEAT") humanized, then falls back to the
+ * first non-generic tag ("imessage", "telegram", etc.), then to a
+ * generic "System Heartbeat" label.
+ */
+function deriveSystemHeartbeatName(task) {
+    if (task.name && task.name.length > 0) {
+        return task.name
+            .replace(/_/g, " ")
+            .toLowerCase()
+            .replace(/\b\w/g, (c) => c.toUpperCase());
+    }
+    const tag = (task.tags ?? []).find((t) => t !== "queue" && t !== "repeat" && t !== "trigger");
+    if (tag) {
+        return `${tag.charAt(0).toUpperCase()}${tag.slice(1)} Heartbeat`;
+    }
+    return "System Heartbeat";
+}
+/**
+ * Synthesize a read-only TriggerSummary for an explicit heartbeat task
+ * that Eliza's trigger schema doesn't fully own. This is narrower than
+ * "any repeat task": internal queue drains and runtime schedulers should
+ * stay out of the Heartbeats UI even though they also use repeat tasks.
+ */
+function synthesizeSystemHeartbeatSummary(task) {
+    if (!task.id)
         return null;
     const metadata = taskMetadata(task);
+    const intervalMs = typeof metadata.updateInterval === "number"
+        ? metadata.updateInterval
+        : undefined;
+    const tags = task.tags ?? [];
+    // Identify the owning plugin from the third tag (first two are "queue"
+    // and "repeat"). This becomes createdBy so the UI can group by source.
+    const createdBy = tags.find((t) => t !== "queue" && t !== "repeat" && t !== "trigger") ??
+        "system";
     return {
-        id: trigger.triggerId,
+        id: task.id,
         taskId: task.id,
-        displayName: trigger.displayName,
-        instructions: trigger.instructions,
-        triggerType: trigger.triggerType,
-        enabled: trigger.enabled,
-        wakeMode: trigger.wakeMode,
-        createdBy: trigger.createdBy,
-        timezone: trigger.timezone,
-        intervalMs: trigger.intervalMs,
-        scheduledAtIso: trigger.scheduledAtIso,
-        cronExpression: trigger.cronExpression,
-        maxRuns: trigger.maxRuns,
-        runCount: trigger.runCount,
-        nextRunAtMs: trigger.nextRunAtMs,
-        lastRunAtIso: trigger.lastRunAtIso,
-        lastStatus: trigger.lastStatus,
-        lastError: trigger.lastError,
-        updatedAt: metadata.updatedAt,
-        updateInterval: metadata.updateInterval,
+        displayName: deriveSystemHeartbeatName(task),
+        instructions: task.description ?? "",
+        triggerType: "interval",
+        enabled: true,
+        wakeMode: "next_autonomy_cycle",
+        createdBy,
+        intervalMs,
+        runCount: 0,
+        updatedAt: typeof metadata.updatedAt === "number" ? metadata.updatedAt : undefined,
+        updateInterval: intervalMs,
     };
 }
+export function taskToTriggerSummary(task) {
+    const trigger = readTriggerConfig(task);
+    if (trigger && task.id) {
+        const metadata = taskMetadata(task);
+        return {
+            id: trigger.triggerId,
+            taskId: task.id,
+            displayName: trigger.displayName,
+            instructions: trigger.instructions,
+            triggerType: trigger.triggerType,
+            enabled: trigger.enabled,
+            wakeMode: trigger.wakeMode,
+            createdBy: trigger.createdBy,
+            timezone: trigger.timezone,
+            intervalMs: trigger.intervalMs,
+            scheduledAtIso: trigger.scheduledAtIso,
+            cronExpression: trigger.cronExpression,
+            eventKind: trigger.eventKind,
+            maxRuns: trigger.maxRuns,
+            runCount: trigger.runCount,
+            nextRunAtMs: trigger.nextRunAtMs,
+            lastRunAtIso: trigger.lastRunAtIso,
+            lastStatus: trigger.lastStatus,
+            lastError: trigger.lastError,
+            updatedAt: metadata.updatedAt,
+            updateInterval: metadata.updateInterval,
+            kind: trigger.kind,
+            workflowId: trigger.workflowId,
+            workflowName: trigger.workflowName,
+        };
+    }
+    if (isExplicitHeartbeatTask(task)) {
+        return synthesizeSystemHeartbeatSummary(task);
+    }
+    return null;
+}
 export async function getTriggerHealthSnapshot(runtime) {
     const tasks = await listTriggerTasks(runtime);
     let activeTriggers = 0;

package/packages/agent/src/triggers/scheduling.d.ts

@@ -1,5 +1,5 @@
 import type { UUID } from "@elizaos/core";
-import { type NormalizedTriggerDraft, type TriggerConfig, type TriggerTaskMetadata, type TriggerType, type TriggerWakeMode } from "./types";
+import { type NormalizedTriggerDraft, type TriggerConfig, type TriggerKind, type TriggerTaskMetadata, type TriggerType, type TriggerWakeMode } from "./types.ts";
 export declare const MIN_TRIGGER_INTERVAL_MS = 60000;
 export declare const MAX_TRIGGER_INTERVAL_MS: number;
 export declare const DISABLED_TRIGGER_INTERVAL_MS: number;
@@ -27,8 +27,13 @@ interface DraftInput {
     intervalMs?: number;
     scheduledAtIso?: string;
     cronExpression?: string;
+    eventKind?: string;
     maxRuns?: number;
+    kind?: TriggerKind;
+    workflowId?: string;
+    workflowName?: string;
 }
+export declare function normalizeText(value: string): string;
 export declare function parseCronExpression(expression: string): CronSchedule | null;
 export declare function computeNextCronRunAtMs(expression: string, fromMs: number, timezone?: string): number | null;
 export declare function parseScheduledAtIso(scheduledAtIso: string): number | null;
@@ -45,7 +50,10 @@ export declare function buildTriggerDedupeKey(parts: {
     intervalMs?: number;
     scheduledAtIso?: string;
     cronExpression?: string;
+    eventKind?: string;
     wakeMode: TriggerWakeMode;
+    kind?: TriggerKind;
+    workflowId?: string;
 }): string;
 export declare function buildTriggerConfig(params: {
     draft: NormalizedTriggerDraft;

package/packages/agent/src/triggers/scheduling.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"scheduling.d.ts","sourceRoot":"","sources":["../../../../../src/triggers/scheduling.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"scheduling.d.ts","sourceRoot":"","sources":["../../../../../src/triggers/scheduling.ts"],"names":[],"mappings":"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"}

package/packages/agent/src/triggers/scheduling.js

@@ -1,4 +1,4 @@
-import { TRIGGER_SCHEMA_VERSION, } from "./types";
+import { TRIGGER_SCHEMA_VERSION, } from "./types.js";
 export const MIN_TRIGGER_INTERVAL_MS = 60_000;
 export const MAX_TRIGGER_INTERVAL_MS = 31 * 24 * 60 * 60 * 1000;
 export const DISABLED_TRIGGER_INTERVAL_MS = 365 * 24 * 60 * 60 * 1000;
@@ -28,7 +28,7 @@ function clamp(value, min, max) {
         return max;
     return value;
 }
-function normalizeText(value) {
+export function normalizeText(value) {
     return value.trim().replace(/\s+/g, " ");
 }
 function parseCronPart(part, range) {
@@ -38,22 +38,24 @@ function parseCronPart(part, range) {
         const chunk = chunkRaw.trim();
         if (!chunk)
             return null;
-        const stepParts = chunk.split("/");
-        if (stepParts.length > 2)
+        const [baseRaw, stepRaw, extraStep] = chunk.split("/");
+        if (baseRaw === undefined || extraStep !== undefined)
             return null;
-        const step = stepParts.length === 2 ? parseInteger(stepParts[1].trim()) : 1;
+        const step = stepRaw === undefined ? 1 : parseInteger(stepRaw.trim());
         if (step === null || step <= 0)
             return null;
-        const base = stepParts[0].trim();
+        const base = baseRaw.trim();
         if (base === "*") {
             for (let value = range.min; value <= range.max; value += step) {
                 output.add(value);
             }
             continue;
         }
-        const rangeParts = base.split("-");
-        if (rangeParts.length === 1) {
-            const single = parseInteger(rangeParts[0].trim());
+        const [rangeStartRaw, rangeEndRaw, extraRange] = base.split("-");
+        if (rangeStartRaw === undefined || extraRange !== undefined)
+            return null;
+        if (rangeEndRaw === undefined) {
+            const single = parseInteger(rangeStartRaw.trim());
             if (single === null)
                 return null;
             if (single < range.min || single > range.max)
@@ -61,10 +63,8 @@ function parseCronPart(part, range) {
             output.add(single);
             continue;
         }
-        if (rangeParts.length !== 2)
-            return null;
-        const start = parseInteger(rangeParts[0].trim());
-        const end = parseInteger(rangeParts[1].trim());
+        const start = parseInteger(rangeStartRaw.trim());
+        const end = parseInteger(rangeEndRaw.trim());
         if (start === null || end === null)
             return null;
         if (start > end)
@@ -84,11 +84,19 @@ export function parseCronExpression(expression) {
     const parts = trimmed.split(/\s+/);
     if (parts.length !== CRON_FIELDS)
         return null;
-    const minute = parseCronPart(parts[0], CRON_RANGES[0]);
-    const hour = parseCronPart(parts[1], CRON_RANGES[1]);
-    const dayOfMonth = parseCronPart(parts[2], CRON_RANGES[2]);
-    const month = parseCronPart(parts[3], CRON_RANGES[3]);
-    const dayOfWeek = parseCronPart(parts[4], CRON_RANGES[4]);
+    const [minuteExpr, hourExpr, dayOfMonthExpr, monthExpr, dayOfWeekExpr] = parts;
+    if (minuteExpr === undefined ||
+        hourExpr === undefined ||
+        dayOfMonthExpr === undefined ||
+        monthExpr === undefined ||
+        dayOfWeekExpr === undefined) {
+        return null;
+    }
+    const minute = parseCronPart(minuteExpr, CRON_RANGES[0]);
+    const hour = parseCronPart(hourExpr, CRON_RANGES[1]);
+    const dayOfMonth = parseCronPart(dayOfMonthExpr, CRON_RANGES[2]);
+    const month = parseCronPart(monthExpr, CRON_RANGES[3]);
+    const dayOfWeek = parseCronPart(dayOfWeekExpr, CRON_RANGES[4]);
     if (!minute || !hour || !dayOfMonth || !month || !dayOfWeek) {
         return null;
     }
@@ -191,6 +199,13 @@ export function resolveTriggerTiming(trigger, nowMs) {
             nextRunAtMs,
         };
     }
+    if (trigger.triggerType === "event") {
+        return {
+            updatedAt: nowMs,
+            updateIntervalMs: DISABLED_TRIGGER_INTERVAL_MS,
+            nextRunAtMs: nowMs + DISABLED_TRIGGER_INTERVAL_MS,
+        };
+    }
     const nextRunAtMs = trigger.cronExpression
         ? computeNextCronRunAtMs(trigger.cronExpression, nowMs, trigger.timezone)
         : null;
@@ -218,14 +233,23 @@ export function buildTriggerMetadata(params) {
     };
 }
 export function buildTriggerDedupeKey(parts) {
-    const normalized = [
+    // Phase 2E: every persisted trigger is `kind: "workflow"`. Stale
+    // `kind: "text"` records are tolerated only on read (legacy hash) until
+    // the boot migration rewrites them.
+    const effectiveKind = parts.kind ?? "workflow";
+    const normalizedParts = [
         parts.triggerType,
         normalizeText(parts.instructions).toLowerCase(),
         String(parts.intervalMs ?? ""),
         parts.scheduledAtIso ?? "",
         parts.cronExpression ?? "",
+        parts.eventKind ?? "",
         parts.wakeMode,
-    ].join("|");
+    ];
+    if (effectiveKind === "workflow") {
+        normalizedParts.push(effectiveKind, parts.workflowId ?? "");
+    }
+    const normalized = normalizedParts.join("|");
     let hash = 5381;
     for (const char of normalized) {
         hash = (hash * 33) ^ char.charCodeAt(0);
@@ -253,6 +277,7 @@ export function buildTriggerConfig(params) {
         cronExpression: params.draft.triggerType === "cron"
             ? params.draft.cronExpression
             : undefined,
+        eventKind: params.draft.triggerType === "event" ? params.draft.eventKind : undefined,
         maxRuns: params.draft.maxRuns,
         runCount: previous?.runCount ?? 0,
         dedupeKey: buildTriggerDedupeKey({
@@ -261,19 +286,44 @@ export function buildTriggerConfig(params) {
             intervalMs: params.draft.intervalMs,
             scheduledAtIso: params.draft.scheduledAtIso,
             cronExpression: params.draft.cronExpression,
+            eventKind: params.draft.eventKind,
             wakeMode: params.draft.wakeMode,
+            kind: params.draft.kind,
+            workflowId: params.draft.workflowId,
         }),
         nextRunAtMs: previous?.nextRunAtMs,
         lastRunAtIso: previous?.lastRunAtIso,
         lastStatus: previous?.lastStatus,
         lastError: previous?.lastError,
+        kind: params.draft.kind,
+        workflowId: params.draft.workflowId,
+        workflowName: params.draft.workflowName,
     };
 }
 export function normalizeTriggerDraft(params) {
+    const kind = params.input.kind;
+    const workflowId = params.input.workflowId?.trim();
+    const workflowName = params.input.workflowName?.trim();
     const displayName = normalizeText(params.input.displayName ?? "") ||
         normalizeText(params.fallback.displayName);
-    const instructions = normalizeText(params.input.instructions ?? "") ||
-        normalizeText(params.fallback.instructions);
+    // Workflow-kind triggers don't require user-provided instructions; we
+    // synthesize them so display/dedupe logic downstream keeps working.
+    let instructions;
+    if (kind === "workflow") {
+        if (!workflowId) {
+            return { error: "workflowId is required for workflow triggers" };
+        }
+        const synthesized = `Run workflow ${workflowName ?? workflowId}`;
+        instructions =
+            normalizeText(params.input.instructions ?? "") ||
+                normalizeText(params.fallback.instructions) ||
+                normalizeText(synthesized);
+    }
+    else {
+        instructions =
+            normalizeText(params.input.instructions ?? "") ||
+                normalizeText(params.fallback.instructions);
+    }
     if (!displayName) {
         return { error: "displayName is required" };
     }
@@ -290,6 +340,7 @@ export function normalizeTriggerDraft(params) {
         : undefined;
     const scheduledAtIso = params.input.scheduledAtIso?.trim();
     const cronExpression = params.input.cronExpression?.trim();
+    const eventKind = params.input.eventKind?.trim();
     const maxRuns = typeof params.input.maxRuns === "number"
         ? Math.floor(params.input.maxRuns)
         : undefined;
@@ -315,6 +366,9 @@ export function normalizeTriggerDraft(params) {
                 timezone,
                 intervalMs,
                 maxRuns,
+                kind,
+                workflowId,
+                workflowName,
             },
         };
     }
@@ -333,6 +387,30 @@ export function normalizeTriggerDraft(params) {
                 timezone,
                 scheduledAtIso,
                 maxRuns,
+                kind,
+                workflowId,
+                workflowName,
+            },
+        };
+    }
+    if (triggerType === "event") {
+        if (!eventKind) {
+            return { error: "eventKind is required for event triggers" };
+        }
+        return {
+            draft: {
+                displayName,
+                instructions,
+                triggerType,
+                wakeMode,
+                enabled,
+                createdBy,
+                timezone,
+                eventKind,
+                maxRuns,
+                kind,
+                workflowId,
+                workflowName,
             },
         };
     }
@@ -350,6 +428,9 @@ export function normalizeTriggerDraft(params) {
             timezone,
             cronExpression,
             maxRuns,
+            kind,
+            workflowId,
+            workflowName,
         },
     };
 }