@noormdev/sdk 1.4.2 → 1.5.1

package/dist/index.js

@@ -1,9 +1,9 @@
 import { createRequire } from 'module';
-import { processFile, es_default, DtReader, isTemplate, FORMAT_VERSION, DT_EXTENSIONS, encryptWithPassphrase, ENCODED_TYPES } from './chunk-CDTFXLXU.js';
+import { processFile, es_default, DtReader, isTemplate, FORMAT_VERSION, DT_EXTENSIONS, encryptWithPassphrase, ENCODED_TYPES } from './chunk-M7Q44VFJ.js';
 import './chunk-UOFJT5PY.js';
-import { resolveLegacyAccess, checkConfigPolicy, initializeVault, getVaultStatus, setVaultSecret, getVaultSecret, getAllVaultSecrets, listVaultSecretKeys, deleteVaultSecret, vaultSecretExists, getVaultKey, noormDb, getNoormTables, encryptVaultKey, assertVaultPolicy, assertPolicy, detectAgentHarness, guarded } from './chunk-OMY6CKR4.js';
-import { observer, getEnvConfigName, ObserverRelay, isDebug } from './chunk-A2OYZAVT.js';
-export { observer as noormObserver } from './chunk-A2OYZAVT.js';
+import { resolveLegacyAccess, checkConfigPolicy, initializeVault, getVaultStatus, setVaultSecret, getVaultSecret, getAllVaultSecrets, listVaultSecretKeys, deleteVaultSecret, vaultSecretExists, getVaultKey, noormDb, getNoormTables, encryptVaultKey, assertVaultPolicy, assertPolicy, detectAgentHarness, guarded } from './chunk-24L5UNQR.js';
+import { observer, getEnvConfigName, ObserverRelay, isDebug } from './chunk-6LG4ENOJ.js';
+export { observer as noormObserver } from './chunk-6LG4ENOJ.js';
 import { explainConnectionError, DatabaseConnectionError } from './chunk-OXTXFKWJ.js';
 import { makeNestedConfig, gigabytes, attempt, attemptSync, clone, merge, equals, retry, runWithTimeout, isTimeoutError, wait } from './chunk-TXDGFA44.js';
 import { external_exports, PortSchema, connectTimeoutFor, DEFAULT_PORTS } from './chunk-WE2JLJMT.js';
@@ -4786,6 +4786,33 @@ function hydrateDate(value, dialect) {
   }
   return /* @__PURE__ */ new Date(`${value.replace(" ", "T")}Z`);
 }
+function decideNeedsRunFile(record, checksum, force) {
+  if (force) {
+    return { needsRun: true, reason: "force" };
+  }
+  if (record instanceof Error || !record) {
+    return { needsRun: true, reason: "new" };
+  }
+  if (record.exec_status === "failed") {
+    return {
+      needsRun: true,
+      reason: "failed",
+      previousChecksum: record.checksum
+    };
+  }
+  if (record.checksum !== checksum) {
+    return {
+      needsRun: true,
+      reason: "changed",
+      previousChecksum: record.checksum
+    };
+  }
+  return {
+    needsRun: false,
+    skipReason: "already applied",
+    previousChecksum: record.checksum
+  };
+}
 var ChangeHistory = class {
   #db;
   #ndb;
@@ -4965,31 +4992,19 @@ var ChangeHistory = class {
     };
   }
   /**
-   * Check if a single file within a change needs to run.
-   *
-   * Mirrors `Tracker.needsRun` (runner/tracker.ts) but scoped to this
-   * change's name+direction+config instead of a global filepath lookup,
-   * so file A's success under one change never satisfies file A's check
-   * under a different change.
-   *
-   * Excludes `pending` rows from consideration: `createFileRecords`
-   * inserts a fresh pending row for every file before the per-file loop
-   * runs, and that row (always the highest id for this filepath) would
-   * otherwise shadow the prior operation's real success/failure record,
-   * making retries re-run every file instead of just the one that failed.
-   *
-   * Also excludes `skipped` rows: `status: 'skipped'` is written for two
-   * different meanings — `skipRemainingFiles` writes it for files never
-   * reached after an earlier failure (must re-run), while this method's
-   * own per-file-skip path (called from `executor.ts`) writes it for a
-   * file that matched a prior success (must stay skipped). A `skipped`
-   * row is never itself a decision basis: a success-match skip still has
-   * its covering `success` row further back in history (found once the
-   * `skipped` row is excluded), and a never-reached skip has no terminal
-   * row at all, so the lookup falls through to `{ needsRun: true, reason:
-   * 'new' }` below and the file runs. Both resolve correctly without
-   * consulting the ambiguous row — excluding it here is what prevents a
-   * third attempt from re-running a file a prior success already covered.
+   * Fetch the newest qualifying execution row per filepath for one
+   * change and direction.
+   *
+   * Two SELECTs for any number of files: the direction boundary, then the
+   * same query form as `Tracker.latestExecutions`.
+   *
+   * Rows are scoped to this change's name+direction+config, so file A's
+   * success under one change never satisfies file A's check under another.
+   *
+   * `pending` and `skipped` rows never count. Neither records an outcome:
+   * `pending` is a file its batch never reached, and `skipped` is written by
+   * `skipRemainingFiles` for the same reason, or by older versions for a
+   * file that matched a success still further back in history.
    *
    * A prior success only licenses a skip while it is still *standing*.
    * Two things retire it, and neither is visible on the execution row
@@ -5010,72 +5025,56 @@ var ChangeHistory = class {
    *
    * @param name - Change name
    * @param direction - 'change' or 'revert'
-   * @param filepath - Relative filepath as stored in execution records
-   * @param checksum - Current checksum of the file
-   * @param force - Force re-run regardless of status
-   * @returns Whether the file needs to run and why
+   * @returns Map of relative filepath to its newest qualifying row, or the lookup error
+   *
+   * @example
+   * ```typescript
+   * const [latest, err] = await history.latestFileExecutions('2024-01-15-add-users', 'change')
+   * const result = decideNeedsRunFile(err ?? latest.get(filepath), checksum, false)
+   * ```
    */
