[WIP] Workflows

migrations/20250101000004_trigger_sensor_event_rule.sql

@@ -2,6 +2,12 @@
 -- Description: Creates trigger, sensor, event, enforcement, and action tables
 --              with runtime version constraint support. Includes webhook key
 --              generation function used by webhook management functions in 000007.
+--
+--              NOTE: The event and enforcement tables are converted to TimescaleDB
+--              hypertables in migration 000009. Hypertables cannot be the target of
+--              FK constraints, so enforcement.event is a plain BIGINT with no FK.
+--              FKs *from* hypertables to regular tables (e.g., event.trigger → trigger,
+--              enforcement.rule → rule) are supported by TimescaleDB 2.x and are kept.
 -- Version: 20250101000004
 
 -- ============================================================================
@@ -140,8 +146,7 @@ CREATE TABLE event (
     source_ref TEXT,
     created TIMESTAMPTZ NOT NULL DEFAULT NOW(),
     rule BIGINT,
-    rule_ref TEXT,
-    updated TIMESTAMPTZ NOT NULL DEFAULT NOW()
+    rule_ref TEXT
 );
 
 -- Indexes
@@ -154,12 +159,6 @@ CREATE INDEX idx_event_trigger_ref_created ON event(trigger_ref, created DESC);
 CREATE INDEX idx_event_source_created ON event(source, created DESC);
 CREATE INDEX idx_event_payload_gin ON event USING GIN (payload);
 
--- Trigger
-CREATE TRIGGER update_event_updated
-    BEFORE UPDATE ON event
-    FOR EACH ROW
-    EXECUTE FUNCTION update_updated_column();
-
 -- Comments
 COMMENT ON TABLE event IS 'Events are instances of triggers firing';
 COMMENT ON COLUMN event.trigger IS 'Trigger that fired (may be null if trigger deleted)';
