@noormdev/sdk 1.4.1 → 1.5.0

package/dist/index.js

@@ -1,9 +1,11 @@
 import { createRequire } from 'module';
-import { processFile, es_default, DtReader, isTemplate, FORMAT_VERSION, DT_EXTENSIONS, encryptWithPassphrase, ENCODED_TYPES } from './chunk-G4B7EHL7.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-FSVO6NAJ.js';
-import { makeNestedConfig, gigabytes, attempt, observer, attemptSync, getEnvConfigName, clone, merge, equals, retry, runWithTimeout, isTimeoutError, ObserverRelay, isDebug, wait } from './chunk-LY2F7ZFI.js';
-export { observer as noormObserver } from './chunk-LY2F7ZFI.js';
+import { resolveLegacyAccess, checkConfigPolicy, initializeVault, getVaultStatus, setVaultSecret, getVaultSecret, getAllVaultSecrets, listVaultSecretKeys, deleteVaultSecret, vaultSecretExists, getVaultKey, noormDb, getNoormTables, encryptVaultKey, assertVaultPolicy, assertPolicy, detectAgentHarness, guarded } from './chunk-WUMCIKEQ.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';
 import { dist_default } from './chunk-TBRUDUBQ.js';
 import { require_dist } from './chunk-YJBKNUTP.js';
@@ -2926,7 +2928,7 @@ async function getDialectFactory(dialect) {
     case "mysql":
       return (await import('./mysql-32B4SXWA.js')).createMysqlConnection;
     case "mssql":
-      return (await import('./mssql-3BQB6ACD.js')).createMssqlConnection;
+      return (await import('./mssql-II62FO2B.js')).createMssqlConnection;
     default:
       throw new Error(`Unsupported dialect: ${dialect}`);
   }
