@secondlayer/subgraphs 3.24.0 → 3.24.2

package/dist/src/index.js

@@ -226,6 +226,11 @@ import { createHash } from "node:crypto";
 
 // src/schema/utils.ts
 import { pgSchemaName } from "@secondlayer/shared/db/queries/subgraphs";
+function quotePgIdent(name) {
+  if (/^[a-z_][a-z0-9_]*$/i.test(name))
+    return name;
+  return `"${name.replace(/"/g, '""')}"`;
+}
 
 // src/schema/generator.ts
 var TYPE_MAP = {
@@ -250,7 +255,7 @@ function tableNeedsTrgm(tableDef) {
   return Object.values(tableDef.columns).some((col) => col.search);
 }
 function emitTableDDL(schemaName, tableName, tableDef) {
-  const qualifiedName = `${schemaName}.${tableName}`;
+  const qualifiedName = `${quotePgIdent(schemaName)}.${quotePgIdent(tableName)}`;
   const statements = [];
   const columnDefs = [
     "_id BIGSERIAL PRIMARY KEY",
@@ -261,12 +266,12 @@ function emitTableDDL(schemaName, tableName, tableDef) {
   for (const [colName, col] of Object.entries(tableDef.columns)) {
     const sqlType = TYPE_MAP[col.type];
     const nullable = col.nullable ? "" : " NOT NULL";
-    let colDef = `${colName} ${sqlType}${nullable}`;
+    let colDef = `${quotePgIdent(colName)} ${sqlType}${nullable}`;
     if (col.default !== undefined) {
       colDef += ` DEFAULT ${escapeLiteralDefault(col.default)}`;
     }
     if (col.type === "uint") {
-      colDef += ` CHECK (${colName} >= 0)`;
+      colDef += ` CHECK (${quotePgIdent(colName)} >= 0)`;
     }
     columnDefs.push(colDef);
   }
@@ -274,30 +279,30 @@ function emitTableDDL(schemaName, tableName, tableDef) {
   ${columnDefs.join(`,
   `)}
 )`);
-  statements.push(`CREATE INDEX IF NOT EXISTS idx_${schemaName}_${tableName}_block_height ON ${qualifiedName} (_block_height)`);
-  statements.push(`CREATE INDEX IF NOT EXISTS idx_${schemaName}_${tableName}_tx_id ON ${qualifiedName} (_tx_id)`);
+  statements.push(`CREATE INDEX IF NOT EXISTS ${quotePgIdent(`idx_${schemaName}_${tableName}_block_height`)} ON ${qualifiedName} (_block_height)`);
+  statements.push(`CREATE INDEX IF NOT EXISTS ${quotePgIdent(`idx_${schemaName}_${tableName}_tx_id`)} ON ${qualifiedName} (_tx_id)`);
   for (const [colName, col] of Object.entries(tableDef.columns)) {
     if (col.indexed) {
-      statements.push(`CREATE INDEX IF NOT EXISTS idx_${schemaName}_${tableName}_${colName} ON ${qualifiedName} (${colName})`);
+      statements.push(`CREATE INDEX IF NOT EXISTS ${quotePgIdent(`idx_${schemaName}_${tableName}_${colName}`)} ON ${qualifiedName} (${quotePgIdent(colName)})`);
     }
   }
   for (const [colName, col] of Object.entries(tableDef.columns)) {
     if (col.search) {
-      statements.push(`CREATE INDEX IF NOT EXISTS idx_${schemaName}_${tableName}_${colName}_trgm ON ${qualifiedName} USING gin (${colName} gin_trgm_ops)`);
+      statements.push(`CREATE INDEX IF NOT EXISTS ${quotePgIdent(`idx_${schemaName}_${tableName}_${colName}_trgm`)} ON ${qualifiedName} USING gin (${quotePgIdent(colName)} gin_trgm_ops)`);
     }
   }
   if (tableDef.indexes) {
     for (let i = 0;i < tableDef.indexes.length; i++) {
       const cols = tableDef.indexes[i];
-      const idxName = `idx_${schemaName}_${tableName}_composite_${i}`;
-      statements.push(`CREATE INDEX IF NOT EXISTS ${idxName} ON ${qualifiedName} (${cols.join(", ")})`);
+      const idxName = quotePgIdent(`idx_${schemaName}_${tableName}_composite_${i}`);
+      statements.push(`CREATE INDEX IF NOT EXISTS ${idxName} ON ${qualifiedName} (${cols.map(quotePgIdent).join(", ")})`);
     }
   }
   if (tableDef.uniqueKeys) {
     for (let i = 0;i < tableDef.uniqueKeys.length; i++) {
       const cols = tableDef.uniqueKeys[i];
-      const constraintName = `uq_${schemaName}_${tableName}_${cols.join("_")}`;
-      statements.push(`ALTER TABLE ${qualifiedName} ADD CONSTRAINT ${constraintName} UNIQUE (${cols.join(", ")})`);
+      const constraintName = quotePgIdent(`uq_${schemaName}_${tableName}_${cols.join("_")}`);
+      statements.push(`ALTER TABLE ${qualifiedName} ADD CONSTRAINT ${constraintName} UNIQUE (${cols.map(quotePgIdent).join(", ")})`);
     }
   }
   return statements;
@@ -329,8 +334,8 @@ function emitFactoryDDL(schemaName) {
 }
 function emitForeignKeyDDL(schemaName, tableName, tableDef) {
   return (tableDef.relations ?? []).map((rel) => {
-    const constraintName = `fk_${schemaName}_${tableName}_${rel.name}`;
-    return `ALTER TABLE ${schemaName}.${tableName} ADD CONSTRAINT ${constraintName} ` + `FOREIGN KEY (${rel.fields.join(", ")}) ` + `REFERENCES ${schemaName}.${rel.references} (${rel.referencedColumns.join(", ")})`;
+    const constraintName = quotePgIdent(`fk_${schemaName}_${tableName}_${rel.name}`);
+    return `ALTER TABLE ${quotePgIdent(schemaName)}.${quotePgIdent(tableName)} ADD CONSTRAINT ${constraintName} ` + `FOREIGN KEY (${rel.fields.map(quotePgIdent).join(", ")}) ` + `REFERENCES ${quotePgIdent(schemaName)}.${quotePgIdent(rel.references)} (${rel.referencedColumns.map(quotePgIdent).join(", ")})`;
   });
 }
 function generateSubgraphSQL(def, schemaNameOverride) {
@@ -1849,7 +1854,7 @@ import {
   rewindLiveProgress,
   updateSubgraphStatus
 } from "@secondlayer/shared/db/queries/subgraphs";
-import { logger as logger6 } from "@secondlayer/shared/logger";
+import { logger as logger7 } from "@secondlayer/shared/logger";
 import { sql as sql3 } from "kysely";
 
 // src/runtime/block-source.ts
@@ -2290,6 +2295,315 @@ async function emitSubscriptionOutbox(tx, subgraphName, manifest, matcher, block
   return rows.length;
 }
 
+// src/runtime/sandbox/flag.ts
+function sandboxWorkersGloballyEnabled() {
+  return process.env.SUBGRAPH_SANDBOX_WORKERS === "1";
+}
+function sandboxEnabled(subgraph) {
+  return sandboxWorkersGloballyEnabled() && subgraph.sandbox_workers === true;
+}
+
+// src/runtime/sandbox/host.ts
+import { tmpdir } from "node:os";
+import { fileURLToPath } from "node:url";
+import { logger as logger6 } from "@secondlayer/shared/logger";
+
+// src/runtime/sandbox/bundle.ts
+import esbuild from "esbuild";
+var ALLOWED_BARE_SPECIFIERS = new Set;
+var SUBGRAPHS_PACKAGE_SPECIFIER = "@secondlayer/subgraphs";
+var SUBGRAPHS_STUB_SOURCE = `export function defineSubgraph(def) { return def; }
+`;
+function resolverLockdownPlugin() {
+  return {
+    name: "f071-sandbox-resolver-lockdown",
+    setup(build) {
+      build.onResolve({ filter: /^@secondlayer\/subgraphs$/ }, (args) => ({
+        path: args.path,
+        namespace: "f071-sandbox-subgraphs-stub"
+      }));
+      build.onLoad({ filter: /.*/, namespace: "f071-sandbox-subgraphs-stub" }, () => ({ contents: SUBGRAPHS_STUB_SOURCE, loader: "js" }));
+      build.onResolve({ filter: /^(node:|bun:)/ }, (args) => ({
+        path: args.path,
+        namespace: "f071-sandbox-blocked"
+      }));
+      build.onResolve({ filter: /^[^./]/ }, (args) => {
+        if (args.path === SUBGRAPHS_PACKAGE_SPECIFIER)
+          return;
+        if (ALLOWED_BARE_SPECIFIERS.has(args.path))
+          return;
+        return { path: args.path, namespace: "f071-sandbox-blocked" };
+      });
+      build.onLoad({ filter: /.*/, namespace: "f071-sandbox-blocked" }, (args) => ({
+        contents: `throw new Error(${JSON.stringify(`subgraph sandbox: import of "${args.path}" is blocked in sandboxed handler code — handlers must use the injected \`ctx\` for all I/O`)});`,
+        loader: "js"
+      }));
+    }
+  };
+}
+async function bundleHandlerCode(handlerCode) {
+  const result = await esbuild.build({
+    stdin: {
+      contents: handlerCode,
+      loader: "ts",
+      resolveDir: process.cwd()
+    },
+    bundle: true,
+    platform: "neutral",
+    format: "esm",
+    write: false,
+    logLevel: "silent",
+    plugins: [resolverLockdownPlugin()]
+  });
+  const out = result.outputFiles?.[0];
+  if (!out)
+    throw new Error("esbuild produced no output for handler_code bundle");
+  return new TextDecoder().decode(out.contents);
+}
+
+// src/runtime/sandbox/host.ts
+var BLOCK_TIMEOUT_MS = Number.parseInt(process.env.SUBGRAPH_SANDBOX_BLOCK_TIMEOUT_MS ?? "60000");
+var SUBPROCESS_ENTRY_PATH = fileURLToPath(new URL("./subprocess-entry.ts", import.meta.url));
+function spawnSandboxProcess() {
+  let onMessage = null;
+  const proc = Bun.spawn({
+    cmd: [process.execPath, "--no-env-file", SUBPROCESS_ENTRY_PATH],
+    env: { PATH: process.env.PATH ?? "" },
+    cwd: tmpdir(),
+    stdio: ["ignore", "ignore", "pipe"],
+    serialization: "advanced",
+    ipc(message) {
+      onMessage?.(message);
+    }
+  });
+  (async () => {
+    const reader = proc.stderr.getReader();
+    const decoder = new TextDecoder;
+    try {
+      while (true) {
+        const { done, value } = await reader.read();
+        if (done)
+          break;
+        const text = decoder.decode(value, { stream: true });
+        if (text.trim()) {
+          logger6.warn("Sandbox subprocess stderr", { stderr: text.trim() });
+        }
+      }
+    } catch {}
+  })();
+  return {
+    send: (msg) => proc.send(msg),
+    kill: () => proc.kill(),
+    exited: proc.exited,
+    setOnMessage: (handler) => {
+      onMessage = handler;
+    }
+  };
+}
+var pool = new Map;
+
+class SandboxWorkerCrash extends Error {
+  constructor(subgraphName, cause) {
+    super(`sandbox subprocess for "${subgraphName}" failed: ${cause}`);
+    this.name = "SandboxWorkerCrash";
+  }
+}
+async function initSandboxProcess(proc, subgraphName, version, handlerCode) {
+  const bundledCode = await bundleHandlerCode(handlerCode);
+  let settled = false;
+  const ready = new Promise((resolve, reject) => {
+    proc.setOnMessage((msg) => {
+      if (msg.type === "ready" && msg.version === version) {
+        settled = true;
+        proc.setOnMessage(null);
+        resolve();
+      } else if (msg.type === "error") {
+        settled = true;
+        proc.setOnMessage(null);
+        reject(new SandboxWorkerCrash(subgraphName, msg.message));
+      }
+    });
+    const init = { type: "init", bundledCode, version };
+    proc.send(init);
+  });
+  const crashed = proc.exited.then((code) => {
+    if (settled)
+      return;
+    throw new SandboxWorkerCrash(subgraphName, `subprocess exited (code ${code}) during init`);
+  });
+  await Promise.race([ready, crashed]);
+}
+async function ensureSandboxProcess(subgraphName, version, handlerCode) {
+  if (handlerCode == null) {
+    throw new SandboxWorkerCrash(subgraphName, "subgraph has no handler_code; cannot bundle for the sandbox path");
+  }
+  const existing = pool.get(subgraphName);
+  if (existing && existing.version === version)
+    return existing;
+  if (existing) {
+    try {
+      await initSandboxProcess(existing.proc, subgraphName, version, handlerCode);
+      existing.version = version;
+      logger6.info("Sandbox subprocess handler reloaded", {
+        subgraph: subgraphName,
+        version
+      });
+      return existing;
+    } catch (err) {
+      existing.proc.kill();
+      pool.delete(subgraphName);
+      logger6.warn("Sandbox subprocess re-init failed; respawning", {
+        subgraph: subgraphName,
+        error: err instanceof Error ? err.message : String(err)
+      });
+    }
+  }
+  const proc = spawnSandboxProcess();
+  try {
+    await initSandboxProcess(proc, subgraphName, version, handlerCode);
+  } catch (err) {
+    proc.kill();
+    throw err;
+  }
+  const entry = { proc, version, chain: Promise.resolve() };
+  pool.set(subgraphName, entry);
+  return entry;
+}
+function evictSandboxWorker(subgraphName) {
+  const entry = pool.get(subgraphName);
+  if (!entry)
+    return;
+  entry.proc.kill();
+  pool.delete(subgraphName);
+}
+async function runHandlersSandboxed(params) {
+  const { subgraphName, version, handlerCode, hostCtx, block, matched } = params;
+  const entry = await ensureSandboxProcess(subgraphName, version, handlerCode);
+  const run = entry.chain.then(() => runBlockThroughProcess(entry, subgraphName, hostCtx, block, matched));
+  entry.chain = run.catch(() => {
+    return;
+  });
+  return run;
+}
+async function runBlockThroughProcess(entry, subgraphName, hostCtx, block, matched) {
+  const { proc } = entry;
+  let timeoutHandle;
+  let settled = false;
+  try {
+    const done = new Promise((resolve, reject) => {
+      proc.setOnMessage((msg) => {
+        if (msg.type === "readRequest") {
+          answerRead(hostCtx, msg).then((reply) => {
+            proc.send({ type: "readResponse", id: msg.id, reply });
+          }).catch((err) => {
+            settled = true;
+            reject(new SandboxWorkerCrash(subgraphName, `host read failed: ${err instanceof Error ? err.message : String(err)}`));
+          });
+          return;
+        }
+        if (msg.type === "blockDone") {
+          settled = true;
+          resolve({
+            ops: msg.ops,
+            result: { processed: msg.processed, errors: msg.errors }
+          });
+          return;
+        }
+        if (msg.type === "error") {
+          settled = true;
+          reject(new SandboxWorkerCrash(subgraphName, msg.message));
+        }
+      });
+      proc.send({ type: "runBlock", block, matched });
+    });
+    const crashed = proc.exited.then((code) => {
+      if (settled)
+        return;
+      throw new SandboxWorkerCrash(subgraphName, `subprocess exited unexpectedly (code ${code}) mid-block`);
+    });
+    const deadline = new Promise((_, reject) => {
+      timeoutHandle = setTimeout(() => {
+        settled = true;
+        reject(new SandboxWorkerCrash(subgraphName, `block ${block.height} exceeded ${BLOCK_TIMEOUT_MS}ms deadline`));
+      }, BLOCK_TIMEOUT_MS);
+    });
+    const { ops, result } = await Promise.race([done, crashed, deadline]);
+    for (const op of ops) {
+      hostCtx.setTx(op.tx);
+      replayOp(hostCtx, op);
+    }
+    return result;
+  } catch (err) {
+    evictSandboxWorker(subgraphName);
+    logger6.warn("Sandbox subprocess run failed; subprocess evicted", {
+      subgraph: subgraphName,
+      blockHeight: block.height,
+      error: err instanceof Error ? err.message : String(err)
+    });
+    throw err;
+  } finally {
+    if (timeoutHandle !== undefined)
+      clearTimeout(timeoutHandle);
+    proc.setOnMessage(null);
+  }
+}
+function replayOp(hostCtx, op) {
+  switch (op.method) {
+    case "insert":
+      hostCtx.insert(op.table, op.args[0]);
+      return;
+    case "upsert":
+      hostCtx.upsert(op.table, op.args[0], op.args[1]);
+      return;
+    case "increment":
+      hostCtx.increment(op.table, op.args[0], op.args[1]);
+      return;
+    case "update":
+      hostCtx.update(op.table, op.args[0], op.args[1]);
+      return;
+    case "delete":
+      hostCtx.delete(op.table, op.args[0]);
+      return;
+  }
+}
+async function answerRead(hostCtx, msg) {
+  const { method, table, where, column } = msg;
+  switch (method) {
+    case "findOne":
+      return { kind: "row", row: await hostCtx.findOne(table, where) };
+    case "findMany":
+      return { kind: "rows", rows: await hostCtx.findMany(table, where) };
+    case "count":
+      return { kind: "count", count: await hostCtx.count(table, where) };
+    case "countDistinct": {
+      if (!column)
+        throw new Error("countDistinct read missing column");
+      return {
+        kind: "count",
+        count: await hostCtx.countDistinct(table, column, where)
+      };
+    }
+    case "sum": {
+      if (!column)
+        throw new Error("sum read missing column");
+      const v = await hostCtx.sum(table, column, where);
+      return { kind: "amount", amount: v.toString() };
+    }
+    case "min": {
+      if (!column)
+        throw new Error("min read missing column");
+      const v = await hostCtx.min(table, column, where);
+      return { kind: "amount", amount: v == null ? null : v.toString() };
+    }
+    case "max": {
+      if (!column)
+        throw new Error("max read missing column");
+      const v = await hostCtx.max(table, column, where);
+      return { kind: "amount", amount: v == null ? null : v.toString() };
+    }
+  }
+}
+
 // src/runtime/subscription-state.ts
 import { listSubscriptions } from "@secondlayer/shared/db/queries/subscriptions";
 import { sql as sql2 } from "kysely";
@@ -2474,13 +2788,17 @@ async function resolveRoute(subgraphName, targetDb) {
   const route = {
     schemaName: row?.schema_name ?? pgSchemaName(subgraphName),
     dataDb: row && byo ? resolveSubgraphDb(row) : targetDb,
-    byo
+    byo,
+    sandboxWorkers: row?.sandbox_workers === true,
+    handlerCode: row?.handler_code ?? null,
+    version: row?.version ?? ""
   };
   routeCache.set(subgraphName, route);
   return route;
 }
 function invalidateSubgraphRoute(subgraphName) {
   routeCache.delete(subgraphName);
+  evictSandboxWorker(subgraphName);
 }
 async function resolveFactoryContracts(subgraph, blockHeight, schemaName, db, txs, evts) {
   const factories = new Map;
@@ -2586,7 +2904,7 @@ async function processBlockWithRetry(subgraph, subgraphName, blockHeight, opts,
       const delay = retryDelaysMs[attempt];
       if (delay === undefined)
         break;
-      logger6.warn("Block processing failed, retrying", {
+      logger7.warn("Block processing failed, retrying", {
         subgraph: subgraphName,
         blockHeight,
         attempt: attempt + 1,
@@ -2618,7 +2936,7 @@ async function processBlock(subgraph, subgraphName, blockHeight, opts) {
   } else {
     const data = (await resolveBlockSource(subgraph).loadBlockRange(blockHeight, blockHeight)).get(blockHeight);
     if (!data) {
-      logger6.debug("Block not found or non-canonical for subgraph processing", {
+      logger7.debug("Block not found or non-canonical for subgraph processing", {
         subgraph: subgraphName,
         blockHeight
       });
@@ -2754,7 +3072,16 @@ async function processBlock(subgraph, subgraphName, blockHeight, opts) {
         }
         const ctx = new SubgraphContext(tx, schemaName, subgraph.schema, blockMeta, initialTx, false, journalEnabled(opts));
         const handlerStart = performance.now();
-        const runResult = await runHandlers(subgraph, matched, ctx);
+        const runResult = sandboxEnabled({
+          sandbox_workers: route.sandboxWorkers
+        }) ? await runHandlersSandboxed({
+          subgraphName,
+          version: route.version,
+          handlerCode: route.handlerCode,
+          hostCtx: ctx,
+          block: blockMeta,
+          matched
+        }) : await runHandlers(subgraph, matched, ctx);
         handlerMs = performance.now() - handlerStart;
         result.processed = runResult.processed;
         result.errors = runResult.errors;
@@ -2780,7 +3107,7 @@ async function processBlock(subgraph, subgraphName, blockHeight, opts) {
       });
     } catch (err) {
       if (err instanceof CursorRaceLostError || err instanceof LiveCursorRaceLostError) {
-        logger6.warn("cursor race lost — block already covered", {
+        logger7.warn("cursor race lost — block already covered", {
           subgraph: subgraphName,
           blockHeight,
           error: err.message
@@ -2806,7 +3133,7 @@ async function processBlock(subgraph, subgraphName, blockHeight, opts) {
         const { rows } = await sql3.raw(`SELECT n_live_tup AS count FROM pg_stat_user_tables WHERE schemaname = '${schemaName}' AND relname = '${table}'`).execute(route.dataDb);
         const count = Number(rows[0]?.count ?? 0);
         if (count >= 1e7) {
-          logger6.warn("Subgraph table exceeds 10M rows (estimate)", {
+          logger7.warn("Subgraph table exceeds 10M rows (estimate)", {
             subgraph: subgraphName,
             table,
             count
@@ -2814,7 +3141,7 @@ async function processBlock(subgraph, subgraphName, blockHeight, opts) {
         }
       }
     } catch (err) {
-      logger6.debug("Row count sample failed", {
+      logger7.debug("Row count sample failed", {
         subgraph: subgraphName,
         error: err instanceof Error ? err.message : String(err)
       });
@@ -2904,11 +3231,11 @@ import {
   recordSubgraphProcessed as recordSubgraphProcessed2,
   updateSubgraphStatus as updateSubgraphStatus2
 } from "@secondlayer/shared/db/queries/subgraphs";
-import { logger as logger8 } from "@secondlayer/shared/logger";
+import { logger as logger9 } from "@secondlayer/shared/logger";
 
 // src/runtime/reindex-notify.ts
 import { getErrorMessage as getErrorMessage2 } from "@secondlayer/shared";
-import { logger as logger7 } from "@secondlayer/shared/logger";
+import { logger as logger8 } from "@secondlayer/shared/logger";
 async function notifyReindexComplete(db, subgraphName, stats) {
   try {
     const subgraph = await db.selectFrom("subgraphs").select(["account_id"]).where("name", "=", subgraphName).executeTakeFirst();
@@ -2919,7 +3246,7 @@ async function notifyReindexComplete(db, subgraphName, stats) {
       return;
     const resendKey = process.env.RESEND_API_KEY;
     if (!resendKey) {
-      logger7.warn("RESEND_API_KEY unset — skipping reindex-complete email", {
+      logger8.warn("RESEND_API_KEY unset — skipping reindex-complete email", {
         subgraph: subgraphName
       });
       return;
@@ -2941,14 +3268,14 @@ async function notifyReindexComplete(db, subgraphName, stats) {
     });
     if (!res.ok) {
       const text = await res.text().catch(() => "");
-      logger7.warn("reindex-complete email failed", {
+      logger8.warn("reindex-complete email failed", {
         subgraph: subgraphName,
         status: res.status,
         body: text.slice(0, 200)
       });
     }
   } catch (err) {
-    logger7.warn("reindex-complete email threw", {
+    logger8.warn("reindex-complete email threw", {
       subgraph: subgraphName,
       error: getErrorMessage2(err)
     });
@@ -3060,7 +3387,7 @@ async function processBlockRange(def, opts) {
   while (currentHeight <= toBlock) {
     if (opts.signal?.aborted) {
       aborted = true;
-      logger8.info("Block processing aborted", {
+      logger9.info("Block processing aborted", {
         subgraph: subgraphName,
         currentBlock: currentHeight,
         reason: String(opts.signal.reason ?? "unknown")
@@ -3109,7 +3436,7 @@ async function processBlockRange(def, opts) {
         });
       } catch (err) {
         const errorMsg = getErrorMessage3(err);
-        logger8.error("Block processing failed persistently", {
+        logger9.error("Block processing failed persistently", {
           subgraph: subgraphName,
           blockHeight: height,
           error: errorMsg
@@ -3155,7 +3482,7 @@ async function processBlockRange(def, opts) {
         lastProgressFlushAt = now;
       }
       if (blocksProcessed % LOG_INTERVAL === 0) {
-        logger8.info(`${status === "reindexing" ? "Reindex" : "Backfill"} progress`, {
+        logger9.info(`${status === "reindexing" ? "Reindex" : "Backfill"} progress`, {
           subgraph: subgraphName,
           processed: blocksProcessed,
           total: totalBlocks,
@@ -3175,7 +3502,7 @@ async function processBlockRange(def, opts) {
     if (batchFailedBlocks.length > 0 && opts.subgraphId) {
       const gaps = coalesceFailedBlocks(batchFailedBlocks);
       await recordGapBatch(targetDb, opts.subgraphId, subgraphName, gaps).catch((err) => {
-        logger8.warn("Failed to record subgraph gaps", {
+        logger9.warn("Failed to record subgraph gaps", {
           subgraph: subgraphName,
           error: err instanceof Error ? err.message : String(err)
         });
@@ -3192,7 +3519,7 @@ async function processBlockRange(def, opts) {
         } else {
           await updateSubgraphStatus2(targetDb, subgraphName, status, jumpTo - 1);
         }
-        logger8.info("Sparse skip", {
+        logger9.info("Sparse skip", {
           subgraph: subgraphName,
           from: batchEnd + 1,
           to: jumpTo - 1,
@@ -3232,11 +3559,11 @@ async function reindexSubgraph(def, opts) {
   const subgraphName = def.name;
   const schemaName = opts?.schemaName ?? pgSchemaName(subgraphName);
   await updateSubgraphStatus2(targetDb, subgraphName, "reindexing");
-  logger8.info("Reindex starting", { subgraph: subgraphName });
+  logger9.info("Reindex starting", { subgraph: subgraphName });
   try {
     const { fromBlock, toBlock } = await resolveBlockRange(source, def, opts);
     if (fromBlock > toBlock) {
-      logger8.info("No blocks to reindex", {
+      logger9.info("No blocks to reindex", {
         subgraph: subgraphName,
         fromBlock,
         toBlock
@@ -3250,7 +3577,7 @@ async function reindexSubgraph(def, opts) {
       await client.unsafe(stmt);
     }
     await updateSubgraphStatus2(targetDb, subgraphName, "reindexing", Math.max(0, fromBlock - 1));
-    logger8.info("Schema recreated for reindex", {
+    logger9.info("Schema recreated for reindex", {
       subgraph: subgraphName,
       cursorResetTo: Math.max(0, fromBlock - 1)
     });
@@ -3264,7 +3591,7 @@ async function reindexSubgraph(def, opts) {
       last_error_at: null,
       updated_at: new Date
     }).where("name", "=", subgraphName).execute();
-    logger8.info("Reindexing blocks", {
+    logger9.info("Reindexing blocks", {
       subgraph: subgraphName,
       fromBlock,
       toBlock,
@@ -3286,9 +3613,9 @@ async function reindexSubgraph(def, opts) {
       if (reason === "user-cancelled") {
         await updateSubgraphStatus2(targetDb, subgraphName, "active");
         await clearReindexMetadata(targetDb, subgraphName);
-        logger8.info("Reindex cancelled by user", { subgraph: subgraphName });
+        logger9.info("Reindex cancelled by user", { subgraph: subgraphName });
       } else {
-        logger8.info("Reindex interrupted by shutdown, will resume", {
+        logger9.info("Reindex interrupted by shutdown, will resume", {
           subgraph: subgraphName
         });
       }
@@ -3296,7 +3623,7 @@ async function reindexSubgraph(def, opts) {
     }
     await updateSubgraphStatus2(targetDb, subgraphName, "active", toBlock);
     await clearReindexMetadata(targetDb, subgraphName);
-    logger8.info("Reindex complete", {
+    logger9.info("Reindex complete", {
       subgraph: subgraphName,
       blocks: result.blocksProcessed,
       events: result.totalEventsProcessed,
@@ -3309,7 +3636,7 @@ async function reindexSubgraph(def, opts) {
     });
     return { processed: result.blocksProcessed };
   } catch (err) {
-    logger8.error("Reindex failed", {
+    logger9.error("Reindex failed", {
       subgraph: subgraphName,
       error: getErrorMessage3(err)
     });
@@ -3331,7 +3658,7 @@ async function resumeReindex(def, opts) {
   const fromBlock = resolveReindexResumeBlock(row);
   const toBlock = Number(row.reindex_to_block);
   if (fromBlock == null) {
-    logger8.info("No reindex metadata, starting fresh reindex", {
+    logger9.info("No reindex metadata, starting fresh reindex", {
       subgraph: subgraphName
     });
     return reindexSubgraph(def, {
@@ -3340,12 +3667,12 @@ async function resumeReindex(def, opts) {
     });
   }
   if (fromBlock > toBlock) {
-    logger8.info("Resume: no remaining blocks", { subgraph: subgraphName });
+    logger9.info("Resume: no remaining blocks", { subgraph: subgraphName });
     await updateSubgraphStatus2(targetDb, subgraphName, "active", toBlock);
     await clearReindexMetadata(targetDb, subgraphName);
     return { processed: 0 };
   }
-  logger8.info("Resuming reindex", {
+  logger9.info("Resuming reindex", {
     subgraph: subgraphName,
     fromBlock,
     toBlock,
@@ -3367,9 +3694,9 @@ async function resumeReindex(def, opts) {
       if (reason === "user-cancelled") {
         await updateSubgraphStatus2(targetDb, subgraphName, "active");
         await clearReindexMetadata(targetDb, subgraphName);
-        logger8.info("Resume cancelled by user", { subgraph: subgraphName });
+        logger9.info("Resume cancelled by user", { subgraph: subgraphName });
       } else {
-        logger8.info("Resume interrupted by shutdown, will resume again", {
+        logger9.info("Resume interrupted by shutdown, will resume again", {
           subgraph: subgraphName
         });
       }
@@ -3377,13 +3704,13 @@ async function resumeReindex(def, opts) {
     }
     await updateSubgraphStatus2(targetDb, subgraphName, "active", toBlock);
     await clearReindexMetadata(targetDb, subgraphName);
-    logger8.info("Resumed reindex complete", {
+    logger9.info("Resumed reindex complete", {
       subgraph: subgraphName,
       blocks: result.blocksProcessed
     });
     return { processed: result.blocksProcessed };
   } catch (err) {
-    logger8.error("Resumed reindex failed", {
+    logger9.error("Resumed reindex failed", {
       subgraph: subgraphName,
       error: getErrorMessage3(err)
     });
@@ -3394,7 +3721,7 @@ async function resumeReindex(def, opts) {
 async function backfillSubgraph(def, opts) {
   const targetDb = getTargetDb2();
   const subgraphName = def.name;
-  logger8.info("Backfill starting", {
+  logger9.info("Backfill starting", {
     subgraph: subgraphName,
     from: opts.fromBlock,
     to: opts.toBlock
@@ -3412,17 +3739,17 @@ async function backfillSubgraph(def, opts) {
       signal: opts.signal
     });
     if (result.aborted) {
-      logger8.info("Backfill aborted", { subgraph: subgraphName });
+      logger9.info("Backfill aborted", { subgraph: subgraphName });
       return { processed: result.blocksProcessed };
     }
     const resolved = await resolveGaps(targetDb, subgraphName, opts.fromBlock, opts.toBlock).catch(() => 0);
     if (resolved > 0) {
-      logger8.info("Resolved subgraph gaps via backfill", {
+      logger9.info("Resolved subgraph gaps via backfill", {
         subgraph: subgraphName,
         resolved
       });
     }
-    logger8.info("Backfill complete", {
+    logger9.info("Backfill complete", {
       subgraph: subgraphName,
       blocks: result.blocksProcessed,
       events: result.totalEventsProcessed,
@@ -3430,7 +3757,7 @@ async function backfillSubgraph(def, opts) {
     });
     return { processed: result.blocksProcessed };
   } catch (err) {
-    logger8.error("Backfill failed", {
+    logger9.error("Backfill failed", {
       subgraph: subgraphName,
       error: getErrorMessage3(err)
     });
@@ -4736,5 +5063,5 @@ export {
   ByoBreakingChangeError
 };
 
-//# debugId=0DAD1DFA856B057164756E2164756E21
+//# debugId=F67C948CCFE0BB8264756E2164756E21
 //# sourceMappingURL=index.js.map