@@ -178,13 +177,13 @@ CREATE TABLE enforcement (
     rule_ref TEXT NOT NULL,
     trigger_ref TEXT NOT NULL,
     config JSONB,
-    event BIGINT REFERENCES event(id) ON DELETE SET NULL,
+    event BIGINT,           -- references event(id); no FK because event becomes a hypertable
     status enforcement_status_enum NOT NULL DEFAULT 'created',
     payload JSONB NOT NULL,
     condition enforcement_condition_enum NOT NULL DEFAULT 'all',
     conditions JSONB NOT NULL DEFAULT '[]'::jsonb,
     created TIMESTAMPTZ NOT NULL DEFAULT NOW(),
-    updated TIMESTAMPTZ NOT NULL DEFAULT NOW(),
+    resolved_at TIMESTAMPTZ,
 
     -- Constraints
     CONSTRAINT enforcement_condition_check CHECK (condition IN ('any', 'all'))
@@ -203,18 +202,13 @@ CREATE INDEX idx_enforcement_event_status ON enforcement(event, status);
 CREATE INDEX idx_enforcement_payload_gin ON enforcement USING GIN (payload);
 CREATE INDEX idx_enforcement_conditions_gin ON enforcement USING GIN (conditions);
 
--- Trigger
-CREATE TRIGGER update_enforcement_updated
-    BEFORE UPDATE ON enforcement
-    FOR EACH ROW
-    EXECUTE FUNCTION update_updated_column();
-
 -- Comments
 COMMENT ON TABLE enforcement IS 'Enforcements represent rule triggering by events';
 COMMENT ON COLUMN enforcement.rule IS 'Rule being enforced (may be null if rule deleted)';
 COMMENT ON COLUMN enforcement.rule_ref IS 'Rule reference (preserved even if rule deleted)';
-COMMENT ON COLUMN enforcement.event IS 'Event that triggered this enforcement';
-COMMENT ON COLUMN enforcement.status IS 'Processing status';
+COMMENT ON COLUMN enforcement.event IS 'Event that triggered this enforcement (no FK — event is a hypertable)';
+COMMENT ON COLUMN enforcement.status IS 'Processing status (created → processed or disabled)';
+COMMENT ON COLUMN enforcement.resolved_at IS 'Timestamp when the enforcement was resolved (status changed from created to processed/disabled). NULL while status is created.';
 COMMENT ON COLUMN enforcement.payload IS 'Event payload for rule evaluation';
 COMMENT ON COLUMN enforcement.condition IS 'Logical operator for conditions (any=OR, all=AND)';
 COMMENT ON COLUMN enforcement.conditions IS 'Condition expressions to evaluate';

migrations/20250101000005_execution_and_operations.sql

@@ -3,6 +3,14 @@
 --              Includes retry tracking, worker health views, and helper functions.
 --              Consolidates former migrations: 000006 (execution_system), 000008
 --              (worker_notification), 000014 (worker_table), and 20260209 (phase3).
+--
+--              NOTE: The execution table is converted to a TimescaleDB hypertable in
+--              migration 000009. Hypertables cannot be the target of FK constraints,
+--              so columns referencing execution (inquiry.execution, workflow_execution.execution)
+--              are plain BIGINT with no FK. Similarly, columns ON the execution table that
+--              would self-reference or reference other hypertables (parent, enforcement,
+--              original_execution) are plain BIGINT. The action and executor FKs are also
+--              omitted since they would need to be dropped during hypertable conversion.
 -- Version: 20250101000005
 
 -- ============================================================================
@@ -11,25 +19,25 @@
 
 CREATE TABLE execution (
     id BIGSERIAL PRIMARY KEY,
-    action BIGINT REFERENCES action(id) ON DELETE SET NULL,
+    action BIGINT,          -- references action(id); no FK because execution becomes a hypertable
     action_ref TEXT NOT NULL,
     config JSONB,
     env_vars JSONB,
-    parent BIGINT REFERENCES execution(id) ON DELETE SET NULL,
-    enforcement BIGINT REFERENCES enforcement(id) ON DELETE SET NULL,
-    executor BIGINT REFERENCES identity(id) ON DELETE SET NULL,
+    parent BIGINT,          -- self-reference; no FK because execution becomes a hypertable
+    enforcement BIGINT,     -- references enforcement(id); no FK (both are hypertables)
+    executor BIGINT,        -- references identity(id); no FK because execution becomes a hypertable
     status execution_status_enum NOT NULL DEFAULT 'requested',
     result JSONB,
     created TIMESTAMPTZ NOT NULL DEFAULT NOW(),
     is_workflow BOOLEAN DEFAULT false NOT NULL,
-    workflow_def BIGINT,
+    workflow_def BIGINT,    -- references workflow_definition(id); no FK because execution becomes a hypertable
     workflow_task JSONB,
 
     -- Retry tracking (baked in from phase 3)
     retry_count INTEGER NOT NULL DEFAULT 0,
     max_retries INTEGER,
     retry_reason TEXT,
-    original_execution BIGINT REFERENCES execution(id) ON DELETE SET NULL,
+    original_execution BIGINT, -- self-reference; no FK because execution becomes a hypertable
 
     updated TIMESTAMPTZ NOT NULL DEFAULT NOW()
 );
@@ -65,9 +73,9 @@ COMMENT ON COLUMN execution.action IS 'Action being executed (may be null if act
 COMMENT ON COLUMN execution.action_ref IS 'Action reference (preserved even if action deleted)';
 COMMENT ON COLUMN execution.config IS 'Snapshot of action configuration at execution time';
 COMMENT ON COLUMN execution.env_vars IS 'Environment variables for this execution as key-value pairs (string -> string). These are set in the execution environment and are separate from action parameters. Used for execution context, configuration, and non-sensitive metadata.';
-COMMENT ON COLUMN execution.parent IS 'Parent execution ID for workflow hierarchies';
-COMMENT ON COLUMN execution.enforcement IS 'Enforcement that triggered this execution (if rule-driven)';
-COMMENT ON COLUMN execution.executor IS 'Identity that initiated the execution';
+COMMENT ON COLUMN execution.parent IS 'Parent execution ID for workflow hierarchies (no FK — execution is a hypertable)';
+COMMENT ON COLUMN execution.enforcement IS 'Enforcement that triggered this execution (no FK — both are hypertables)';
+COMMENT ON COLUMN execution.executor IS 'Identity that initiated the execution (no FK — execution is a hypertable)';
 COMMENT ON COLUMN execution.status IS 'Current execution lifecycle status';
 COMMENT ON COLUMN execution.result IS 'Execution output/results';
 COMMENT ON COLUMN execution.retry_count IS 'Current retry attempt number (0 = first attempt, 1 = first retry, etc.)';
@@ -83,7 +91,7 @@ COMMENT ON COLUMN execution.original_execution IS 'ID of the original execution
 
 CREATE TABLE inquiry (
     id BIGSERIAL PRIMARY KEY,
-    execution BIGINT NOT NULL REFERENCES execution(id) ON DELETE CASCADE,
+    execution BIGINT NOT NULL, -- references execution(id); no FK because execution is a hypertable
     prompt TEXT NOT NULL,
     response_schema JSONB,
     assigned_to BIGINT REFERENCES identity(id) ON DELETE SET NULL,
@@ -114,7 +122,7 @@ CREATE TRIGGER update_inquiry_updated
 
 -- Comments
 COMMENT ON TABLE inquiry IS 'Inquiries enable human-in-the-loop workflows with async user interactions';
-COMMENT ON COLUMN inquiry.execution IS 'Execution that is waiting on this inquiry';
+COMMENT ON COLUMN inquiry.execution IS 'Execution that is waiting on this inquiry (no FK — execution is a hypertable)';
 COMMENT ON COLUMN inquiry.prompt IS 'Question or prompt text for the user';
 COMMENT ON COLUMN inquiry.response_schema IS 'JSON schema defining expected response format';
 COMMENT ON COLUMN inquiry.assigned_to IS 'Identity who should respond to this inquiry';

migrations/20250101000006_workflow_system.sql

@@ -1,6 +1,13 @@
 -- Migration: Workflow System
 -- Description: Creates workflow_definition and workflow_execution tables
 --              (workflow_task_execution consolidated into execution.workflow_task JSONB)
+--
+--              NOTE: The execution table is converted to a TimescaleDB hypertable in
+--              migration 000009. Hypertables cannot be the target of FK constraints,
+--              so workflow_execution.execution is a plain BIGINT with no FK.
+--              execution.workflow_def also has no FK (added as plain BIGINT in 000005)
+--              since execution is a hypertable and FKs from hypertables are only
+--              supported for simple cases — we omit it for consistency.
 -- Version: 20250101000006
 
 -- ============================================================================
@@ -49,7 +56,7 @@ COMMENT ON COLUMN workflow_definition.out_schema IS 'JSON schema for workflow ou
 
 CREATE TABLE workflow_execution (
     id BIGSERIAL PRIMARY KEY,
-    execution BIGINT NOT NULL REFERENCES execution(id) ON DELETE CASCADE,
+    execution BIGINT NOT NULL, -- references execution(id); no FK because execution is a hypertable
     workflow_def BIGINT NOT NULL REFERENCES workflow_definition(id) ON DELETE CASCADE,
     current_tasks TEXT[] DEFAULT '{}',
     completed_tasks TEXT[] DEFAULT '{}',
@@ -78,7 +85,7 @@ CREATE TRIGGER update_workflow_execution_updated
     EXECUTE FUNCTION update_updated_column();
 
 -- Comments
-COMMENT ON TABLE workflow_execution IS 'Runtime state tracking for workflow executions';
+COMMENT ON TABLE workflow_execution IS 'Runtime state tracking for workflow executions. execution column has no FK — execution is a hypertable.';
 COMMENT ON COLUMN workflow_execution.variables IS 'Workflow-scoped variables, updated via publish directives';
 COMMENT ON COLUMN workflow_execution.task_graph IS 'Execution graph with dependencies and transitions';
 COMMENT ON COLUMN workflow_execution.current_tasks IS 'Array of task names currently executing';
@@ -89,22 +96,15 @@ COMMENT ON COLUMN workflow_execution.paused IS 'True if workflow execution is pa
 -- ============================================================================
 
 ALTER TABLE action
-    ADD COLUMN is_workflow BOOLEAN DEFAULT false NOT NULL,
     ADD COLUMN workflow_def BIGINT REFERENCES workflow_definition(id) ON DELETE CASCADE;
 
-CREATE INDEX idx_action_is_workflow ON action(is_workflow) WHERE is_workflow = true;
 CREATE INDEX idx_action_workflow_def ON action(workflow_def);
 
-COMMENT ON COLUMN action.is_workflow IS 'True if this action is a workflow (composable action graph)';
-COMMENT ON COLUMN action.workflow_def IS 'Reference to workflow definition if is_workflow=true';
+COMMENT ON COLUMN action.workflow_def IS 'Reference to workflow definition (non-null means this action is a workflow)';
 
--- ============================================================================
--- ADD FOREIGN KEY CONSTRAINT FOR EXECUTION.WORKFLOW_DEF
--- ============================================================================
-
-ALTER TABLE execution
-    ADD CONSTRAINT execution_workflow_def_fkey
-    FOREIGN KEY (workflow_def) REFERENCES workflow_definition(id) ON DELETE CASCADE;
+-- NOTE: execution.workflow_def has no FK constraint because execution is a
+-- TimescaleDB hypertable (converted in migration 000009). The column was
+-- created as a plain BIGINT in migration 000005.
 
 -- ============================================================================
 -- WORKFLOW VIEWS
@@ -143,6 +143,6 @@ SELECT
     a.pack as pack_id,
     a.pack_ref
 FROM workflow_definition wd
-LEFT JOIN action a ON a.workflow_def = wd.id AND a.is_workflow = true;
+LEFT JOIN action a ON a.workflow_def = wd.id;
 
 COMMENT ON VIEW workflow_action_link IS 'Links workflow definitions to their corresponding action records';

migrations/20250101000008_notify_triggers.sql

@@ -163,7 +163,7 @@ BEGIN
         'config', NEW.config,
         'payload', NEW.payload,
         'created', NEW.created,
-        'updated', NEW.updated
+        'resolved_at', NEW.resolved_at
     );
 
     PERFORM pg_notify('enforcement_created', payload::text);
@@ -203,7 +203,7 @@ BEGIN
             'config', NEW.config,
             'payload', NEW.payload,
             'created', NEW.created,
-            'updated', NEW.updated
+            'resolved_at', NEW.resolved_at
         );
 
         PERFORM pg_notify('enforcement_status_changed', payload::text);

migrations/20250101000009_timescaledb_history.sql

@@ -1,10 +1,15 @@
 -- Migration: TimescaleDB Entity History and Analytics
--- Description: Creates append-only history hypertables for execution, worker, enforcement,
---              and event tables. Uses JSONB diff format to track field-level changes via
---              PostgreSQL triggers. Includes continuous aggregates for dashboard analytics.
---              Consolidates former migrations: 20260226100000 (entity_history_timescaledb),
---              20260226200000 (continuous_aggregates), and 20260226300000 (fix + result digest).
+-- Description: Creates append-only history hypertables for execution and worker tables.
+--              Uses JSONB diff format to track field-level changes via PostgreSQL triggers.
+--              Converts the event, enforcement, and execution tables into TimescaleDB
+--              hypertables (events are immutable; enforcements are updated exactly once;
+--              executions are updated ~4 times during their lifecycle).
+--              Includes continuous aggregates for dashboard analytics.
 --              See docs/plans/timescaledb-entity-history.md for full design.
+--
+--              NOTE: FK constraints that would reference hypertable targets were never
+--              created in earlier migrations (000004, 000005, 000006), so no DROP
+--              CONSTRAINT statements are needed here.
 -- Version: 20250101000009
 
 -- ============================================================================
@@ -114,67 +119,76 @@ CREATE INDEX idx_worker_history_changed_fields
 COMMENT ON TABLE worker_history IS 'Append-only history of field-level changes to the worker table (TimescaleDB hypertable)';
 COMMENT ON COLUMN worker_history.entity_ref IS 'Denormalized worker name for JOIN-free queries';
 
--- ----------------------------------------------------------------------------
--- enforcement_history
+-- ============================================================================
+-- CONVERT EVENT TABLE TO HYPERTABLE
+-- ============================================================================
+-- Events are immutable after insert — they are never updated. Instead of
+-- maintaining a separate event_history table to track changes that never
+-- happen, we convert the event table itself into a TimescaleDB hypertable
+-- partitioned on `created`. This gives us automatic time-based partitioning,
+-- compression, and retention for free.
+--
+-- No FK constraints reference event(id) — enforcement.event was created as a
+-- plain BIGINT in migration 000004 (hypertables cannot be FK targets).
 -- ----------------------------------------------------------------------------
 
-CREATE TABLE enforcement_history (
-    time             TIMESTAMPTZ    NOT NULL DEFAULT NOW(),
-    operation        TEXT           NOT NULL,
-    entity_id        BIGINT         NOT NULL,
-    entity_ref       TEXT,
-    changed_fields   TEXT[]         NOT NULL DEFAULT '{}',
-    old_values       JSONB,
-    new_values       JSONB
-);
+-- Replace the single-column PK with a composite PK that includes the
+-- partitioning column (required by TimescaleDB).
+ALTER TABLE event DROP CONSTRAINT event_pkey;
+ALTER TABLE event ADD PRIMARY KEY (id, created);
 
-SELECT create_hypertable('enforcement_history', 'time',
-    chunk_time_interval => INTERVAL '1 day');
+SELECT create_hypertable('event', 'created',
+    chunk_time_interval => INTERVAL '1 day',
+    migrate_data        => true);
 
-CREATE INDEX idx_enforcement_history_entity
-    ON enforcement_history (entity_id, time DESC);
+COMMENT ON TABLE event IS 'Events are instances of triggers firing (TimescaleDB hypertable partitioned on created)';
 
-CREATE INDEX idx_enforcement_history_entity_ref
-    ON enforcement_history (entity_ref, time DESC);
-
-CREATE INDEX idx_enforcement_history_status_changes
-    ON enforcement_history (time DESC)
-    WHERE 'status' = ANY(changed_fields);
-
-CREATE INDEX idx_enforcement_history_changed_fields
-    ON enforcement_history USING GIN (changed_fields);
-
-COMMENT ON TABLE enforcement_history IS 'Append-only history of field-level changes to the enforcement table (TimescaleDB hypertable)';
-COMMENT ON COLUMN enforcement_history.entity_ref IS 'Denormalized rule_ref for JOIN-free queries';
-
--- ----------------------------------------------------------------------------
--- event_history
+-- ============================================================================
+-- CONVERT ENFORCEMENT TABLE TO HYPERTABLE
+-- ============================================================================
+-- Enforcements are created and then updated exactly once (status changes from
+-- `created` to `processed` or `disabled` within ~1 second). This single update
+-- happens well before the 7-day compression window, so UPDATE on uncompressed
+-- chunks works without issues.
+--
+-- No FK constraints reference enforcement(id) — execution.enforcement was
+-- created as a plain BIGINT in migration 000005.
 -- ----------------------------------------------------------------------------
 
-CREATE TABLE event_history (
-    time             TIMESTAMPTZ    NOT NULL DEFAULT NOW(),
-    operation        TEXT           NOT NULL,
-    entity_id        BIGINT         NOT NULL,
-    entity_ref       TEXT,
-    changed_fields   TEXT[]         NOT NULL DEFAULT '{}',
-    old_values       JSONB,
-    new_values       JSONB
-);
+ALTER TABLE enforcement DROP CONSTRAINT enforcement_pkey;
+ALTER TABLE enforcement ADD PRIMARY KEY (id, created);
 
-SELECT create_hypertable('event_history', 'time',
-    chunk_time_interval => INTERVAL '1 day');
+SELECT create_hypertable('enforcement', 'created',
+    chunk_time_interval => INTERVAL '1 day',
+    migrate_data        => true);
 
-CREATE INDEX idx_event_history_entity
-    ON event_history (entity_id, time DESC);
+COMMENT ON TABLE enforcement IS 'Enforcements represent rule triggering by events (TimescaleDB hypertable partitioned on created)';
 
-CREATE INDEX idx_event_history_entity_ref
-    ON event_history (entity_ref, time DESC);
+-- ============================================================================
+-- CONVERT EXECUTION TABLE TO HYPERTABLE
+-- ============================================================================
+-- Executions are updated ~4 times during their lifecycle (requested → scheduled
+-- → running → completed/failed), completing within at most ~1 day — well before
+-- the 7-day compression window. The `updated` column and its BEFORE UPDATE
+-- trigger are preserved (used by timeout monitor and UI).
+--
+-- No FK constraints reference execution(id) — inquiry.execution,
+-- workflow_execution.execution, execution.parent, and execution.original_execution
+-- were all created as plain BIGINT columns in migrations 000005 and 000006.
+--
+-- The existing execution_history hypertable and its trigger are preserved —
+-- they track field-level diffs of each update, which remains valuable for
+-- a mutable table.
+-- ----------------------------------------------------------------------------
 
-CREATE INDEX idx_event_history_changed_fields
-    ON event_history USING GIN (changed_fields);
+ALTER TABLE execution DROP CONSTRAINT execution_pkey;
+ALTER TABLE execution ADD PRIMARY KEY (id, created);
 
-COMMENT ON TABLE event_history IS 'Append-only history of field-level changes to the event table (TimescaleDB hypertable)';
-COMMENT ON COLUMN event_history.entity_ref IS 'Denormalized trigger_ref for JOIN-free queries';
+SELECT create_hypertable('execution', 'created',
+    chunk_time_interval => INTERVAL '1 day',
+    migrate_data        => true);
+
+COMMENT ON TABLE execution IS 'Executions represent action runs with workflow support (TimescaleDB hypertable partitioned on created). Updated ~4 times during lifecycle, completing within ~1 day (well before 7-day compression window).';
 
 -- ============================================================================
 -- TRIGGER FUNCTIONS
@@ -341,118 +355,6 @@ $$ LANGUAGE plpgsql;
 
 COMMENT ON FUNCTION record_worker_history() IS 'Records field-level changes to worker table in worker_history hypertable. Excludes heartbeat-only updates.';
 
--- ----------------------------------------------------------------------------
--- enforcement history trigger
--- Tracked fields: status, payload
--- ----------------------------------------------------------------------------
-
-CREATE OR REPLACE FUNCTION record_enforcement_history()
-RETURNS TRIGGER AS $$
-DECLARE
-    changed TEXT[] := '{}';
-    old_vals JSONB := '{}';
-    new_vals JSONB := '{}';
-BEGIN
-    IF TG_OP = 'INSERT' THEN
-        INSERT INTO enforcement_history (time, operation, entity_id, entity_ref, changed_fields, old_values, new_values)
-        VALUES (NOW(), 'INSERT', NEW.id, NEW.rule_ref, '{}', NULL,
-                jsonb_build_object(
-                    'rule_ref', NEW.rule_ref,
-                    'trigger_ref', NEW.trigger_ref,
-                    'status', NEW.status,
-                    'condition', NEW.condition,
-                    'event', NEW.event
-                ));
-        RETURN NEW;
-    END IF;
-
-    IF TG_OP = 'DELETE' THEN
-        INSERT INTO enforcement_history (time, operation, entity_id, entity_ref, changed_fields, old_values, new_values)
-        VALUES (NOW(), 'DELETE', OLD.id, OLD.rule_ref, '{}', NULL, NULL);
-        RETURN OLD;
-    END IF;
-
-    -- UPDATE: detect which fields changed
-    IF OLD.status IS DISTINCT FROM NEW.status THEN
-        changed := array_append(changed, 'status');
-        old_vals := old_vals || jsonb_build_object('status', OLD.status);
-        new_vals := new_vals || jsonb_build_object('status', NEW.status);
-    END IF;
-
-    IF OLD.payload IS DISTINCT FROM NEW.payload THEN
-        changed := array_append(changed, 'payload');
-        old_vals := old_vals || jsonb_build_object('payload', OLD.payload);
-        new_vals := new_vals || jsonb_build_object('payload', NEW.payload);
-    END IF;
-
-    -- Only record if something actually changed
-    IF array_length(changed, 1) > 0 THEN
-        INSERT INTO enforcement_history (time, operation, entity_id, entity_ref, changed_fields, old_values, new_values)
-        VALUES (NOW(), 'UPDATE', NEW.id, NEW.rule_ref, changed, old_vals, new_vals);
-    END IF;
-
-    RETURN NEW;
-END;
-$$ LANGUAGE plpgsql;
-
-COMMENT ON FUNCTION record_enforcement_history() IS 'Records field-level changes to enforcement table in enforcement_history hypertable';
-
--- ----------------------------------------------------------------------------
--- event history trigger
--- Tracked fields: config, payload
--- ----------------------------------------------------------------------------
-
-CREATE OR REPLACE FUNCTION record_event_history()
-RETURNS TRIGGER AS $$
-DECLARE
-    changed TEXT[] := '{}';
-    old_vals JSONB := '{}';
-    new_vals JSONB := '{}';
-BEGIN
-    IF TG_OP = 'INSERT' THEN
-        INSERT INTO event_history (time, operation, entity_id, entity_ref, changed_fields, old_values, new_values)
-        VALUES (NOW(), 'INSERT', NEW.id, NEW.trigger_ref, '{}', NULL,
-                jsonb_build_object(
-                    'trigger_ref', NEW.trigger_ref,
-                    'source', NEW.source,
-                    'source_ref', NEW.source_ref,
-                    'rule', NEW.rule,
-                    'rule_ref', NEW.rule_ref
-                ));
-        RETURN NEW;
-    END IF;
-
-    IF TG_OP = 'DELETE' THEN
-        INSERT INTO event_history (time, operation, entity_id, entity_ref, changed_fields, old_values, new_values)
-        VALUES (NOW(), 'DELETE', OLD.id, OLD.trigger_ref, '{}', NULL, NULL);
-        RETURN OLD;
-    END IF;
-
-    -- UPDATE: detect which fields changed
-    IF OLD.config IS DISTINCT FROM NEW.config THEN
-        changed := array_append(changed, 'config');
-        old_vals := old_vals || jsonb_build_object('config', OLD.config);
-        new_vals := new_vals || jsonb_build_object('config', NEW.config);
-    END IF;
-
-    IF OLD.payload IS DISTINCT FROM NEW.payload THEN
-        changed := array_append(changed, 'payload');
-        old_vals := old_vals || jsonb_build_object('payload', OLD.payload);
-        new_vals := new_vals || jsonb_build_object('payload', NEW.payload);
-    END IF;
-
-    -- Only record if something actually changed
-    IF array_length(changed, 1) > 0 THEN
-        INSERT INTO event_history (time, operation, entity_id, entity_ref, changed_fields, old_values, new_values)
-        VALUES (NOW(), 'UPDATE', NEW.id, NEW.trigger_ref, changed, old_vals, new_vals);
-    END IF;
-
-    RETURN NEW;
-END;
-$$ LANGUAGE plpgsql;
-
-COMMENT ON FUNCTION record_event_history() IS 'Records field-level changes to event table in event_history hypertable';
-
 -- ============================================================================
 -- ATTACH TRIGGERS TO OPERATIONAL TABLES
 -- ============================================================================
@@ -467,20 +369,11 @@ CREATE TRIGGER worker_history_trigger
     FOR EACH ROW
     EXECUTE FUNCTION record_worker_history();
 
-CREATE TRIGGER enforcement_history_trigger
-    AFTER INSERT OR UPDATE OR DELETE ON enforcement
-    FOR EACH ROW
-    EXECUTE FUNCTION record_enforcement_history();
-
-CREATE TRIGGER event_history_trigger
-    AFTER INSERT OR UPDATE OR DELETE ON event
-    FOR EACH ROW
-    EXECUTE FUNCTION record_event_history();
-
 -- ============================================================================
 -- COMPRESSION POLICIES
 -- ============================================================================
 
+-- History tables
 ALTER TABLE execution_history SET (
     timescaledb.compress,
     timescaledb.compress_segmentby = 'entity_id',
@@ -495,28 +388,39 @@ ALTER TABLE worker_history SET (
 );
 SELECT add_compression_policy('worker_history', INTERVAL '7 days');
 
-ALTER TABLE enforcement_history SET (
+-- Event table (hypertable)
+ALTER TABLE event SET (
     timescaledb.compress,
-    timescaledb.compress_segmentby = 'entity_id',
-    timescaledb.compress_orderby = 'time DESC'
+    timescaledb.compress_segmentby = 'trigger_ref',
+    timescaledb.compress_orderby = 'created DESC'
 );
-SELECT add_compression_policy('enforcement_history', INTERVAL '7 days');
+SELECT add_compression_policy('event', INTERVAL '7 days');
 
-ALTER TABLE event_history SET (
+-- Enforcement table (hypertable)
+ALTER TABLE enforcement SET (
     timescaledb.compress,
-    timescaledb.compress_segmentby = 'entity_id',
-    timescaledb.compress_orderby = 'time DESC'
+    timescaledb.compress_segmentby = 'rule_ref',
+    timescaledb.compress_orderby = 'created DESC'
 );
-SELECT add_compression_policy('event_history', INTERVAL '7 days');
+SELECT add_compression_policy('enforcement', INTERVAL '7 days');
+
+-- Execution table (hypertable)
+ALTER TABLE execution SET (
+    timescaledb.compress,
+    timescaledb.compress_segmentby = 'action_ref',
+    timescaledb.compress_orderby = 'created DESC'
+);
+SELECT add_compression_policy('execution', INTERVAL '7 days');
 
 -- ============================================================================
 -- RETENTION POLICIES
 -- ============================================================================
 
 SELECT add_retention_policy('execution_history', INTERVAL '90 days');
-SELECT add_retention_policy('enforcement_history', INTERVAL '90 days');
-SELECT add_retention_policy('event_history', INTERVAL '30 days');
 SELECT add_retention_policy('worker_history', INTERVAL '180 days');
+SELECT add_retention_policy('event', INTERVAL '90 days');
+SELECT add_retention_policy('enforcement', INTERVAL '90 days');
+SELECT add_retention_policy('execution', INTERVAL '90 days');
 
 -- ============================================================================
 -- CONTINUOUS AGGREGATES
@@ -530,6 +434,7 @@ DROP MATERIALIZED VIEW IF EXISTS execution_throughput_hourly CASCADE;
 DROP MATERIALIZED VIEW IF EXISTS event_volume_hourly CASCADE;
 DROP MATERIALIZED VIEW IF EXISTS worker_status_hourly CASCADE;
 DROP MATERIALIZED VIEW IF EXISTS enforcement_volume_hourly CASCADE;
+DROP MATERIALIZED VIEW IF EXISTS execution_volume_hourly CASCADE;
 
 -- ----------------------------------------------------------------------------
 -- execution_status_hourly
@@ -582,17 +487,18 @@ SELECT add_continuous_aggregate_policy('execution_throughput_hourly',
 -- event_volume_hourly
 -- Tracks event creation volume per hour by trigger ref.
 -- Powers: event throughput monitoring widget.
+-- NOTE: Queries the event table directly (it is now a hypertable) instead of
+--       a separate event_history table.
 -- ----------------------------------------------------------------------------
 
 CREATE MATERIALIZED VIEW event_volume_hourly
 WITH (timescaledb.continuous) AS
 SELECT
-    time_bucket('1 hour', time) AS bucket,
-    entity_ref AS trigger_ref,
+    time_bucket('1 hour', created) AS bucket,
+    trigger_ref,
     COUNT(*) AS event_count
-FROM event_history
-WHERE operation = 'INSERT'
-GROUP BY bucket, entity_ref
+FROM event
+GROUP BY bucket, trigger_ref
 WITH NO DATA;
 
 SELECT add_continuous_aggregate_policy('event_volume_hourly',
@@ -629,17 +535,18 @@ SELECT add_continuous_aggregate_policy('worker_status_hourly',
 -- enforcement_volume_hourly
 -- Tracks enforcement creation volume per hour by rule ref.
 -- Powers: rule activation rate monitoring.
+-- NOTE: Queries the enforcement table directly (it is now a hypertable)
+--       instead of a separate enforcement_history table.
 -- ----------------------------------------------------------------------------
 
 CREATE MATERIALIZED VIEW enforcement_volume_hourly
 WITH (timescaledb.continuous) AS
 SELECT
-    time_bucket('1 hour', time) AS bucket,
-    entity_ref AS rule_ref,
+    time_bucket('1 hour', created) AS bucket,
+    rule_ref,
     COUNT(*) AS enforcement_count
-FROM enforcement_history
-WHERE operation = 'INSERT'
-GROUP BY bucket, entity_ref
+FROM enforcement
+GROUP BY bucket, rule_ref
 WITH NO DATA;
 
 SELECT add_continuous_aggregate_policy('enforcement_volume_hourly',
@@ -648,6 +555,34 @@ SELECT add_continuous_aggregate_policy('enforcement_volume_hourly',
     schedule_interval => INTERVAL '30 minutes'
 );
 
+-- ----------------------------------------------------------------------------
+-- execution_volume_hourly
+-- Tracks execution creation volume per hour by action_ref and status.
+-- This queries the execution hypertable directly (like event_volume_hourly
+-- queries the event table). Complements the existing execution_status_hourly
+-- and execution_throughput_hourly aggregates which query execution_history.
+--
+-- Use case: direct execution volume monitoring without relying on the history
+-- trigger (belt-and-suspenders, plus captures the initial status at creation).
+-- ----------------------------------------------------------------------------
+
+CREATE MATERIALIZED VIEW execution_volume_hourly
+WITH (timescaledb.continuous) AS
+SELECT
+    time_bucket('1 hour', created) AS bucket,
+    action_ref,
+    status AS initial_status,
+    COUNT(*) AS execution_count
+FROM execution
+GROUP BY bucket, action_ref, status
+WITH NO DATA;
+
+SELECT add_continuous_aggregate_policy('execution_volume_hourly',
+    start_offset    => INTERVAL '7 days',
+    end_offset      => INTERVAL '1 hour',
+    schedule_interval => INTERVAL '30 minutes'
+);
+
 -- ============================================================================
 -- INITIAL REFRESH NOTE
 -- ============================================================================
@@ -664,3 +599,4 @@ SELECT add_continuous_aggregate_policy('enforcement_volume_hourly',
 --   CALL refresh_continuous_aggregate('event_volume_hourly', NULL, NOW());
 --   CALL refresh_continuous_aggregate('worker_status_hourly', NULL, NOW());
 --   CALL refresh_continuous_aggregate('enforcement_volume_hourly', NULL, NOW());
+--   CALL refresh_continuous_aggregate('execution_volume_hourly', NULL, NOW());