-  async needsRunFile(name, direction, filepath, checksum, force) {
-    if (force) {
-      return { needsRun: true, reason: "force" };
-    }
+  async latestFileExecutions(name, direction) {
+    const { executions, change } = this.#tables;
     const opposite = direction === "change" ? "revert" : "change";
     const [boundary, boundaryErr] = await attempt(
-      () => this.#ndb.selectFrom(this.#tables.change).select(["id"]).where("name", "=", name).where("change_type", "=", "change").where("direction", "=", opposite).where("config_name", "=", this.#configName).orderBy("id", "desc").limit(1).executeTakeFirst()
+      () => this.#ndb.selectFrom(change).select(["id"]).where("name", "=", name).where("change_type", "=", "change").where("direction", "=", opposite).where("config_name", "=", this.#configName).orderBy("id", "desc").limit(1).executeTakeFirst()
     );
     if (boundaryErr) {
       observer.emit("error", {
         source: "change",
         error: boundaryErr,
-        context: { name, filepath, operation: "needs-run-file-boundary" }
+        context: { name, operation: "latest-file-executions-boundary" }
       });
-      return { needsRun: true, reason: "new" };
+      return [null, boundaryErr];
     }
-    const [record, err] = await attempt(() => {
-      let query = this.#ndb.selectFrom(this.#tables.executions).innerJoin(
-        this.#tables.change,
-        `${this.#tables.change}.id`,
-        `${this.#tables.executions}.change_id`
+    let qualifying = this.#ndb.selectFrom(executions).innerJoin(change, `${change}.id`, `${executions}.change_id`).where(`${change}.name`, "=", name).where(`${change}.direction`, "=", direction).where(`${change}.config_name`, "=", this.#configName).where(`${change}.status`, "not in", ["reverted", "stale"]).where(`${executions}.status`, "not in", ["pending", "skipped"]);
+    if (boundary) {
+      qualifying = qualifying.where(`${change}.id`, ">", boundary.id);
+    }
+    const newestIds = qualifying.select((eb) => eb.fn.max(`${executions}.id`).as("id")).groupBy(`${executions}.filepath`).as("newest");
+    const [rows, err] = await attempt(
+      () => (
         // eslint-disable-next-line @typescript-eslint/no-explicit-any
-      ).select((eb) => [
-        eb.ref(`${this.#tables.executions}.checksum`).as("checksum"),
-        eb.ref(`${this.#tables.executions}.status`).as("exec_status")
-      ]).where(`${this.#tables.change}.name`, "=", name).where(`${this.#tables.change}.direction`, "=", direction).where(`${this.#tables.change}.config_name`, "=", this.#configName).where(`${this.#tables.change}.status`, "not in", ["reverted", "stale"]).where(`${this.#tables.executions}.filepath`, "=", filepath).where(`${this.#tables.executions}.status`, "not in", ["pending", "skipped"]);
-      if (boundary) {
-        query = query.where(`${this.#tables.change}.id`, ">", boundary.id);
-      }
-      return query.orderBy(`${this.#tables.executions}.id`, "desc").limit(1).executeTakeFirst();
-    });
+        this.#ndb.selectFrom(executions).innerJoin(newestIds, "newest.id", `${executions}.id`).select((eb) => [
+          eb.ref(`${executions}.filepath`).as("filepath"),
+          eb.ref(`${executions}.checksum`).as("checksum"),
+          eb.ref(`${executions}.status`).as("exec_status")
+        ]).execute()
+      )
+    );
     if (err) {
       observer.emit("error", {
         source: "change",
         error: err,
-        context: { name, filepath, operation: "needs-run-file-check" }
+        context: { name, operation: "latest-file-executions" }
       });
-      return { needsRun: true, reason: "new" };
-    }
-    if (!record) {
-      return { needsRun: true, reason: "new" };
-    }
-    if (record.exec_status === "failed") {
-      return {
-        needsRun: true,
-        reason: "failed",
-        previousChecksum: record.checksum
-      };
+      return [null, err];
     }
-    if (record.checksum !== checksum) {
-      return {
-        needsRun: true,
-        reason: "changed",
-        previousChecksum: record.checksum
-      };
+    const latest = /* @__PURE__ */ new Map();
+    for (const { filepath, ...record } of rows) {
+      latest.set(filepath, record);
     }
-    return {
-      needsRun: false,
-      skipReason: "already applied",
-      previousChecksum: record.checksum
-    };
+    return [latest, null];
   }
   // ─────────────────────────────────────────────────────────
   // Create Records
@@ -5113,9 +5112,10 @@ var ChangeHistory = class {
     return id;
   }
   /**
-   * Create pending file records for all files.
+   * Create pending file records for the files about to run.
    *
-   * Creates records upfront so we can mark remaining as skipped on failure.
+   * The pending rows let `skipRemainingFiles` mark the files a
+   * failure left unreached.
    *
    * @returns Error message if creation failed, null on success
    */
@@ -5481,6 +5481,44 @@ var ChangeHistory = class {
 };
 
 // src/core/runner/tracker.ts
