diff --git a/.claude/settings.json b/.claude/settings.json
new file mode 100644
index 0000000..7b0c17c
--- /dev/null
+++ b/.claude/settings.json
@@ -0,0 +1,17 @@
+{
+  "permissions": {
+    "allow": [
+      "Bash(git check-ignore *)",
+      "Bash(rm -f bun.lockb)",
+      "Bash(rm -rf node_modules)",
+      "Bash(echo \"exit:$?\")",
+      "Bash(cd \"/Users/arjunkrishna/Developer/My Projects/nodrix\" && rm -f /tmp/kysely-test-bundle.js && echo \"=== .gitignore lock entries ===\" && grep -n \"lock\" .gitignore)",
+      "Bash(curl -s \"https://www.googleapis.com/pagespeedonline/v5/runPagespeed?url=https://nodrix.live&strategy=mobile&category=performance\")",
+      "WebFetch(domain:pagespeed.web.dev)",
+      "mcp__plugin_cloudflare_cloudflare-docs__search_cloudflare_documentation"
+    ],
+    "additionalDirectories": [
+      "/private/tmp"
+    ]
+  }
+}
diff --git a/internal b/internal
index 0b559bb..49283a0 160000
--- a/internal
+++ b/internal
@@ -1 +1 @@
-Subproject commit 0b559bbe377d8fe28240793ef7b134646625ddb4
+Subproject commit 49283a0b7013e67e8b5d12c271cec650524fc793
diff --git a/shared/blocks/actions.ts b/shared/blocks/actions.ts
new file mode 100644
index 0000000..2e45fde
--- /dev/null
+++ b/shared/blocks/actions.ts
@@ -0,0 +1,43 @@
+// Action block manifests. Per-kind run logic lives in the worker engine.
+
+import type { BlockManifest } from './index';
+
+export const ACTION_CATALOG = [
+  {
+    kind: 'set_variable',
+    category: 'action',
+    label: 'Set variable',
+    description: 'Write a value to a variable (queued as a control write).',
+    icon: 'M10.5 6h9.75M10.5 6a1.5 1.5 0 1 1-3 0m3 0a1.5 1.5 0 1 0-3 0M3.75 6H7.5m3 12h9.75m-9.75 0a1.5 1.5 0 0 1-3 0m3 0a1.5 1.5 0 0 0-3 0m-3.75 0H7.5m9-6h3.75m-3.75 0a1.5 1.5 0 0 1-3 0m3 0a1.5 1.5 0 0 0-3 0m-9.75 0h9.75',
+    executable: true,
+    ports: { in: ['in'], out: ['out'] },
+    fields: [
+      { key: 'variable', label: 'Variable', type: 'variable', required: true },
+      { key: 'value', label: 'Value', type: 'text', placeholder: 'value' },
+    ],
+  },
+  {
+    kind: 'call_integration',
+    category: 'action',
+    label: 'Call integration',
+    description: 'Invoke a configured integration (webhook, HTTP, email, …).',
+    icon: 'm3.75 13.5 10.5-11.25L12 10.5h8.25L9.75 21.75 12 13.5H3.75Z',
+    executable: true,
+    ports: { in: ['in'], out: ['out'] },
+    fields: [
+      { key: 'integration_id', label: 'Integration', type: 'integration', required: true },
+    ],
+  },
+  {
+    kind: 'emit_event',
+    category: 'action',
+    label: 'Emit event',
+    description: 'Fire a named event that other event-triggered automations can react to.',
+    icon: 'M10.34 15.84c-.688-.06-1.386-.09-2.09-.09H7.5a4.5 4.5 0 1 1 0-9h.75c.704 0 1.402-.03 2.09-.09m0 9.18c.253.962.584 1.892.985 2.783.247.55.06 1.21-.463 1.511l-.657.38c-.551.318-1.26.117-1.527-.461a20.845 20.845 0 0 1-1.44-4.282m3.102.069a18.03 18.03 0 0 1-.59-4.59c0-1.586.205-3.124.59-4.59m0 9.18a23.848 23.848 0 0 1 8.835 2.535M10.34 6.66a23.847 23.847 0 0 0 8.835-2.535m0 0A23.74 23.74 0 0 0 18.795 3m.38 1.125a23.91 23.91 0 0 1 1.014 5.395m-1.014 8.855c-.118.38-.245.754-.38 1.125m.38-1.125a23.91 23.91 0 0 0 1.014-5.395m0-3.46c.495.413.811 1.035.811 1.73 0 .695-.316 1.317-.811 1.73m0-3.46a24.347 24.347 0 0 1 0 3.46',
+    executable: true,
+    ports: { in: ['in'] },
+    fields: [
+      { key: 'event', label: 'Event name', type: 'text', required: true, mono: true, placeholder: 'event name' },
+    ],
+  },
+] as const satisfies readonly BlockManifest[];
diff --git a/shared/blocks/graph.ts b/shared/blocks/graph.ts
new file mode 100644
index 0000000..6a2d7c6
--- /dev/null
+++ b/shared/blocks/graph.ts
@@ -0,0 +1,125 @@
+// The automation flow-graph model + pure helpers, shared by the worker engine
+// (executor, scheduler, hot path) and the web editor (canvas, validation, save).
+
+import { VALID_TRIGGER_KINDS, VALID_ACTION_KINDS } from './index';
+
+export type GraphNode = {
+  id: string;
+  kind: string;                        // trigger/action kind from the catalog
+  config: Record<string, unknown>;
+  x?: number;                          // canvas position (editor only)
+  y?: number;
+};
+
+export type GraphEdge = {
+  from: string;                        // source node id
+  to: string;                          // target node id
+  port?: string;                       // source output port; default 'out'
+};
+
+export type AutomationGraph = { nodes: GraphNode[]; edges: GraphEdge[] };
+
+// Builds a linear trigger → action chain from legacy parts. Shared by the worker
+// convert-on-read shim and the editor's "open a pre-graph automation" path.
+export function buildLinearGraph(
+  triggerKind: string | undefined,
+  triggerConfig: Record<string, unknown>,
+  actions: unknown[]
+): AutomationGraph {
+  const nodes: GraphNode[] = [];
+  const edges: GraphEdge[] = [];
+
+  if (triggerKind && VALID_TRIGGER_KINDS.has(triggerKind)) {
+    nodes.push({ id: 'trigger', kind: triggerKind, config: triggerConfig ?? {} });
+  }
+
+  let prev: string | null = nodes.length ? 'trigger' : null;
+  let i = 0;
+  for (const raw of actions) {
+    if (!raw || typeof raw !== 'object') continue;
+    const { type, ...config } = raw as Record<string, unknown> & { type?: unknown };
+    if (typeof type !== 'string' || !VALID_ACTION_KINDS.has(type)) continue;
+    const id = `a${i++}`;
+    nodes.push({ id, kind: type, config });
+    if (prev) edges.push({ from: prev, to: id, port: 'out' });
+    prev = id;
+  }
+
+  return { nodes, edges };
+}
+
+export function isGraph(v: unknown): v is AutomationGraph {
+  return !!v && typeof v === 'object'
+    && Array.isArray((v as AutomationGraph).nodes)
+    && Array.isArray((v as AutomationGraph).edges);
+}
+
+export function triggerNodes(graph: AutomationGraph): GraphNode[] {
+  return graph.nodes.filter((n) => VALID_TRIGGER_KINDS.has(n.kind));
+}
+
+export function actionNodes(graph: AutomationGraph): GraphNode[] {
+  return graph.nodes.filter((n) => VALID_ACTION_KINDS.has(n.kind));
+}
+
+export function countActionNodes(graph: AutomationGraph): number {
+  return actionNodes(graph).length;
+}
+
+// Entrypoint: the first node (trigger, or the head of the action chain when a
+// row has no valid trigger — keeps an orphaned automation runnable).
+export function entryNode(graph: AutomationGraph): GraphNode | undefined {
+  return graph.nodes[0];
+}
+
+export function nodesById(graph: AutomationGraph): Map<string, GraphNode> {
+  return new Map(graph.nodes.map((n) => [n.id, n]));
+}
+
+export function outgoingEdges(graph: AutomationGraph, nodeId: string): GraphEdge[] {
+  return graph.edges.filter((e) => e.from === nodeId);
+}
+
+// ",kind,kind," membership string for the denormalized trigger_kinds column.
+export function serializeTriggerKinds(graph: AutomationGraph): string {
+  const kinds = [...new Set(triggerNodes(graph).map((n) => n.kind))];
+  return kinds.length ? `,${kinds.join(',')},` : '';
+}
+
+// Validates a graph for saving. Returns an error message, or null if valid.
+// Enforces: ≥1 trigger, known node kinds, edges reference real nodes, and DAG
+// (no cycles) — the executor relies on acyclicity for its bounded traversal.
+export function graphError(graph: AutomationGraph): string | null {
+  if (triggerNodes(graph).length === 0) return 'Add at least one trigger.';
+
+  const ids = new Set(graph.nodes.map((n) => n.id));
+  for (const n of graph.nodes) {
+    if (!VALID_TRIGGER_KINDS.has(n.kind) && !VALID_ACTION_KINDS.has(n.kind)) {
+      return `Unknown block kind: ${n.kind}`;
+    }
+  }
+  for (const e of graph.edges) {
+    if (!ids.has(e.from) || !ids.has(e.to)) return 'An edge references a missing node.';
+  }
+  if (hasCycle(graph)) return 'Connections must not form a loop.';
+  return null;
+}
+
+function hasCycle(graph: AutomationGraph): boolean {
+  const adj = new Map<string, string[]>();
+  for (const e of graph.edges) (adj.get(e.from) ?? adj.set(e.from, []).get(e.from)!).push(e.to);
+
+  const state = new Map<string, 0 | 1 | 2>(); // 0=visiting, 2=done
+  const dfs = (id: string): boolean => {
+    state.set(id, 0);
+    for (const to of adj.get(id) ?? []) {
+      const s = state.get(to);
+      if (s === 0) return true;          // back-edge → cycle
+      if (s === undefined && dfs(to)) return true;
+    }
+    state.set(id, 2);
+    return false;
+  };
+  for (const n of graph.nodes) if (state.get(n.id) === undefined && dfs(n.id)) return true;
+  return false;
+}
diff --git a/shared/blocks/index.ts b/shared/blocks/index.ts
new file mode 100644
index 0000000..986ab3f
--- /dev/null
+++ b/shared/blocks/index.ts
@@ -0,0 +1,97 @@
+// Manifest-driven catalog of automation blocks (triggers + actions). Per-kind
+// eval/run lives in the worker engine, so these are pure metadata; the kind enums
+// and validation sets all derive from here. Worker-safe (no fetch/DOM).
+
+import type { SummaryDescriptor } from '@nodrix/integrations-shared';
+import { TRIGGER_CATALOG } from './triggers';
+import { ACTION_CATALOG } from './actions';
+
+export { TRIGGER_CATALOG } from './triggers';
+export { ACTION_CATALOG } from './actions';
+export * from './graph';
+
+// ─── Manifest types ─────────────────────────────────────────────────────────
+
+export type BlockCategory = 'trigger' | 'condition' | 'action';
+
+// Superset of integration ConnField types; drives the editor field renderer.
+export type BlockFieldType =
+  | 'text'
+  | 'textarea'
+  | 'json'
+  | 'select'
+  | 'number'
+  | 'boolean'
+  | 'variable'
+  | 'integration'
+  | 'time'
+  | 'weekdays';
+
+export type BlockField = {
+  key: string;
+  label: string;
+  type: BlockFieldType;
+  required?: boolean;
+  placeholder?: string;
+  hint?: string;
+  mono?: boolean;
+  options?: readonly string[];
+  default?: string | number | boolean;
+};
+
+// Graph ports: triggers are entrypoints (out only), actions are in→out,
+// conditions fan out via named ports (e.g. true/false).
+export type BlockPorts = {
+  in?: readonly string[];
+  out?: readonly string[];
+};
+
+export type BlockManifest = {
+  kind: string;
+  category: BlockCategory;
+  label: string;
+  description: string;
+  icon: string;                 // 24x24 outline path
+  executable: boolean;          // false = "coming soon", not run by the engine yet
+  ports: BlockPorts;
+  fields: readonly BlockField[];
+  summary?: SummaryDescriptor;
+};
+
+// ─── Derived kinds ──────────────────────────────────────────────────────────
+
+export type TriggerKind = (typeof TRIGGER_CATALOG)[number]['kind'];
+export type ActionKind = (typeof ACTION_CATALOG)[number]['kind'];
+export type BlockKind = TriggerKind | ActionKind;
+
+// Non-empty tuples for allowlists (worker validation, z.enum, …).
+export const TRIGGER_KINDS = TRIGGER_CATALOG.map((t) => t.kind) as [TriggerKind, ...TriggerKind[]];
+export const ACTION_KINDS = ACTION_CATALOG.map((a) => a.kind) as [ActionKind, ...ActionKind[]];
+
+export const VALID_TRIGGER_KINDS: ReadonlySet<string> = new Set(TRIGGER_KINDS);
+export const VALID_ACTION_KINDS: ReadonlySet<string> = new Set(ACTION_KINDS);
+
+export const EXECUTABLE_ACTIONS = ACTION_CATALOG.filter((a) => a.executable);
+export const COMING_SOON_ACTIONS = ACTION_CATALOG.filter((a) => !a.executable);
+export const EXECUTABLE_TRIGGERS = TRIGGER_CATALOG.filter((t) => t.executable);
+export const COMING_SOON_TRIGGERS = TRIGGER_CATALOG.filter((t) => !t.executable);
+
+// ─── Lookups ──────────────────────────────────────────────────────────────────
+
+export function triggerSpec(kind: string): BlockManifest {
+  return TRIGGER_CATALOG.find((t) => t.kind === kind) ?? TRIGGER_CATALOG[0];
+}
+
+export function actionSpec(kind: string): BlockManifest {
+  return ACTION_CATALOG.find((a) => a.kind === kind) ?? ACTION_CATALOG[0];
+}
+
+export function blockSpec(category: BlockCategory, kind: string): BlockManifest | undefined {
+  const catalog = category === 'trigger' ? TRIGGER_CATALOG : category === 'action' ? ACTION_CATALOG : [];
+  return catalog.find((b) => b.kind === kind);
+}
+
+// Find a block by kind across catalogs (the editor only knows a node's kind).
+export function findBlock(kind: string): BlockManifest | undefined {
+  return TRIGGER_CATALOG.find((b) => b.kind === kind) ?? ACTION_CATALOG.find((b) => b.kind === kind);
+}
diff --git a/shared/blocks/package.json b/shared/blocks/package.json
new file mode 100644
index 0000000..cbb6fb1
--- /dev/null
+++ b/shared/blocks/package.json
@@ -0,0 +1,12 @@
+{
+  "name": "@nodrix/blocks-shared",
+  "private": true,
+  "version": "0.0.0",
+  "type": "module",
+  "exports": {
+    ".": "./index.ts"
+  },
+  "dependencies": {
+    "@nodrix/integrations-shared": "*"
+  }
+}
diff --git a/shared/blocks/triggers.ts b/shared/blocks/triggers.ts
new file mode 100644
index 0000000..b5a1a3a
--- /dev/null
+++ b/shared/blocks/triggers.ts
@@ -0,0 +1,100 @@
+// Trigger block manifests. Per-kind evaluation lives in the worker engine.
+
+import type { BlockManifest } from './index';
+
+export const TRIGGER_CATALOG = [
+  {
+    kind: 'variable',
+    category: 'trigger',
+    label: 'Variable',
+    description: 'Run when the value of a variable meets a condition.',
+    icon: 'M21 7.5 12 3 3 7.5m18 0L12 12m9-4.5v9L12 21m0-9L3 7.5m9 4.5v9M3 7.5v9L12 21',
+    executable: true,
+    ports: { out: ['out'] },
+    fields: [
+      { key: 'variable', label: 'Variable', type: 'variable', required: true },
+      {
+        key: 'operator',
+        label: 'Condition',
+        type: 'select',
+        options: ['>', '<', '>=', '<=', '==', '!=', 'changed'],
+        default: '>',
+      },
+      { key: 'value', label: 'Value', type: 'text', placeholder: 'value' },
+      {
+        key: 'mode',
+        label: 'Fire mode',
+        type: 'select',
+        options: ['edge', 'always'],
+        default: 'edge',
+        hint: 'edge = once on entry; always = every matching reading.',
+      },
+      {
+        key: 'cooldown_seconds',
+        label: 'Cooldown (s)',
+        type: 'number',
+        default: 0,
+        hint: 'Minimum seconds between fires (0 = none).',
+      },
+    ],
+  },
+  {
+    kind: 'manual',
+    category: 'trigger',
+    label: 'Manual',
+    description: 'Run on demand with a Run button — no condition.',
+    icon: 'M15 11.25h-1.5m0 0V9.75m0 1.5h-1.5m1.5 0v-1.5M10.5 21h.75m-1.5-12.75V6.75A2.25 2.25 0 0 1 12 4.5a2.25 2.25 0 0 1 2.25 2.25V9m-4.5 0H7.5a1.5 1.5 0 0 0-1.5 1.5v8.25A2.25 2.25 0 0 0 8.25 21h7.5A2.25 2.25 0 0 0 18 18.75V10.5a1.5 1.5 0 0 0-1.5-1.5h-2.25M9.75 9h4.5',
+    executable: true,
+    ports: { out: ['out'] },
+    fields: [],
+  },
+  {
+    kind: 'schedule',
+    category: 'trigger',
+    label: 'Schedule',
+    description: 'Run at a specific time of day, on chosen weekdays.',
+    icon: 'M12 6v6l4 2M21 12a9 9 0 1 1-18 0 9 9 0 0 1 18 0Z',
+    executable: true,
+    ports: { out: ['out'] },
+    fields: [
+      { key: 'time', label: 'Time', type: 'time', required: true, default: '08:00' },
+      { key: 'days', label: 'Days', type: 'weekdays', hint: 'No days selected = every day.' },
+      { key: 'tz', label: 'Timezone', type: 'text', mono: true, placeholder: 'IANA timezone' },
+    ],
+  },
+  {
+    kind: 'sunset_sunrise',
+    category: 'trigger',
+    label: 'Sunset / Sunrise',
+    description: 'Run relative to local sunrise or sunset.',
+    icon: 'M12 3v2.25m6.364.386-1.591 1.591M21 12h-2.25m-.386 6.364-1.591-1.591M12 18.75V21m-4.773-4.227-1.591 1.591M5.25 12H3m4.227-4.773L5.636 5.636M15.75 12a3.75 3.75 0 1 1-7.5 0 3.75 3.75 0 0 1 7.5 0Z',
+    executable: true,
+    ports: { out: ['out'] },
+    fields: [
+      { key: 'event', label: 'Event', type: 'select', options: ['sunrise', 'sunset'], default: 'sunset' },
+      { key: 'lat', label: 'Latitude', type: 'number', placeholder: 'lat' },
+      { key: 'lng', label: 'Longitude', type: 'number', placeholder: 'lng' },
+      { key: 'offset_minutes', label: 'Offset (min)', type: 'number', default: 0 },
+    ],
+  },
+  {
+    kind: 'event',
+    category: 'trigger',
+    label: 'Event',
+    description: 'Run when a named event is posted by hardware or an automation.',
+    icon: 'M14.857 17.082a23.848 23.848 0 0 0 5.454-1.31A8.967 8.967 0 0 1 18 9.75V9A6 6 0 0 0 6 9v.75a8.967 8.967 0 0 1-2.312 6.022c1.733.64 3.56 1.085 5.455 1.31m5.714 0a24.255 24.255 0 0 1-5.714 0m5.714 0a3 3 0 1 1-5.714 0',
+    executable: true,
+    ports: { out: ['out'] },
+    fields: [
+      {
+        key: 'event',
+        label: 'Event name',
+        type: 'text',
+        required: true,
+        mono: true,
+        placeholder: 'event name, e.g. button_pressed',
+        hint: 'Matched against POST /v1/events { "event": "…" }.',
+      },
+    ],
+  },
+] as const satisfies readonly BlockManifest[];
diff --git a/shared/widgets/package.json b/shared/widgets/package.json
index cc5175c..bffd0ae 100644
--- a/shared/widgets/package.json
+++ b/shared/widgets/package.json
@@ -6,5 +6,12 @@
   "exports": {
     ".": "./index.ts",
     "./registry": "./registry.ts"
+  },
+  "dependencies": {
+    "apexcharts": "^5.12.0",
+    "leaflet": "^1.9.4"
+  },
+  "devDependencies": {
+    "@types/leaflet": "^1.9.21"
   }
 }
