@straiffi/archon 1.7.7 → 1.7.9

package/dist/server/db.js

@@ -1,5 +1,6 @@
 import Database from 'better-sqlite3';
 import { createHash } from 'crypto';
+import { parseCheckDefinitionsJsonStrict, parseLegacyTestCommandsJsonStrict, projectCheckDefinitionsToTestCommands, } from './lib/checkDefinitions.js';
 import { ensureParentDirectory, resolveArchonDbPath } from './lib/runtimePaths.js';
 import { TRANSCRIPT_RUN_TEXT_LIMIT_BYTES, truncateUtf8 } from './lib/transcriptRuns.js';
 const dbPath = ensureParentDirectory(resolveArchonDbPath());
@@ -55,6 +56,8 @@ db.exec(`
     worktree_cmd TEXT,
     run_setup    TEXT,
     run_services TEXT,
+    check_definitions TEXT,
+    required_check_definition_ids TEXT NOT NULL DEFAULT '[]',
     test_commands TEXT,
     run_ide      TEXT,
     preview_service_name TEXT,
@@ -63,6 +66,7 @@ db.exec(`
     helper_model TEXT,
     helper_variant TEXT,
     commit_message_rules TEXT,
+    commit_after_each_ticket INTEGER NOT NULL DEFAULT 0,
     auto_park_stale_tickets INTEGER NOT NULL DEFAULT 0,
     memory_enabled INTEGER NOT NULL DEFAULT 0,
     scan_include_globs_json TEXT,
@@ -129,10 +133,13 @@ ensureColumn('worktree_bundles', 'automation_pause_on_open_questions', 'INTEGER'
 ensureColumn('projects', 'worktree_sync', 'TEXT');
 ensureColumn('projects', 'active_target_kind', "TEXT NOT NULL DEFAULT 'repo_root'");
 ensureColumn('projects', 'active_target_bundle_id', 'TEXT');
+ensureColumn('projects', 'check_definitions', 'TEXT');
+ensureColumn('projects', 'required_check_definition_ids', "TEXT NOT NULL DEFAULT '[]'");
 ensureColumn('projects', 'test_commands', 'TEXT');
 ensureColumn('projects', 'helper_model', 'TEXT');
 ensureColumn('projects', 'helper_variant', 'TEXT');
 ensureColumn('projects', 'commit_message_rules', 'TEXT');
+ensureColumn('projects', 'commit_after_each_ticket', 'INTEGER NOT NULL DEFAULT 0');
 ensureColumn('projects', 'preview_service_name', 'TEXT');
 ensureColumn('projects', 'preview_path', 'TEXT');
 ensureColumn('projects', 'preview_capability_mode', 'TEXT');
@@ -144,6 +151,38 @@ ensureColumn('projects', 'spec_aware_code_review_enabled', 'INTEGER NOT NULL DEF
 ensureColumn('projects', 'deletion_started_at', 'DATETIME');
 ensureColumn('projects', 'deletion_claim_id', 'TEXT');
 ensureColumn('projects', 'deletion_cleanup_started_at', 'DATETIME');
+const backfillProjectCheckDefinitions = () => {
+    const rows = db.prepare(`
+    SELECT id, check_definitions, test_commands
+    FROM projects
+  `).all();
+    const update = db.prepare(`
+    UPDATE projects
+    SET check_definitions = ?, test_commands = ?
+    WHERE id = ?
+  `);
+    const migrate = db.transaction(() => {
+        for (const row of rows) {
+            if (row.check_definitions == null && row.test_commands == null) {
+                continue;
+            }
+            const result = row.check_definitions == null
+                ? parseLegacyTestCommandsJsonStrict(row.test_commands)
+                : parseCheckDefinitionsJsonStrict(row.check_definitions);
+            if ('error' in result) {
+                continue;
+            }
+            const definitions = result.value;
+            const canonicalJson = JSON.stringify(definitions);
+            const projectionJson = JSON.stringify(projectCheckDefinitionsToTestCommands(definitions));
+            if (row.check_definitions !== canonicalJson || row.test_commands !== projectionJson) {
+                update.run(canonicalJson, projectionJson, row.id);
+            }
+        }
+    });
+    migrate();
+};
+backfillProjectCheckDefinitions();
 db.exec(`
   CREATE TRIGGER IF NOT EXISTS reject_ticket_insert_for_deleting_project
   BEFORE INSERT ON tickets
@@ -1516,7 +1555,14 @@ const migrateExecutionLifecycleSchema = () => {
         db.exec('ALTER TABLE lifecycle_events_v2 RENAME TO lifecycle_events');
         db.exec('DROP TABLE execution_run_correlations');
         const violations = db.prepare('PRAGMA foreign_key_check').all();
-        if (violations.some(violation => ['execution_runs', 'lifecycle_events', 'test_execution_details', 'github_actions_run_details'].includes(violation.table))) {
+        if (violations.some(violation => [
+            'execution_runs',
+            'lifecycle_events',
+            'test_execution_details',
+            'github_actions_run_details',
+            'check_batch_details',
+            'check_attempt_details',
+        ].includes(violation.table))) {
             throw new Error('Execution lifecycle migration produced foreign key violations');
         }
         db.exec('COMMIT');
@@ -1755,6 +1801,377 @@ db.exec(`
     FOREIGN KEY (execution_run_id) REFERENCES execution_runs(id) ON DELETE CASCADE
   )
 `);
+db.exec(`
+  CREATE TABLE IF NOT EXISTS check_batch_details (
+    execution_run_id                   TEXT PRIMARY KEY,
+    target_kind                        TEXT NOT NULL,
+    target_bundle_id                   TEXT,
+    target_label                       TEXT,
+    selected_definition_snapshots_json TEXT NOT NULL,
+    initial_workspace_identity_json    TEXT NOT NULL,
+    configuration_fingerprint          TEXT NOT NULL,
+    stop_requested                     INTEGER NOT NULL DEFAULT 0,
+    queued_count                       INTEGER NOT NULL DEFAULT 0,
+    running_count                      INTEGER NOT NULL DEFAULT 0,
+    passed_count                       INTEGER NOT NULL DEFAULT 0,
+    failed_count                       INTEGER NOT NULL DEFAULT 0,
+    cancelled_count                    INTEGER NOT NULL DEFAULT 0,
+    interrupted_count                  INTEGER NOT NULL DEFAULT 0,
+    rerun_of_batch_run_id              TEXT,
+    FOREIGN KEY (execution_run_id) REFERENCES execution_runs(id) ON DELETE CASCADE,
+    FOREIGN KEY (rerun_of_batch_run_id) REFERENCES execution_runs(id) ON DELETE RESTRICT,
+    CHECK (target_kind IN ('repo_root', 'bundle')),
+    CHECK ((target_kind = 'repo_root' AND target_bundle_id IS NULL)
+      OR (target_kind = 'bundle' AND target_bundle_id IS NOT NULL AND length(trim(target_bundle_id)) > 0)),
+    CHECK (length(configuration_fingerprint) = 64 AND configuration_fingerprint NOT GLOB '*[^0-9a-f]*'),
+    CHECK (stop_requested IN (0, 1)),
+    CHECK (queued_count >= 0 AND running_count >= 0 AND passed_count >= 0 AND failed_count >= 0
+      AND cancelled_count >= 0 AND interrupted_count >= 0)
+  )
+`);
+db.exec(`
+  CREATE TABLE IF NOT EXISTS check_attempt_details (
+    execution_run_id                TEXT PRIMARY KEY,
+    batch_run_id                    TEXT NOT NULL,
+    definition_id                  TEXT NOT NULL,
+    command_snapshot_json           TEXT NOT NULL,
+    definition_fingerprint          TEXT NOT NULL,
+    initial_workspace_identity_json TEXT NOT NULL,
+    final_workspace_identity_json   TEXT,
+    outcome                         TEXT,
+    rerun_of_attempt_run_id         TEXT,
+    exit_code                       INTEGER,
+    exit_signal                     TEXT,
+    exit_error                      TEXT,
+    output_revision                 INTEGER NOT NULL DEFAULT 0,
+    retained_start_offset           INTEGER NOT NULL DEFAULT 0,
+    retained_end_offset             INTEGER NOT NULL DEFAULT 0,
+    total_persisted_bytes           INTEGER NOT NULL DEFAULT 0,
+    retained_output                 TEXT NOT NULL DEFAULT '',
+    output_retention_state          TEXT NOT NULL DEFAULT 'retained',
+    FOREIGN KEY (execution_run_id) REFERENCES execution_runs(id) ON DELETE CASCADE,
+    FOREIGN KEY (batch_run_id) REFERENCES execution_runs(id) ON DELETE RESTRICT,
+    FOREIGN KEY (rerun_of_attempt_run_id) REFERENCES execution_runs(id) ON DELETE RESTRICT,
+    CHECK (length(definition_id) BETWEEN 1 AND 500),
+    CHECK (length(definition_fingerprint) = 64 AND definition_fingerprint NOT GLOB '*[^0-9a-f]*'),
+    CHECK (outcome IS NULL OR outcome IN ('passed', 'command_failure', 'spawn_failure', 'timeout',
+      'workspace_changed_before_start', 'user_stop', 'restart_loss', 'shutdown_loss')),
+    CHECK (output_revision >= 0 AND retained_start_offset >= 0 AND retained_end_offset >= retained_start_offset
+      AND total_persisted_bytes >= retained_end_offset),
+    CHECK (output_retention_state IN ('retained', 'expired'))
+  )
+`);
+db.exec(`
+  CREATE TABLE IF NOT EXISTS check_gate_evaluations (
+    id                              TEXT PRIMARY KEY,
+    project_id                      TEXT NOT NULL,
+    target_kind                     TEXT NOT NULL,
+    target_bundle_id                TEXT,
+    automation_progression_run_id   TEXT,
+    boundary_kind                   TEXT NOT NULL,
+    effective_policy_fingerprint    TEXT NOT NULL,
+    source_batch_run_id             TEXT,
+    decision                        TEXT NOT NULL,
+    reason_codes_json               TEXT NOT NULL,
+    snapshot_json                   TEXT NOT NULL,
+    expected_attempt_count          INTEGER NOT NULL DEFAULT 0,
+    attempts_sealed                 INTEGER NOT NULL DEFAULT 1,
+    created_at                      DATETIME NOT NULL DEFAULT CURRENT_TIMESTAMP,
+    FOREIGN KEY (project_id) REFERENCES projects(id) ON DELETE CASCADE,
+    FOREIGN KEY (source_batch_run_id) REFERENCES execution_runs(id) ON DELETE RESTRICT,
+    CHECK (target_kind IN ('repo_root', 'bundle')),
+    CHECK ((target_kind = 'repo_root' AND target_bundle_id IS NULL)
+      OR (target_kind = 'bundle' AND target_bundle_id IS NOT NULL AND length(trim(target_bundle_id)) > 0)),
+    CHECK (length(boundary_kind) BETWEEN 1 AND 100),
+    CHECK (length(effective_policy_fingerprint) = 64 AND effective_policy_fingerprint NOT GLOB '*[^0-9a-f]*'),
+    CHECK (decision IN ('passed', 'blocked')),
+    CHECK (expected_attempt_count >= 0),
+    CHECK (attempts_sealed IN (0, 1)),
+    CHECK (length(CAST(reason_codes_json AS BLOB)) <= 16384),
+    CHECK (length(CAST(snapshot_json AS BLOB)) <= 262144)
+  );
+
+  CREATE TABLE IF NOT EXISTS check_gate_evaluation_attempts (
+    evaluation_id       TEXT NOT NULL,
+    ordinal             INTEGER NOT NULL,
+    attempt_run_id      TEXT NOT NULL,
+    attempt_snapshot_json TEXT NOT NULL,
+    PRIMARY KEY (evaluation_id, ordinal),
+    UNIQUE (evaluation_id, attempt_run_id),
+    FOREIGN KEY (evaluation_id) REFERENCES check_gate_evaluations(id) ON DELETE CASCADE,
+    FOREIGN KEY (attempt_run_id) REFERENCES execution_runs(id) ON DELETE RESTRICT,
+    CHECK (ordinal >= 0),
+    CHECK (length(CAST(attempt_snapshot_json AS BLOB)) <= 65536)
+  );
+
+  CREATE TRIGGER IF NOT EXISTS preserve_check_gate_evaluations
+  BEFORE UPDATE OF id, project_id, target_kind, target_bundle_id, automation_progression_run_id,
+    boundary_kind, effective_policy_fingerprint, source_batch_run_id, decision, reason_codes_json,
+    snapshot_json, expected_attempt_count, created_at ON check_gate_evaluations
+  BEGIN
+    SELECT RAISE(ABORT, 'Check gate evaluations are immutable');
+  END;
+
+  CREATE TRIGGER IF NOT EXISTS preserve_check_gate_evaluation_attempts
+  BEFORE UPDATE ON check_gate_evaluation_attempts
+  BEGIN
+    SELECT RAISE(ABORT, 'Check gate evaluation attempts are immutable');
+  END;
+
+  CREATE TRIGGER IF NOT EXISTS prevent_check_gate_evaluation_delete
+  BEFORE DELETE ON check_gate_evaluations
+  WHEN EXISTS (
+    SELECT 1 FROM projects WHERE id = OLD.project_id AND deletion_started_at IS NULL
+  )
+  BEGIN
+    SELECT RAISE(ABORT, 'Check gate evaluations are immutable');
+  END;
+
+
+  CREATE TRIGGER IF NOT EXISTS prevent_check_gate_evaluation_attempt_delete
+  BEFORE DELETE ON check_gate_evaluation_attempts
+  WHEN EXISTS (
+    SELECT 1
+    FROM check_gate_evaluations evaluation
+    JOIN projects project ON project.id = evaluation.project_id
+    WHERE evaluation.id = OLD.evaluation_id AND project.deletion_started_at IS NULL
+  )
+  BEGIN
+    SELECT RAISE(ABORT, 'Check gate evaluation attempts are immutable');
+  END;
+
+  CREATE TRIGGER IF NOT EXISTS validate_check_gate_evaluation_insert
+  BEFORE INSERT ON check_gate_evaluations
+  WHEN (
+    NEW.source_batch_run_id IS NOT NULL
+    AND NOT EXISTS (
+      SELECT 1 FROM execution_runs
+      WHERE id = NEW.source_batch_run_id AND project_id = NEW.project_id AND kind = 'check_batch'
+    )
+  ) OR (
+    NEW.automation_progression_run_id IS NOT NULL
+    AND NOT EXISTS (
+      SELECT 1 FROM execution_runs
+      WHERE id = NEW.automation_progression_run_id
+        AND project_id = NEW.project_id AND kind = 'automation_progression'
+    )
+  ) OR (
+    NEW.source_batch_run_id IS NOT NULL
+    AND NOT EXISTS (
+      SELECT 1 FROM execution_runs batch
+      WHERE batch.id = NEW.source_batch_run_id
+        AND (
+          (batch.parent_run_id IS NULL AND NEW.automation_progression_run_id IS NULL)
+          OR batch.parent_run_id = NEW.automation_progression_run_id
+        )
+    )
+  )
+  BEGIN
+    SELECT RAISE(ABORT, 'Invalid check gate evaluation lineage');
+  END;
+
+  CREATE TRIGGER IF NOT EXISTS validate_check_gate_evaluation_attempt_insert
+  BEFORE INSERT ON check_gate_evaluation_attempts
+  WHEN NOT EXISTS (
+    SELECT 1
+    FROM check_gate_evaluations evaluation
+    JOIN execution_runs attempt ON attempt.id = NEW.attempt_run_id
+    WHERE evaluation.id = NEW.evaluation_id
+      AND attempt.project_id = evaluation.project_id
+      AND attempt.kind = 'check_attempt'
+  )
+  BEGIN
+    SELECT RAISE(ABORT, 'Invalid check gate evaluation attempt lineage');
+  END;
+`);
+ensureColumn('check_gate_evaluations', 'expected_attempt_count', 'INTEGER NOT NULL DEFAULT 0');
+ensureColumn('check_gate_evaluations', 'attempts_sealed', 'INTEGER NOT NULL DEFAULT 1');
+db.exec(`
+  DROP TRIGGER IF EXISTS preserve_check_gate_evaluations;
+  DROP TRIGGER IF EXISTS seal_check_gate_evaluation_attempts;
+  DROP TRIGGER IF EXISTS validate_check_gate_evaluation_insert;
+  DROP TRIGGER IF EXISTS validate_check_gate_evaluation_attempt_insert;
+
+  CREATE TRIGGER preserve_check_gate_evaluations
+  BEFORE UPDATE OF id, project_id, target_kind, target_bundle_id, automation_progression_run_id,
+    boundary_kind, effective_policy_fingerprint, source_batch_run_id, decision, reason_codes_json,
+    snapshot_json, expected_attempt_count, created_at ON check_gate_evaluations
+  BEGIN
+    SELECT RAISE(ABORT, 'Check gate evaluations are immutable');
+  END;
+
+  CREATE TRIGGER seal_check_gate_evaluation_attempts
+  BEFORE UPDATE OF attempts_sealed ON check_gate_evaluations
+  WHEN OLD.attempts_sealed <> 0 OR NEW.attempts_sealed <> 1 OR (
+    SELECT COUNT(*) FROM check_gate_evaluation_attempts WHERE evaluation_id = OLD.id
+  ) <> OLD.expected_attempt_count
+  BEGIN
+    SELECT RAISE(ABORT, 'Invalid check gate evaluation seal');
+  END;
+
+  CREATE TRIGGER validate_check_gate_evaluation_insert
+  BEFORE INSERT ON check_gate_evaluations
+  WHEN (
+    NEW.source_batch_run_id IS NOT NULL
+    AND NOT EXISTS (
+      SELECT 1 FROM execution_runs
+      WHERE id = NEW.source_batch_run_id AND project_id = NEW.project_id AND kind = 'check_batch'
+    )
+  ) OR (
+    NEW.automation_progression_run_id IS NOT NULL
+    AND NOT EXISTS (
+      SELECT 1 FROM execution_runs
+      WHERE id = NEW.automation_progression_run_id
+        AND project_id = NEW.project_id AND kind = 'automation_progression'
+    )
+  ) OR (
+    NEW.source_batch_run_id IS NOT NULL
+    AND NOT EXISTS (
+      SELECT 1 FROM execution_runs batch
+      WHERE batch.id = NEW.source_batch_run_id
+        AND (
+          (batch.initiated_by <> 'automation' AND batch.parent_run_id IS NULL)
+          OR (batch.initiated_by = 'automation' AND batch.parent_run_id = NEW.automation_progression_run_id)
+        )
+    )
+  )
+  BEGIN
+    SELECT RAISE(ABORT, 'Invalid check gate evaluation lineage');
+  END;
+
+  CREATE TRIGGER validate_check_gate_evaluation_attempt_insert
+  BEFORE INSERT ON check_gate_evaluation_attempts
+  WHEN NOT EXISTS (
+    SELECT 1
+    FROM check_gate_evaluations evaluation
+    JOIN execution_runs attempt ON attempt.id = NEW.attempt_run_id
+    JOIN check_attempt_details details ON details.execution_run_id = attempt.id
+    WHERE evaluation.id = NEW.evaluation_id
+      AND evaluation.attempts_sealed = 0
+      AND NEW.ordinal < evaluation.expected_attempt_count
+      AND evaluation.source_batch_run_id IS NOT NULL
+      AND details.batch_run_id = evaluation.source_batch_run_id
+      AND attempt.project_id = evaluation.project_id
+      AND attempt.kind = 'check_attempt'
+  )
+  BEGIN
+    SELECT RAISE(ABORT, 'Invalid check gate evaluation attempt lineage');
+  END;
+`);
+ensureColumn('check_attempt_details', 'retained_end_offset', 'INTEGER NOT NULL DEFAULT 0');
+ensureColumn('check_attempt_details', 'retained_output', "TEXT NOT NULL DEFAULT ''");
+db.prepare(`
+  UPDATE check_attempt_details
+  SET retained_end_offset = total_persisted_bytes
+  WHERE retained_end_offset = 0 AND total_persisted_bytes > 0
+`).run();
+db.exec('DROP TRIGGER IF EXISTS validate_check_batch_details_insert');
+db.exec(`
+  CREATE TRIGGER IF NOT EXISTS preserve_check_batch_snapshots
+  BEFORE UPDATE OF execution_run_id, target_kind, target_bundle_id, target_label,
+    selected_definition_snapshots_json, initial_workspace_identity_json, configuration_fingerprint,
+    rerun_of_batch_run_id ON check_batch_details
+  BEGIN
+    SELECT RAISE(ABORT, 'Check batch snapshots are immutable');
+  END;
+
+  CREATE TRIGGER IF NOT EXISTS preserve_check_attempt_snapshots
+  BEFORE UPDATE OF execution_run_id, batch_run_id, definition_id, command_snapshot_json,
+    definition_fingerprint, initial_workspace_identity_json, rerun_of_attempt_run_id
+    ON check_attempt_details
+  BEGIN
+    SELECT RAISE(ABORT, 'Check attempt snapshots are immutable');
+  END;
+
+  CREATE TRIGGER IF NOT EXISTS preserve_completed_check_attempt_details
+  BEFORE UPDATE OF final_workspace_identity_json, outcome, exit_code, exit_signal, exit_error
+    ON check_attempt_details
+  WHEN OLD.outcome IS NOT NULL
+  BEGIN
+    SELECT RAISE(ABORT, 'Completed check attempt details are immutable');
+  END;
+
+  CREATE TRIGGER IF NOT EXISTS validate_check_batch_details_insert
+  BEFORE INSERT ON check_batch_details
+  WHEN NOT EXISTS (
+    SELECT 1
+    FROM execution_runs run
+    WHERE run.id = NEW.execution_run_id
+      AND run.kind = 'check_batch'
+      AND (
+        (run.parent_run_id IS NULL AND run.initiated_by <> 'automation')
+        OR (
+           run.initiated_by = 'automation'
+          AND EXISTS (
+            SELECT 1
+            FROM execution_runs progression
+            JOIN execution_run_links owner
+              ON owner.execution_run_id = progression.id
+              AND owner.project_id = progression.project_id
+              AND owner.entity_type = 'bundle'
+              AND owner.relationship = 'primary'
+            JOIN worktree_bundles bundle
+              ON bundle.id = owner.entity_id
+              AND bundle.project_id = owner.project_id
+            JOIN bundle_automation_state state
+              ON state.project_id = progression.project_id
+              AND state.worktree_bundle_id = owner.entity_id
+              AND state.automation_progression_run_id = progression.id
+            WHERE progression.id = run.parent_run_id
+              AND progression.project_id = run.project_id
+              AND progression.kind = 'automation_progression'
+              AND progression.status IN ('queued', 'running', 'waiting')
+              AND (
+                (NEW.target_kind = 'bundle' AND owner.entity_id = NEW.target_bundle_id
+                  AND COALESCE(bundle.kind, 'worktree') <> 'project_root')
+                OR (NEW.target_kind = 'repo_root' AND NEW.target_bundle_id IS NULL
+                  AND bundle.kind = 'project_root')
+              )
+              AND NOT EXISTS (
+                SELECT 1 FROM execution_runs sibling
+                WHERE sibling.project_id = run.project_id
+                  AND sibling.parent_run_id = progression.id
+                  AND sibling.id <> run.id
+                  AND sibling.kind IN ('check_batch', 'review', 'automation_review_fix', 'automation_commit', 'automation_push', 'automation_pull_request')
+                  AND sibling.status IN ('queued', 'running', 'waiting')
+              )
+          )
+        )
+      )
+  ) OR (
+    NEW.rerun_of_batch_run_id IS NOT NULL AND NOT EXISTS (
+      SELECT 1 FROM execution_runs source, execution_runs current
+      WHERE source.id = NEW.rerun_of_batch_run_id AND source.kind = 'check_batch'
+        AND current.id = NEW.execution_run_id AND source.project_id = current.project_id
+    )
+  )
+  BEGIN
+    SELECT RAISE(ABORT, 'Invalid check batch execution details');
+  END;
+
+  CREATE TRIGGER IF NOT EXISTS validate_check_attempt_details_insert
+  BEFORE INSERT ON check_attempt_details
+  WHEN NOT EXISTS (
+    SELECT 1
+    FROM execution_runs attempt
+    JOIN execution_runs batch ON batch.id = NEW.batch_run_id
+    WHERE attempt.id = NEW.execution_run_id AND attempt.kind = 'check_attempt'
+      AND attempt.parent_run_id = batch.id AND batch.kind = 'check_batch'
+      AND attempt.project_id = batch.project_id AND attempt.correlation_id = batch.correlation_id
+  ) OR (
+    NEW.rerun_of_attempt_run_id IS NOT NULL AND NOT EXISTS (
+      SELECT 1
+      FROM check_attempt_details source
+      JOIN check_batch_details current_batch ON current_batch.execution_run_id = NEW.batch_run_id
+      WHERE source.execution_run_id = NEW.rerun_of_attempt_run_id
+        AND source.batch_run_id = current_batch.rerun_of_batch_run_id
+        AND source.definition_id = NEW.definition_id
+    )
+  )
+  BEGIN
+    SELECT RAISE(ABORT, 'Invalid check attempt execution details');
+  END;
+`);
 ensureColumn('github_actions_run_details', 'ref', 'TEXT');
 ensureColumn('github_actions_run_details', 'input_names_json', 'TEXT');
 ensureColumn('github_actions_run_details', 'input_fingerprint', 'TEXT');
@@ -1983,6 +2400,12 @@ db.exec("CREATE UNIQUE INDEX IF NOT EXISTS idx_execution_run_links_primary ON ex
 db.exec('CREATE INDEX IF NOT EXISTS idx_lifecycle_events_run_sequence ON lifecycle_events(project_id, execution_run_id, sequence ASC)');
 db.exec('CREATE INDEX IF NOT EXISTS idx_lifecycle_events_project_created ON lifecycle_events(project_id, created_at DESC, id DESC)');
 db.exec('CREATE INDEX IF NOT EXISTS idx_github_actions_details_dispatch ON github_actions_run_details(workflow_id, ref, dispatched_at DESC)');
+db.exec('CREATE INDEX IF NOT EXISTS idx_check_batches_rerun ON check_batch_details(rerun_of_batch_run_id)');
+db.exec('CREATE INDEX IF NOT EXISTS idx_check_attempts_batch ON check_attempt_details(batch_run_id, definition_id)');
+db.exec('CREATE INDEX IF NOT EXISTS idx_check_attempts_rerun ON check_attempt_details(rerun_of_attempt_run_id)');
+db.exec('CREATE INDEX IF NOT EXISTS idx_check_gate_evaluations_target ON check_gate_evaluations(project_id, target_kind, target_bundle_id, created_at DESC, id DESC)');
+db.exec('CREATE INDEX IF NOT EXISTS idx_check_gate_evaluations_batch ON check_gate_evaluations(source_batch_run_id)');
+db.exec('CREATE INDEX IF NOT EXISTS idx_check_gate_evaluation_attempts_run ON check_gate_evaluation_attempts(attempt_run_id)');
 db.exec(`
   CREATE TABLE IF NOT EXISTS project_memory_selections (
     id                  TEXT PRIMARY KEY,
@@ -2133,11 +2556,46 @@ db.exec(`
     FOREIGN KEY (project_id) REFERENCES projects(id) ON DELETE CASCADE,
     FOREIGN KEY (worktree_bundle_id) REFERENCES worktree_bundles(id) ON DELETE CASCADE,
     CHECK (stage_kind IN ('automation_commit', 'automation_push', 'automation_pull_request')),
-    CHECK (schema_version = 1),
+    CHECK (schema_version IN (1, 2, 3)),
     CHECK (length(CAST(intent_json AS BLOB)) BETWEEN 2 AND 16384),
     CHECK (result_json IS NULL OR length(CAST(result_json AS BLOB)) BETWEEN 2 AND 16384)
   )
 `);
+const automationStageDetailsTableSql = db.prepare("SELECT sql FROM sqlite_master WHERE type = 'table' AND name = 'automation_stage_details'").get()?.sql ?? '';
+if (!automationStageDetailsTableSql.includes('schema_version IN (1, 2, 3)')) {
+    db.transaction(() => {
+        db.exec(`
+      CREATE TABLE automation_stage_details_v3 (
+        execution_run_id  TEXT PRIMARY KEY,
+        project_id        TEXT NOT NULL,
+        worktree_bundle_id TEXT NOT NULL,
+        stage_kind        TEXT NOT NULL,
+        schema_version    INTEGER NOT NULL,
+        intent_json       TEXT NOT NULL,
+        result_json       TEXT,
+        created_at        DATETIME NOT NULL DEFAULT CURRENT_TIMESTAMP,
+        updated_at        DATETIME NOT NULL DEFAULT CURRENT_TIMESTAMP,
+        FOREIGN KEY (execution_run_id, project_id) REFERENCES execution_runs(id, project_id) ON DELETE CASCADE,
+        FOREIGN KEY (project_id) REFERENCES projects(id) ON DELETE CASCADE,
+        FOREIGN KEY (worktree_bundle_id) REFERENCES worktree_bundles(id) ON DELETE CASCADE,
+        CHECK (stage_kind IN ('automation_commit', 'automation_push', 'automation_pull_request')),
+        CHECK (schema_version IN (1, 2, 3)),
+        CHECK (length(CAST(intent_json AS BLOB)) BETWEEN 2 AND 16384),
+        CHECK (result_json IS NULL OR length(CAST(result_json AS BLOB)) BETWEEN 2 AND 16384)
+      );
+      INSERT INTO automation_stage_details_v3 (
+        execution_run_id, project_id, worktree_bundle_id, stage_kind, schema_version,
+        intent_json, result_json, created_at, updated_at
+      )
+      SELECT
+        execution_run_id, project_id, worktree_bundle_id, stage_kind, schema_version,
+        intent_json, result_json, created_at, updated_at
+      FROM automation_stage_details;
+      DROP TABLE automation_stage_details;
+      ALTER TABLE automation_stage_details_v3 RENAME TO automation_stage_details;
+    `);
+    })();
+}
 db.exec(`
   CREATE TABLE IF NOT EXISTS build_open_question_batches (
     id                 TEXT PRIMARY KEY,