+function decideNeedsRun(record, checksum, force) {
+  if (record instanceof Error) {
+    return { needsRun: true, reason: "error" };
+  }
+  if (!record) {
+    return { needsRun: true, reason: "new" };
+  }
+  if (record.exec_status === "failed") {
+    return {
+      needsRun: true,
+      reason: "failed",
+      previousChecksum: record.checksum
+    };
+  }
+  const isUnchangedSkip = record.exec_status === "skipped" && record.skip_reason === "unchanged";
+  if (record.exec_status === "pending" || record.exec_status === "skipped" && !isUnchangedSkip) {
+    return { needsRun: true, reason: "new" };
+  }
+  if (record.change_status === "stale") {
+    return {
+      needsRun: true,
+      reason: "stale",
+      previousChecksum: record.checksum
+    };
+  }
+  if (record.checksum !== checksum) {
+    return {
+      needsRun: true,
+      reason: "changed",
+      previousChecksum: record.checksum
+    };
+  }
+  return {
+    needsRun: false,
+    skipReason: "unchanged",
+    previousChecksum: record.checksum
+  };
+}
 var Tracker = class {
   #db;
   #ndb;
@@ -5495,89 +5533,45 @@ var Tracker = class {
     this.#dialect = dialect;
   }
   /**
-   * Check if a file needs to run.
+   * Fetch the newest execution row per filepath for this config.
    *
-   * A file needs to run if:
-   * - Force flag is set
-   * - No previous execution exists (new file)
-   * - Previous execution failed
-   * - Parent change is stale (schema was torn down)
-   * - Checksum differs (file changed)
+   * One SELECT for any number of files, so a batch can decide every file
+   * with `decideNeedsRun` before writing any tracking rows. Query form:
+   * `docs/design/prefetch-run-gate.md`.
    *
-   * @param filepath - File path to check
-   * @param checksum - Current file checksum
-   * @param force - Force re-run regardless of status
-   * @param excludeOperationId - Operation whose own rows should be ignored.
-   * `executeFiles` inserts a `pending` row for every discovered file
-   * *before* running any of them (for batch visibility), so within that
-   * same operation the newest row for a file is always its own pending
-   * record — reading as "new" forever and making checksum-based skipping
-   * unreachable. Passing the running operation's id here excludes those
-   * rows so the lookup finds the last *completed* operation instead.
-   * @returns Whether file needs to run and why
-   */
-  async needsRun(filepath, checksum, force, excludeOperationId) {
-    if (force) {
-      return { needsRun: true, reason: "force" };
-    }
-    let query = this.#ndb.selectFrom(this.#tables.executions).innerJoin(
-      this.#tables.change,
-      `${this.#tables.change}.id`,
-      `${this.#tables.executions}.change_id`
-      // eslint-disable-next-line @typescript-eslint/no-explicit-any
-    ).select((eb) => [
-      eb.ref(`${this.#tables.executions}.checksum`).as("checksum"),
-      eb.ref(`${this.#tables.executions}.status`).as("exec_status"),
-      eb.ref(`${this.#tables.executions}.skip_reason`).as("skip_reason"),
-      eb.ref(`${this.#tables.change}.status`).as("change_status")
-    ]).where(`${this.#tables.executions}.filepath`, "=", filepath).where(`${this.#tables.change}.config_name`, "=", this.#configName);
-    if (excludeOperationId !== void 0) {
-      query = query.where(`${this.#tables.executions}.change_id`, "<>", excludeOperationId);
-    }
-    const [record, err] = await attempt(
-      () => query.orderBy(`${this.#tables.executions}.id`, "desc").limit(1).executeTakeFirst()
+   * @returns Map of filepath to its newest record, or the lookup error
+   *
+   * @example
+   * ```typescript
+   * const [latest, err] = await tracker.latestExecutions()
+   * const result = decideNeedsRun(err ?? latest.get(filepath), checksum, false)
+   * ```
+   */
+  async latestExecutions() {
+    const { executions, change } = this.#tables;
+    const newestIds = this.#ndb.selectFrom(executions).innerJoin(change, `${change}.id`, `${executions}.change_id`).where(`${change}.config_name`, "=", this.#configName).select((eb) => eb.fn.max(`${executions}.id`).as("id")).groupBy(`${executions}.filepath`).as("newest");
+    const [rows, err] = await attempt(
+      () => this.#ndb.selectFrom(executions).innerJoin(change, `${change}.id`, `${executions}.change_id`).innerJoin(newestIds, "newest.id", `${executions}.id`).select((eb) => [
+        eb.ref(`${executions}.filepath`).as("filepath"),
+        eb.ref(`${executions}.checksum`).as("checksum"),
+        eb.ref(`${executions}.status`).as("exec_status"),
+        eb.ref(`${executions}.skip_reason`).as("skip_reason"),
+        eb.ref(`${change}.status`).as("change_status")
+      ]).execute()
     );
     if (err) {
       observer.emit("error", {
         source: "runner",
         error: err,
-        context: { filepath, operation: "needs-run-check" }
+        context: { operation: "latest-executions" }
       });
-      return { needsRun: true, reason: "error" };
-    }
-    if (!record) {
-      return { needsRun: true, reason: "new" };
-    }
-    if (record.exec_status === "failed") {
-      return {
-        needsRun: true,
-        reason: "failed",
-        previousChecksum: record.checksum
-      };
-    }
-    const isUnchangedSkip = record.exec_status === "skipped" && record.skip_reason === "unchanged";
-    if (record.exec_status === "pending" || record.exec_status === "skipped" && !isUnchangedSkip) {
-      return { needsRun: true, reason: "new" };
+      return [null, err];
     }
-    if (record.change_status === "stale") {
-      return {
-        needsRun: true,
-        reason: "stale",
-        previousChecksum: record.checksum
-      };
+    const latest = /* @__PURE__ */ new Map();
+    for (const { filepath, ...record } of rows) {
+      latest.set(filepath, record);
     }
-    if (record.checksum !== checksum) {
-      return {
-        needsRun: true,
-        reason: "changed",
-        previousChecksum: record.checksum
-      };
-    }
-    return {
-      needsRun: false,
-      skipReason: "unchanged",
-      previousChecksum: record.checksum
-    };
+    return [latest, null];
   }
   /**
    * Create a new operation record.
@@ -5613,35 +5607,6 @@ var Tracker = class {
     }
     return id;
   }
-  /**
-   * Record a file execution.
-   *
-   * Creates a child record in __noorm_executions__ linked
-   * to the parent operation.
-   *
-   * @param data - Execution data
-   */
-  async recordExecution(data2) {
-    const [, err] = await attempt(
-      () => this.#ndb.insertInto(this.#tables.executions).values({
-        change_id: data2.changeId,
-        filepath: data2.filepath,
-        file_type: "sql",
-        checksum: data2.checksum,
-        status: data2.status,
-        skip_reason: data2.skipReason ?? "",
-        error_message: data2.errorMessage ?? "",
-        duration_ms: Math.round(data2.durationMs ?? 0)
-      }).execute()
-    );
-    if (err) {
-      observer.emit("error", {
-        source: "runner",
-        error: err,
-        context: { filepath: data2.filepath, operation: "record-execution" }
-      });
-    }
-  }
   /**
    * Finalize an operation.
    *
@@ -5689,10 +5654,10 @@ var Tracker = class {
   // Batch File Operations (Shared by Runner and Changes)
   // ─────────────────────────────────────────────────────────
   /**
-   * Create pending file records for all files upfront.
+   * Create pending file records for the files about to run.
    *
-   * Creates records so the batch is fully visible. On failure,
-   * remaining files can be marked as skipped.
+   * The pending rows let `skipRemainingFiles` mark the files a
+   * failure left unreached.
    *
    * @param operationId - Parent operation ID
    * @param files - Files to create records for
@@ -5732,23 +5697,15 @@ var Tracker = class {
    * @param durationMs - Execution time
    * @param errorMessage - Error message if failed
    * @param skipReason - Skip reason if skipped
-   * @param checksum - Checksum of the SQL that actually reached the
-   * database. `createFileRecords` seeds the pending row with the *raw*
-   * file hash because rendering every template upfront would execute them
-   * twice; for a `.sql.tmpl` that hash is not what `needsRun` compares
-   * against, so leaving it in place made template dedup unreachable.
-   * Omitted leaves the seeded value alone — correct only where no render
-   * happened (e.g. the file could not be read).
    * @returns Error message if update failed, null on success
    */