diff --git a/web/package.json b/web/package.json
index 6a5e4b1..88243f0 100644
--- a/web/package.json
+++ b/web/package.json
@@ -10,12 +10,12 @@
     "typecheck": "vue-tsc --noEmit"
   },
   "dependencies": {
+    "@nodrix/blocks-shared": "*",
     "@nodrix/integrations-shared": "*",
     "@nodrix/widgets-shared": "*",
-    "apexcharts": "^5.12.0",
+    "@vue-flow/core": "^1.48.2",
     "better-auth": "^1.6.11",
     "grid-layout-plus": "^1.1.1",
-    "leaflet": "^1.9.4",
     "pinia": "^2.3.0",
     "reka-ui": "^2.0.2",
     "vue": "^3.5.13",
@@ -23,7 +23,6 @@
   },
   "devDependencies": {
     "@tailwindcss/vite": "^4.0.0",
-    "@types/leaflet": "^1.9.21",
     "@vitejs/plugin-vue": "^5.2.1",
     "tailwindcss": "^4.0.0",
     "typescript": "^5.6.3",
diff --git a/web/src/pages/project/automations/AutomationCard.vue b/web/src/pages/project/automations/AutomationCard.vue
index d055882..fbbcfa7 100644
--- a/web/src/pages/project/automations/AutomationCard.vue
+++ b/web/src/pages/project/automations/AutomationCard.vue
@@ -62,13 +62,17 @@ async function run() {
 async function duplicate() {
   menuOpen.value = false;
   try {
-    await project.createAutomation({
-      name: `${props.automation.name} (copy)`,
-      description: props.automation.description,
-      trigger_type: props.automation.trigger_type,
-      trigger_config: props.automation.trigger_config,
-      actions: props.automation.actions,
-    });
+    await project.createAutomation(
+      props.automation.graph
+        ? { name: `${props.automation.name} (copy)`, description: props.automation.description, graph: props.automation.graph }
+        : {
+            name: `${props.automation.name} (copy)`,
+            description: props.automation.description,
+            trigger_type: props.automation.trigger_type,
+            trigger_config: props.automation.trigger_config,
+            actions: props.automation.actions,
+          }
+    );
   } catch (e) {
     toast.error((e as Error).message);
   }
diff --git a/web/src/pages/project/automations/AutomationEditor.vue b/web/src/pages/project/automations/AutomationEditor.vue
index 15e61f0..f48a626 100644
--- a/web/src/pages/project/automations/AutomationEditor.vue
+++ b/web/src/pages/project/automations/AutomationEditor.vue
@@ -1,16 +1,21 @@
 <script setup lang="ts">
-import { computed, reactive, ref, watch } from 'vue';
+import { computed, ref, watch } from 'vue';
 import { useRoute, useRouter } from 'vue-router';
+import { VueFlow, useVueFlow, type Connection, type Edge } from '@vue-flow/core';
+import '@vue-flow/core/dist/style.css';
+import { TRIGGER_CATALOG, ACTION_CATALOG, graphError } from '@nodrix/blocks-shared';
 import { useProjectStore } from '../../../stores/project';
 import { toast } from '../../../lib/toast';
 import Icon from '../../../components/Icon.vue';
-import Dropdown from '../../../components/Dropdown.vue';
 import Spinner from '../../../components/Spinner.vue';
-import FlowChip from '../../../components/FlowChip.vue';
-import { TRIGGERS, triggerSpec, OPERATORS, ACTION_TYPES, triggerChipLabel, actionChips } from './automation-catalog';
-import { connSpec } from '@nodrix/integrations-shared';
+import BlockNode from './BlockNode.vue';
+import NodeInspector from './NodeInspector.vue';
 import { recipeById } from './automation-recipes';
-import type { AutomationTriggerType, Automation } from '../../../types';
+import {
+  automationToFlow, graphToFlow, flowToGraph, defaultConfig, newNodeId, wouldCycle, blockOf,
+  type FlowNode,
+} from './graph-edit';
+import { buildLinearGraph } from '@nodrix/blocks-shared';
 
 const project = useProjectStore();
 const route = useRoute();
@@ -19,78 +24,56 @@ const router = useRouter();
 const editId = computed(() => (route.params['id'] as string | undefined) || null);
 const recipeId = (route.query['recipe'] as string | undefined) || null;
 
-type Draft = {
-  id: string | null;
-  trigger_type: AutomationTriggerType;
-  name: string;
-  description: string;
-  // eslint-disable-next-line @typescript-eslint/no-explicit-any
-  trigger_config: Record<string, any>;
-  // eslint-disable-next-line @typescript-eslint/no-explicit-any
-  actions: any[];
-};
+const {
+  onConnect, addEdges, addNodes, removeNodes, onNodeClick, onPaneClick,
+  toObject, findNode, setNodes, setEdges, getEdges,
+} = useVueFlow();
 
-const browserTz = Intl.DateTimeFormat().resolvedOptions().timeZone || 'UTC';
-const WEEKDAYS = [
-  { n: 1, label: 'Mon' }, { n: 2, label: 'Tue' }, { n: 3, label: 'Wed' },
-  { n: 4, label: 'Thu' }, { n: 5, label: 'Fri' }, { n: 6, label: 'Sat' }, { n: 0, label: 'Sun' },
-];
-
-function defaultConfig(t: AutomationTriggerType): Record<string, unknown> {
-  switch (t) {
-    case 'variable':       return { variable: project.variables[0]?.key ?? '', operator: '>', value: '', mode: 'edge' };
-    case 'schedule':       return { time: '08:00', days: [], tz: browserTz };
-    case 'sunset_sunrise': return { event: 'sunset', lat: 0, lng: 0, offset_minutes: 0 };
-    case 'event':          return { event: '' };
-    case 'scene':
-    default:               return {};
-  }
-}
-function blankDraft(t: AutomationTriggerType): Draft {
-  return { id: null, trigger_type: t, name: '', description: '', trigger_config: defaultConfig(t), actions: [] };
-}
-
-const draft = reactive<Draft>(blankDraft('variable'));
-const mode = ref<'picker' | 'form'>(editId.value || recipeId ? 'form' : 'picker');
+const name = ref('');
+const description = ref('');
 const loading = ref(!!editId.value);
 const saving = ref(false);
 const notFound = ref(false);
+const selectedId = ref<string | null>(null);
+let placed = 0;
 
-// Seed from a recipe synchronously so the right trigger UI shows immediately
-// (no flash of the default trigger while project data loads).
-if (recipeId) {
-  const r = recipeById(recipeId);
-  if (r) {
-    Object.assign(draft, blankDraft(r.trigger_type));
-    draft.name = r.name;
-    draft.trigger_config = { ...defaultConfig(r.trigger_type), ...r.trigger_config };
-    draft.actions = r.actions.map((a) => ({ ...a }));
-  }
-}
+const selectedNode = computed(() => (selectedId.value ? findNode(selectedId.value) : undefined));
 
-// Dropdown option lists.
-const variableOptions = computed(() => project.variables.map((v) => ({ value: v.key, label: v.key })));
-const integrationOptions = computed(() =>
-  project.integrations.map((i) => ({ value: i.id, label: i.name, hint: connSpec(i.kind).label }))
-);
-const operatorOptions = OPERATORS.map((o) => ({ value: o.value, label: o.label }));
-const solarEventOptions = [{ value: 'sunrise', label: 'Sunrise' }, { value: 'sunset', label: 'Sunset' }];
-const actionTypeOptions = ACTION_TYPES.map((a) => ({ value: a.value, label: a.label }));
+onNodeClick(({ node }) => { selectedId.value = node.id; });
+onPaneClick(() => { selectedId.value = null; });
 
-const spec = computed(() => triggerSpec(draft.trigger_type));
+onConnect((c: Connection) => {
+  if (!c.source || !c.target || c.source === c.target) return;
+  if (wouldCycle(getEdges.value, c.source, c.target)) {
+    toast.error('That connection would create a loop.');
+    return;
+  }
+  addEdges([{ ...c, id: `e_${c.source}_${c.target}_${c.sourceHandle ?? 'out'}` }]);
+});
+
+const isValidConnection = (c: Connection): boolean =>
+  !!c.source && !!c.target && c.source !== c.target && !wouldCycle(getEdges.value, c.source, c.target);
+
+function addBlock(kind: string) {
+  const manifest = blockOf(kind);
+  if (!manifest) return;
+  const id = newNodeId();
+  addNodes([{
+    id,
+    type: 'block',
+    position: { x: 140 + (placed % 3) * 40, y: 40 + placed * 96 },
+    data: { kind, config: defaultConfig(manifest) },
+  }]);
+  placed++;
+  selectedId.value = id;
+}
 
-// Live rule-flow preview of the draft (trigger → actions), shown atop the form.
-const previewResolvers = computed(() => ({
-  variableLabel: (k: string) => k,
-  integration: (id: string) => {
-    const i = project.integrations.find((x) => x.id === id);
-    return i ? { name: i.name, icon: connSpec(i.kind).icon } : undefined;
-  },
-}));
-const previewTrigger = computed(() => triggerChipLabel(draft.trigger_type, draft.trigger_config, previewResolvers.value));
-const previewChips = computed(() => actionChips(draft.actions, previewResolvers.value));
+function deleteSelected() {
+  if (!selectedId.value) return;
+  removeNodes([selectedId.value]); // Vue Flow also drops connected edges
+  selectedId.value = null;
+}
 
-// Init once the project is resolved (route may set it after this mounts).
 watch(() => project.currentProjectId, init, { immediate: true });
 
 async function init() {
@@ -100,107 +83,62 @@ async function init() {
     project.loadIntegrations(),
   ]);
 
+  if (recipeId) {
+    const r = recipeById(recipeId);
+    if (r) {
+      name.value = r.name;
+      const { nodes, edges } = graphToFlow(buildLinearGraph(r.trigger_type, r.trigger_config ?? {}, r.actions ?? []));
+      setNodes(nodes);
+      setEdges(edges);
+      placed = nodes.length;
+    }
+    return;
+  }
+
   if (editId.value) {
     let a = project.automations.find((x) => x.id === editId.value);
     if (!a) { await project.loadAutomations(); a = project.automations.find((x) => x.id === editId.value); }
-    if (a) populateFromAutomation(a);
-    else notFound.value = true;
+    if (a) {
+      name.value = a.name;
+      description.value = a.description ?? '';
+      const { nodes, edges } = automationToFlow(a);
+      setNodes(nodes);
+      setEdges(edges);
+      placed = nodes.length;
+    } else {
+      notFound.value = true;
+    }
     loading.value = false;
   }
 }
 
-function populateFromAutomation(a: Automation) {
-  draft.id = a.id;
-  draft.trigger_type = a.trigger_type;
-  draft.name = a.name;
-  draft.description = a.description ?? '';
-  draft.trigger_config = { ...defaultConfig(a.trigger_type), ...((a.trigger_config as Record<string, unknown>) ?? {}) };
-  draft.actions = Array.isArray(a.actions) ? JSON.parse(JSON.stringify(a.actions)) : [];
-}
-
-function pick(key: AutomationTriggerType) {
-  Object.assign(draft, blankDraft(key));
-  mode.value = 'form';
-}
-
-// Coerce strings to number/boolean where unambiguous, so comparisons and
-// control writes carry the right type.
+// Coerce string config `value`s to number/boolean where unambiguous, matching how
+// the engine compares and writes them.
 function coerce(v: unknown): unknown {
   if (typeof v !== 'string') return v;
   const s = v.trim();
-  if (s === '') return '';
-  if (s === 'true') return true;
-  if (s === 'false') return false;
-  if (!Number.isNaN(Number(s))) return Number(s);
-  return s;
-}
-
-function buildConfig(): Record<string, unknown> {
-  const cfg = { ...draft.trigger_config };
-  if (draft.trigger_type === 'variable') {
-    if (cfg.operator === 'changed') delete cfg.value;
-    else cfg.value = coerce(cfg.value);
-  }
-  return cfg;
-}
-function buildActions(): unknown[] {
-  return draft.actions.map((a) => {
-    if (a.type === 'set_variable') return { type: 'set_variable', variable: a.variable, value: coerce(a.value) };
-    if (a.type === 'call_integration') return { type: 'call_integration', integration_id: a.integration_id };
-    if (a.type === 'emit_event') return { type: 'emit_event', event: a.event };
-    return a;
-  });
+  if (s === '' || s === 'true' || s === 'false') return s === 'true' ? true : s === 'false' ? false : '';
+  return Number.isNaN(Number(s)) ? s : Number(s);
 }
 
-function addAction() {
-  draft.actions.push({ type: 'set_variable', variable: project.variables[0]?.key ?? '', value: '' });
-}
-function removeAction(i: number) { draft.actions.splice(i, 1); }
-function moveAction(i: number, dir: -1 | 1) {
-  const j = i + dir;
-  if (j < 0 || j >= draft.actions.length) return;
-  const [item] = draft.actions.splice(i, 1);
-  draft.actions.splice(j, 0, item);
-}
-// eslint-disable-next-line @typescript-eslint/no-explicit-any
-function onActionTypeChange(a: any) {
-  if (a.type === 'set_variable') { a.variable = project.variables[0]?.key ?? ''; a.value = ''; }
-  else if (a.type === 'call_integration') { a.integration_id = project.integrations[0]?.id ?? ''; }
-  else if (a.type === 'emit_event') { a.event = ''; }
-}
-function toggleDay(n: number) {
-  const days: number[] = draft.trigger_config.days ?? (draft.trigger_config.days = []);
-  const idx = days.indexOf(n);
-  if (idx >= 0) days.splice(idx, 1);
-  else days.push(n);
-}
+async function save() {
+  const n = name.value.trim();
+  if (!n) return;
+  const obj = toObject();
+  const graph = flowToGraph(obj.nodes as FlowNode[], obj.edges as Edge[]);
+  for (const node of graph.nodes) if ('value' in node.config) node.config['value'] = coerce(node.config['value']);
 
-function backToList() {
-  router.push({ name: 'automations' });
-}
+  const err = graphError(graph);
+  if (err) { toast.error(err); return; }
 
-async function save() {
-  const name = draft.name.trim();
-  if (!name) return;
   saving.value = true;
   try {
-    if (draft.id) {
-      await project.updateAutomation(draft.id, {
-        name,
-        description: draft.description.trim() || null,
-        trigger_config: buildConfig(),
-        actions: buildActions(),
-      });
+    if (editId.value) {
+      await project.updateAutomation(editId.value, { name: n, description: description.value.trim() || null, graph });
     } else {
-      await project.createAutomation({
-        name,
-        description: draft.description.trim() || null,
-        trigger_type: draft.trigger_type,
-        trigger_config: buildConfig(),
-        actions: buildActions(),
-      });
+      await project.createAutomation({ name: n, description: description.value.trim() || null, graph });
     }
-    backToList();
+    router.push({ name: 'automations' });
   } catch (e) {
     toast.error((e as Error).message);
   } finally {
@@ -210,192 +148,66 @@ async function save() {
 </script>
 
 <template>
-  <div class="mx-auto max-w-3xl px-4 py-6 sm:px-6 sm:py-8">
-    <button type="button" class="mb-4 inline-flex items-center gap-1.5 text-xs text-neutral-500 hover:text-neutral-900 dark:text-neutral-400 dark:hover:text-neutral-100" @click="backToList">
+  <div class="mx-auto max-w-6xl px-4 py-6 sm:px-6 sm:py-8">
+    <button type="button" class="mb-4 inline-flex items-center gap-1.5 text-xs text-neutral-500 hover:text-neutral-900 dark:text-neutral-400 dark:hover:text-neutral-100" @click="router.push({ name: 'automations' })">
       <svg viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" class="h-3.5 w-3.5"><path d="M15.75 19.5 8.25 12l7.5-7.5" /></svg>
       Automations
     </button>
 
     <div v-if="loading" class="rounded-xl border border-neutral-200 bg-white p-10 dark:border-neutral-800 dark:bg-neutral-900"><Spinner block /></div>
-
     <div v-else-if="notFound" class="rounded-xl border border-dashed border-neutral-300 bg-white p-10 text-center text-sm text-neutral-500 dark:border-neutral-700 dark:bg-neutral-900 dark:text-neutral-400">
       Automation not found.
     </div>
 
-    <!-- Trigger picker -->
-    <section v-else-if="mode === 'picker'">
-      <h1 class="text-lg font-semibold tracking-tight">New automation</h1>
-      <p class="mt-1 text-sm text-neutral-600 dark:text-neutral-400">Choose what should trigger it.</p>
-      <div class="mt-5 grid grid-cols-1 gap-3 sm:grid-cols-2">
-        <button
-          v-for="t in TRIGGERS"
-          :key="t.key"
-          type="button"
-          class="group flex items-start gap-4 rounded-xl border border-neutral-200 bg-white p-4 text-left transition hover:border-accent-300 hover:shadow-sm sm:p-5 dark:border-neutral-800 dark:bg-neutral-900 dark:hover:border-accent-700"
-          @click="pick(t.key)"
-        >
-          <div class="grid h-10 w-10 shrink-0 place-items-center rounded-lg bg-accent-50 text-accent-700 dark:bg-accent-900/30 dark:text-accent-300">
-            <Icon :path="t.icon" class="h-5 w-5" />
-          </div>
-          <div class="min-w-0">
-            <div class="text-base font-semibold text-neutral-900 dark:text-neutral-100">{{ t.title }}</div>
-            <div class="mt-1 text-sm leading-relaxed text-neutral-600 dark:text-neutral-400">{{ t.desc }}</div>
-          </div>
-        </button>
-      </div>
-    </section>
-
-    <!-- Editor form -->
-    <form v-else @submit.prevent="save">
-      <div class="mb-5 flex items-center gap-3">
-        <div class="grid h-10 w-10 shrink-0 place-items-center rounded-lg bg-accent-50 text-accent-700 dark:bg-accent-900/30 dark:text-accent-300">
-          <Icon :path="spec.icon" class="h-5 w-5" />
-        </div>
-        <div>
-          <h1 class="text-lg font-semibold tracking-tight">{{ draft.id ? 'Edit automation' : 'New automation' }}</h1>
-          <p class="text-xs text-neutral-500 dark:text-neutral-400">{{ spec.title }} · {{ spec.desc }}</p>
-        </div>
-      </div>
-
-      <!-- Live rule-flow preview -->
-      <div class="mb-4 flex flex-wrap items-center gap-1.5 rounded-xl border border-neutral-200 bg-neutral-50/70 p-3 dark:border-neutral-800 dark:bg-neutral-900/40">
-        <FlowChip tone="trigger" :icon="spec.icon" :label="previewTrigger || 'Set a trigger'" />
-        <template v-if="previewChips.length">
-          <template v-for="(c, i) in previewChips" :key="i">
-            <svg viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" class="h-3.5 w-3.5 shrink-0 text-neutral-300 dark:text-neutral-600"><path stroke-linecap="round" stroke-linejoin="round" d="m8.25 4.5 7.5 7.5-7.5 7.5" /></svg>
-            <FlowChip tone="action" :icon="c.icon" :label="c.label" />
-          </template>
-        </template>
-        <template v-else>
-          <svg viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" class="h-3.5 w-3.5 shrink-0 text-neutral-300 dark:text-neutral-600"><path stroke-linecap="round" stroke-linejoin="round" d="m8.25 4.5 7.5 7.5-7.5 7.5" /></svg>
-          <span class="text-xs italic text-neutral-400 dark:text-neutral-500">Add an action</span>
-        </template>
+    <template v-else>
+      <!-- Header -->
+      <div class="mb-4 grid gap-3 sm:grid-cols-2">
+        <input v-model="name" type="text" required placeholder="Automation name" class="rounded-md border border-neutral-300 bg-white px-3 py-2 text-sm font-medium dark:border-neutral-700 dark:bg-neutral-950 dark:text-neutral-100" />
+        <input v-model="description" type="text" placeholder="Description (optional)" class="rounded-md border border-neutral-300 bg-white px-3 py-2 text-sm dark:border-neutral-700 dark:bg-neutral-950 dark:text-neutral-100" />
       </div>
 
-      <!-- Details -->
-      <div class="rounded-xl border border-neutral-200 bg-white p-4 sm:p-5 dark:border-neutral-800 dark:bg-neutral-900">
-        <label class="block">
-          <span class="block text-xs font-medium text-neutral-600 dark:text-neutral-300">Name</span>
-          <input v-model="draft.name" type="text" required class="mt-1 w-full rounded-md border border-neutral-300 bg-white px-3 py-2 text-sm dark:border-neutral-700 dark:bg-neutral-950 dark:text-neutral-100" placeholder="e.g. Fan on when hot" />
-        </label>
-        <label class="mt-3 block">
-          <span class="block text-xs font-medium text-neutral-600 dark:text-neutral-300">Description (optional)</span>
-          <textarea v-model="draft.description" rows="2" class="mt-1 w-full rounded-md border border-neutral-300 bg-white px-3 py-2 text-sm dark:border-neutral-700 dark:bg-neutral-950 dark:text-neutral-100" />
-        </label>
-      </div>
-
-      <!-- When -->
-      <div class="mt-4 rounded-xl border border-neutral-200 bg-white p-4 sm:p-5 dark:border-neutral-800 dark:bg-neutral-900">
-        <div class="mb-3 flex items-center gap-2">
-          <span class="grid h-5 w-5 place-items-center rounded-full bg-accent-100 text-[10px] font-bold text-accent-700 dark:bg-accent-900/40 dark:text-accent-300">1</span>
-          <h3 class="text-xs font-semibold uppercase tracking-wide text-neutral-500 dark:text-neutral-400">When this happens</h3>
-        </div>
-
-        <div v-if="draft.trigger_type === 'variable'" class="flex flex-wrap items-center gap-2">
-          <Dropdown v-model="draft.trigger_config.variable" :options="variableOptions" placeholder="Variable" size="sm" class="w-44" />
-          <Dropdown v-model="draft.trigger_config.operator" :options="operatorOptions" size="sm" class="w-48" />
-          <input v-if="draft.trigger_config.operator !== 'changed'" v-model="draft.trigger_config.value" type="text" class="w-32 rounded-md border border-neutral-300 bg-white px-2 py-1.5 text-sm dark:border-neutral-700 dark:bg-neutral-950" placeholder="value" />
-          <label class="ml-auto inline-flex items-center gap-1.5 text-xs text-neutral-600 dark:text-neutral-300">
-            <input v-model="draft.trigger_config.mode" type="checkbox" true-value="always" false-value="edge" class="rounded" />
-            Fire on every reading
-          </label>
-        </div>
-
-        <p v-else-if="draft.trigger_type === 'scene'" class="rounded-lg border border-dashed border-neutral-300 p-3 text-xs text-neutral-500 dark:border-neutral-700 dark:text-neutral-400">
-          No condition — run this automation manually with the Run button.
-        </p>
-
-        <div v-else-if="draft.trigger_type === 'schedule'" class="space-y-3">
-          <div class="flex flex-wrap items-center gap-2">
-            <input v-model="draft.trigger_config.time" type="time" class="rounded-md border border-neutral-300 bg-white px-2 py-1.5 text-sm dark:border-neutral-700 dark:bg-neutral-950" />
-            <input v-model="draft.trigger_config.tz" type="text" class="w-56 max-w-full rounded-md border border-neutral-300 bg-white px-2 py-1.5 font-mono text-xs dark:border-neutral-700 dark:bg-neutral-950" placeholder="IANA timezone" />
-          </div>
-          <div class="flex flex-wrap gap-1.5">
-            <button
-              v-for="d in WEEKDAYS"
-              :key="d.n"
-              type="button"
-              class="rounded-md border px-2.5 py-1 text-xs"
-              :class="(draft.trigger_config.days ?? []).includes(d.n)
-                ? 'border-accent-500 bg-accent-50 text-accent-700 dark:bg-accent-900/30 dark:text-accent-300'
-                : 'border-neutral-300 text-neutral-600 dark:border-neutral-700 dark:text-neutral-300'"
-              @click="toggleDay(d.n)"
-            >{{ d.label }}</button>
-          </div>
-          <p class="text-[11px] text-neutral-500 dark:text-neutral-400">No days selected = every day.</p>
+      <!-- Editor: palette | canvas | inspector -->
+      <div class="grid h-[64vh] grid-cols-[180px_1fr_260px] gap-3">
+        <!-- Palette -->
+        <div class="overflow-y-auto rounded-xl border border-neutral-200 bg-white p-3 dark:border-neutral-800 dark:bg-neutral-900">
+          <h3 class="mb-2 text-[10px] font-semibold uppercase tracking-wide text-neutral-400">Triggers</h3>
+          <button v-for="t in TRIGGER_CATALOG" :key="t.kind" type="button" class="mb-1.5 flex w-full items-center gap-2 rounded-md border border-neutral-200 px-2 py-1.5 text-left text-xs hover:border-accent-300 dark:border-neutral-700 dark:hover:border-accent-700" @click="addBlock(t.kind)">
+            <Icon :path="t.icon" class="h-4 w-4 text-accent-600 dark:text-accent-400" /> {{ t.label }}
+          </button>
+          <h3 class="mb-2 mt-4 text-[10px] font-semibold uppercase tracking-wide text-neutral-400">Actions</h3>
+          <button v-for="a in ACTION_CATALOG" :key="a.kind" type="button" class="mb-1.5 flex w-full items-center gap-2 rounded-md border border-neutral-200 px-2 py-1.5 text-left text-xs hover:border-accent-300 dark:border-neutral-700 dark:hover:border-accent-700" @click="addBlock(a.kind)">
+            <Icon :path="a.icon" class="h-4 w-4 text-neutral-500" /> {{ a.label }}
+          </button>
         </div>
 
-        <div v-else-if="draft.trigger_type === 'sunset_sunrise'" class="flex flex-wrap items-center gap-2">
-          <Dropdown v-model="draft.trigger_config.event" :options="solarEventOptions" size="sm" class="w-32" />
-          <input v-model.number="draft.trigger_config.lat" type="number" step="any" class="w-28 rounded-md border border-neutral-300 bg-white px-2 py-1.5 text-sm dark:border-neutral-700 dark:bg-neutral-950" placeholder="lat" />
-          <input v-model.number="draft.trigger_config.lng" type="number" step="any" class="w-28 rounded-md border border-neutral-300 bg-white px-2 py-1.5 text-sm dark:border-neutral-700 dark:bg-neutral-950" placeholder="lng" />
-          <label class="inline-flex items-center gap-1.5 text-xs text-neutral-600 dark:text-neutral-300">
-            offset
-            <input v-model.number="draft.trigger_config.offset_minutes" type="number" class="w-20 rounded-md border border-neutral-300 bg-white px-2 py-1.5 text-sm dark:border-neutral-700 dark:bg-neutral-950" />
-            min
-          </label>
-        </div>
-
-        <div v-else-if="draft.trigger_type === 'event'">
-          <input v-model="draft.trigger_config.event" type="text" class="w-full rounded-md border border-neutral-300 bg-white px-2 py-1.5 font-mono text-sm dark:border-neutral-700 dark:bg-neutral-950" placeholder="event name, e.g. button_pressed" />
-          <p class="mt-1 text-[11px] text-neutral-500 dark:text-neutral-400">Matched against <code>POST /v1/events</code> <code>{ "event": "…" }</code>.</p>
+        <!-- Canvas -->
+        <div class="overflow-hidden rounded-xl border border-neutral-200 bg-neutral-50 dark:border-neutral-800 dark:bg-neutral-950/40">
+          <VueFlow :is-valid-connection="isValidConnection" :default-edge-options="{ animated: true }" fit-view-on-init class="h-full w-full">
+            <template #node-block="props">
+              <BlockNode v-bind="props" />
+            </template>
+          </VueFlow>
         </div>
-      </div>
 
-      <!-- Connector -->
-      <div class="flex justify-center py-1.5" aria-hidden="true">
-        <svg viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" class="h-4 w-4 text-neutral-300 dark:text-neutral-600"><path stroke-linecap="round" stroke-linejoin="round" d="M12 4.5v15m0 0 6.75-6.75M12 19.5l-6.75-6.75" /></svg>
-      </div>
-
-      <!-- Then -->
-      <div class="rounded-xl border border-neutral-200 bg-white p-4 sm:p-5 dark:border-neutral-800 dark:bg-neutral-900">
-        <div class="mb-3 flex items-center justify-between">
-          <div class="flex items-center gap-2">
-            <span class="grid h-5 w-5 place-items-center rounded-full bg-accent-100 text-[10px] font-bold text-accent-700 dark:bg-accent-900/40 dark:text-accent-300">2</span>
-            <h3 class="text-xs font-semibold uppercase tracking-wide text-neutral-500 dark:text-neutral-400">Then do this</h3>
-          </div>
-          <button type="button" class="rounded-md border border-neutral-300 px-2.5 py-1 text-xs hover:bg-neutral-100 dark:border-neutral-700 dark:hover:bg-neutral-800" @click="addAction">Add action</button>
+        <!-- Inspector -->
+        <div class="overflow-y-auto rounded-xl border border-neutral-200 bg-white p-3 dark:border-neutral-800 dark:bg-neutral-900">
+          <template v-if="selectedNode">
+            <NodeInspector :node="selectedNode.data" />
+            <button type="button" class="mt-4 w-full rounded-md border border-red-200 px-2 py-1.5 text-xs text-red-600 hover:bg-red-50 dark:border-red-900/50 dark:hover:bg-red-950/40" @click="deleteSelected">Remove block</button>
+          </template>
+          <p v-else class="text-xs text-neutral-400 dark:text-neutral-500">
+            Add blocks from the left, drag to connect them, and click a block to configure it.
+          </p>
         </div>
-
-        <ul v-if="draft.actions.length > 0" class="space-y-2">
-          <li v-for="(a, i) in draft.actions" :key="i" class="flex flex-wrap items-center gap-2 rounded-lg border border-neutral-200 p-3 dark:border-neutral-800">
-            <span class="grid h-6 w-6 shrink-0 place-items-center rounded-full bg-neutral-100 text-[11px] font-semibold text-neutral-500 dark:bg-neutral-800 dark:text-neutral-400">{{ i + 1 }}</span>
-            <Dropdown :model-value="a.type" :options="actionTypeOptions" size="sm" class="w-44" @update:model-value="(v) => { a.type = v; onActionTypeChange(a); }" />
-
-            <template v-if="a.type === 'set_variable'">
-              <Dropdown v-model="a.variable" :options="variableOptions" placeholder="Variable" size="sm" class="w-40" />
-              <span class="text-xs text-neutral-500">to</span>
-              <input v-model="a.value" type="text" class="w-28 rounded-md border border-neutral-300 bg-white px-2 py-1.5 text-sm dark:border-neutral-700 dark:bg-neutral-950" placeholder="value" />
-            </template>
-
-            <template v-else-if="a.type === 'call_integration'">
-              <Dropdown v-model="a.integration_id" :options="integrationOptions" placeholder="Integration" size="sm" class="min-w-0 flex-1" />
-              <RouterLink v-if="integrationOptions.length === 0" :to="`/p/${project.currentProjectId}/automations/integrations`" class="text-xs text-accent-600 hover:underline dark:text-accent-400">Add an integration</RouterLink>
-            </template>
-
-            <template v-else-if="a.type === 'emit_event'">
-              <input v-model="a.event" type="text" class="w-48 rounded-md border border-neutral-300 bg-white px-2 py-1.5 font-mono text-sm dark:border-neutral-700 dark:bg-neutral-950" placeholder="event name" />
-            </template>
-
-            <div class="ml-auto flex items-center gap-1">
-              <button type="button" class="rounded p-1 text-neutral-400 hover:bg-neutral-100 hover:text-neutral-700 dark:hover:bg-neutral-800" title="Move up" @click="moveAction(i, -1)">↑</button>
-              <button type="button" class="rounded p-1 text-neutral-400 hover:bg-neutral-100 hover:text-neutral-700 dark:hover:bg-neutral-800" title="Move down" @click="moveAction(i, 1)">↓</button>
-              <button type="button" class="rounded p-1 text-red-500 hover:bg-red-50 dark:hover:bg-red-950/40" title="Remove" @click="removeAction(i)">✕</button>
-            </div>
-          </li>
-        </ul>
-        <p v-else class="rounded-lg border border-dashed border-neutral-300 p-3 text-xs text-neutral-500 dark:border-neutral-700 dark:text-neutral-400">
-          No actions yet. Add at least one for this automation to do something.
-        </p>
       </div>
 
       <!-- Save bar -->
-      <div class="sticky bottom-0 mt-4 flex items-center justify-end gap-2 rounded-xl border border-neutral-200 bg-white/90 p-3 backdrop-blur dark:border-neutral-800 dark:bg-neutral-900/90">
-        <button type="button" class="rounded-md border border-neutral-300 px-3 py-1.5 text-xs hover:bg-neutral-100 dark:border-neutral-700 dark:hover:bg-neutral-800" @click="backToList">Cancel</button>
-        <button type="submit" :disabled="saving || !draft.name.trim()" class="rounded-md bg-accent-600 px-4 py-1.5 text-xs font-semibold text-white hover:bg-accent-700 disabled:opacity-50">
-          {{ saving ? 'Saving…' : draft.id ? 'Save changes' : 'Create automation' }}
+      <div class="mt-4 flex items-center justify-end gap-2">
+        <button type="button" class="rounded-md border border-neutral-300 px-3 py-1.5 text-xs hover:bg-neutral-100 dark:border-neutral-700 dark:hover:bg-neutral-800" @click="router.push({ name: 'automations' })">Cancel</button>
+        <button type="button" :disabled="saving || !name.trim()" class="rounded-md bg-accent-600 px-4 py-1.5 text-xs font-semibold text-white hover:bg-accent-700 disabled:opacity-50" @click="save">
+          {{ saving ? 'Saving…' : editId ? 'Save changes' : 'Create automation' }}
         </button>
       </div>
-    </form>
+    </template>
   </div>
 </template>
diff --git a/web/src/pages/project/automations/BlockNode.vue b/web/src/pages/project/automations/BlockNode.vue
new file mode 100644
index 0000000..4e13319
--- /dev/null
+++ b/web/src/pages/project/automations/BlockNode.vue
@@ -0,0 +1,56 @@
+<script setup lang="ts">
+import { computed } from 'vue';
+import { Handle, Position } from '@vue-flow/core';
+import Icon from '../../../components/Icon.vue';
+import { blockOf, type BlockData } from './graph-edit';
+
+const props = defineProps<{ id: string; data: BlockData; selected?: boolean }>();
+
+const manifest = computed(() => blockOf(props.data.kind));
+const isTrigger = computed(() => manifest.value?.category === 'trigger');
+const hasIn = computed(() => !!manifest.value?.ports.in?.length);
+const outPorts = computed(() => manifest.value?.ports.out ?? []);
+
+// One-line subtitle from the most telling config field.
+const subtitle = computed(() => {
+  const c = props.data.config ?? {};
+  const v = c['variable'] ?? c['event'] ?? c['time'] ?? c['integration_id'] ?? c['value'];
+  return v === undefined || v === '' ? '' : String(v);
+});
+</script>
+
+<template>
+  <div
+    class="min-w-[150px] rounded-lg border bg-white px-3 py-2 shadow-sm transition dark:bg-neutral-900"
+    :class="[
+      selected ? 'border-accent-500 ring-1 ring-accent-400' : 'border-neutral-200 dark:border-neutral-700',
+    ]"
+  >
+    <Handle v-if="hasIn" type="target" :position="Position.Top" />
+
+    <div class="flex items-center gap-2">
+      <div
+        class="grid h-7 w-7 shrink-0 place-items-center rounded-md"
+        :class="isTrigger
+          ? 'bg-accent-50 text-accent-700 dark:bg-accent-900/30 dark:text-accent-300'
+          : 'bg-neutral-100 text-neutral-600 dark:bg-neutral-800 dark:text-neutral-300'"
+      >
+        <Icon :path="manifest?.icon ?? ''" class="h-4 w-4" />
+      </div>
+      <div class="min-w-0">
+        <div class="truncate text-sm font-semibold text-neutral-900 dark:text-neutral-100">
+          {{ manifest?.label ?? data.kind }}
+        </div>
+        <div v-if="subtitle" class="truncate text-[11px] text-neutral-500 dark:text-neutral-400">{{ subtitle }}</div>
+      </div>
+    </div>
+
+    <Handle
+      v-for="p in outPorts"
+      :key="p"
+      :id="p"
+      type="source"
+      :position="Position.Bottom"
+    />
+  </div>
+</template>
diff --git a/web/src/pages/project/automations/NodeInspector.vue b/web/src/pages/project/automations/NodeInspector.vue
new file mode 100644
index 0000000..4406ff0
--- /dev/null
+++ b/web/src/pages/project/automations/NodeInspector.vue
@@ -0,0 +1,122 @@
+<script setup lang="ts">
+import { computed } from 'vue';
+import { useProjectStore } from '../../../stores/project';
+import { connSpec } from '@nodrix/integrations-shared';
+import { blockOf, type BlockData } from './graph-edit';
+import Dropdown from '../../../components/Dropdown.vue';
+
+const props = defineProps<{ node: BlockData }>();
+
+const project = useProjectStore();
+const manifest = computed(() => blockOf(props.node.kind));
+
+const WEEKDAYS = [
+  { n: 1, label: 'Mon' }, { n: 2, label: 'Tue' }, { n: 3, label: 'Wed' },
+  { n: 4, label: 'Thu' }, { n: 5, label: 'Fri' }, { n: 6, label: 'Sat' }, { n: 0, label: 'Sun' },
+];
+
+const variableOptions = computed(() => project.variables.map((v) => ({ value: v.key, label: v.key })));
+const integrationOptions = computed(() =>
+  project.integrations.map((i) => ({ value: i.id, label: i.name, hint: connSpec(i.kind).label }))
+);
+function selectOptions(opts: readonly string[] = []) {
+  return opts.map((o) => ({ value: o, label: o }));
+}
+
+// Direct two-way access to a config key on the (reactive) node data. Loosely
+// typed: the field set is dynamic (manifest-driven), so v-model binds freely.
+const cfg = computed(() => props.node.config as Record<string, any>);
+function days(): number[] {
+  if (!Array.isArray(cfg.value['days'])) cfg.value['days'] = [];
+  return cfg.value['days'] as number[];
+}
+function toggleDay(n: number) {
+  const d = days();
+  const i = d.indexOf(n);
+  if (i >= 0) d.splice(i, 1); else d.push(n);
+}
+</script>
+
+<template>
+  <div v-if="manifest" class="space-y-3">
+    <div class="text-xs font-semibold uppercase tracking-wide text-neutral-500 dark:text-neutral-400">
+      {{ manifest.label }}
+    </div>
+    <p v-if="manifest.fields.length === 0" class="text-xs text-neutral-500 dark:text-neutral-400">
+      No settings — this block has nothing to configure.
+    </p>
+
+    <label v-for="f in manifest.fields" :key="f.key" class="block">
+      <span class="block text-xs font-medium text-neutral-600 dark:text-neutral-300">{{ f.label }}</span>
+
+      <Dropdown
+        v-if="f.type === 'select'"
+        v-model="cfg[f.key]"
+        :options="selectOptions(f.options)"
+        size="sm"
+        class="mt-1 w-full"
+      />
+      <Dropdown
+        v-else-if="f.type === 'variable'"
+        v-model="cfg[f.key]"
+        :options="variableOptions"
+        placeholder="Variable"
+        size="sm"
+        class="mt-1 w-full"
+      />
+      <Dropdown
+        v-else-if="f.type === 'integration'"
+        v-model="cfg[f.key]"
+        :options="integrationOptions"
+        placeholder="Integration"
+        size="sm"
+        class="mt-1 w-full"
+      />
+      <input
+        v-else-if="f.type === 'number'"
+        v-model.number="cfg[f.key]"
+        type="number"
+        step="any"
+        class="mt-1 w-full rounded-md border border-neutral-300 bg-white px-2 py-1.5 text-sm dark:border-neutral-700 dark:bg-neutral-950"
+      />
+      <input
+        v-else-if="f.type === 'time'"
+        v-model="cfg[f.key]"
+        type="time"
+        class="mt-1 rounded-md border border-neutral-300 bg-white px-2 py-1.5 text-sm dark:border-neutral-700 dark:bg-neutral-950"
+      />
+      <label v-else-if="f.type === 'boolean'" class="mt-1 inline-flex items-center gap-2 text-sm">
+        <input v-model="cfg[f.key]" type="checkbox" class="rounded" />
+      </label>
+      <textarea
+        v-else-if="f.type === 'textarea' || f.type === 'json'"
+        v-model="cfg[f.key]"
+        rows="3"
+        class="mt-1 w-full rounded-md border border-neutral-300 bg-white px-2 py-1.5 font-mono text-xs dark:border-neutral-700 dark:bg-neutral-950"
+        :placeholder="f.placeholder"
+      ></textarea>
+      <div v-else-if="f.type === 'weekdays'" class="mt-1 flex flex-wrap gap-1.5">
+        <button
+          v-for="d in WEEKDAYS"
+          :key="d.n"
+          type="button"
+          class="rounded-md border px-2.5 py-1 text-xs"
+          :class="days().includes(d.n)
+            ? 'border-accent-500 bg-accent-50 text-accent-700 dark:bg-accent-900/30 dark:text-accent-300'
+            : 'border-neutral-300 text-neutral-600 dark:border-neutral-700 dark:text-neutral-300'"
+          @click="toggleDay(d.n)"
+        >{{ d.label }}</button>
+      </div>
+      <input
+        v-else
+        v-model="cfg[f.key]"
+        type="text"
+        :class="f.mono ? 'font-mono' : ''"
+        class="mt-1 w-full rounded-md border border-neutral-300 bg-white px-2 py-1.5 text-sm dark:border-neutral-700 dark:bg-neutral-950"
+        :placeholder="f.placeholder"
+      />
+
+      <span v-if="f.hint" class="mt-1 block text-[11px] text-neutral-400 dark:text-neutral-500">{{ f.hint }}</span>
+    </label>
+  </div>
+</template>
diff --git a/web/src/pages/project/automations/automation-catalog.ts b/web/src/pages/project/automations/automation-catalog.ts
index e49cd32..65ebce9 100644
--- a/web/src/pages/project/automations/automation-catalog.ts
+++ b/web/src/pages/project/automations/automation-catalog.ts
@@ -1,7 +1,14 @@
-// Catalog + formatting helpers for automations. Trigger metadata drives the
-// picker, the editor header, and the card summaries. Keeping the human-readable
-// summary logic here means cards and the editor stay in sync.
-
+// Formatting helpers for automations: the human-readable summary/chip logic that
+// keeps cards and the editor in sync. Block metadata (labels, icons, kinds) is
+// sourced from the shared block catalog — the single source of truth — so adding
+// a trigger/action is a manifest folder, not an edit here.
+
+import {
+  TRIGGER_CATALOG,
+  ACTION_CATALOG,
+  triggerSpec as triggerManifest,
+  actionSpec as actionManifest,
+} from '@nodrix/blocks-shared';
 import type { AutomationTriggerType, VariableOperator, Action } from '../../../types';
 
 export type TriggerSpec = {
@@ -11,25 +18,17 @@ export type TriggerSpec = {
   icon: string; // 24x24 outline path
 };
 
-// Heroicons-style outline paths.
-const ICON = {
-  variable: 'M21 7.5 12 3 3 7.5m18 0L12 12m9-4.5v9L12 21m0-9L3 7.5m9 4.5v9M3 7.5v9L12 21',
-  scene: 'M15 11.25h-1.5m0 0V9.75m0 1.5h-1.5m1.5 0v-1.5M10.5 21h.75m-1.5-12.75V6.75A2.25 2.25 0 0 1 12 4.5a2.25 2.25 0 0 1 2.25 2.25V9m-4.5 0H7.5a1.5 1.5 0 0 0-1.5 1.5v8.25A2.25 2.25 0 0 0 8.25 21h7.5A2.25 2.25 0 0 0 18 18.75V10.5a1.5 1.5 0 0 0-1.5-1.5h-2.25M9.75 9h4.5',
-  clock: 'M12 6v6l4 2M21 12a9 9 0 1 1-18 0 9 9 0 0 1 18 0Z',
-  sun: 'M12 3v2.25m6.364.386-1.591 1.591M21 12h-2.25m-.386 6.364-1.591-1.591M12 18.75V21m-4.773-4.227-1.591 1.591M5.25 12H3m4.227-4.773L5.636 5.636M15.75 12a3.75 3.75 0 1 1-7.5 0 3.75 3.75 0 0 1 7.5 0Z',
-  bell: 'M14.857 17.082a23.848 23.848 0 0 0 5.454-1.31A8.967 8.967 0 0 1 18 9.75V9A6 6 0 0 0 6 9v.75a8.967 8.967 0 0 1-2.312 6.022c1.733.64 3.56 1.085 5.455 1.31m5.714 0a24.255 24.255 0 0 1-5.714 0m5.714 0a3 3 0 1 1-5.714 0',
-} as const;
-
-export const TRIGGERS: readonly TriggerSpec[] = [
-  { key: 'variable',       title: 'Variable',       desc: 'Run when the value of a variable meets a condition.',           icon: ICON.variable },
-  { key: 'scene',          title: 'Scene',          desc: 'Run on demand with a Run button — no condition.',               icon: ICON.scene },
-  { key: 'schedule',       title: 'Schedule',       desc: 'Run at a specific time of day, on chosen weekdays.',            icon: ICON.clock },
-  { key: 'sunset_sunrise', title: 'Sunset / Sunrise', desc: 'Run relative to local sunrise or sunset.',                   icon: ICON.sun },
-  { key: 'event',          title: 'Event',          desc: 'Run when a named event is posted by hardware or an automation.', icon: ICON.bell },
-];
+// Picker / editor-header metadata, derived from the shared catalog.
+export const TRIGGERS: readonly TriggerSpec[] = TRIGGER_CATALOG.map((m) => ({
+  key: m.kind as AutomationTriggerType,
+  title: m.label,
+  desc: m.description,
+  icon: m.icon,
+}));
 
 export function triggerSpec(key: AutomationTriggerType): TriggerSpec {
-  return TRIGGERS.find((t) => t.key === key) ?? TRIGGERS[0]!;
+  const m = triggerManifest(key);
+  return { key: m.kind as AutomationTriggerType, title: m.label, desc: m.description, icon: m.icon };
 }
 
 export const OPERATORS: readonly { value: VariableOperator; label: string; short: string }[] = [
@@ -42,11 +41,10 @@ export const OPERATORS: readonly { value: VariableOperator; label: string; short
   { value: 'changed', label: 'changes',    short: 'changes' },
 ];
 
-export const ACTION_TYPES = [
-  { value: 'set_variable', label: 'Set variable' },
-  { value: 'call_integration', label: 'Call integration' },
-  { value: 'emit_event', label: 'Emit event' },
-] as const;
+export const ACTION_TYPES: readonly { value: string; label: string }[] = ACTION_CATALOG.map((m) => ({
+  value: m.kind,
+  label: m.label,
+}));
 
 const DAY_LABEL = ['Sun', 'Mon', 'Tue', 'Wed', 'Thu', 'Fri', 'Sat'];
 
@@ -71,7 +69,7 @@ export function triggerSummary(
       if (cfg.operator === 'changed') return `When ${v} changes`;
       return `When ${v} ${op?.label ?? cfg.operator} ${fmtVal(cfg.value)}`;
     }
-    case 'scene':
+    case 'manual':
       return 'Run manually';
     case 'schedule': {
       const days = Array.isArray(cfg.days) ? (cfg.days as number[]) : [];
@@ -93,12 +91,7 @@ export function triggerSummary(
 
 // ─── Rule-flow chips ──────────────────────────────────────────────────────────
 // Compact trigger + action nodes for the rule-flow card and editor preview.
-
-const ACTION_ICON = {
-  set_variable: 'M10.5 6h9.75M10.5 6a1.5 1.5 0 1 1-3 0m3 0a1.5 1.5 0 1 0-3 0M3.75 6H7.5m3 12h9.75m-9.75 0a1.5 1.5 0 0 1-3 0m3 0a1.5 1.5 0 0 0-3 0m-3.75 0H7.5m9-6h3.75m-3.75 0a1.5 1.5 0 0 1-3 0m3 0a1.5 1.5 0 0 0-3 0m-9.75 0h9.75',
-  call_integration: 'm3.75 13.5 10.5-11.25L12 10.5h8.25L9.75 21.75 12 13.5H3.75Z',
-  emit_event: 'M10.34 15.84c-.688-.06-1.386-.09-2.09-.09H7.5a4.5 4.5 0 1 1 0-9h.75c.704 0 1.402-.03 2.09-.09m0 9.18c.253.962.584 1.892.985 2.783.247.55.06 1.21-.463 1.511l-.657.38c-.551.318-1.26.117-1.527-.461a20.845 20.845 0 0 1-1.44-4.282m3.102.069a18.03 18.03 0 0 1-.59-4.59c0-1.586.205-3.124.59-4.59m0 9.18a23.848 23.848 0 0 1 8.835 2.535M10.34 6.66a23.847 23.847 0 0 0 8.835-2.535m0 0A23.74 23.74 0 0 0 18.795 3m.38 1.125a23.91 23.91 0 0 1 1.014 5.395m-1.014 8.855c-.118.38-.245.754-.38 1.125m.38-1.125a23.91 23.91 0 0 0 1.014-5.395m0-3.46c.495.413.811 1.035.811 1.73 0 .695-.316 1.317-.811 1.73m0-3.46a24.347 24.347 0 0 1 0 3.46',
-} as const;
+// Action icons come from the shared catalog (actionManifest(kind).icon).
 
 export type FlowChip = { icon: string; label: string };
 
@@ -123,7 +116,7 @@ export function triggerChipLabel(
       const op = OPERATORS.find((o) => o.value === cfg.operator);
       return `${v} ${op?.short ?? cfg.operator} ${fmtVal(cfg.value)}`;
     }
-    case 'scene':
+    case 'manual':
       return 'Manual';
     case 'schedule': {
       const days = Array.isArray(cfg.days) ? (cfg.days as number[]) : [];
@@ -150,16 +143,16 @@ export function actionChips(actions: unknown[] | null | undefined, r: ChipResolv
   return actions.map((raw) => {
     const a = raw as Partial<Action> & Record<string, unknown>;
     if (a.type === 'set_variable') {
-      return { icon: ACTION_ICON.set_variable, label: `${varLabel(String(a.variable ?? '?'))} = ${fmtVal(a.value)}` };
+      return { icon: actionManifest('set_variable').icon, label: `${varLabel(String(a.variable ?? '?'))} = ${fmtVal(a.value)}` };
     }
     if (a.type === 'call_integration') {
       const meta = r.integration?.(String(a.integration_id ?? ''));
-      return { icon: meta?.icon ?? ACTION_ICON.call_integration, label: meta?.name ?? 'an integration' };
+      return { icon: meta?.icon ?? actionManifest('call_integration').icon, label: meta?.name ?? 'an integration' };
     }
     if (a.type === 'emit_event') {
-      return { icon: ACTION_ICON.emit_event, label: `Emit "${a.event ?? '?'}"` };
+      return { icon: actionManifest('emit_event').icon, label: `Emit "${a.event ?? '?'}"` };
     }
-    return { icon: ACTION_ICON.call_integration, label: 'Unknown action' };
+    return { icon: actionManifest('call_integration').icon, label: 'Unknown action' };
   });
 }
 
diff --git a/web/src/pages/project/automations/graph-edit.ts b/web/src/pages/project/automations/graph-edit.ts
new file mode 100644
index 0000000..3d41afa
--- /dev/null
+++ b/web/src/pages/project/automations/graph-edit.ts
@@ -0,0 +1,83 @@
+// Converts between an AutomationGraph and Vue Flow's node/edge arrays, and the
+// helpers the canvas editor needs (ids, default config, cycle check).
+
+import type { Node, Edge } from '@vue-flow/core';
+import { buildLinearGraph, findBlock, type AutomationGraph, type BlockManifest } from '@nodrix/blocks-shared';
+import type { Automation } from '../../../types';
+
+export type BlockData = { kind: string; config: Record<string, unknown> };
+export type FlowNode = Node<BlockData>;
+
+let seq = 0;
+export function newNodeId(): string {
+  return `n${Date.now().toString(36)}${(seq++).toString(36)}`;
+}
+
+// Default config for a freshly-added node: the manifest field defaults.
+export function defaultConfig(manifest: BlockManifest): Record<string, unknown> {
+  const cfg: Record<string, unknown> = {};
+  for (const f of manifest.fields) if (f.default !== undefined) cfg[f.key] = f.default;
+  return cfg;
+}
+
+// Existing automation → flow. Prefers the persisted graph; falls back to the
+// legacy columns; a brand-new automation starts empty.
+export function automationToFlow(a: Automation | null): { nodes: FlowNode[]; edges: Edge[] } {
+  if (!a) return { nodes: [], edges: [] };
+  const graph: AutomationGraph = a.graph ?? buildLinearGraph(
+    a.trigger_type,
+    (a.trigger_config ?? {}) as Record<string, unknown>,
+    Array.isArray(a.actions) ? a.actions : []
+  );
+  return graphToFlow(graph);
+}
+
+export function graphToFlow(graph: AutomationGraph): { nodes: FlowNode[]; edges: Edge[] } {
+  const nodes: FlowNode[] = graph.nodes.map((n, i) => ({
+    id: n.id,
+    type: 'block',
+    position: { x: n.x ?? 120, y: n.y ?? 40 + i * 130 },
+    data: { kind: n.kind, config: { ...n.config } },
+  }));
+  const edges: Edge[] = graph.edges.map((e, i) => ({
+    id: `e${i}_${e.from}_${e.to}`,
+    source: e.from,
+    target: e.to,
+    sourceHandle: e.port ?? 'out',
+  }));
+  return { nodes, edges };
+}
+
+export function flowToGraph(nodes: FlowNode[], edges: Edge[]): AutomationGraph {
+  return {
+    nodes: nodes.map((n) => ({
+      id: n.id,
+      kind: n.data!.kind,
+      config: n.data!.config ?? {},
+      x: Math.round(n.position.x),
+      y: Math.round(n.position.y),
+    })),
+    edges: edges.map((e) => ({ from: e.source, to: e.target, port: e.sourceHandle ?? 'out' })),
+  };
+}
+
+// True if adding source→target would create a cycle (target already reaches source).
+export function wouldCycle(edges: Edge[], source: string, target: string): boolean {
+  if (source === target) return true;
+  const adj = new Map<string, string[]>();
+  for (const e of edges) (adj.get(e.source) ?? adj.set(e.source, []).get(e.source)!).push(e.target);
+  const seen = new Set<string>();
+  const stack = [target];
+  while (stack.length) {
+    const cur = stack.pop()!;
+    if (cur === source) return true;
+    if (seen.has(cur)) continue;
+    seen.add(cur);
+    for (const next of adj.get(cur) ?? []) stack.push(next);
+  }
+  return false;
+}
+
+export function blockOf(kind: string): BlockManifest | undefined {
+  return findBlock(kind);
+}
diff --git a/web/src/stores/project.ts b/web/src/stores/project.ts
index edef1b2..ad90b19 100644
--- a/web/src/stores/project.ts
+++ b/web/src/stores/project.ts
@@ -5,6 +5,7 @@ import { GRID_COLUMNS } from '../builder/grid';
 import type {
   Automation,
   AutomationTriggerType,
+  AutomationGraph,
   Dashboard,
   DashboardMeta,
   Variable,
@@ -249,10 +250,11 @@ export const useProjectStore = defineStore('project', () => {
 
   async function createAutomation(input: {
     name: string;
-    trigger_type: AutomationTriggerType;
+    trigger_type?: AutomationTriggerType;
     description?: string | null;
     trigger_config?: unknown;
     actions?: unknown[];
+    graph?: AutomationGraph;
   }): Promise<Automation> {
     const pid = requireProjectId();
     const a = await api.post<Automation>(
@@ -265,7 +267,7 @@ export const useProjectStore = defineStore('project', () => {
 
   async function updateAutomation(
     id: string,
-    patch: Partial<Pick<Automation, 'name' | 'description' | 'enabled' | 'trigger_config' | 'actions'>>
+    patch: Partial<Pick<Automation, 'name' | 'description' | 'enabled' | 'trigger_config' | 'actions' | 'graph'>>
   ): Promise<Automation> {
     const pid = requireProjectId();
     const a = await api.patch<Automation>(
diff --git a/web/src/types.ts b/web/src/types.ts
index c62933a..37e8c0e 100644
--- a/web/src/types.ts
+++ b/web/src/types.ts
@@ -1,5 +1,8 @@
 // Shared types used across stores, pages, and widgets.
 
+import type { AutomationGraph, GraphNode, GraphEdge } from '@nodrix/blocks-shared';
+export type { AutomationGraph, GraphNode, GraphEdge };
+
 export type InstanceRole = 'owner' | 'admin' | 'member';
 
 // A project the user has access to. owner/admin see all; members see only the
@@ -163,7 +166,7 @@ export type ShareState = {
 
 export type AutomationTriggerType =
   | 'variable'
-  | 'scene'
+  | 'manual'
   | 'schedule'
   | 'sunset_sunrise'
   | 'event';
@@ -210,8 +213,9 @@ export type Automation = {
   description: string | null;
   enabled: boolean;
   trigger_type: AutomationTriggerType;
-  trigger_config: unknown;            // JSON; shape depends on trigger_type
-  actions: unknown[];                 // JSON ordered list of action descriptors
+  trigger_config: unknown;            // JSON; legacy primary trigger
+  actions: unknown[];                 // JSON ordered list (legacy)
+  graph: AutomationGraph | null;      // flow graph; source of truth
   created_at: number;
   updated_at: number;
   last_run_at: number | null;
@@ -219,7 +223,8 @@ export type Automation = {
   last_error: string | null;
 };
 
-// Sourced from the shared package; re-exported so '../types' imports keep working.
+// Sourced from the shared packages; re-exported so '../types' imports keep working.
+// (GraphNode/GraphEdge/AutomationGraph are imported + re-exported at the top.)
 export type { IntegrationKind, Integration } from '@nodrix/integrations-shared';
 export type { IntegrationResult as IntegrationTestResult } from '@nodrix/integrations-shared';
 
diff --git a/worker/package.json b/worker/package.json
index ff9fffc..e7c8c8d 100644
--- a/worker/package.json
+++ b/worker/package.json
@@ -13,6 +13,7 @@
   "dependencies": {
     "@cloudflare/workers-oauth-provider": "^0.7.0",
     "@modelcontextprotocol/sdk": "^1.29.0",
+    "@nodrix/blocks-shared": "*",
     "@nodrix/integrations-shared": "*",
     "@nodrix/widgets-shared": "*",
     "agents": "^0.13.2",
diff --git a/worker/src/domains/automations/graph-build.ts b/worker/src/domains/automations/graph-build.ts
new file mode 100644
index 0000000..e80ada3
--- /dev/null
+++ b/worker/src/domains/automations/graph-build.ts
@@ -0,0 +1,31 @@
+// Service-side graph helpers: derive the persisted columns from a canonical
+// graph (graph is the source of truth; legacy trigger_type/trigger_config/actions
+// are kept populated for back-compat + the convert-on-read fallback).
+
+import {
+  triggerNodes, actionNodes, serializeTriggerKinds,
+  type AutomationGraph,
+} from '@nodrix/blocks-shared';
+
+export { buildLinearGraph, isGraph, graphError, type AutomationGraph } from '@nodrix/blocks-shared';
+
+export function graphColumns(graph: AutomationGraph): {
+  graph: string;
+  trigger_kinds: string;
+  trigger_type: string;
+  trigger_config: string;
+  actions: string;
+} {
+  const primary = triggerNodes(graph)[0];
+  return {
+    graph: JSON.stringify(graph),
+    trigger_kinds: serializeTriggerKinds(graph),
+    trigger_type: primary?.kind ?? 'manual',
+    trigger_config: JSON.stringify(primary?.config ?? {}),
+    actions: JSON.stringify(actionNodes(graph).map((n) => ({ type: n.kind, ...n.config }))),
+  };
+}
+
+export function hasScheduledTrigger(graph: AutomationGraph): boolean {
+  return triggerNodes(graph).some((n) => n.kind === 'schedule' || n.kind === 'sunset_sunrise');
+}
diff --git a/worker/src/domains/automations/routes.ts b/worker/src/domains/automations/routes.ts
index cfe7521..bb0fd68 100644
--- a/worker/src/domains/automations/routes.ts
+++ b/worker/src/domains/automations/routes.ts
@@ -42,15 +42,17 @@ automations.post('/', async (c) => {
     trigger_type?: string;
     trigger_config?: unknown;
     actions?: unknown[];
+    graph?: unknown;
     enabled?: boolean;
   }>();
   try {
     const a = await createAutomation(c.env, actorFromSession(c.get('user')), project.id, {
       name: body.name ?? '',
       description: body.description ?? null,
-      trigger_type: body.trigger_type ?? '',
+      trigger_type: body.trigger_type,
       trigger_config: body.trigger_config,
       actions: body.actions,
+      graph: body.graph,
       enabled: body.enabled,
     });
     return c.json(a, 201);
@@ -59,8 +61,8 @@ automations.post('/', async (c) => {
   }
 });
 
-// Manual run — drives "scene" automations and doubles as a test harness for any
-// automation. Runs synchronously so the UI gets the outcome.
+// Manual run — drives manual-trigger automations and doubles as a test harness
+// for any automation. Runs synchronously so the UI gets the outcome.
 automations.post('/:id/run', async (c) => {
   const project = c.get('project');
   const id = c.req.param('id');
@@ -80,16 +82,20 @@ automations.patch('/:id', async (c) => {
     name?: string;
     description?: string | null;
     enabled?: boolean;
+    trigger_type?: string;
     trigger_config?: unknown;
     actions?: unknown[];
+    graph?: unknown;
   }>();
   try {
     const a = await updateAutomation(c.env, actorFromSession(c.get('user')), project.id, id, {
       name: body.name,
       ...('description' in body ? { description: body.description ?? null } : {}),
       enabled: body.enabled,
+      ...('trigger_type' in body ? { trigger_type: body.trigger_type } : {}),
       ...('trigger_config' in body ? { trigger_config: body.trigger_config } : {}),
       ...('actions' in body ? { actions: body.actions } : {}),
+      ...('graph' in body ? { graph: body.graph } : {}),
     });
     return c.json(a);
   } catch (e) {
diff --git a/worker/src/domains/automations/service.ts b/worker/src/domains/automations/service.ts
index 6e48964..09cece4 100644
--- a/worker/src/domains/automations/service.ts
+++ b/worker/src/domains/automations/service.ts
@@ -8,9 +8,10 @@ import { projectStub } from '../../platform/durable-objects/stubs';
 import { safeParse, buildUpdate } from '../../platform/lib/sql';
 import { type Actor, ServiceError } from '../../platform/lib/service';
 import { assertProjectAccess } from '../projects/service';
-
-const TRIGGER_TYPES = ['variable', 'scene', 'schedule', 'sunset_sunrise', 'event'] as const;
-type TriggerType = (typeof TRIGGER_TYPES)[number];
+import {
+  buildLinearGraph, isGraph, graphError, graphColumns, hasScheduledTrigger,
+  type AutomationGraph,
+} from './graph-build';
 
 export function isScheduled(t: string | undefined): boolean {
   return t === 'schedule' || t === 'sunset_sunrise';
@@ -55,6 +56,7 @@ function shape(r: AutomationRow) {
     trigger_type: r.trigger_type,
     trigger_config: safeParse(r.trigger_config),
     actions: safeParse(r.actions),
+    graph: r.graph ? safeParse(r.graph) : null,
     created_at: r.created_at,
     updated_at: r.updated_at,
     last_run_at: r.last_run_at,
@@ -68,7 +70,7 @@ export async function listAutomations(env: Env, projectId: string) {
   const rows = await env.DB
     .prepare(
       `SELECT id, project_id, name, description, enabled, trigger_type,
-              trigger_config, actions, created_at, updated_at,
+              trigger_config, actions, graph, created_at, updated_at,
               last_run_at, last_run_status, last_error
          FROM automations WHERE project_id = ? ORDER BY created_at DESC`
     )
@@ -84,18 +86,21 @@ export async function createAutomation(
   input: {
     name: string;
     description?: string | null;
-    trigger_type: string;
+    trigger_type?: string;
     trigger_config?: unknown;
     actions?: unknown[];
+    graph?: unknown;
     enabled?: boolean;
   }
 ) {
   await assertProjectAccess(env, actor, projectId);
   const name = (input.name ?? '').trim();
   if (!name) throw new ServiceError('bad_request', 'name is required', 'missing_name');
-  if (!TRIGGER_TYPES.includes(input.trigger_type as TriggerType)) {
-    throw new ServiceError('bad_request', 'invalid trigger_type', 'invalid_trigger_type');
-  }
+
+  const graph = inputToGraph(input);
+  const err = graphError(graph);
+  if (err) throw new ServiceError('bad_request', err, 'invalid_graph');
+  const cols = graphColumns(graph);
 
   const id = newId('automation');
   const now = Math.floor(Date.now() / 1000);
@@ -103,14 +108,13 @@ export async function createAutomation(
     .prepare(
       `INSERT INTO automations
          (id, project_id, name, description, enabled, trigger_type,
-          trigger_config, actions, created_by, created_at, updated_at)
-       VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)`
+          trigger_config, actions, trigger_kinds, graph, created_by, created_at, updated_at)
+       VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)`
     )
     .bind(
       id, projectId, name, input.description ?? null,
-      input.enabled === false ? 0 : 1, input.trigger_type,
-      JSON.stringify(input.trigger_config ?? {}),
-      JSON.stringify(Array.isArray(input.actions) ? input.actions : []),
+      input.enabled === false ? 0 : 1, cols.trigger_type,
+      cols.trigger_config, cols.actions, cols.trigger_kinds, cols.graph,
       actor.userId, now, now
     )
     .run();
@@ -121,15 +125,31 @@ export async function createAutomation(
     action: 'automation.create',
     targetType: 'automation',
     targetId: id,
-    metadata: { name, trigger_type: input.trigger_type, source: actor.source },
+    metadata: { name, trigger_type: cols.trigger_type, source: actor.source },
   });
   await invalidateProjectDO(env, projectId);
-  if (isScheduled(input.trigger_type)) await safeReschedule(env);
+  if (hasScheduledTrigger(graph)) await safeReschedule(env);
 
   const row = await env.DB.prepare(`SELECT * FROM automations WHERE id = ?`).bind(id).first<AutomationRow>();
   return shape(row!);
 }
 
+// Canonical graph from create/update input: an explicit graph wins; otherwise
+// build the linear trigger → action chain from the legacy fields.
+function inputToGraph(input: {
+  trigger_type?: string;
+  trigger_config?: unknown;
+  actions?: unknown[];
+  graph?: unknown;
+}): AutomationGraph {
+  if (isGraph(input.graph)) return input.graph;
+  return buildLinearGraph(
+    input.trigger_type,
+    (input.trigger_config ?? {}) as Record<string, unknown>,
+    Array.isArray(input.actions) ? input.actions : []
+  );
+}
+
 export async function updateAutomation(
   env: Env,
   actor: Actor,
@@ -139,23 +159,42 @@ export async function updateAutomation(
     name?: string;
     description?: string | null;
     enabled?: boolean;
+    trigger_type?: string;
     trigger_config?: unknown;
     actions?: unknown[];
+    graph?: unknown;
   }
 ) {
   await assertProjectAccess(env, actor, projectId);
   const existing = await env.DB
-    .prepare(`SELECT id, trigger_type FROM automations WHERE id = ? AND project_id = ?`)
+    .prepare(`SELECT trigger_type, trigger_config, actions FROM automations WHERE id = ? AND project_id = ?`)
     .bind(id, projectId)
-    .first<{ id: string; trigger_type: string }>();
+    .first<{ trigger_type: string; trigger_config: string; actions: string }>();
   if (!existing) throw new ServiceError('not_found', 'automation not found');
 
+  // Any trigger/action/graph field rebuilds the canonical graph + derived columns.
+  const touchesGraph = 'graph' in input || 'trigger_type' in input
+    || 'trigger_config' in input || 'actions' in input;
+  let graphCols: ReturnType<typeof graphColumns> | undefined;
+  let graph: AutomationGraph | undefined;
+  if (touchesGraph) {
+    graph = isGraph(input.graph)
+      ? input.graph
+      : buildLinearGraph(
+          input.trigger_type ?? existing.trigger_type,
+          ('trigger_config' in input ? input.trigger_config : safeParse(existing.trigger_config)) as Record<string, unknown>,
+          'actions' in input ? (Array.isArray(input.actions) ? input.actions : []) : (safeParse(existing.actions) as unknown[])
+        );
+    const err = graphError(graph);
+    if (err) throw new ServiceError('bad_request', err, 'invalid_graph');
+    graphCols = graphColumns(graph);
+  }
+
   const u = buildUpdate({
     name: typeof input.name === 'string' && input.name.trim() ? input.name.trim() : undefined,
     description: 'description' in input ? (input.description ?? null) : undefined,
     enabled: typeof input.enabled === 'boolean' ? (input.enabled ? 1 : 0) : undefined,
-    trigger_config: 'trigger_config' in input ? JSON.stringify(input.trigger_config ?? {}) : undefined,
-    actions: 'actions' in input ? JSON.stringify(Array.isArray(input.actions) ? input.actions : []) : undefined,
+    ...(graphCols ? graphCols : {}),
   });
   if (!u) throw new ServiceError('bad_request', 'no fields to update', 'no_fields');
 
@@ -165,25 +204,25 @@ export async function updateAutomation(
     .bind(...u.values, now, id, projectId)
     .run();
 
-  const providedCount = Object.values(input).filter((v) => v !== undefined).length;
+  const onlyEnabled = typeof input.enabled === 'boolean'
+    && Object.values(input).filter((v) => v !== undefined).length === 1;
   await recordAudit(env, {
     projectId,
     userId: actor.userId,
-    action: typeof input.enabled === 'boolean' && providedCount === 1
-      ? `automation.${input.enabled ? 'enable' : 'disable'}`
-      : 'automation.update',
+    action: onlyEnabled ? `automation.${input.enabled ? 'enable' : 'disable'}` : 'automation.update',
     targetType: 'automation',
     targetId: id,
     metadata: { source: actor.source },
   });
   await invalidateProjectDO(env, projectId);
-  if (isScheduled(existing.trigger_type)) await safeReschedule(env);
+  // Re-arm if the automation had or now has a scheduled trigger.
+  if (isScheduled(existing.trigger_type) || (graph && hasScheduledTrigger(graph))) await safeReschedule(env);
 
   const row = await env.DB.prepare(`SELECT * FROM automations WHERE id = ?`).bind(id).first<AutomationRow>();
   return shape(row!);
 }
 
-// Manual run — drives "scene" automations and doubles as a test for any
+// Manual run — drives manual-trigger automations and doubles as a test for any
 // automation. Runs synchronously so the caller gets the outcome.
 export async function runAutomationNow(env: Env, actor: Actor, projectId: string, id: string) {
   await assertProjectAccess(env, actor, projectId);
diff --git a/worker/src/domains/telemetry/telemetry.ts b/worker/src/domains/telemetry/telemetry.ts
index 6afdb43..faf6495 100644
--- a/worker/src/domains/telemetry/telemetry.ts
+++ b/worker/src/domains/telemetry/telemetry.ts
@@ -9,14 +9,19 @@ const telemetry = new Hono<{ Bindings: Env; Variables: ProjectTokenContextVars }
 
 telemetry.use('*', requireProjectToken);
 
-// A valid project token authorizes a device, but the payload is still untrusted:
-// these caps stop a buggy/compromised device exploding variable cardinality,
-// storing oversized values, or polluting the time series.
+// A valid project token authorizes a device, but the payload is still untrusted.
+// These per-request caps stop a buggy/compromised device exploding the time
+// series, storing oversized values, or flooding keys in a single POST.
 const MAX_BODY_BYTES = 256 * 1024;
 const MAX_POINTS = 200;
 const MAX_KEY_LEN = 64;
 const MAX_STRING_VALUE = 512;
 
+// Per-request caps only bound a single POST; a device sending fresh keys across
+// many requests could still grow project_variables without bound. Cap the total
+// distinct auto-created variables per project (enforced in upsertVariables).
+const MAX_VARIABLES_PER_PROJECT = 1000;
+
 const CONTROL_CHARS = /[\u0000-\u001f\u007f]/;
 
 function validKey(k: string): boolean {
@@ -120,6 +125,9 @@ function dueForLastSeen(projectId: string, key: string, nowMs: number): boolean
 // Permissive ingest: ensure a project_variables row exists for each key (created
 // on first sight) and refresh last_seen. UNIQUE(project_id, key) makes the
 // INSERT idempotent; the UPDATE keeps last_seen current for existing rows.
+// Brand-new keys are created only while the project is under
+// MAX_VARIABLES_PER_PROJECT, so a chatty/compromised device can't grow the
+// metadata table without bound; existing keys always refresh regardless.
 async function upsertVariables(
   env: Env,
   projectId: string,
@@ -127,13 +135,35 @@ async function upsertVariables(
   now: number
 ): Promise<void> {
   const nowMs = Date.now();
-  // Only write keys whose last_seen is actually due — and only generate an id for
-  // those (the ON CONFLICT path discards it, so it was wasted for existing rows).
+  // Only touch keys whose last_seen is actually due (throttled per isolate).
   const due = [...new Set(keys)].filter((key) => dueForLastSeen(projectId, key, nowMs));
   if (due.length === 0) return;
   try {
+    // Existing rows only need last_seen refreshed; new keys count against the cap.
+    const placeholders = due.map(() => '?').join(',');
+    const existingRows = await env.DB
+      .prepare(`SELECT key FROM project_variables WHERE project_id = ? AND key IN (${placeholders})`)
+      .bind(projectId, ...due)
+      .all<{ key: string }>();
+    const existing = new Set(existingRows.results.map((r) => r.key));
+
+    let toCreate = due.filter((key) => !existing.has(key));
+    if (toCreate.length > 0) {
+      const countRow = await env.DB
+        .prepare(`SELECT COUNT(*) AS n FROM project_variables WHERE project_id = ?`)
+        .bind(projectId)
+        .first<{ n: number }>();
+      const remaining = Math.max(0, MAX_VARIABLES_PER_PROJECT - (countRow?.n ?? 0));
+      // Best-effort guardrail: a small overshoot under concurrency is acceptable
+      // since the cap bounds growth rather than enforcing an exact invariant.
+      toCreate = toCreate.slice(0, remaining);
+    }
+
+    // Existing keys (last_seen refresh) + capped new keys (first-sight create).
+    const keysToWrite = [...existing, ...toCreate];
+    if (keysToWrite.length === 0) return;
     await env.DB.batch(
-      due.map((key) =>
+      keysToWrite.map((key) =>
         env.DB
           .prepare(
             `INSERT INTO project_variables (id, project_id, key, created_at, updated_at, last_seen)
@@ -144,9 +174,9 @@ async function upsertVariables(
       )
     );
   } catch {
-    // last_seen is best-effort; never fail telemetry on it. Clear the throttle
-    // stamps so a failed write retries on the next POST instead of waiting out
-    // the window.
+    // last_seen + auto-create are best-effort; never fail telemetry on them.
+    // Clear the throttle stamps so a failed write retries on the next POST
+    // instead of waiting out the window.
     for (const key of due) lastSeenWrites.delete(`${projectId}:${key}`);
   }
 }
diff --git a/worker/src/mcp/tools-write.ts b/worker/src/mcp/tools-write.ts
index 747bc49..7196110 100644
--- a/worker/src/mcp/tools-write.ts
+++ b/worker/src/mcp/tools-write.ts
@@ -200,12 +200,12 @@ export function registerWriteTools(server: McpServer, env: Env, props: McpProps)
   server.registerTool(
     'create_automation',
     {
-      description: 'Create an automation. trigger_type ∈ variable|scene|schedule|sunset_sunrise|event.',
+      description: 'Create an automation. trigger_type ∈ variable|manual|schedule|sunset_sunrise|event.',
       inputSchema: {
         project,
         name: z.string(),
         description: z.string().nullable().optional(),
-        trigger_type: z.enum(['variable', 'scene', 'schedule', 'sunset_sunrise', 'event']),
+        trigger_type: z.enum(['variable', 'manual', 'schedule', 'sunset_sunrise', 'event']),
         trigger_config: z.any().optional(),
         actions: z.array(z.any()).optional(),
         enabled: z.boolean().optional(),
@@ -253,7 +253,7 @@ export function registerWriteTools(server: McpServer, env: Env, props: McpProps)
   server.registerTool(
     'run_automation',
     {
-      description: 'Run an automation now (drives scene automations; also a test harness).',
+      description: 'Run an automation now (drives manual automations; also a test harness).',
       inputSchema: { project, automation_id: z.string() },
     },
     (args) => run(() => runAutomationNow(env, actor(), scopeProjectId(props, args.project), args.automation_id))
diff --git a/worker/src/platform/db/migrations.gen.ts b/worker/src/platform/db/migrations.gen.ts
index d647846..1ee6689 100644
--- a/worker/src/platform/db/migrations.gen.ts
+++ b/worker/src/platform/db/migrations.gen.ts
@@ -28,7 +28,7 @@ export const MIGRATIONS: Migration[] = [
       "CREATE TABLE IF NOT EXISTS dashboards (\n  id          TEXT PRIMARY KEY,\n  project_id  TEXT NOT NULL REFERENCES projects(id) ON DELETE CASCADE,\n  name        TEXT NOT NULL,\n  description TEXT,\n  layout      TEXT NOT NULL,                                   \n  visibility  TEXT NOT NULL DEFAULT 'private'\n              CHECK (visibility IN ('private','public')),\n  share_token TEXT,                                            \n  created_by  TEXT REFERENCES users(id),\n  created_at  INTEGER NOT NULL,\n  updated_at  INTEGER NOT NULL,\n  archived_at INTEGER\n)",
       "CREATE INDEX IF NOT EXISTS idx_dashboards_project ON dashboards(project_id)",
       "CREATE UNIQUE INDEX IF NOT EXISTS idx_dashboards_share_token\n  ON dashboards(share_token) WHERE share_token IS NOT NULL",
-      "CREATE TABLE IF NOT EXISTS automations (\n  id              TEXT PRIMARY KEY,\n  project_id      TEXT NOT NULL REFERENCES projects(id) ON DELETE CASCADE,\n  name            TEXT NOT NULL,\n  description     TEXT,\n  enabled         INTEGER NOT NULL DEFAULT 1,                  \n  trigger_type    TEXT NOT NULL CHECK (trigger_type IN\n                    ('variable','scene','schedule','sunset_sunrise','event')),\n  trigger_config  TEXT NOT NULL,                               \n  actions         TEXT NOT NULL,                               \n  created_by      TEXT REFERENCES users(id),\n  created_at      INTEGER NOT NULL,\n  updated_at      INTEGER NOT NULL,\n  last_run_at     INTEGER,\n  last_run_status TEXT CHECK (last_run_status IN ('ok','error','skipped')),\n  last_error      TEXT\n)",
+      "CREATE TABLE IF NOT EXISTS automations (\n  id              TEXT PRIMARY KEY,\n  project_id      TEXT NOT NULL REFERENCES projects(id) ON DELETE CASCADE,\n  name            TEXT NOT NULL,\n  description     TEXT,\n  enabled         INTEGER NOT NULL DEFAULT 1,                  \n  trigger_type    TEXT NOT NULL CHECK (trigger_type IN\n                    ('variable','manual','schedule','sunset_sunrise','event')),\n  trigger_config  TEXT NOT NULL,                               \n  actions         TEXT NOT NULL,                               \n  trigger_kinds   TEXT NOT NULL DEFAULT '',                    \n  graph           TEXT,                                        \n  created_by      TEXT REFERENCES users(id),\n  created_at      INTEGER NOT NULL,\n  updated_at      INTEGER NOT NULL,\n  last_run_at     INTEGER,\n  last_run_status TEXT CHECK (last_run_status IN ('ok','error','skipped')),\n  last_error      TEXT\n)",
       "CREATE INDEX IF NOT EXISTS idx_automations_project ON automations(project_id)",
       "CREATE INDEX IF NOT EXISTS idx_automations_enabled ON automations(enabled) WHERE enabled = 1",
       "CREATE INDEX IF NOT EXISTS idx_automations_project_enabled_type\n  ON automations(project_id, enabled, trigger_type)",
diff --git a/worker/src/platform/db/migrations/0001_init.sql b/worker/src/platform/db/migrations/0001_init.sql
index bedd7ff..42a6423 100644
--- a/worker/src/platform/db/migrations/0001_init.sql
+++ b/worker/src/platform/db/migrations/0001_init.sql
@@ -171,9 +171,11 @@ CREATE TABLE IF NOT EXISTS automations (
   description     TEXT,
   enabled         INTEGER NOT NULL DEFAULT 1,                  -- 0/1
   trigger_type    TEXT NOT NULL CHECK (trigger_type IN
-                    ('variable','scene','schedule','sunset_sunrise','event')),
-  trigger_config  TEXT NOT NULL,                               -- JSON
-  actions         TEXT NOT NULL,                               -- JSON ordered list
+                    ('variable','manual','schedule','sunset_sunrise','event')),
+  trigger_config  TEXT NOT NULL,                               -- JSON (legacy primary trigger)
+  actions         TEXT NOT NULL,                               -- JSON ordered list (legacy)
+  trigger_kinds   TEXT NOT NULL DEFAULT '',                    -- ",kind,kind," for multi-trigger lookups
+  graph           TEXT,                                        -- JSON AutomationGraph; source of truth
   created_by      TEXT REFERENCES users(id),
   created_at      INTEGER NOT NULL,
   updated_at      INTEGER NOT NULL,
diff --git a/worker/src/platform/durable-objects/project-do.ts b/worker/src/platform/durable-objects/project-do.ts
index c2d2395..7ccc0be 100644
--- a/worker/src/platform/durable-objects/project-do.ts
+++ b/worker/src/platform/durable-objects/project-do.ts
@@ -4,6 +4,7 @@ import { newId } from '../lib/ids';
 import { dashboardStub } from './stubs';
 import { runAutomation } from '../engine/run';
 import { matchVariableCondition } from '../engine/triggers';
+import { toGraph, triggerNodes } from '../engine/graph';
 import type { AutomationContext, AutomationRow, VariableTriggerConfig } from '../engine/types';
 import { toCompactSeries, type CompactSeries } from '../lib/series';
 
@@ -147,22 +148,25 @@ export class ProjectDO extends DurableObject<Env> {
             this.addControl(newId('control'), variable, value);
 
           for (const a of autos) {
-            let cfg: VariableTriggerConfig;
-            try { cfg = JSON.parse(a.trigger_config); } catch { continue; }
-
-            const point = points.find((p) => p.variable === cfg.variable);
-            if (!point) continue;
-            if (!matchVariableCondition(cfg, point.value, prev.get(cfg.variable))) continue;
-
-            const ctx: AutomationContext = {
-              source: 'variable',
-              projectId,
-              ts,
-              variable: cfg.variable,
-              value: point.value,
-              depth: 0,
-            };
-            await runAutomation(this.env, a, ctx, { setVariable });
+            for (const node of triggerNodes(toGraph(a))) {
+              if (node.kind !== 'variable') continue;
+              const cfg = node.config as VariableTriggerConfig;
+
+              const point = points.find((p) => p.variable === cfg.variable);
+              if (!point) continue;
+              if (!matchVariableCondition(cfg, point.value, prev.get(cfg.variable))) continue;
+
+              const ctx: AutomationContext = {
+                source: 'variable',
+                projectId,
+                ts,
+                variable: cfg.variable,
+                value: point.value,
+                depth: 0,
+                entryNodeId: node.id,
+              };
+              await runAutomation(this.env, a, ctx, { setVariable });
+            }
           }
         } catch (e) {
           console.error('variable-trigger eval failed', e);
@@ -193,7 +197,7 @@ export class ProjectDO extends DurableObject<Env> {
       .prepare(
         `SELECT id, project_id, name, enabled, trigger_type, trigger_config, actions, last_run_at
            FROM automations
-          WHERE project_id = ? AND enabled = 1 AND trigger_type = 'variable'`
+          WHERE project_id = ? AND enabled = 1 AND trigger_kinds LIKE '%,variable,%'`
       )
       .bind(projectId)
       .all<AutomationRow>();
diff --git a/worker/src/platform/durable-objects/scheduler-do.ts b/worker/src/platform/durable-objects/scheduler-do.ts
index 08c1a3f..b5afaba 100644
--- a/worker/src/platform/durable-objects/scheduler-do.ts
+++ b/worker/src/platform/durable-objects/scheduler-do.ts
@@ -1,6 +1,6 @@
 import { DurableObject } from 'cloudflare:workers';
 import type { Env } from '../../env';
-import { computeNextScheduled, runScheduledByIds, type SchedulePlan } from '../engine/schedule';
+import { computeNextScheduled, runScheduledDue, type SchedulePlan } from '../engine/schedule';
 
 // Singleton scheduler. Holds ONE alarm set to the next schedule/sunset fire time;
 // on wake it runs the planned automations and re-arms. Replaces the every-minute
@@ -35,7 +35,7 @@ export class SchedulerDO extends DurableObject<Env> {
     const plan = await this.ctx.storage.get<SchedulePlan>('plan');
     if (plan?.fireAt != null) {
       try {
-        await runScheduledByIds(this.env, plan.dueIds, Math.floor(plan.fireAt / 1000));
+        await runScheduledDue(this.env, plan.due, Math.floor(plan.fireAt / 1000));
       } catch (e) {
         console.error('[scheduler] run failed', e);
       }
diff --git a/worker/src/platform/engine/actions.ts b/worker/src/platform/engine/actions.ts
new file mode 100644
index 0000000..ec8f508
--- /dev/null
+++ b/worker/src/platform/engine/actions.ts
@@ -0,0 +1,66 @@
+// Action node handlers, keyed by kind. Adding an action = register a handler here
+// and add its manifest to @nodrix/blocks-shared.
+
+import type { Env } from '../../env';
+import { executeIntegration, recordIntegrationRun } from './integrations';
+import type { AutomationContext, AutomationRow, IntegrationRow } from './types';
+
+export const MAX_DEPTH = 5;
+
+export type ActionDeps = {
+  setVariable: (variable: string, value: unknown) => Promise<void>;
+  emitEvent: (
+    event: string,
+    payload: Record<string, unknown> | undefined,
+    ctx: AutomationContext
+  ) => Promise<void>;
+};
+
+type HandlerArgs = {
+  env: Env;
+  automation: AutomationRow;
+  ctx: AutomationContext;
+  config: Record<string, unknown>;
+  deps: ActionDeps;
+};
+
+type ActionHandler = (a: HandlerArgs) => Promise<void>;
+
+const HANDLERS: Record<string, ActionHandler> = {
+  set_variable: async ({ config, deps }) => {
+    await deps.setVariable(String(config.variable), config.value);
+  },
+
+  call_integration: async ({ env, automation, ctx, config }) => {
+    const integration = await loadIntegration(env, automation.project_id, String(config.integration_id));
+    if (!integration) throw new Error(`integration ${config.integration_id} not found`);
+    const res = await executeIntegration(integration, ctx, config.payload as Record<string, unknown> | undefined);
+    await recordIntegrationRun(env, integration.id, res).catch(() => {});
+    if (res.status === 'error') throw new Error(`integration "${integration.name}": ${res.detail}`);
+  },
+
+  emit_event: async ({ ctx, config, deps }) => {
+    if (ctx.depth >= MAX_DEPTH) throw new Error('max event depth exceeded');
+    await deps.emitEvent(String(config.event), config.payload as Record<string, unknown> | undefined, {
+      ...ctx,
+      depth: ctx.depth + 1,
+    });
+  },
+};
+
+export async function runActionNode(kind: string, args: HandlerArgs): Promise<void> {
+  const handler = HANDLERS[kind];
+  if (!handler) throw new Error(`no handler for action '${kind}'`);
+  await handler(args);
+}
+
+async function loadIntegration(env: Env, projectId: string, id: string): Promise<IntegrationRow | null> {
+  return env.DB
+    .prepare(
+      `SELECT id, project_id, name, kind, config, enabled
+         FROM integrations
+        WHERE id = ? AND project_id = ? AND archived_at IS NULL`
+    )
+    .bind(id, projectId)
+    .first<IntegrationRow>();
+}
diff --git a/worker/src/platform/engine/graph.ts b/worker/src/platform/engine/graph.ts
new file mode 100644
index 0000000..efad38b
--- /dev/null
+++ b/worker/src/platform/engine/graph.ts
@@ -0,0 +1,42 @@
+// Resolves an automation row to its executable graph: the persisted `graph`
+// column when present, else the legacy trigger_config/actions columns rebuilt
+// into a linear chain. Pure graph helpers live in @nodrix/blocks-shared.
+
+import { buildLinearGraph, isGraph, type AutomationGraph } from '@nodrix/blocks-shared';
+import type { AutomationRow } from './types';
+
+export {
+  triggerNodes,
+  entryNode,
+  nodesById,
+  outgoingEdges,
+  countActionNodes,
+} from '@nodrix/blocks-shared';
+
+export function toGraph(row: AutomationRow): AutomationGraph {
+  if (row.graph) {
+    try {
+      const parsed = JSON.parse(row.graph);
+      if (isGraph(parsed)) return parsed;
+    } catch { /* fall back to legacy columns */ }
+  }
+  return buildLinearGraph(row.trigger_type, safeObject(row.trigger_config), safeArray(row.actions));
+}
+
+function safeObject(raw: string): Record<string, unknown> {
+  try {
+    const v = JSON.parse(raw);
+    return v && typeof v === 'object' ? (v as Record<string, unknown>) : {};
+  } catch {
+    return {};
+  }
+}
+
+function safeArray(raw: string): unknown[] {
+  try {
+    const v = JSON.parse(raw);
+    return Array.isArray(v) ? v : [];
+  } catch {
+    return [];
+  }
+}
diff --git a/worker/src/platform/engine/run.ts b/worker/src/platform/engine/run.ts
index ccef9cf..a0e404d 100644
--- a/worker/src/platform/engine/run.ts
+++ b/worker/src/platform/engine/run.ts
@@ -1,25 +1,28 @@
-// Automation orchestrator. Runs an automation's ordered action list, records the
-// outcome on the row + audit log, and supports event chaining with a depth guard.
+// Automation orchestrator. Builds the automation's flow graph, walks it from the
+// trigger node running each action via the kind→handler registry, and records the
+// outcome on the row + audit log. DAG traversal: each node runs once, condition
+// ports gate which edges are followed, and a step cap bounds runaway graphs.
 //
 // Callable from anywhere: the ProjectDO hot path, the cron scheduled handler, the
-// manual-run endpoint, and the /v1/events endpoint. `set_variable` differs by
-// caller (DO binds addControl; the worker routes to the PROJECT_DO stub), so it's
-// injectable via deps.
+// manual-run endpoint, and /v1/events. `set_variable` differs by caller (DO binds
+// addControl; the worker routes to the PROJECT_DO stub), so it's injectable via deps.
 
+import { VALID_ACTION_KINDS } from '@nodrix/blocks-shared';
 import type { Env } from '../../env';
 import { newId } from '../lib/ids';
 import { recordAudit } from '../lib/audit';
 import { projectStub } from '../durable-objects/stubs';
-import { executeIntegration, recordIntegrationRun } from './integrations';
-import type { Action, AutomationContext, AutomationRow, IntegrationRow, RunResult } from './types';
+import { runActionNode, type ActionDeps } from './actions';
+import { toGraph, entryNode, nodesById, outgoingEdges, countActionNodes, triggerNodes } from './graph';
+import type { AutomationContext, AutomationRow, RunResult, RunStatus } from './types';
 
-const MAX_DEPTH = 5;
+const MAX_STEPS = 100;
 
 export type RunDeps = {
   // Enqueue a control write. Defaults to the PROJECT_DO stub path.
-  setVariable?: (variable: string, value: unknown) => Promise<void>;
+  setVariable?: ActionDeps['setVariable'];
   // Re-entry for emit_event. Defaults to dispatchEvent over D1.
-  emitEvent?: (event: string, payload: Record<string, unknown> | undefined, ctx: AutomationContext) => Promise<void>;
+  emitEvent?: ActionDeps['emitEvent'];
 };
 
 export async function runAutomation(
@@ -28,19 +31,54 @@ export async function runAutomation(
   ctx: AutomationContext,
   deps: RunDeps = {}
 ): Promise<RunResult> {
-  const actions = parseActions(automation.actions);
-  const setVariable = deps.setVariable ?? defaultSetVariable(env, automation.project_id);
-  const emitEvent = deps.emitEvent ?? defaultEmitEvent(env);
+  const graph = toGraph(automation);
+  const byId = nodesById(graph);
+  // Enter at the trigger that fired (multi-trigger); fall back to the graph entry.
+  const start = (ctx.entryNodeId ? byId.get(ctx.entryNodeId) : undefined) ?? entryNode(graph);
+
+  // Trigger cooldown: suppress re-fires within the window, measured from the last
+  // real run. Skipped silently (no last_run_at write) so the window isn't reset,
+  // and never applied to manual runs.
+  const cooldown = Number((start?.config as { cooldown_seconds?: unknown })?.cooldown_seconds ?? 0);
+  if (ctx.source !== 'manual' && cooldown > 0 && automation.last_run_at != null
+      && ctx.ts - automation.last_run_at < cooldown) {
+    return { status: 'skipped', actionsRun: 0 };
+  }
+
+  const actionDeps: ActionDeps = {
+    setVariable: deps.setVariable ?? defaultSetVariable(env, automation.project_id),
+    emitEvent: deps.emitEvent ?? defaultEmitEvent(env),
+  };
 
   let actionsRun = 0;
-  let status: RunResult['status'] = actions.length === 0 ? 'skipped' : 'ok';
+  let status: RunStatus = countActionNodes(graph) === 0 ? 'skipped' : 'ok';
   let error: string | undefined;
 
-  try {
-    for (const action of actions) {
-      await runAction(env, automation, ctx, action, setVariable, emitEvent);
+  const visited = new Set<string>();
+  let steps = 0;
+
+  const visit = async (id: string): Promise<void> => {
+    if (visited.has(id)) return;
+    visited.add(id);
+    if (++steps > MAX_STEPS) throw new Error('graph step limit exceeded');
+
+    const node = byId.get(id);
+    if (!node) return;
+
+    // Action nodes execute; trigger nodes are pass-through entrypoints. Condition
+    // nodes will additionally gate which output ports are followed.
+    if (VALID_ACTION_KINDS.has(node.kind)) {
+      await runActionNode(node.kind, { env, automation, ctx, config: node.config, deps: actionDeps });
       actionsRun++;
     }
+
+    for (const e of outgoingEdges(graph, id)) {
+      await visit(e.to);
+    }
+  };
+
+  try {
+    if (start) await visit(start.id);
   } catch (e) {
     status = 'error';
     error = (e as Error).message;
@@ -59,36 +97,6 @@ export async function runAutomation(
   return { status, error, actionsRun };
 }
 
-async function runAction(
-  env: Env,
-  automation: AutomationRow,
-  ctx: AutomationContext,
-  action: Action,
-  setVariable: NonNullable<RunDeps['setVariable']>,
-  emitEvent: NonNullable<RunDeps['emitEvent']>
-): Promise<void> {
-  switch (action.type) {
-    case 'set_variable':
-      await setVariable(action.variable, action.value);
-      return;
-
-    case 'call_integration': {
-      const integration = await loadIntegration(env, automation.project_id, action.integration_id);
-      if (!integration) throw new Error(`integration ${action.integration_id} not found`);
-      const res = await executeIntegration(integration, ctx, action.payload);
-      await recordIntegrationRun(env, integration.id, res).catch(() => {});
-      if (res.status === 'error') throw new Error(`integration "${integration.name}": ${res.detail}`);
-      return;
-    }
-
-    case 'emit_event': {
-      if (ctx.depth >= MAX_DEPTH) throw new Error('max event depth exceeded');
-      await emitEvent(action.event, action.payload, { ...ctx, depth: ctx.depth + 1 });
-      return;
-    }
-  }
-}
-
 // Loads enabled `event` automations matching `eventName` and runs each. Returns
 // how many ran. Used by POST /v1/events and by emit_event chaining.
 export async function dispatchEvent(
@@ -102,66 +110,48 @@ export async function dispatchEvent(
     .prepare(
       `SELECT id, project_id, name, enabled, trigger_type, trigger_config, actions, last_run_at
          FROM automations
-        WHERE project_id = ? AND enabled = 1 AND trigger_type = 'event'`
+        WHERE project_id = ? AND enabled = 1 AND trigger_kinds LIKE '%,event,%'`
     )
     .bind(projectId)
     .all<AutomationRow>();
 
   let ran = 0;
   for (const a of rows.results) {
-    let cfg: { event?: string };
-    try { cfg = JSON.parse(a.trigger_config); } catch { cfg = {}; }
-    if (cfg.event !== eventName) continue;
-
-    const ctx: AutomationContext = {
-      source: 'event',
-      projectId,
-      ts: Math.floor(Date.now() / 1000),
-      event: eventName,
-      payload,
-      depth,
-    };
-    await runAutomation(env, a, ctx, { emitEvent: defaultEmitEvent(env) });
-    ran++;
+    for (const node of triggerNodes(toGraph(a))) {
+      if (node.kind !== 'event' || (node.config as { event?: string }).event !== eventName) continue;
+
+      const ctx: AutomationContext = {
+        source: 'event',
+        projectId,
+        ts: Math.floor(Date.now() / 1000),
+        event: eventName,
+        payload,
+        depth,
+        entryNodeId: node.id,
+      };
+      await runAutomation(env, a, ctx, { emitEvent: defaultEmitEvent(env) });
+      ran++;
+    }
   }
   return ran;
 }
 
-function defaultSetVariable(env: Env, projectId: string) {
-  return async (variable: string, value: unknown): Promise<void> => {
+function defaultSetVariable(env: Env, projectId: string): ActionDeps['setVariable'] {
+  return async (variable, value) => {
     await projectStub(env, projectId).addControl(newId('control'), variable, value);
   };
 }
 
-function defaultEmitEvent(env: Env) {
-  return async (
-    event: string,
-    payload: Record<string, unknown> | undefined,
-    ctx: AutomationContext
-  ): Promise<void> => {
+function defaultEmitEvent(env: Env): ActionDeps['emitEvent'] {
+  return async (event, payload, ctx) => {
     await dispatchEvent(env, ctx.projectId, event, payload, ctx.depth);
   };
 }
 
-async function loadIntegration(
-  env: Env,
-  projectId: string,
-  id: string
-): Promise<IntegrationRow | null> {
-  return env.DB
-    .prepare(
-      `SELECT id, project_id, name, kind, config, enabled
-         FROM integrations
-        WHERE id = ? AND project_id = ? AND archived_at IS NULL`
-    )
-    .bind(id, projectId)
-    .first<IntegrationRow>();
-}
-
 async function recordRun(
   env: Env,
   id: string,
-  status: RunResult['status'],
+  status: RunStatus,
   error: string | undefined
 ): Promise<void> {
   const now = Math.floor(Date.now() / 1000);
@@ -170,16 +160,3 @@ async function recordRun(
     .bind(now, status, error ?? null, id)
     .run();
 }
-
-function parseActions(raw: string): Action[] {
-  let parsed: unknown;
-  try { parsed = JSON.parse(raw); } catch { return []; }
-  if (!Array.isArray(parsed)) return [];
-  return parsed.filter(isAction);
-}
-
-function isAction(a: unknown): a is Action {
-  if (!a || typeof a !== 'object') return false;
-  const t = (a as { type?: unknown }).type;
-  return t === 'set_variable' || t === 'call_integration' || t === 'emit_event';
-}
diff --git a/worker/src/platform/engine/schedule.ts b/worker/src/platform/engine/schedule.ts
index 523c8a5..9b0d640 100644
--- a/worker/src/platform/engine/schedule.ts
+++ b/worker/src/platform/engine/schedule.ts
@@ -2,8 +2,8 @@
 // sunset/sunrise automations, and run a planned set when due.
 //
 // The DO alarm fires at `computeNextScheduled().fireAt`, then runs exactly the
-// `dueIds` planned for that instant — so it's robust to wake-up drift (we fire
-// the ids that were due at the planned time, not whatever the clock says).
+// `due` (automation, node) pairs planned for that instant — so it's robust to
+// wake-up drift (we fire what was due at the planned time, not the clock).
 
 import type { Env } from '../../env';
 import type {
@@ -14,49 +14,52 @@ import type {
 } from './types';
 import { sunTimes } from './solar';
 import { runAutomation } from './run';
+import { toGraph, triggerNodes, nodesById } from './graph';
 
-export type SchedulePlan = { fireAt: number | null; dueIds: string[] };
+// A due fire is a specific schedule/solar trigger node within an automation.
+export type ScheduleDue = { id: string; nodeId: string };
+export type SchedulePlan = { fireAt: number | null; due: ScheduleDue[] };
 
-// Soonest upcoming fire across all enabled schedule/solar automations, plus the
-// ids that share that instant.
+// Soonest upcoming fire across every schedule/solar trigger node of all enabled
+// automations, plus the (automation, node) pairs that share that instant.
 export async function computeNextScheduled(env: Env): Promise<SchedulePlan> {
   const rows = await env.DB
     .prepare(
       `SELECT id, project_id, name, enabled, trigger_type, trigger_config, actions, last_run_at
          FROM automations
-        WHERE enabled = 1 AND trigger_type IN ('schedule', 'sunset_sunrise')`
+        WHERE enabled = 1 AND (trigger_kinds LIKE '%,schedule,%' OR trigger_kinds LIKE '%,sunset_sunrise,%')`
     )
     .all<AutomationRow>();
 
   const now = Date.now();
   let best: number | null = null;
-  const fireAtById = new Map<string, number>();
+  const entries: { id: string; nodeId: string; fireAt: number }[] = [];
 
   for (const a of rows.results) {
-    let next: number | null = null;
-    try {
-      next = a.trigger_type === 'schedule'
-        ? nextScheduleFireAt(JSON.parse(a.trigger_config) as ScheduleTriggerConfig, now)
-        : nextSolarFireAt(JSON.parse(a.trigger_config) as SolarTriggerConfig, now);
-    } catch {
-      next = null;
+    for (const node of triggerNodes(toGraph(a))) {
+      let next: number | null = null;
+      try {
+        if (node.kind === 'schedule') next = nextScheduleFireAt(node.config as ScheduleTriggerConfig, now);
+        else if (node.kind === 'sunset_sunrise') next = nextSolarFireAt(node.config as SolarTriggerConfig, now);
+      } catch {
+        next = null;
+      }
+      if (next == null) continue;
+      entries.push({ id: a.id, nodeId: node.id, fireAt: next });
+      if (best == null || next < best) best = next;
     }
-    if (next == null) continue;
-    fireAtById.set(a.id, next);
-    if (best == null || next < best) best = next;
   }
 
-  if (best == null) return { fireAt: null, dueIds: [] };
-  const dueIds: string[] = [];
-  for (const [id, t] of fireAtById) if (t - best < 1000) dueIds.push(id);
-  return { fireAt: best, dueIds };
+  if (best == null) return { fireAt: null, due: [] };
+  const due = entries.filter((e) => e.fireAt - best! < 1000).map(({ id, nodeId }) => ({ id, nodeId }));
+  return { fireAt: best, due };
 }
 
-// Run the planned automations. `fireAtSec` dedups against last_run_at so a
-// duplicate scheduler instance (or replay) can't double-fire the same instant.
-export async function runScheduledByIds(env: Env, ids: string[], fireAtSec: number): Promise<number> {
+// Run the planned fires. `fireAtSec` dedups against last_run_at so a duplicate
+// scheduler instance (or replay) can't double-fire the same instant.
+export async function runScheduledDue(env: Env, due: ScheduleDue[], fireAtSec: number): Promise<number> {
   let ran = 0;
-  for (const id of ids) {
+  for (const { id, nodeId } of due) {
     const a = await env.DB
       .prepare(
         `SELECT id, project_id, name, enabled, trigger_type, trigger_config, actions, last_run_at
@@ -67,11 +70,13 @@ export async function runScheduledByIds(env: Env, ids: string[], fireAtSec: numb
     if (!a) continue;
     if (a.last_run_at != null && a.last_run_at >= fireAtSec) continue; // already fired this instant
 
+    const node = nodesById(toGraph(a)).get(nodeId);
     const ctx: AutomationContext = {
-      source: a.trigger_type === 'schedule' ? 'schedule' : 'sunset_sunrise',
+      source: node?.kind === 'sunset_sunrise' ? 'sunset_sunrise' : 'schedule',
       projectId: a.project_id,
       ts: Math.floor(Date.now() / 1000),
       depth: 0,
+      entryNodeId: nodeId,
     };
     try {
       await runAutomation(env, a, ctx);
diff --git a/worker/src/platform/engine/types.ts b/worker/src/platform/engine/types.ts
index eddc772..0b2621b 100644
--- a/worker/src/platform/engine/types.ts
+++ b/worker/src/platform/engine/types.ts
@@ -10,6 +10,7 @@ export type VariableTriggerConfig = {
   operator: VariableOperator;
   value?: number | string | boolean;   // omitted for 'changed'
   mode?: 'edge' | 'always';            // edge (default): fire once on entry
+  cooldown_seconds?: number;           // min seconds between runs; suppresses re-fires
 };
 
 export type ScheduleTriggerConfig = {
@@ -34,6 +35,10 @@ export type Action =
   | { type: 'call_integration'; integration_id: string; payload?: Record<string, unknown> }
   | { type: 'emit_event'; event: string; payload?: Record<string, unknown> };
 
+// Flow-graph model lives in the shared catalog (used by web + worker); re-exported
+// so engine imports keep resolving from './types'.
+export type { GraphNode, GraphEdge, AutomationGraph } from '@nodrix/blocks-shared';
+
 export type TriggerSource = 'variable' | 'manual' | 'event' | 'schedule' | 'sunset_sunrise';
 
 // Threaded through a run: feeds integration templating/payloads, the audit
@@ -47,6 +52,7 @@ export type AutomationContext = {
   event?: string;
   payload?: Record<string, unknown>;
   depth: number;                       // emit_event recursion depth
+  entryNodeId?: string;                // trigger node that fired; defaults to the graph entry
 };
 
 export type RunStatus = 'ok' | 'error' | 'skipped';
@@ -66,6 +72,7 @@ export type AutomationRow = {
   trigger_type: string;
   trigger_config: string;              // JSON
   actions: string;                     // JSON
+  graph?: string | null;               // JSON AutomationGraph; preferred when present
   last_run_at: number | null;
 };
 
diff --git a/worker/test/graph.test.ts b/worker/test/graph.test.ts
new file mode 100644
index 0000000..dc12f15
--- /dev/null
+++ b/worker/test/graph.test.ts
@@ -0,0 +1,64 @@
+// Unit tests for the convert-on-read shim: the legacy trigger_config/actions row
+// must rebuild into the same linear trigger → action chain the executor walks.
+
+import { expect, test } from 'bun:test';
+import { toGraph, entryNode, countActionNodes, outgoingEdges } from '../src/platform/engine/graph';
+import type { AutomationRow } from '../src/platform/engine/types';
+
+function row(over: Partial<AutomationRow>): AutomationRow {
+  return {
+    id: 'au1', project_id: 'p1', name: 'a', enabled: 1,
+    trigger_type: 'variable', trigger_config: '{}', actions: '[]', last_run_at: null,
+    ...over,
+  };
+}
+
+test('variable trigger + actions → trigger node and ordered chain', () => {
+  const g = toGraph(row({
+    trigger_type: 'variable',
+    trigger_config: JSON.stringify({ variable: 'temp', operator: '>', value: 30 }),
+    actions: JSON.stringify([
+      { type: 'set_variable', variable: 'fan', value: 1 },
+      { type: 'call_integration', integration_id: 'int1' },
+    ]),
+  }));
+
+  expect(g.nodes.map((n) => n.kind)).toEqual(['variable', 'set_variable', 'call_integration']);
+  expect(entryNode(g)?.kind).toBe('variable');
+  expect(countActionNodes(g)).toBe(2);
+  // chain: trigger → a0 → a1
+  expect(g.edges).toEqual([
+    { from: 'trigger', to: 'a0', port: 'out' },
+    { from: 'a0', to: 'a1', port: 'out' },
+  ]);
+  // trigger config preserved, action `type` stripped into kind
+  expect(entryNode(g)?.config).toEqual({ variable: 'temp', operator: '>', value: 30 });
+  expect(g.nodes[1]?.config).toEqual({ variable: 'fan', value: 1 });
+});
+
+test('invalid action kinds are dropped', () => {
+  const g = toGraph(row({
+    actions: JSON.stringify([
+      { type: 'set_variable', variable: 'x', value: 1 },
+      { type: 'bogus_action', foo: 1 },
+    ]),
+  }));
+  expect(countActionNodes(g)).toBe(1);
+  expect(g.nodes.map((n) => n.kind)).toEqual(['variable', 'set_variable']);
+});
+
+test('manual trigger with no actions → single trigger node, no edges', () => {
+  const g = toGraph(row({ trigger_type: 'manual', trigger_config: '{}', actions: '[]' }));
+  expect(g.nodes.map((n) => n.kind)).toEqual(['manual']);
+  expect(g.edges).toEqual([]);
+  expect(countActionNodes(g)).toBe(0);
+});
+
+test('unknown trigger_type → actions form the entry chain', () => {
+  const g = toGraph(row({
+    trigger_type: 'not_a_trigger',
+    actions: JSON.stringify([{ type: 'emit_event', event: 'boom' }]),
+  }));
+  expect(entryNode(g)?.kind).toBe('emit_event');
+  expect(outgoingEdges(g, 'a0')).toEqual([]);
+});