@@ -2997,6 +2999,9 @@ async function openConnection(config, configName, retryOptions, signal) {
         backoff,
         jitterFactor: 0.1,
         signal,
+        // Otherwise running out of retries reads "Max retries
+        // reached", and the server's own error is lost.
+        throwLastError: true,
         shouldRetry: (err2) => {
           if (err2 instanceof OperationAbortedError) return false;
           const msg = err2.message.toLowerCase();
@@ -3014,8 +3019,10 @@ async function openConnection(config, configName, retryOptions, signal) {
     )
   );
   if (err) {
-    observer.emit("connection:error", { configName, error: err.message });
-    throw err;
+    const explained = explainConnectionError(err, config);
+    const server = explained instanceof DatabaseConnectionError ? { serverCode: explained.serverCode, serverMessage: explained.serverMessage } : {};
+    observer.emit("connection:error", { configName, error: explained.message, ...server });
+    throw explained;
   }
   const manager = getConnectionManager();
   const trackId = manager.track(conn, configName);
@@ -3055,15 +3062,21 @@ var SYSTEM_DATABASES = {
   // SQLite creates the file on connect
   mssql: "master"
 };
-async function testConnection(config, options = {}) {
-  let testConfig = config;
-  if (options.testServerOnly && config.dialect !== "sqlite") {
-    const systemDb = SYSTEM_DATABASES[config.dialect];
-    testConfig = {
-      ...config,
-      database: systemDb ?? config.database
-    };
+async function probeConnection(config, signal) {
+  const [conn, err] = await attempt(
+    () => createConnection(config, "__test__", {}, signal)
+  );
+  if (err) {
+    if (err instanceof OperationAbortedError) {
+      return { ok: false, error: err.message, aborted: true };
+    }
+    return { ok: false, error: err.message };
   }
+  await conn.destroy();
+  return { ok: true };
+}
+async function testConnection(config, options = {}) {
+  const systemDb = SYSTEM_DATABASES[config.dialect];
   if (options.testServerOnly && config.dialect === "sqlite") {
     const filename = config.filename ?? config.database;
     if (filename !== ":memory:" && !existsSync(filename)) {
@@ -3074,17 +3087,12 @@ async function testConnection(config, options = {}) {
       return { ok: true };
     }
   }
-  const [conn, err] = await attempt(
-    () => createConnection(testConfig, "__test__", {}, options.signal)
-  );
-  if (err) {
-    if (err instanceof OperationAbortedError) {
-      return { ok: false, error: err.message, aborted: true };
-    }
-    return { ok: false, error: err.message };
+  const result = await probeConnection(config, options.signal);
+  const targetMissing = !result.ok && !result.aborted && !!result.error?.includes("does not exist");
+  if (options.testServerOnly && systemDb && targetMissing) {
+    return probeConnection({ ...config, database: systemDb }, options.signal);
   }
-  await conn.destroy();
-  return { ok: true };
+  return result;
 }
 function addIdColumn(builder, dialect) {
   if (dialect === "postgres") {
@@ -6011,6 +6019,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 = {
@@ -6610,6 +6961,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,
@@ -6620,8 +6972,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) => {
@@ -6635,7 +6988,8 @@ async function executeFiles(context, change, files, direction, checksum, force,
         force,
         trxHistory,
         trx,
-        startTime
+        startTime,
+        watcher
       );
       if (batchResult.status !== "success") {
         throw new ChangeRollback(batchResult);
@@ -6643,6 +6997,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 };
@@ -6651,7 +7006,7 @@ 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 [operationId, createErr] = await attempt(
     () => history.createOperation({
       name: change.name,
@@ -6775,7 +7130,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);
@@ -7546,7 +7903,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-V5I67ANZ.js');
+    const { getAllVaultSecrets: getAllVaultSecrets2 } = await import('./storage-FBDOY3MC.js');
     const vaultSecrets = await getAllVaultSecrets2(db, vaultKey, dialect ?? "postgres");
     for (const [key, secret] of Object.entries(vaultSecrets)) {
       secrets[key] = secret.value;
@@ -8350,10 +8707,11 @@ async function runFile(context, filepath, options = {}) {
       error: createErr.message
     };
   }
-  const result = await executeSingleFile(context, filepath, opts, tracker, operationId);
+  const watcher = createWatcher(context);
+  const result = await executeSingleFile(context, filepath, opts, tracker, operationId, watcher).finally(() => watcher.close());
   await tracker.finalizeOperation(
     operationId,
-    result.status === "failed" ? "failed" : "success",
+    result.status === "failed" || result.error ? "failed" : "success",
     Math.round(result.durationMs ?? 0),
     result.checksum,
     result.error
@@ -8437,6 +8795,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 };
@@ -8524,34 +8907,48 @@ 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(
+  let cancelled = false;
+  const watcher = createWatcher(context);
+  try {
+    for (let i = 0; i < files.length; i++) {
+      const file = files[i];
+      const fileRecord = fileRecords[i];
+      if (context.signal?.aborted) {
+        failed = true;
+        cancelled = true;
+        await skipRemaining(tracker, operationId, RUN_CANCELLED);
+        break;
+      }
+      const result = await executeSingleFileWithUpdate(
+        context,
+        file.path,
+        fileRecord.checksum,
+        opts,
+        tracker,
         operationId,
-        `Skipped: failure in ${path.basename(file.path)}`.slice(0, 100)
+        execOptions.changeType,
+        watcher
       );
-      if (skipErr) {
-        observer.emit("error", {
-          source: "runner:skip-remaining",
-          error: new Error(skipErr),
-          context: { operationId }
-        });
+      if (!result) {
+        failed = true;
+        cancelled = true;
+        await skipRemaining(tracker, operationId, RUN_CANCELLED);
+        break;
+      }
+      results.push(result);
+      cancelled = (context.signal?.aborted ?? false) && (i < files.length - 1 || result.status === "failed");
+      if (cancelled || result.status === "failed" && opts.abortOnError) {
+        failed = true;
+        await skipRemaining(
+          tracker,
+          operationId,
+          cancelled ? RUN_CANCELLED : `Skipped: failure in ${path.basename(file.path)}`
+        );
+        break;
       }
-      break;
     }
+  } finally {
+    await watcher.close();
   }
   if (!failed && results.length !== files.length) {
     throw new Error(
@@ -8573,7 +8970,7 @@ async function executeFiles2(context, files, runOptions, execOptions) {
     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", {
@@ -8589,7 +8986,8 @@ async function executeFiles2(context, files, runOptions, execOptions) {
     filesSkipped,
     filesFailed,
     durationMs,
-    changeId: operationId
+    changeId: operationId,
+    error: cancelled ? RUN_CANCELLED : void 0
   };
 }
 async function executeFilesInternal(context, files, options, changeType, sqlPath) {
@@ -8605,7 +9003,7 @@ 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, filepath, checksum, options, tracker, operationId, changeType, watcher) {
   const start = performance.now();
   const relFilepath = path.relative(context.projectRoot, filepath);
   const [sqlContent, loadErr] = await attempt(() => loadAndRenderFile2(context, filepath));
@@ -8665,7 +9063,8 @@ async function executeSingleFileWithUpdate(context, filepath, checksum, options,
       return result2;
     }
   }
-  const execErrMsg = await executeSqlBody(context, sqlContent);
+  const execErrMsg = await runWatched(context, watcher, filepath, sqlContent);
+  if (execErrMsg === NOT_STARTED) return null;
   const durationMs = performance.now() - start;
   if (execErrMsg) {
     const error = execErrMsg + await describePriorSuccesses(tracker, relFilepath, operationId);
@@ -8715,7 +9114,7 @@ async function executeSingleFileWithUpdate(context, filepath, checksum, options,
   });
   return result;
 }
-async function executeSingleFile(context, filepath, options, tracker, operationId) {
+async function executeSingleFile(context, filepath, options, tracker, operationId, watcher) {
   const start = performance.now();
   const relFilepath = path.relative(context.projectRoot, filepath);
   const [sqlContent, loadErr] = await attempt(() => loadAndRenderFile2(context, filepath));
@@ -8795,8 +9194,18 @@ async function executeSingleFile(context, filepath, options, tracker, operationI
     });
     return result2;
   }
-  const execErrMsg = await executeSqlBody(context, sqlContent);
+  const execErrMsg = await runWatched(context, watcher, filepath, sqlContent);
   const durationMs = performance.now() - start;
+  if (execErrMsg === NOT_STARTED) {
+    await tracker.recordExecution({
+      changeId: operationId,
+      filepath: relFilepath,
+      checksum,
+      status: "skipped",
+      skipReason: RUN_CANCELLED
+    });
+    return { filepath, checksum, status: "skipped", error: RUN_CANCELLED };
+  }
   if (execErrMsg) {
     const error = execErrMsg + await describePriorSuccesses(tracker, relFilepath, operationId);
     const result2 = {
@@ -9227,7 +9636,8 @@ var postgresExploreOperations = {
             SELECT
                 p.proname,
                 n.nspname,
-                p.pronargs::text as param_count
+                p.pronargs::text as param_count,
+                pg_get_function_identity_arguments(p.oid) as identity_args
             FROM pg_proc p
             JOIN pg_namespace n ON p.pronamespace = n.oid
             WHERE n.nspname ${schemaFilter(schema)}
@@ -9242,7 +9652,8 @@ var postgresExploreOperations = {
     return result.rows.map((row) => ({
       name: row.proname,
       schema: row.nspname,
-      parameterCount: parseInt(row.param_count, 10)
+      parameterCount: parseInt(row.param_count, 10),
+      signature: row.identity_args
     }));
   },
   async listFunctions(db, schema) {
@@ -9251,7 +9662,8 @@ var postgresExploreOperations = {
                 p.proname,
                 n.nspname,
                 p.pronargs::text as param_count,
-                pg_get_function_result(p.oid) as return_type
+                pg_get_function_result(p.oid) as return_type,
+                pg_get_function_identity_arguments(p.oid) as identity_args
             FROM pg_proc p
             JOIN pg_namespace n ON p.pronamespace = n.oid
             WHERE n.nspname ${schemaFilter(schema)}
@@ -9267,7 +9679,8 @@ var postgresExploreOperations = {
       name: row.proname,
       schema: row.nspname,
       parameterCount: parseInt(row.param_count, 10),
-      returnType: row.return_type
+      returnType: row.return_type,
+      signature: row.identity_args
     }));
   },
   async listTypes(db, schema) {