-  async updateFileExecution(operationId, filepath, status, durationMs, errorMessage, skipReason, checksum) {
+  async updateFileExecution(operationId, filepath, status, durationMs, errorMessage, skipReason) {
     const [result, err] = await attempt(
       () => this.#ndb.updateTable(this.#tables.executions).set({
         status,
         duration_ms: Math.round(durationMs),
         error_message: errorMessage ?? "",
-        skip_reason: skipReason ?? "",
-        ...checksum === void 0 ? {} : { checksum }
+        skip_reason: skipReason ?? ""
       }).where("change_id", "=", operationId).where("filepath", "=", filepath).executeTakeFirst()
     );
     if (err) {
@@ -5842,7 +5799,6 @@ var Tracker = class {
   /**
    * Check if a change needs to run by name.
    *
-   * Similar to needsRun but checks by change name instead of filepath.
    * Used for change sets where we track by change name, not individual files.
    *
    * @param name - Change name
@@ -6019,6 +5975,349 @@ function computeCombinedChecksum(checksums) {
   const combined = sorted.join("");
   return createHash("sha256").update(combined, "utf-8").digest("hex");
 }
+var SESSION_ID_SQL = {
+  postgres: "select pg_backend_pid() as id",
+  mysql: "select connection_id() as id",
+  mssql: "select @@SPID as id"
+};
+var SERVER_CANCEL = {
+  postgres: (db, sessionId) => sql`select pg_cancel_backend(${sessionId})`.execute(db),
+  // KILL cannot be prepared, so the id is interpolated. It comes from
+  // connection_id() and is checked by readSessionId before it gets here,
+  // never from user input.
+  mysql: (db, sessionId) => sql.raw(`kill query ${sessionId}`).execute(db)
+};
+function readSessionId(rows) {
+  const raw = rows[0]?.id;
+  const id = Number(raw);
+  if (!Number.isInteger(id) || id <= 0) return void 0;
+  return id;
+}
+function percentOf(done, total) {
+  if (done === null || total === null || total <= 0) return null;
+  return Math.min(100, done / total * 100);
+}
+function toNumber(value) {
+  if (value === null || value === void 0) return null;
+  const n = Number(value);
+  return Number.isFinite(n) ? n : null;
+}
+function toText(value) {
+  if (value === null || value === void 0 || value === "") return null;
+  return String(value);
+}
+async function rowsOrEmpty(query) {
+  const [result, err] = await attempt(query);
+  return err ? [] : result.rows;
+}
+function toBlockers(rows) {
+  return rows.map((row) => ({
+    pid: Number(row.pid),
+    query: toText(row.query),
+    ageMs: toNumber(row.age_ms)
+  }));
+}
+var postgresProbe = async (side, pid) => {
+  const [activity] = await rowsOrEmpty(() => sql`
+        select a.state, a.wait_event_type, a.wait_event,
+               pg_blocking_pids(a.pid) as blockers,
+               (select count(*)::int from pg_stat_activity w
+                 where w.leader_pid = a.pid and w.pid <> a.pid) as workers
+          from pg_stat_activity a
+         where a.pid = ${pid}
+    `.execute(side));
+  const blockerPids = (activity?.blockers ?? []).map(Number);
+  const blockers = blockerPids.length === 0 ? [] : await rowsOrEmpty(() => sql`
+        select pid, left(query, 120) as query,
+               (extract(epoch from now() - coalesce(xact_start, query_start)) * 1000)::float8 as age_ms
+          from pg_stat_activity
+         where pid = any(${blockerPids}::int[])
+    `.execute(side));
+  const [progress] = await rowsOrEmpty(() => sql`
+        select command as operation, phase,
+               nullif(relid, 0)::regclass::text as relation,
+               (case when tuples_total > 0 then tuples_done else blocks_done end)::float8 as done,
+               (case when tuples_total > 0 then tuples_total else blocks_total end)::float8 as total
+          from pg_stat_progress_create_index where pid = ${pid}
+        union all
+        select 'VACUUM', phase, nullif(relid, 0)::regclass::text,
+               heap_blks_scanned::float8, heap_blks_total::float8
+          from pg_stat_progress_vacuum where pid = ${pid}
+        union all
+        select command, phase, nullif(relid, 0)::regclass::text,
+               heap_blks_scanned::float8, heap_blks_total::float8
+          from pg_stat_progress_cluster where pid = ${pid}
+        union all
+        select command, null, nullif(relid, 0)::regclass::text,
+               bytes_processed::float8, nullif(bytes_total, 0)::float8
+          from pg_stat_progress_copy where pid = ${pid}
+        union all
+        select 'ANALYZE', phase, nullif(relid, 0)::regclass::text,
+               sample_blks_scanned::float8, sample_blks_total::float8
+          from pg_stat_progress_analyze where pid = ${pid}
+        limit 1
+    `.execute(side));
+  const waitEvent = activity?.wait_event ? `${activity.wait_event_type ?? "Wait"}: ${activity.wait_event}` : null;
+  return {
+    state: toText(activity?.state),
+    waitEvent,
+    blockedBy: toBlockers(blockers),
+    workers: toNumber(activity?.workers) ?? 0,
+    progress: progress ? {
+      operation: progress.operation,
+      phase: toText(progress.phase),
+      relation: toText(progress.relation),
+      done: toNumber(progress.done),
+      total: toNumber(progress.total),
+      percent: percentOf(toNumber(progress.done), toNumber(progress.total))
+    } : null
+  };
+};
+var mssqlProbe = async (side, spid) => {
+  const [request] = await rowsOrEmpty(() => sql`
+        select status, wait_type, blocking_session_id, percent_complete, command
+          from sys.dm_exec_requests
+         where session_id = ${spid}
+    `.execute(side));
+  const blockerId = toNumber(request?.blocking_session_id);
+  const blockers = !blockerId ? [] : await rowsOrEmpty(() => sql`
+        select s.session_id as pid,
+               coalesce(left(t.text, 120), r.command, s.status) as query,
+               datediff_big(millisecond, coalesce(r.start_time, s.last_request_start_time), sysdatetime()) as age_ms
+          from sys.dm_exec_sessions s
+          left join sys.dm_exec_requests r on r.session_id = s.session_id
+          outer apply sys.dm_exec_sql_text(r.sql_handle) t
+         where s.session_id = ${blockerId}
+    `.execute(side));
+  const percent = toNumber(request?.percent_complete);
+  return {
+    state: toText(request?.status),
+    waitEvent: toText(request?.wait_type),
+    blockedBy: toBlockers(blockers),
+    workers: 0,
+    progress: request?.command && percent ? { operation: request.command, phase: null, relation: null, done: null, total: null, percent } : null
+  };
+};
+var mysqlProbe = async (side, id) => {
+  const [process2] = await rowsOrEmpty(() => sql`
+        select state from information_schema.processlist where id = ${id}
+    `.execute(side));
+  const blockerIds = await rowsOrEmpty(() => sql`
+        select blocking_pid as pid from sys.innodb_lock_waits where waiting_pid = ${id}
+        union
+        select blocking_pid from sys.schema_table_lock_waits where waiting_pid = ${id}
+    `.execute(side));
+  const ids = blockerIds.map((row) => Number(row.pid));
+  const blockers = ids.length === 0 ? [] : await rowsOrEmpty(() => sql`
+        select id as pid, left(coalesce(info, command), 120) as query, time * 1000 as age_ms
+          from information_schema.processlist
+         where id in (${sql.join(ids)})
+    `.execute(side));
+  const [stage] = await rowsOrEmpty(() => sql`
+        select s.event_name, s.work_completed, s.work_estimated
+          from performance_schema.events_stages_current s
+          join performance_schema.threads t on t.thread_id = s.thread_id
+         where t.processlist_id = ${id}
+    `.execute(side));
+  const state = toText(process2?.state);
+  const done = toNumber(stage?.work_completed);
+  const total = toNumber(stage?.work_estimated);
+  return {
+    state,
+    waitEvent: state?.startsWith("Waiting") ? state : null,
+    blockedBy: toBlockers(blockers),
+    workers: 0,
+    progress: stage ? {
+      operation: stage.event_name.replace(/^stage\/\w+\//, ""),
+      phase: null,
+      relation: null,
+      done,
+      total,
+      percent: percentOf(done, total)
+    } : null
+  };
+};
+var STATEMENT_PROBES = {
+  postgres: postgresProbe,
+  mssql: mssqlProbe,
+  mysql: mysqlProbe
+};
+
+// src/core/runner/statement-watcher.ts
+var DEFAULT_WATCH_DELAY_MS = 1e4;
+var DEFAULT_WATCH_INTERVAL_MS = 1e4;
+var SIDE_CONNECTION_WAIT_MS = 5e3;
+var StatementWatcher = class {
+  #pool;
+  #dialect;
+  #signal;
+  #delayMs;
+  #intervalMs;
+  #active = null;
+  #side = null;
+  #sideAbandoned = false;
+  #releaseSide = null;
+  #sideHeld = Promise.resolve();
+  #closed = false;
+  #onAbort = () => {
+    const statement = this.#active;
+    if (statement) void this.#cancel(statement);
+  };
+  /**
+   * @param pool - Root connection pool the side connection is checked out
+   *   from. Never a transaction: the side connection must be a separate session.
+   */
+  constructor(pool, options = {}) {
+    this.#pool = pool;
+    this.#dialect = options.dialect;
+    this.#signal = options.signal;
+    this.#delayMs = options.delayMs ?? DEFAULT_WATCH_DELAY_MS;
+    this.#intervalMs = options.intervalMs ?? DEFAULT_WATCH_INTERVAL_MS;
+    this.#signal?.addEventListener("abort", this.#onAbort, { once: true });
+  }
+  /**
+   * Run `fn` on one pinned connection while watching it.
+   *
+   * A transaction is already one connection, so it is used as is; anything
+   * else is pinned with `connection()` so the session id read up front is
+   * the session the SQL runs on.
+   *
+   * @throws OperationAbortedError when the signal aborted before `fn` started
+   */
+  async run(filepath, executor, fn) {
+    if (executor.isTransaction) {
+      return this.#watch(filepath, executor, fn);
+    }
+    return executor.connection().execute((conn) => this.#watch(filepath, conn, fn));
+  }
+  /**
+   * Stop watching and return the side connection to the pool.
+   */
+  async close() {
+    this.#closed = true;
+    this.#signal?.removeEventListener("abort", this.#onAbort);
+    this.#releaseSide?.();
+    await this.#sideHeld;
+  }
+  async #watch(filepath, conn, fn) {
+    const sessionId = await this.#readSessionId(conn);
+    const statement = {
+      filepath,
+      sessionId,
+      startedAt: performance.now(),
+      timer: void 0,
+      finished: false,
+      cancelling: null
+    };
+    if (this.#signal?.aborted) {
+      throw new OperationAbortedError("Run cancelled before the file started");
+    }
+    this.#active = statement;
+    statement.timer = setTimeout(() => void this.#report(statement), this.#delayMs);
+    try {
+      return await fn(conn);
+    } finally {
+      clearTimeout(statement.timer);
+      this.#active = null;
+      statement.finished = true;
+      await statement.cancelling;
+    }
+  }
+  async #readSessionId(conn) {
+    const query = this.#dialect ? SESSION_ID_SQL[this.#dialect] : void 0;
+    if (!query) return null;
+    const [result, err] = await attempt(() => sql.raw(query).execute(conn));
+    if (err) return null;
+    return readSessionId(result.rows) ?? null;
+  }
+  async #report(statement) {
+    if (this.#active !== statement) return;
+    const status = await this.#poll(statement);
+    if (this.#active !== statement) return;
+    observer.emit("file:progress", {
+      filepath: statement.filepath,
+      elapsedMs: performance.now() - statement.startedAt,
+      sessionId: statement.sessionId,
+      status
+    });
+    statement.timer = setTimeout(() => void this.#report(statement), this.#intervalMs);
+  }
+  async #poll(statement) {
+    const probe = this.#dialect ? STATEMENT_PROBES[this.#dialect] : void 0;
+    const sessionId = statement.sessionId;
+    if (!probe || sessionId === null) return null;
+    const side = await this.#sideConnection();
+    if (!side) return null;
+    const [status, err] = await attempt(() => probe(side, sessionId));
+    return err ? null : status;
+  }
+  async #cancel(statement) {
+    const cancel = this.#dialect ? SERVER_CANCEL[this.#dialect] : void 0;
+    const sessionId = statement.sessionId;
+    if (sessionId === null || !cancel) return;
+    const side = await this.#sideConnection();
+    if (statement.finished || this.#closed) return;
+    if (!side) {
+      observer.emit("error", {
+        source: "runner:cancel",
+        error: new Error("No free connection to send the cancel from"),
+        context: { filepath: statement.filepath, sessionId }
+      });
+      return;
+    }
+    const sending = attempt(() => cancel(side, sessionId));
+    statement.cancelling = sending.then(() => void 0);
+    const [, err] = await sending;
+    if (err) {
+      observer.emit("error", {
+        source: "runner:cancel",
+        error: err,
+        context: { filepath: statement.filepath, sessionId }
+      });
+    }
+  }
+  async #sideConnection() {
+    if (this.#closed || this.#sideAbandoned) return null;
+    this.#side ??= this.#checkoutSide();
+    const pending = this.#side;
+    const [side] = await attempt(() => runWithTimeout(() => pending, { timeout: SIDE_CONNECTION_WAIT_MS }));
+    if (!side && this.#side === pending) this.#sideAbandoned = true;
+    return side ?? null;
+  }
+  /**
+   * Check a connection out of the pool and hold it until `close()`.
+   *
+   * Kysely only lends a dedicated connection for the duration of a callback,
+   * so the callback parks on a promise that `close()` resolves. A checkout
+   * that arrives after the watcher gave up on it returns at once.
+   */
+  #checkoutSide() {
+    return new Promise((resolveSide) => {
+      const released = new Promise((release) => {
+        this.#releaseSide = release;
+      });
+      this.#sideHeld = attempt(() => this.#pool.connection().execute(async (side) => {
+        if (this.#sideAbandoned || this.#closed) return;
+        if (this.#active === null) {
+          this.#side = null;
+          resolveSide(null);
+          return;
+        }
+        resolveSide(side);
+        await released;
+      })).then(([, err]) => {
+        if (err) {
+          resolveSide(null);
+          observer.emit("error", {
+            source: "runner:watch",
+            error: err,
+            context: { operation: "side-connection" }
+          });
+        }
+      });
+    });
+  }
+};
 
 // src/core/lock/types.ts
 var DEFAULT_LOCK_OPTIONS = {
@@ -6618,6 +6917,7 @@ var ChangeRollback = class extends Error {
 async function executeFiles(context, change, files, direction, checksum, force, history, startTime) {
   const dialect = context.dialect ?? "postgres";
   const expandedFiles = await expandFiles(files, context.sqlDir);
+  const watcher = new StatementWatcher(context.db, { dialect });
   if (!TRANSACTIONAL_DIALECTS.has(dialect)) {
     return runFileBatch(
       context,
@@ -6628,8 +6928,9 @@ async function executeFiles(context, change, files, direction, checksum, force,
       force,
       history,
       context.db,
-      startTime
-    );
+      startTime,
+      watcher
+    ).finally(() => watcher.close());
   }
   const [result, err] = await attempt(
     () => context.db.transaction().execute(async (trx) => {
@@ -6643,7 +6944,8 @@ async function executeFiles(context, change, files, direction, checksum, force,
         force,
         trxHistory,
         trx,
-        startTime
+        startTime,
+        watcher
       );
       if (batchResult.status !== "success") {
         throw new ChangeRollback(batchResult);
@@ -6651,6 +6953,7 @@ async function executeFiles(context, change, files, direction, checksum, force,
       return batchResult;
     })
   );
+  await watcher.close();
   if (err) {
     if (err instanceof ChangeRollback) {
       return { ...err.result, operationId: void 0 };
@@ -6659,7 +6962,13 @@ async function executeFiles(context, change, files, direction, checksum, force,
   }
   return result;
 }
-async function runFileBatch(context, change, expandedFiles, direction, checksum, force, history, executor, startTime) {
+async function runFileBatch(context, change, expandedFiles, direction, checksum, force, history, executor, startTime, watcher) {
+  const fileChecksums = /* @__PURE__ */ new Map();
+  for (const file of expandedFiles) {
+    const [cs] = await attempt(() => computeChecksum(file.path));
+    fileChecksums.set(file.path, cs ?? "");
+  }
+  const skipReasons = await findSkippedFiles(context, change.name, direction, expandedFiles, fileChecksums, force, history);
   const [operationId, createErr] = await attempt(
     () => history.createOperation({
       name: change.name,
@@ -6675,14 +6984,9 @@ async function runFileBatch(context, change, expandedFiles, direction, checksum,
     });
     return createFailedResult(change.name, direction, createErr.message, startTime);
   }
-  const fileChecksums = /* @__PURE__ */ new Map();
-  for (const file of expandedFiles) {
-    const [cs] = await attempt(() => computeChecksum(file.path));
-    fileChecksums.set(file.path, cs ?? "");
-  }
   const createRecordsErr = await history.createFileRecords(
     operationId,
-    expandedFiles.map((f) => ({
+    expandedFiles.filter((_, i) => !skipReasons[i]).map((f) => ({
       filepath: path.relative(context.projectRoot, f.path),
       fileType: f.type,
       checksum: fileChecksums.get(f.path) ?? ""
@@ -6722,36 +7026,15 @@ async function runFileBatch(context, change, expandedFiles, direction, checksum,
       const fileStart = performance.now();
       const relPath = path.relative(context.projectRoot, file.path);
       const fileChecksum = fileChecksums.get(file.path) ?? "";
-      const needsRunFileResult = await history.needsRunFile(
-        change.name,
-        direction,
-        relPath,
-        fileChecksum,
-        force
-      );
-      if (!needsRunFileResult.needsRun) {
+      const skipReason = skipReasons[i];
+      if (skipReason) {
         results.push({
           filepath: file.path,
           checksum: fileChecksum,
           status: "skipped",
-          skipReason: needsRunFileResult.skipReason,
+          skipReason,
           durationMs: 0
         });
-        const skipUpdateErr = await history.updateFileExecution(
-          operationId,
-          relPath,
-          "skipped",
-          0,
-          void 0,
-          needsRunFileResult.skipReason
-        );
-        if (skipUpdateErr) {
-          observer.emit("error", {
-            source: "change",
-            error: new Error(skipUpdateErr),
-            context: { filepath: relPath, operation: "update-skipped-record" }
-          });
-        }
         continue;
       }
       const [sqlContent, loadErr] = await attempt(() => loadAndRenderFile(context, file.path));
@@ -6783,7 +7066,9 @@ async function runFileBatch(context, change, expandedFiles, direction, checksum,
         }
         break;
       }
-      const [, execErr] = await attempt(() => sql.raw(sqlContent).execute(executor));
+      const [, execErr] = await attempt(
+        () => watcher.run(file.path, executor, (conn) => sql.raw(sqlContent).execute(conn))
+      );
       const durationMs = performance.now() - fileStart;
       if (execErr) {
         const errorMessage2 = getSqlErrorMessage(execErr);
@@ -6884,6 +7169,22 @@ async function runFileBatch(context, change, expandedFiles, direction, checksum,
     operationId
   };
 }
+async function findSkippedFiles(context, changeName, direction, files, fileChecksums, force, history) {
+  const skipReasons = [];
+  const seen = /* @__PURE__ */ new Set();
+  const [latest, latestErr] = force ? [null, null] : await history.latestFileExecutions(changeName, direction);
+  for (const file of files) {
+    const relPath = path.relative(context.projectRoot, file.path);
+    if (seen.has(relPath)) {
+      skipReasons.push("already applied");
+      continue;
+    }
+    seen.add(relPath);
+    const decision = decideNeedsRunFile(latestErr ?? latest?.get(relPath), fileChecksums.get(file.path) ?? "", force);
+    skipReasons.push(decision.needsRun ? void 0 : decision.skipReason);
+  }
+  return skipReasons;
+}
 async function executePreview(context, change, files, direction, output, startTime) {
   const expandedFiles = await expandFiles(files, context.sqlDir);
   const results = [];
@@ -7554,7 +7855,7 @@ async function resolveVaultKey(db, dialect) {
 async function buildSecretsContext(stateManager, configName, db, vaultKey, dialect) {
   const secrets = {};
   if (db && vaultKey) {
-    const { getAllVaultSecrets: getAllVaultSecrets2 } = await import('./storage-V6BHWNS3.js');
+    const { getAllVaultSecrets: getAllVaultSecrets2 } = await import('./storage-NQA4H7PK.js');
     const vaultSecrets = await getAllVaultSecrets2(db, vaultKey, dialect ?? "postgres");
     for (const [key, secret] of Object.entries(vaultSecrets)) {
       secrets[key] = secret.value;
@@ -8326,47 +8627,20 @@ async function runBuild(context, sqlPath, options = {}, preFilteredFiles) {
 }
 async function runFile(context, filepath, options = {}) {
   assertRunPolicy(context, "run:file");
-  const opts = { ...DEFAULT_RUN_OPTIONS_INTERNAL, ...options };
   observer.emit("run:file", {
     filepath,
     configName: context.configName
   });
-  if (opts.dryRun) {
-    const results = await executeDryRun2(context, [filepath]);
-    return results[0];
-  }
-  const tracker = new Tracker(context.db, context.configName, context.dialect ?? "postgres");
-  const operationName = `run:${(/* @__PURE__ */ new Date()).toISOString()}`;
-  const [operationId, createErr] = await attempt(
-    () => tracker.createOperation({
-      name: operationName,
-      changeType: "run",
-      configName: context.configName,
-      executedBy: formatIdentity(context.identity)
-    })
-  );
-  if (createErr) {
-    observer.emit("error", {
-      source: "runner",
-      error: createErr,
-      context: { filepath, operation: "create-operation" }
-    });
-    return {
-      filepath,
-      checksum: "",
-      status: "failed",
-      error: createErr.message
-    };
-  }
-  const result = await executeSingleFile(context, filepath, opts, tracker, operationId);
-  await tracker.finalizeOperation(
-    operationId,
-    result.status === "failed" ? "failed" : "success",
-    Math.round(result.durationMs ?? 0),
-    result.checksum,
-    result.error
-  );
-  return result;
+  const batch = await executeFiles2(context, [{ path: filepath, type: "sql" }], options, {
+    changeType: "run",
+    operationName: `run:${(/* @__PURE__ */ new Date()).toISOString()}`
+  });
+  return batch.files[0] ?? {
+    filepath,
+    checksum: "",
+    status: batch.error === RUN_CANCELLED ? "skipped" : "failed",
+    error: batch.error
+  };
 }
 async function runDir(context, dirpath, options = {}) {
   assertRunPolicy(context, "run:dir");
@@ -8445,6 +8719,31 @@ var DEFAULT_RUN_OPTIONS_INTERNAL = {
   preview: false,
   output: null
 };
+var RUN_CANCELLED = "Run cancelled";
+function createWatcher(context) {
+  return new StatementWatcher(context.db, {
+    dialect: context.dialect ?? "postgres",
+    signal: context.signal
+  });
+}
+var NOT_STARTED = /* @__PURE__ */ Symbol("not-started");
+async function runWatched(context, watcher, filepath, sqlContent) {
+  const [execErrMsg, err] = await attempt(
+    () => watcher.run(filepath, context.db, (conn) => executeSqlBody({ ...context, db: conn }, sqlContent))
+  );
+  if (err instanceof OperationAbortedError) return NOT_STARTED;
+  return err ? getSqlErrorMessage(err) : execErrMsg;
+}
+async function skipRemaining(tracker, operationId, reason) {
+  const skipErr = await tracker.skipRemainingFiles(operationId, reason.slice(0, 100));
+  if (skipErr) {
+    observer.emit("error", {
+      source: "runner:skip-remaining",
+      error: new Error(skipErr),
+      context: { operationId }
+    });
+  }
+}
 async function executeFiles2(context, files, runOptions, execOptions) {
   const start = performance.now();
   const opts = { ...DEFAULT_RUN_OPTIONS_INTERNAL, ...runOptions };
@@ -8484,6 +8783,19 @@ async function executeFiles2(context, files, runOptions, execOptions) {
     };
   }
   const tracker = execOptions.tracker ?? new Tracker(context.db, context.configName, context.dialect ?? "postgres");
+  const isChange = execOptions.changeType === "change";
+  const prepared = await prepareFiles(context, files);
+  const gated = isChange ? prepared : await applyRunGate(tracker, prepared, opts.force);
+  if (!isChange && gated.every((entry) => entry.skipReason !== void 0)) {
+    return {
+      status: "success",
+      files: gated.map(skipFile),
+      filesRun: 0,
+      filesSkipped: gated.length,
+      filesFailed: 0,
+      durationMs: performance.now() - start
+    };
+  }
   const [operationId, createErr] = await attempt(
     () => tracker.createOperation({
       name: execOptions.operationName,
@@ -8504,20 +8816,11 @@ async function executeFiles2(context, files, runOptions, execOptions) {
       performance.now() - start
     );
   }
-  const fileRecords = [];
-  for (const file of files) {
-    let checksum = file.checksum;
-    if (!checksum) {
-      const [computed, err] = await attempt(() => computeChecksum(file.path));
-      checksum = err ? "" : computed;
-    }
-    fileRecords.push({
-      filepath: path.relative(context.projectRoot, file.path),
-      fileType: file.type,
-      checksum
-    });
-  }
-  const createRecordsErr = await tracker.createFileRecords(operationId, fileRecords);
+  const runSet = gated.filter((entry) => !entry.skipReason);
+  const createRecordsErr = await tracker.createFileRecords(
+    operationId,
+    runSet.map((entry) => ({ filepath: entry.relFilepath, fileType: entry.file.type, checksum: entry.checksum }))
+  );
   if (createRecordsErr) {
     observer.emit("error", {
       source: "runner:create-file-records",
@@ -8532,34 +8835,43 @@ async function executeFiles2(context, files, runOptions, execOptions) {
   }
   const results = [];
   let failed = false;
-  for (let i = 0; i < files.length; i++) {
-    const file = files[i];
-    const fileRecord = fileRecords[i];
-    const result = await executeSingleFileWithUpdate(
-      context,
-      file.path,
-      fileRecord.checksum,
-      opts,
-      tracker,
-      operationId,
-      execOptions.changeType
-    );
-    results.push(result);
-    if (result.status === "failed" && opts.abortOnError) {
-      failed = true;
-      const skipErr = await tracker.skipRemainingFiles(
-        operationId,
-        `Skipped: failure in ${path.basename(file.path)}`.slice(0, 100)
-      );
-      if (skipErr) {
-        observer.emit("error", {
-          source: "runner:skip-remaining",
-          error: new Error(skipErr),
-          context: { operationId }
-        });
+  let cancelled = false;
+  const watcher = createWatcher(context);
+  const lastRunIndex = gated.map((entry) => !entry.skipReason).lastIndexOf(true);
+  try {
+    for (let i = 0; i < gated.length; i++) {
+      const entry = gated[i];
+      if (entry.skipReason) {
+        results.push(skipFile(entry));
+        continue;
+      }
+      if (context.signal?.aborted) {
+        failed = true;
+        cancelled = true;
+        await skipRemaining(tracker, operationId, RUN_CANCELLED);
+        break;
+      }
+      const result = await executeSingleFileWithUpdate(context, entry, tracker, operationId, watcher);
+      if (!result) {
+        failed = true;
+        cancelled = true;
+        await skipRemaining(tracker, operationId, RUN_CANCELLED);
+        break;
+      }
+      results.push(result);
+      cancelled = (context.signal?.aborted ?? false) && (i < lastRunIndex || result.status === "failed");
+      if (cancelled || result.status === "failed" && opts.abortOnError) {
+        failed = true;
+        await skipRemaining(
+          tracker,
+          operationId,
+          cancelled ? RUN_CANCELLED : `Skipped: failure in ${path.basename(entry.file.path)}`
+        );
+        break;
       }
-      break;
     }
+  } finally {
+    await watcher.close();
   }
   if (!failed && results.length !== files.length) {
     throw new Error(
@@ -8574,14 +8886,14 @@ async function executeFiles2(context, files, runOptions, execOptions) {
   if (filesFailed > 0 || failed) {
     status = filesRun > 0 ? "partial" : "failed";
   }
-  const combinedChecksum = execOptions.checksum ?? computeCombinedChecksum(fileRecords.map((f) => f.checksum));
+  const combinedChecksum = execOptions.checksum ?? computeCombinedChecksum(gated.map((entry) => entry.checksum));
   const finalStatus = status === "success" ? "success" : "failed";
   const finalizeErr = await tracker.finalizeOperation(
     operationId,
     finalStatus,
     Math.round(durationMs),
     combinedChecksum,
-    failed ? results.find((r) => r.status === "failed")?.error : void 0
+    cancelled ? RUN_CANCELLED : failed ? results.find((r) => r.status === "failed")?.error : void 0
   );
   if (finalizeErr) {
     observer.emit("error", {
@@ -8597,7 +8909,45 @@ async function executeFiles2(context, files, runOptions, execOptions) {
     filesSkipped,
     filesFailed,
     durationMs,
-    changeId: operationId
+    changeId: operationId,
+    error: cancelled ? RUN_CANCELLED : void 0
+  };
+}
+async function prepareFiles(context, files) {
+  const prepared = [];
+  for (const file of files) {
+    const relFilepath = path.relative(context.projectRoot, file.path);
+    const [loaded, loadError] = await attempt(async () => {
+      const sql28 = await loadAndRenderFile2(context, file.path);
+      return { sql: sql28, checksum: computeChecksumFromContent(sql28) };
+    });
+    if (loadError) {
+      prepared.push({ file, relFilepath, checksum: "", sql: "", loadError });
+      continue;
+    }
+    prepared.push({ file, relFilepath, ...loaded });
+  }
+  return prepared;
+}
+async function applyRunGate(tracker, prepared, force) {
+  if (force) return prepared;
+  const [latest, latestErr] = await tracker.latestExecutions();
+  return prepared.map((entry) => {
+    if (entry.loadError) return entry;
+    const decision = decideNeedsRun(latestErr ?? latest.get(entry.relFilepath), entry.checksum);
+    return decision.skipReason ? { ...entry, skipReason: decision.skipReason } : entry;
+  });
+}
+function skipFile(entry) {
+  observer.emit("file:skip", {
+    filepath: entry.file.path,
+    reason: entry.skipReason
+  });
+  return {
+    filepath: entry.file.path,
+    checksum: entry.checksum,
+    status: "skipped",
+    skipReason: entry.skipReason
   };
 }
 async function executeFilesInternal(context, files, options, changeType, sqlPath) {
@@ -8613,17 +8963,16 @@ async function executeFilesInternal(context, files, options, changeType, sqlPath
   };
   return executeFiles2(context, fileInputs, options, execOptions);
 }
-async function executeSingleFileWithUpdate(context, filepath, checksum, options, tracker, operationId, changeType) {
+async function executeSingleFileWithUpdate(context, entry, tracker, operationId, watcher) {
   const start = performance.now();
-  const relFilepath = path.relative(context.projectRoot, filepath);
-  const [sqlContent, loadErr] = await attempt(() => loadAndRenderFile2(context, filepath));
-  if (loadErr) {
+  const { file: { path: filepath }, relFilepath, checksum } = entry;
+  if (entry.loadError) {
     const durationMs2 = performance.now() - start;
     const result2 = {
       filepath,
-      checksum: checksum || "",
+      checksum,
       status: "failed",
-      error: loadErr.message,
+      error: entry.loadError.message,
       durationMs: durationMs2
     };
     await tracker.updateFileExecution(
@@ -8631,55 +8980,29 @@ async function executeSingleFileWithUpdate(context, filepath, checksum, options,
       relFilepath,
       "failed",
       Math.round(durationMs2),
-      loadErr.message
+      entry.loadError.message
     );
     observer.emit("file:after", {
       filepath,
       status: "failed",
       durationMs: durationMs2,
-      error: loadErr.message
+      error: entry.loadError.message
     });
     return result2;
   }
-  const [renderedChecksum, checksumErr] = attemptSync(() => computeChecksumFromContent(sqlContent));
-  const finalChecksum = checksumErr ? checksum : renderedChecksum;
   observer.emit("file:before", {
     filepath,
-    checksum: finalChecksum,
+    checksum,
     configName: context.configName
   });
-  if (changeType !== "change") {
-    const needsRunResult = await tracker.needsRun(relFilepath, finalChecksum, options.force, operationId);
-    if (!needsRunResult.needsRun) {
-      const result2 = {
-        filepath,
-        checksum: finalChecksum,
-        status: "skipped",
-        skipReason: needsRunResult.skipReason
-      };
-      await tracker.updateFileExecution(
-        operationId,
-        relFilepath,
-        "skipped",
-        0,
-        void 0,
-        needsRunResult.skipReason,
-        finalChecksum
-      );
-      observer.emit("file:skip", {
-        filepath,
-        reason: needsRunResult.skipReason
-      });
-      return result2;
-    }
-  }
-  const execErrMsg = await executeSqlBody(context, sqlContent);
+  const execErrMsg = await runWatched(context, watcher, filepath, entry.sql);
+  if (execErrMsg === NOT_STARTED) return null;
   const durationMs = performance.now() - start;
   if (execErrMsg) {
     const error = execErrMsg + await describePriorSuccesses(tracker, relFilepath, operationId);
     const result2 = {
       filepath,
-      checksum: finalChecksum,
+      checksum,
       status: "failed",
       error,
       durationMs
@@ -8689,9 +9012,7 @@ async function executeSingleFileWithUpdate(context, filepath, checksum, options,
       relFilepath,
       "failed",
       Math.round(durationMs),
-      error,
-      void 0,
-      finalChecksum
+      error
     );
     observer.emit("file:after", {
       filepath,
@@ -8703,7 +9024,7 @@ async function executeSingleFileWithUpdate(context, filepath, checksum, options,
   }
   const result = {
     filepath,
-    checksum: finalChecksum,
+    checksum,
     status: "success",
     durationMs
   };
@@ -8711,10 +9032,7 @@ async function executeSingleFileWithUpdate(context, filepath, checksum, options,
     operationId,
     relFilepath,
     "success",
-    Math.round(durationMs),
-    void 0,
-    void 0,
-    finalChecksum
+    Math.round(durationMs)
   );
   observer.emit("file:after", {
     filepath,
@@ -8723,133 +9041,6 @@ async function executeSingleFileWithUpdate(context, filepath, checksum, options,
   });
   return result;
 }
-async function executeSingleFile(context, filepath, options, tracker, operationId) {
-  const start = performance.now();
-  const relFilepath = path.relative(context.projectRoot, filepath);
-  const [sqlContent, loadErr] = await attempt(() => loadAndRenderFile2(context, filepath));
-  if (loadErr) {
-    const durationMs2 = performance.now() - start;
-    const result2 = {
-      filepath,
-      checksum: "",
-      status: "failed",
-      error: loadErr.message,
-      durationMs: durationMs2
-    };
-    await tracker.recordExecution({
-      changeId: operationId,
-      filepath: relFilepath,
-      checksum: "",
-      status: "failed",
-      errorMessage: loadErr.message,
-      durationMs: Math.round(durationMs2)
-    });
-    observer.emit("file:after", {
-      filepath,
-      status: "failed",
-      durationMs: durationMs2,
-      error: loadErr.message
-    });
-    return result2;
-  }
-  const [checksum, checksumErr] = attemptSync(() => computeChecksumFromContent(sqlContent));
-  if (checksumErr) {
-    const result2 = {
-      filepath,
-      checksum: "",
-      status: "failed",
-      error: checksumErr.message,
-      durationMs: performance.now() - start
-    };
-    await tracker.recordExecution({
-      changeId: operationId,
-      filepath: relFilepath,
-      checksum: "",
-      status: "failed",
-      errorMessage: checksumErr.message,
-      durationMs: Math.round(result2.durationMs ?? 0)
-    });
-    observer.emit("file:after", {
-      filepath,
-      status: "failed",
-      durationMs: result2.durationMs ?? 0,
-      error: checksumErr.message
-    });
-    return result2;
-  }
-  observer.emit("file:before", {
-    filepath,
-    checksum,
-    configName: context.configName
-  });
-  const needsRunResult = await tracker.needsRun(relFilepath, checksum, options.force);
-  if (!needsRunResult.needsRun) {
-    const result2 = {
-      filepath,
-      checksum,
-      status: "skipped",
-      skipReason: needsRunResult.skipReason
-    };
-    await tracker.recordExecution({
-      changeId: operationId,
-      filepath: relFilepath,
-      checksum,
-      status: "skipped",
-      skipReason: needsRunResult.skipReason
-    });
-    observer.emit("file:skip", {
-      filepath,
-      reason: needsRunResult.skipReason
-    });
-    return result2;
-  }
-  const execErrMsg = await executeSqlBody(context, sqlContent);
-  const durationMs = performance.now() - start;
-  if (execErrMsg) {
-    const error = execErrMsg + await describePriorSuccesses(tracker, relFilepath, operationId);
-    const result2 = {
-      filepath,
-      checksum,
-      status: "failed",
-      error,
-      durationMs
-    };
-    await tracker.recordExecution({
-      changeId: operationId,
-      filepath: relFilepath,
-      checksum,
-      status: "failed",
-      errorMessage: error,
-      durationMs: Math.round(durationMs)
-    });
-    observer.emit("file:after", {
-      filepath,
-      status: "failed",
-      durationMs,
-      error
-    });
-    return result2;
-  }
-  const result = {
-    filepath,
-    checksum,
-    status: "success",
-    durationMs
-  };
-  await tracker.recordExecution({
-    changeId: operationId,
-    filepath: relFilepath,
-    checksum,
-    status: "success",
-    durationMs: Math.round(durationMs)
-  });
-  observer.emit("file:after", {
-    filepath,
-    status: "success",
-    durationMs
-  });
-  return result;
-}
 async function loadAndRenderFile2(context, filepath) {
   if (isTemplate(filepath)) {
     const result = await processFile(filepath, {