@amalgm/automations 0.2.2 → 0.2.4

package/dist/src/types.d.ts

@@ -1,10 +1,5 @@
 import type { Json } from './contract.js';
 export type { Json } from './contract.js';
-/** The only authenticated identity Automations accepts from Core. */
-export interface AutomationTarget {
-    userId: string;
-    targetId: string;
-}
 interface StoredTriggerBase {
     userId: string;
     automationId: string;
@@ -13,9 +8,10 @@ interface StoredTriggerBase {
 }
 export interface StoredEventTrigger extends StoredTriggerBase {
     kind: 'event';
+    endpointId: string;
     source: string;
     event: string;
-    secret: string;
+    secret: string | null;
 }
 export interface DueCronTrigger extends StoredTriggerBase {
     kind: 'cron';
@@ -32,6 +28,9 @@ export type RunInput = {
 } | {
     kind: 'cron';
     scheduledFor: string;
+} | {
+    kind: 'manual';
+    payload: Json;
 };
 export type RunStatus = 'pending' | 'sent' | 'running' | 'completed' | 'failed';
 export interface AutomationRun {
@@ -52,11 +51,11 @@ export interface AutomationRun {
     error?: string;
 }
 export interface AutomationStore {
-    eventTriggers(target: AutomationTarget): Promise<StoredEventTrigger[]>;
+    eventTrigger(endpointId: string): Promise<StoredEventTrigger | null>;
     dueCronTriggers(now: Date): Promise<DueCronTrigger[]>;
     enqueueEvent(trigger: StoredEventTrigger, input: Extract<RunInput, {
         kind: 'event';
-    }>, now: Date): Promise<AutomationRun | null>;
+    }>, now: Date, deliveryKey: string | null): Promise<AutomationRun | null>;
     enqueueCron(trigger: DueCronTrigger, nextRunAt: string, now: Date): Promise<AutomationRun | null>;
 }
 export type AutomationLog = (event: 'event.rejected' | 'run.pending', details: Readonly<Record<string, string>>) => void;

package/dist/src/webhook.d.ts

@@ -1,6 +1,20 @@
 import type { Json, StoredEventTrigger } from './types.js';
 export declare function normalizeHeaders(headers: Record<string, string>): Record<string, string>;
-export declare function verifyEventSecret(secret: string, headers: Record<string, string>, body: Buffer): boolean;
+export declare function verifyEventSecret(secret: string | null, headers: Record<string, string>, body: Buffer): boolean;
+/**
+ * Generates and verifies the bearer capability embedded in a webhook URL.
+ * Supabase stores only the random endpoint id; possession also requires the
+ * service-held HMAC key, so a database read cannot mint working URLs.
+ */
+export declare class WebhookEndpoints {
+    #private;
+    readonly origin: string;
+    constructor(origin: string, key: string | Buffer, randomId?: () => string);
+    createId(): string;
+    url(id: string): string;
+    resolve(token: string): string | null;
+}
+export declare function webhookDeliveryKey(headers: Record<string, string>, payload: Json): string | null;
 export declare function matchesEvent(trigger: Pick<StoredEventTrigger, 'source' | 'event'>, source: string, event: string): boolean;
 export declare function eventReferences(headers: Record<string, string>, payload: Json): {
     primary: {

package/dist/src/webhook.js

@@ -1,6 +1,16 @@
 import crypto from 'node:crypto';
 const HMAC_HEADERS = ['x-webhook-signature', 'x-hub-signature-256', 'x-hub-signature'];
 const TOKEN_HEADERS = ['x-amalgm-webhook-secret', 'x-webhook-secret', 'x-gitlab-token'];
+const DELIVERY_HEADERS = [
+    'idempotency-key',
+    'x-github-delivery',
+    'x-gitlab-event-uuid',
+    'x-linear-delivery',
+    'svix-id',
+    'webhook-id',
+];
+const ENDPOINT_ID = /^[a-f0-9]{32}$/;
+const MAX_DELIVERY_KEY_BYTES = 500;
 function equal(left, right) {
     const a = Buffer.from(left);
     const b = Buffer.from(right);
@@ -10,6 +20,8 @@ export function normalizeHeaders(headers) {
     return Object.fromEntries(Object.entries(headers).map(([name, value]) => [name.toLowerCase(), value]));
 }
 export function verifyEventSecret(secret, headers, body) {
+    if (secret === null)
+        return true;
     const normalized = normalizeHeaders(headers);
     for (const name of HMAC_HEADERS) {
         const supplied = normalized[name];
@@ -28,6 +40,63 @@ export function verifyEventSecret(secret, headers, body) {
     }
     return false;
 }
+/**
+ * Generates and verifies the bearer capability embedded in a webhook URL.
+ * Supabase stores only the random endpoint id; possession also requires the
+ * service-held HMAC key, so a database read cannot mint working URLs.
+ */
+export class WebhookEndpoints {
+    origin;
+    #key;
+    #randomId;
+    constructor(origin, key, randomId = endpointId) {
+        this.origin = webhookOrigin(origin);
+        this.#key = Buffer.isBuffer(key) ? Buffer.from(key) : Buffer.from(key, 'utf8');
+        if (this.#key.length < 32)
+            throw new Error('Webhook endpoint key must contain at least 32 bytes');
+        this.#randomId = randomId;
+    }
+    createId() {
+        const value = this.#randomId();
+        if (!ENDPOINT_ID.test(value))
+            throw new Error('Webhook endpoint id must be 128-bit lowercase hex');
+        return value;
+    }
+    url(id) {
+        if (!ENDPOINT_ID.test(id))
+            throw new Error('Invalid webhook endpoint id');
+        return `${this.origin}/e/${id}.${this.#signature(id)}`;
+    }
+    resolve(token) {
+        const separator = token.indexOf('.');
+        if (separator === -1 || token.indexOf('.', separator + 1) !== -1)
+            return null;
+        const id = token.slice(0, separator);
+        const supplied = token.slice(separator + 1);
+        if (!ENDPOINT_ID.test(id) || !supplied || !equal(supplied, this.#signature(id)))
+            return null;
+        return id;
+    }
+    #signature(id) {
+        return crypto.createHmac('sha256', this.#key).update(id).digest('base64url');
+    }
+}
+export function webhookDeliveryKey(headers, payload) {
+    const normalized = normalizeHeaders(headers);
+    for (const name of DELIVERY_HEADERS) {
+        const value = normalized[name]?.trim();
+        if (!value)
+            continue;
+        return boundedDeliveryKey(`${name}:${value}`);
+    }
+    if (normalized['stripe-signature']) {
+        const object = payload && typeof payload === 'object' && !Array.isArray(payload) ? payload : {};
+        if (typeof object.id === 'string' && object.id.trim()) {
+            return boundedDeliveryKey(`stripe-event:${object.id.trim()}`);
+        }
+    }
+    return null;
+}
 export function matchesEvent(trigger, source, event) {
     return (trigger.source === '*' || trigger.source === source)
         && (trigger.event === '*' || trigger.event === event);
@@ -58,3 +127,20 @@ export function eventReferences(headers, payload) {
 export function eventReference(headers, payload) {
     return eventReferences(headers, payload).primary;
 }
+const endpointId = () => crypto.randomBytes(16).toString('hex');
+function webhookOrigin(value) {
+    const parsed = new URL(value);
+    const local = parsed.hostname === 'localhost' || parsed.hostname === '127.0.0.1' || parsed.hostname.endsWith('.local');
+    if (parsed.protocol !== 'https:' && !(local && parsed.protocol === 'http:')) {
+        throw new Error('Webhook origin must use HTTPS');
+    }
+    if (parsed.pathname !== '/' || parsed.search || parsed.hash)
+        throw new Error('Webhook origin cannot include a path');
+    return parsed.toString().replace(/\/$/, '');
+}
+function boundedDeliveryKey(value) {
+    if (Buffer.byteLength(value) > MAX_DELIVERY_KEY_BYTES) {
+        throw Object.assign(new Error('Webhook delivery id is too long'), { status: 400 });
+    }
+    return value;
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@amalgm/automations",
-  "version": "0.2.2",
+  "version": "0.2.4",
   "description": "Amalgm's automation SDK: durable trigger admission and target-machine execution.",
   "license": "UNLICENSED",
   "repository": {

package/skills/automations/SKILL.md

@@ -1,6 +1,6 @@
 ---
 name: automations
-description: Create, inspect, change, or delete complete Amalgm automation definitions and inspect their run history through the Automations MCP tools.
+description: Create, inspect, change, delete, or manually run complete Amalgm automation definitions and inspect their run history through the Automations MCP tools.
 ---
 
 # Amalgm Automations
@@ -46,12 +46,20 @@ distinct resources inside the definition. A workflow is zero-or-one per
 automation. Run history is read-only, requested through `get`, and remains
 after configuration deletion.
 
-Action discovery belongs to the Tools product, not Automations. Manual
-execution is not advertised until the delivery SDK supports it.
+Use `amalgm_automations_run_now` when the user wants an enabled automation to
+run immediately. Supply `idempotency_key` when a caller may retry the same
+request. The result is a durable `pending` run, not proof that its selected
+machine has finished it; use `amalgm_automations_get` with run history when the
+user asks for the outcome.
+
+Action discovery belongs to the Tools product, not Automations.
 
 `pending` means a run is durable and waiting for its selected machine. `sent`
 or `running` means that machine holds a lease. `completed` and `failed` are
 terminal. Do not infer delivery from the schedule alone; inspect runs when the
 user asks whether it actually happened.
 
-Webhook secrets are write-only. Never echo, log, or place them in a workflow.
+Each webhook trigger returns one copyable `webhookUrl`; use that URL as the
+provider destination. A separate provider signing secret is optional and
+write-only. Never echo, log, or place either credential in a workflow. Rotate
+the URL when its bearer capability may have been exposed.

package/supabase/migrations/20260831010000_public_webhook_endpoints.sql

@@ -0,0 +1,287 @@
+-- One public webhook URL resolves exactly one trigger. The endpoint locator is
+-- not itself a credential: the hosted service adds and verifies its HMAC.
+
+ALTER TABLE public.amalgm_automation_triggers
+  ADD COLUMN IF NOT EXISTS endpoint_id text;
+
+UPDATE public.amalgm_automation_triggers
+SET endpoint_id = encode(gen_random_bytes(16), 'hex')
+WHERE kind = 'webhook' AND endpoint_id IS NULL;
+
+CREATE UNIQUE INDEX IF NOT EXISTS amalgm_webhook_endpoint_id
+  ON public.amalgm_automation_triggers(endpoint_id)
+  WHERE endpoint_id IS NOT NULL;
+
+DO $$
+DECLARE
+  v_constraint text;
+BEGIN
+  SELECT c.conname INTO v_constraint
+  FROM pg_constraint c
+  WHERE c.conrelid = 'public.amalgm_automation_triggers'::regclass
+    AND c.contype = 'c'
+    AND pg_get_constraintdef(c.oid) LIKE '%length(secret)%'
+  LIMIT 1;
+  IF v_constraint IS NOT NULL THEN
+    EXECUTE format('ALTER TABLE public.amalgm_automation_triggers DROP CONSTRAINT %I', v_constraint);
+  END IF;
+END;
+$$;
+
+ALTER TABLE public.amalgm_automation_triggers
+  DROP CONSTRAINT IF EXISTS amalgm_automation_trigger_shape;
+ALTER TABLE public.amalgm_automation_triggers
+  ADD CONSTRAINT amalgm_automation_trigger_shape CHECK (
+    (kind = 'schedule' AND cron IS NOT NULL AND timezone IS NOT NULL
+      AND next_run_at IS NOT NULL AND source IS NULL AND event IS NULL
+      AND secret IS NULL AND endpoint_id IS NULL)
+    OR
+    (kind = 'webhook' AND cron IS NULL AND timezone IS NULL
+      AND next_run_at IS NULL AND source IS NOT NULL AND event IS NOT NULL
+      AND (secret IS NULL OR length(secret) >= 16)
+      AND endpoint_id ~ '^[a-f0-9]{32}$')
+  );
+
+ALTER TABLE public.amalgm_automation_runs
+  ADD COLUMN IF NOT EXISTS delivery_key text;
+
+ALTER TABLE public.amalgm_automation_runs
+  DROP CONSTRAINT IF EXISTS amalgm_automation_run_delivery_key;
+ALTER TABLE public.amalgm_automation_runs
+  ADD CONSTRAINT amalgm_automation_run_delivery_key CHECK (
+    delivery_key IS NULL OR length(delivery_key) BETWEEN 1 AND 500
+  );
+
+CREATE UNIQUE INDEX IF NOT EXISTS amalgm_automation_webhook_delivery
+  ON public.amalgm_automation_runs(user_id, automation_id, trigger_id, delivery_key)
+  WHERE delivery_key IS NOT NULL;
+
+CREATE OR REPLACE FUNCTION public.amalgm_trigger_json(p_trigger public.amalgm_automation_triggers)
+RETURNS jsonb
+LANGUAGE sql
+IMMUTABLE
+SET search_path = public
+AS $$
+  SELECT jsonb_strip_nulls(jsonb_build_object(
+    'id', p_trigger.id,
+    'automation_id', p_trigger.automation_id,
+    'kind', p_trigger.kind,
+    'enabled', p_trigger.enabled,
+    'cron', p_trigger.cron,
+    'timezone', p_trigger.timezone,
+    'next_run_at', p_trigger.next_run_at,
+    'max_occurrences', p_trigger.max_occurrences,
+    'remaining_occurrences', p_trigger.remaining_occurrences,
+    'source', p_trigger.source,
+    'event', p_trigger.event,
+    'endpoint_id', p_trigger.endpoint_id,
+    'secret_configured', p_trigger.secret IS NOT NULL,
+    'created_at', p_trigger.created_at,
+    'updated_at', p_trigger.updated_at
+  ));
+$$;
+
+CREATE OR REPLACE FUNCTION public.create_amalgm_webhook_trigger(
+  p_user_id uuid,
+  p_automation_id text,
+  p_trigger jsonb
+)
+RETURNS jsonb
+LANGUAGE plpgsql
+SECURITY DEFINER
+SET search_path = public
+AS $$
+DECLARE
+  v_row public.amalgm_automation_triggers;
+BEGIN
+  INSERT INTO public.amalgm_automation_triggers (
+    user_id, automation_id, id, kind, enabled, source, event, secret, endpoint_id
+  )
+  SELECT p_user_id, p_automation_id, p_trigger->>'id', 'webhook',
+    (p_trigger->>'enabled')::boolean, p_trigger->>'source', p_trigger->>'event',
+    NULLIF(p_trigger->>'secret', ''), p_trigger->>'endpointId'
+  WHERE EXISTS (
+    SELECT 1 FROM public.amalgm_automations
+    WHERE user_id = p_user_id AND id = p_automation_id
+  )
+  RETURNING * INTO v_row;
+  IF NOT FOUND THEN RETURN NULL; END IF;
+  RETURN public.amalgm_trigger_json(v_row);
+END;
+$$;
+
+CREATE OR REPLACE FUNCTION public.update_amalgm_webhook_trigger(
+  p_user_id uuid,
+  p_automation_id text,
+  p_trigger_id text,
+  p_patch jsonb
+)
+RETURNS jsonb
+LANGUAGE plpgsql
+SECURITY DEFINER
+SET search_path = public
+AS $$
+DECLARE
+  v_row public.amalgm_automation_triggers;
+BEGIN
+  UPDATE public.amalgm_automation_triggers SET
+    source = CASE WHEN p_patch ? 'source' THEN p_patch->>'source' ELSE source END,
+    event = CASE WHEN p_patch ? 'event' THEN p_patch->>'event' ELSE event END,
+    secret = CASE WHEN p_patch ? 'secret' THEN p_patch->>'secret' ELSE secret END,
+    endpoint_id = CASE WHEN p_patch ? 'endpointId' THEN p_patch->>'endpointId' ELSE endpoint_id END,
+    enabled = CASE WHEN p_patch ? 'enabled' THEN (p_patch->>'enabled')::boolean ELSE enabled END,
+    updated_at = now()
+  WHERE user_id = p_user_id AND automation_id = p_automation_id
+    AND id = p_trigger_id AND kind = 'webhook'
+  RETURNING * INTO v_row;
+  IF NOT FOUND THEN RETURN NULL; END IF;
+  RETURN public.amalgm_trigger_json(v_row);
+END;
+$$;
+
+CREATE FUNCTION public.resolve_amalgm_webhook(p_endpoint_id text)
+RETURNS TABLE (
+  user_id uuid,
+  automation_id text,
+  trigger_id text,
+  target_id text,
+  endpoint_id text,
+  source text,
+  event text,
+  secret text
+)
+LANGUAGE sql
+SECURITY DEFINER
+SET search_path = public
+AS $$
+  SELECT t.user_id, t.automation_id, t.id, a.target_id,
+    t.endpoint_id, t.source, t.event, t.secret
+  FROM public.amalgm_automation_triggers t
+  JOIN public.amalgm_automations a
+    ON a.user_id = t.user_id AND a.id = t.automation_id
+  JOIN public.amalgm_automation_workflows w
+    ON w.user_id = a.user_id AND w.automation_id = a.id
+  WHERE t.kind = 'webhook' AND t.endpoint_id = p_endpoint_id
+    AND t.enabled AND a.enabled
+    AND jsonb_typeof(w.compiled) = 'object'
+    AND w.compiled->>'version' = '1'
+    AND jsonb_typeof(w.compiled->'steps') = 'array'
+    AND jsonb_array_length(
+      CASE WHEN jsonb_typeof(w.compiled->'steps') = 'array'
+        THEN w.compiled->'steps' ELSE '[]'::jsonb END
+    ) BETWEEN 1 AND 100;
+$$;
+
+CREATE FUNCTION public.enqueue_amalgm_run(
+  p_kind text,
+  p_user_id uuid,
+  p_automation_id text,
+  p_trigger_id text,
+  p_target_id text,
+  p_endpoint_id text,
+  p_delivery_key text,
+  p_expected_next_run_at timestamptz,
+  p_next_run_at timestamptz,
+  p_input jsonb,
+  p_now timestamptz
+) RETURNS SETOF public.amalgm_automation_runs
+LANGUAGE plpgsql
+SECURITY DEFINER
+SET search_path = public
+AS $$
+DECLARE
+  v_inserted integer := 0;
+BEGIN
+  IF p_kind = 'cron' THEN
+    IF p_endpoint_id IS NOT NULL OR p_delivery_key IS NOT NULL THEN
+      RAISE EXCEPTION 'Schedule admission cannot carry webhook identity';
+    END IF;
+    PERFORM 1
+    FROM public.amalgm_automation_triggers t
+    JOIN public.amalgm_automations a
+      ON a.user_id = t.user_id AND a.id = t.automation_id
+    WHERE t.user_id = p_user_id AND t.automation_id = p_automation_id
+      AND t.id = p_trigger_id AND a.target_id = p_target_id
+      AND t.kind = 'schedule' AND t.next_run_at = p_expected_next_run_at
+      AND (t.remaining_occurrences IS NULL OR t.remaining_occurrences > 0)
+      AND t.enabled AND a.enabled
+    FOR UPDATE OF t;
+  ELSIF p_kind = 'event' THEN
+    IF p_endpoint_id IS NULL THEN RAISE EXCEPTION 'Webhook endpoint is required'; END IF;
+    PERFORM 1
+    FROM public.amalgm_automation_triggers t
+    JOIN public.amalgm_automations a
+      ON a.user_id = t.user_id AND a.id = t.automation_id
+    WHERE t.user_id = p_user_id AND t.automation_id = p_automation_id
+      AND t.id = p_trigger_id AND a.target_id = p_target_id
+      AND t.kind = 'webhook' AND t.endpoint_id = p_endpoint_id
+      AND t.enabled AND a.enabled;
+  ELSE
+    RAISE EXCEPTION 'Invalid automation trigger kind';
+  END IF;
+  IF NOT FOUND THEN RETURN; END IF;
+
+  RETURN QUERY
+  INSERT INTO public.amalgm_automation_runs (
+    user_id, target_id, automation_id, trigger_id, workflow_id,
+    automation_payload, input, status, delivery_key, created_at
+  )
+  SELECT a.user_id, a.target_id, a.id, t.id, w.id,
+    jsonb_strip_nulls(jsonb_build_object(
+      'id', a.id, 'targetId', a.target_id, 'name', a.name,
+      'description', a.description, 'enabled', a.enabled,
+      'trigger', jsonb_strip_nulls(jsonb_build_object(
+        'id', t.id,
+        'kind', CASE WHEN t.kind = 'schedule' THEN 'cron' ELSE 'event' END,
+        'enabled', t.enabled, 'cron', t.cron, 'timezone', t.timezone,
+        'source', t.source, 'event', t.event
+      )),
+      'workflow', jsonb_strip_nulls(jsonb_build_object(
+        'id', w.id, 'name', w.name, 'script', w.script,
+        'compiled', w.compiled, 'allowlist', w.allowlist, 'limits', w.limits
+      ))
+    )),
+    p_input, 'pending', p_delivery_key, p_now
+  FROM public.amalgm_automations a
+  JOIN public.amalgm_automation_triggers t
+    ON t.user_id = a.user_id AND t.automation_id = a.id
+  JOIN public.amalgm_automation_workflows w
+    ON w.user_id = a.user_id AND w.automation_id = a.id
+  WHERE a.user_id = p_user_id AND a.id = p_automation_id AND t.id = p_trigger_id
+    AND a.target_id = p_target_id AND t.enabled AND a.enabled
+    AND (p_kind = 'cron' OR (t.kind = 'webhook' AND t.endpoint_id = p_endpoint_id))
+    AND jsonb_typeof(w.compiled) = 'object'
+    AND w.compiled->>'version' = '1'
+    AND jsonb_typeof(w.compiled->'steps') = 'array'
+    AND jsonb_array_length(
+      CASE WHEN jsonb_typeof(w.compiled->'steps') = 'array'
+        THEN w.compiled->'steps' ELSE '[]'::jsonb END
+    ) BETWEEN 1 AND 100
+  ON CONFLICT (user_id, automation_id, trigger_id, delivery_key)
+    WHERE delivery_key IS NOT NULL
+  DO UPDATE SET delivery_key = EXCLUDED.delivery_key
+  RETURNING *;
+  GET DIAGNOSTICS v_inserted = ROW_COUNT;
+
+  IF p_kind = 'cron' AND v_inserted = 1 THEN
+    UPDATE public.amalgm_automation_triggers SET
+      next_run_at = p_next_run_at,
+      remaining_occurrences = CASE WHEN remaining_occurrences IS NULL
+        THEN NULL ELSE remaining_occurrences - 1 END,
+      enabled = CASE WHEN remaining_occurrences = 1 THEN false ELSE enabled END,
+      updated_at = p_now
+    WHERE user_id = p_user_id AND automation_id = p_automation_id
+      AND id = p_trigger_id AND kind = 'schedule'
+      AND next_run_at = p_expected_next_run_at;
+  END IF;
+END;
+$$;
+
+REVOKE ALL ON FUNCTION public.resolve_amalgm_webhook(text) FROM PUBLIC;
+REVOKE ALL ON FUNCTION public.enqueue_amalgm_run(
+  text, uuid, text, text, text, text, text, timestamptz, timestamptz, jsonb, timestamptz
+) FROM PUBLIC;
+GRANT EXECUTE ON FUNCTION public.resolve_amalgm_webhook(text) TO service_role;
+GRANT EXECUTE ON FUNCTION public.enqueue_amalgm_run(
+  text, uuid, text, text, text, text, text, timestamptz, timestamptz, jsonb, timestamptz
+) TO service_role;

package/supabase/migrations/20260831020000_manual_run_admission.sql

@@ -0,0 +1,68 @@
+-- Run Now is triggerless admission into the existing durable run ledger. The
+-- selected machine claims and executes the resulting pending run normally.
+
+CREATE FUNCTION public.enqueue_amalgm_manual_run(
+  p_user_id uuid,
+  p_automation_id text,
+  p_input jsonb,
+  p_idempotency_key text,
+  p_now timestamptz
+) RETURNS SETOF public.amalgm_automation_runs
+LANGUAGE plpgsql
+SECURITY DEFINER
+SET search_path = public
+AS $$
+BEGIN
+  IF p_idempotency_key IS NOT NULL THEN
+    RETURN QUERY
+    SELECT r.*
+    FROM public.amalgm_automation_runs r
+    WHERE r.user_id = p_user_id
+      AND r.automation_id = p_automation_id
+      AND r.trigger_id = '@manual'
+      AND r.delivery_key = p_idempotency_key;
+    IF FOUND THEN RETURN; END IF;
+  END IF;
+
+  RETURN QUERY
+  INSERT INTO public.amalgm_automation_runs (
+    user_id, target_id, automation_id, trigger_id, workflow_id,
+    automation_payload, input, status, delivery_key, created_at
+  )
+  SELECT a.user_id, a.target_id, a.id, '@manual', w.id,
+    jsonb_strip_nulls(jsonb_build_object(
+      'id', a.id, 'targetId', a.target_id, 'name', a.name,
+      'description', a.description, 'enabled', a.enabled,
+      'trigger', jsonb_build_object(
+        'id', '@manual', 'kind', 'manual', 'enabled', true
+      ),
+      'workflow', jsonb_strip_nulls(jsonb_build_object(
+        'id', w.id, 'name', w.name, 'script', w.script,
+        'compiled', w.compiled, 'allowlist', w.allowlist, 'limits', w.limits
+      ))
+    )),
+    p_input, 'pending', p_idempotency_key, p_now
+  FROM public.amalgm_automations a
+  JOIN public.amalgm_automation_workflows w
+    ON w.user_id = a.user_id AND w.automation_id = a.id
+  WHERE a.user_id = p_user_id AND a.id = p_automation_id AND a.enabled
+    AND jsonb_typeof(w.compiled) = 'object'
+    AND w.compiled->>'version' = '1'
+    AND jsonb_typeof(w.compiled->'steps') = 'array'
+    AND jsonb_array_length(
+      CASE WHEN jsonb_typeof(w.compiled->'steps') = 'array'
+        THEN w.compiled->'steps' ELSE '[]'::jsonb END
+    ) BETWEEN 1 AND 100
+  ON CONFLICT (user_id, automation_id, trigger_id, delivery_key)
+    WHERE delivery_key IS NOT NULL
+  DO UPDATE SET delivery_key = EXCLUDED.delivery_key
+  RETURNING *;
+END;
+$$;
+
+REVOKE ALL ON FUNCTION public.enqueue_amalgm_manual_run(
+  uuid, text, jsonb, text, timestamptz
+) FROM PUBLIC;
+GRANT EXECUTE ON FUNCTION public.enqueue_amalgm_manual_run(
+  uuid, text, jsonb, text, timestamptz
+) TO service_role;