@tanstack/workflow-store-drizzle-postgres 0.0.1 → 0.0.3

package/dist/schema-contract.js

@@ -0,0 +1,165 @@
+//#region src/schema-contract.ts
+const defaultDrizzlePostgresWorkflowStoreTables = {
+	schemaMigrations: "workflow_schema_migrations",
+	runs: "workflow_runs",
+	runStates: "workflow_run_states",
+	eventLocks: "workflow_event_locks",
+	events: "workflow_events",
+	timers: "workflow_timers",
+	signalDeliveries: "workflow_signal_deliveries",
+	schedules: "workflow_schedules",
+	scheduleBuckets: "workflow_schedule_buckets"
+};
+function resolveDrizzlePostgresWorkflowStoreTables(tables) {
+	return {
+		...defaultDrizzlePostgresWorkflowStoreTables,
+		...tables
+	};
+}
+function getDrizzlePostgresWorkflowStoreSchemaStatements(options = {}) {
+	const tables = resolveDrizzlePostgresWorkflowStoreTables(options.tables);
+	const schemaMigrations = qualifiedTableName(options.schema, tables.schemaMigrations);
+	const runs = qualifiedTableName(options.schema, tables.runs);
+	const runStates = qualifiedTableName(options.schema, tables.runStates);
+	const eventLocks = qualifiedTableName(options.schema, tables.eventLocks);
+	const events = qualifiedTableName(options.schema, tables.events);
+	const timers = qualifiedTableName(options.schema, tables.timers);
+	const signalDeliveries = qualifiedTableName(options.schema, tables.signalDeliveries);
+	const schedules = qualifiedTableName(options.schema, tables.schedules);
+	const scheduleBuckets = qualifiedTableName(options.schema, tables.scheduleBuckets);
+	return [
+		...options.schema ? [`create schema if not exists ${quoteIdent(options.schema)}`] : [],
+		`create table if not exists ${schemaMigrations} (
+      migration_id text primary key,
+      package_name text not null,
+      package_version text,
+      applied_at bigint not null
+    )`,
+		`create table if not exists ${runs} (
+      run_id text primary key,
+      workflow_id text not null,
+      workflow_version text,
+      status text not null,
+      input jsonb not null,
+      output jsonb,
+      error jsonb,
+      awaiting jsonb,
+      waiting_for jsonb,
+      pending_approval jsonb,
+      wake_at bigint,
+      lease_owner text,
+      lease_expires_at bigint,
+      created_at bigint not null,
+      updated_at bigint not null
+    )`,
+		`alter table ${runs} add column if not exists awaiting jsonb`,
+		`create index if not exists ${quoteIdent(`${tables.runs}_status_idx`)}
+      on ${runs} (status, updated_at)`,
+		`create index if not exists ${quoteIdent(`${tables.runs}_lease_idx`)}
+      on ${runs} (status, lease_expires_at)`,
+		`create table if not exists ${runStates} (
+      run_id text primary key,
+      workflow_id text not null,
+      workflow_version text,
+      status text not null,
+      input jsonb not null,
+      output jsonb,
+      error jsonb,
+      awaiting jsonb,
+      waiting_for jsonb,
+      pending_approval jsonb,
+      created_at bigint not null,
+      updated_at bigint not null
+    )`,
+		`alter table ${runStates} add column if not exists awaiting jsonb`,
+		`create table if not exists ${eventLocks} (
+      run_id text primary key,
+      created_at bigint not null
+    )`,
+		`create table if not exists ${events} (
+      run_id text not null,
+      event_index integer not null,
+      event_type text not null,
+      step_id text,
+      event jsonb not null,
+      created_at bigint not null,
+      primary key (run_id, event_index)
+    )`,
+		`create index if not exists ${quoteIdent(`${tables.events}_type_idx`)}
+      on ${events} (run_id, event_type)`,
+		`create table if not exists ${timers} (
+      run_id text not null,
+      signal_id text not null,
+      workflow_id text not null,
+      workflow_version text,
+      wake_at bigint not null,
+      lease_owner text,
+      lease_expires_at bigint,
+      primary key (run_id, signal_id)
+    )`,
+		`create index if not exists ${quoteIdent(`${tables.timers}_due_idx`)}
+      on ${timers} (wake_at, lease_expires_at)`,
+		`create table if not exists ${signalDeliveries} (
+      run_id text not null,
+      signal_id text not null,
+      created_at bigint not null,
+      primary key (run_id, signal_id)
+    )`,
+		`create table if not exists ${schedules} (
+      schedule_id text primary key,
+      workflow_id text not null,
+      workflow_version text,
+      schedule jsonb not null,
+      overlap_policy text not null,
+      input jsonb,
+      next_fire_at bigint,
+      enabled boolean not null,
+      updated_at bigint not null
+    )`,
+		`create index if not exists ${quoteIdent(`${tables.schedules}_due_idx`)}
+      on ${schedules} (enabled, next_fire_at)`,
+		`create table if not exists ${scheduleBuckets} (
+      schedule_id text not null,
+      bucket_id text not null,
+      workflow_id text not null,
+      workflow_version text,
+      run_id text not null,
+      fire_at bigint not null,
+      input jsonb,
+      overlap_policy text not null,
+      status text not null,
+      lease_owner text,
+      lease_expires_at bigint,
+      started_at bigint,
+      primary key (schedule_id, bucket_id)
+    )`,
+		`create index if not exists ${quoteIdent(`${tables.scheduleBuckets}_lease_idx`)}
+      on ${scheduleBuckets} (status, fire_at, lease_expires_at)`,
+		`insert into ${schemaMigrations} (
+      migration_id,
+      package_name,
+      package_version,
+      applied_at
+    )
+    values (
+      '0000_workflow_store',
+      '@tanstack/workflow-store-drizzle-postgres',
+      null,
+      (extract(epoch from now()) * 1000)::bigint
+    )
+    on conflict (migration_id) do nothing`
+	].map(normalizeSqlStatement);
+}
+function qualifiedTableName(schema, table) {
+	return schema ? `${quoteIdent(schema)}.${quoteIdent(table)}` : quoteIdent(table);
+}
+function quoteIdent(identifier) {
+	return `"${identifier.replaceAll("\"", "\"\"")}"`;
+}
+function normalizeSqlStatement(statement) {
+	return statement.split("\n").map((line, index) => index === 0 ? line.trimEnd() : line.replace(/^ {4}/, "").trimEnd()).join("\n");
+}
+
+//#endregion
+export { defaultDrizzlePostgresWorkflowStoreTables, getDrizzlePostgresWorkflowStoreSchemaStatements, qualifiedTableName, resolveDrizzlePostgresWorkflowStoreTables };
+//# sourceMappingURL=schema-contract.js.map

package/dist/schema-contract.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"schema-contract.js","names":[],"sources":["../src/schema-contract.ts"],"sourcesContent":["export interface DrizzlePostgresWorkflowStoreTables {\n  schemaMigrations: string\n  runs: string\n  runStates: string\n  eventLocks: string\n  events: string\n  timers: string\n  signalDeliveries: string\n  schedules: string\n  scheduleBuckets: string\n}\n\nexport interface DrizzlePostgresWorkflowStoreSchemaOptions {\n  schema?: string\n  tables?: Partial<DrizzlePostgresWorkflowStoreTables>\n}\n\nexport const defaultDrizzlePostgresWorkflowStoreTables: DrizzlePostgresWorkflowStoreTables =\n  {\n    schemaMigrations: 'workflow_schema_migrations',\n    runs: 'workflow_runs',\n    runStates: 'workflow_run_states',\n    eventLocks: 'workflow_event_locks',\n    events: 'workflow_events',\n    timers: 'workflow_timers',\n    signalDeliveries: 'workflow_signal_deliveries',\n    schedules: 'workflow_schedules',\n    scheduleBuckets: 'workflow_schedule_buckets',\n  }\n\nexport function resolveDrizzlePostgresWorkflowStoreTables(\n  tables?: Partial<DrizzlePostgresWorkflowStoreTables>,\n): DrizzlePostgresWorkflowStoreTables {\n  return {\n    ...defaultDrizzlePostgresWorkflowStoreTables,\n    ...tables,\n  }\n}\n\nexport function getDrizzlePostgresWorkflowStoreSchemaStatements(\n  options: DrizzlePostgresWorkflowStoreSchemaOptions = {},\n): Array<string> {\n  const tables = resolveDrizzlePostgresWorkflowStoreTables(options.tables)\n  const schemaMigrations = qualifiedTableName(\n    options.schema,\n    tables.schemaMigrations,\n  )\n  const runs = qualifiedTableName(options.schema, tables.runs)\n  const runStates = qualifiedTableName(options.schema, tables.runStates)\n  const eventLocks = qualifiedTableName(options.schema, tables.eventLocks)\n  const events = qualifiedTableName(options.schema, tables.events)\n  const timers = qualifiedTableName(options.schema, tables.timers)\n  const signalDeliveries = qualifiedTableName(\n    options.schema,\n    tables.signalDeliveries,\n  )\n  const schedules = qualifiedTableName(options.schema, tables.schedules)\n  const scheduleBuckets = qualifiedTableName(\n    options.schema,\n    tables.scheduleBuckets,\n  )\n\n  return [\n    ...(options.schema\n      ? [`create schema if not exists ${quoteIdent(options.schema)}`]\n      : []),\n    `create table if not exists ${schemaMigrations} (\n      migration_id text primary key,\n      package_name text not null,\n      package_version text,\n      applied_at bigint not null\n    )`,\n    `create table if not exists ${runs} (\n      run_id text primary key,\n      workflow_id text not null,\n      workflow_version text,\n      status text not null,\n      input jsonb not null,\n      output jsonb,\n      error jsonb,\n      awaiting jsonb,\n      waiting_for jsonb,\n      pending_approval jsonb,\n      wake_at bigint,\n      lease_owner text,\n      lease_expires_at bigint,\n      created_at bigint not null,\n      updated_at bigint not null\n    )`,\n    `alter table ${runs} add column if not exists awaiting jsonb`,\n    `create index if not exists ${quoteIdent(`${tables.runs}_status_idx`)}\n      on ${runs} (status, updated_at)`,\n    `create index if not exists ${quoteIdent(`${tables.runs}_lease_idx`)}\n      on ${runs} (status, lease_expires_at)`,\n    `create table if not exists ${runStates} (\n      run_id text primary key,\n      workflow_id text not null,\n      workflow_version text,\n      status text not null,\n      input jsonb not null,\n      output jsonb,\n      error jsonb,\n      awaiting jsonb,\n      waiting_for jsonb,\n      pending_approval jsonb,\n      created_at bigint not null,\n      updated_at bigint not null\n    )`,\n    `alter table ${runStates} add column if not exists awaiting jsonb`,\n    `create table if not exists ${eventLocks} (\n      run_id text primary key,\n      created_at bigint not null\n    )`,\n    `create table if not exists ${events} (\n      run_id text not null,\n      event_index integer not null,\n      event_type text not null,\n      step_id text,\n      event jsonb not null,\n      created_at bigint not null,\n      primary key (run_id, event_index)\n    )`,\n    `create index if not exists ${quoteIdent(`${tables.events}_type_idx`)}\n      on ${events} (run_id, event_type)`,\n    `create table if not exists ${timers} (\n      run_id text not null,\n      signal_id text not null,\n      workflow_id text not null,\n      workflow_version text,\n      wake_at bigint not null,\n      lease_owner text,\n      lease_expires_at bigint,\n      primary key (run_id, signal_id)\n    )`,\n    `create index if not exists ${quoteIdent(`${tables.timers}_due_idx`)}\n      on ${timers} (wake_at, lease_expires_at)`,\n    `create table if not exists ${signalDeliveries} (\n      run_id text not null,\n      signal_id text not null,\n      created_at bigint not null,\n      primary key (run_id, signal_id)\n    )`,\n    `create table if not exists ${schedules} (\n      schedule_id text primary key,\n      workflow_id text not null,\n      workflow_version text,\n      schedule jsonb not null,\n      overlap_policy text not null,\n      input jsonb,\n      next_fire_at bigint,\n      enabled boolean not null,\n      updated_at bigint not null\n    )`,\n    `create index if not exists ${quoteIdent(`${tables.schedules}_due_idx`)}\n      on ${schedules} (enabled, next_fire_at)`,\n    `create table if not exists ${scheduleBuckets} (\n      schedule_id text not null,\n      bucket_id text not null,\n      workflow_id text not null,\n      workflow_version text,\n      run_id text not null,\n      fire_at bigint not null,\n      input jsonb,\n      overlap_policy text not null,\n      status text not null,\n      lease_owner text,\n      lease_expires_at bigint,\n      started_at bigint,\n      primary key (schedule_id, bucket_id)\n    )`,\n    `create index if not exists ${quoteIdent(\n      `${tables.scheduleBuckets}_lease_idx`,\n    )}\n      on ${scheduleBuckets} (status, fire_at, lease_expires_at)`,\n    `insert into ${schemaMigrations} (\n      migration_id,\n      package_name,\n      package_version,\n      applied_at\n    )\n    values (\n      '0000_workflow_store',\n      '@tanstack/workflow-store-drizzle-postgres',\n      null,\n      (extract(epoch from now()) * 1000)::bigint\n    )\n    on conflict (migration_id) do nothing`,\n  ].map(normalizeSqlStatement)\n}\n\nexport function qualifiedTableName(schema: string | undefined, table: string) {\n  return schema\n    ? `${quoteIdent(schema)}.${quoteIdent(table)}`\n    : quoteIdent(table)\n}\n\nfunction quoteIdent(identifier: string) {\n  return `\"${identifier.replaceAll('\"', '\"\"')}\"`\n}\n\nfunction normalizeSqlStatement(statement: string) {\n  return statement\n    .split('\\n')\n    .map((line, index) =>\n      index === 0 ? line.trimEnd() : line.replace(/^ {4}/, '').trimEnd(),\n    )\n    .join('\\n')\n}\n"],"mappings":";AAiBA,MAAa,4CACX;CACE,kBAAkB;CAClB,MAAM;CACN,WAAW;CACX,YAAY;CACZ,QAAQ;CACR,QAAQ;CACR,kBAAkB;CAClB,WAAW;CACX,iBAAiB;CAClB;AAEH,SAAgB,0CACd,QACoC;AACpC,QAAO;EACL,GAAG;EACH,GAAG;EACJ;;AAGH,SAAgB,gDACd,UAAqD,EAAE,EACxC;CACf,MAAM,SAAS,0CAA0C,QAAQ,OAAO;CACxE,MAAM,mBAAmB,mBACvB,QAAQ,QACR,OAAO,iBACR;CACD,MAAM,OAAO,mBAAmB,QAAQ,QAAQ,OAAO,KAAK;CAC5D,MAAM,YAAY,mBAAmB,QAAQ,QAAQ,OAAO,UAAU;CACtE,MAAM,aAAa,mBAAmB,QAAQ,QAAQ,OAAO,WAAW;CACxE,MAAM,SAAS,mBAAmB,QAAQ,QAAQ,OAAO,OAAO;CAChE,MAAM,SAAS,mBAAmB,QAAQ,QAAQ,OAAO,OAAO;CAChE,MAAM,mBAAmB,mBACvB,QAAQ,QACR,OAAO,iBACR;CACD,MAAM,YAAY,mBAAmB,QAAQ,QAAQ,OAAO,UAAU;CACtE,MAAM,kBAAkB,mBACtB,QAAQ,QACR,OAAO,gBACR;AAED,QAAO;EACL,GAAI,QAAQ,SACR,CAAC,+BAA+B,WAAW,QAAQ,OAAO,GAAG,GAC7D,EAAE;EACN,8BAA8B,iBAAiB;;;;;;EAM/C,8BAA8B,KAAK;;;;;;;;;;;;;;;;;EAiBnC,eAAe,KAAK;EACpB,8BAA8B,WAAW,GAAG,OAAO,KAAK,aAAa,CAAC;WAC/D,KAAK;EACZ,8BAA8B,WAAW,GAAG,OAAO,KAAK,YAAY,CAAC;WAC9D,KAAK;EACZ,8BAA8B,UAAU;;;;;;;;;;;;;;EAcxC,eAAe,UAAU;EACzB,8BAA8B,WAAW;;;;EAIzC,8BAA8B,OAAO;;;;;;;;;EASrC,8BAA8B,WAAW,GAAG,OAAO,OAAO,WAAW,CAAC;WAC/D,OAAO;EACd,8BAA8B,OAAO;;;;;;;;;;EAUrC,8BAA8B,WAAW,GAAG,OAAO,OAAO,UAAU,CAAC;WAC9D,OAAO;EACd,8BAA8B,iBAAiB;;;;;;EAM/C,8BAA8B,UAAU;;;;;;;;;;;EAWxC,8BAA8B,WAAW,GAAG,OAAO,UAAU,UAAU,CAAC;WACjE,UAAU;EACjB,8BAA8B,gBAAgB;;;;;;;;;;;;;;;EAe9C,8BAA8B,WAC5B,GAAG,OAAO,gBAAgB,YAC3B,CAAC;WACK,gBAAgB;EACvB,eAAe,iBAAiB;;;;;;;;;;;;;EAajC,CAAC,IAAI,sBAAsB;;AAG9B,SAAgB,mBAAmB,QAA4B,OAAe;AAC5E,QAAO,SACH,GAAG,WAAW,OAAO,CAAC,GAAG,WAAW,MAAM,KAC1C,WAAW,MAAM;;AAGvB,SAAS,WAAW,YAAoB;AACtC,QAAO,IAAI,WAAW,WAAW,MAAK,OAAK,CAAC;;AAG9C,SAAS,sBAAsB,WAAmB;AAChD,QAAO,UACJ,MAAM,KAAK,CACX,KAAK,MAAM,UACV,UAAU,IAAI,KAAK,SAAS,GAAG,KAAK,QAAQ,SAAS,GAAG,CAAC,SAAS,CACnE,CACA,KAAK,KAAK"}

package/dist/store.cjs

@@ -1,27 +1,18 @@
+const require_schema_contract = require('./schema-contract.cjs');
 let _tanstack_workflow_core = require("@tanstack/workflow-core");
 let drizzle_orm = require("drizzle-orm");
 
 //#region src/store.ts
-const defaultDrizzlePostgresWorkflowStoreTables = {
-	runs: "workflow_runs",
-	runStates: "workflow_run_states",
-	eventLocks: "workflow_event_locks",
-	events: "workflow_events",
-	timers: "workflow_timers",
-	signalDeliveries: "workflow_signal_deliveries",
-	schedules: "workflow_schedules",
-	scheduleBuckets: "workflow_schedule_buckets"
-};
 function createDrizzlePostgresWorkflowStore(options) {
-	const tableNames = {
-		...defaultDrizzlePostgresWorkflowStoreTables,
-		...options.tables
-	};
+	const tableNames = require_schema_contract.resolveDrizzlePostgresWorkflowStoreTables(options.tables);
 	const tableSql = tableSqls(options.schema, tableNames);
 	const db = options.db;
 	return {
 		async ensureSchema() {
-			for (const statement of schemaStatements(options.schema, tableNames)) await db.execute(drizzle_orm.sql.raw(statement));
+			for (const statement of require_schema_contract.getDrizzlePostgresWorkflowStoreSchemaStatements({
+				schema: options.schema,
+				tables: tableNames
+			})) await db.execute(drizzle_orm.sql.raw(statement));
 		},
 		async createRun(args) {
 			const rows = await queryRows(db, drizzle_orm.sql`
@@ -83,6 +74,7 @@ function createDrizzlePostgresWorkflowStore(options) {
             input,
             output,
             error,
+            awaiting,
             waiting_for,
             pending_approval,
             created_at,
@@ -96,6 +88,7 @@ function createDrizzlePostgresWorkflowStore(options) {
             ${encodeJson(state.input)}::jsonb,
             ${encodeJsonOrNull(state.output)}::jsonb,
             ${encodeJsonOrNull(state.error)}::jsonb,
+            ${encodeJsonOrNull(state.awaiting)}::jsonb,
             ${encodeJsonOrNull(state.waitingFor)}::jsonb,
             ${encodeJsonOrNull(state.pendingApproval)}::jsonb,
             ${state.createdAt},
@@ -108,6 +101,7 @@ function createDrizzlePostgresWorkflowStore(options) {
             input = excluded.input,
             output = excluded.output,
             error = excluded.error,
+            awaiting = excluded.awaiting,
             waiting_for = excluded.waiting_for,
             pending_approval = excluded.pending_approval,
             created_at = excluded.created_at,
@@ -122,6 +116,7 @@ function createDrizzlePostgresWorkflowStore(options) {
             input,
             output,
             error,
+            awaiting,
             waiting_for,
             pending_approval,
             wake_at,
@@ -136,6 +131,7 @@ function createDrizzlePostgresWorkflowStore(options) {
             ${encodeJson(state.input)}::jsonb,
             ${encodeJsonOrNull(state.output)}::jsonb,
             ${encodeJsonOrNull(state.error)}::jsonb,
+            ${encodeJsonOrNull(state.awaiting)}::jsonb,
             ${encodeJsonOrNull(state.waitingFor)}::jsonb,
             ${encodeJsonOrNull(state.pendingApproval)}::jsonb,
             ${state.waitingFor?.signalName === "__timer" ? state.waitingFor.deadline : null},
@@ -149,6 +145,7 @@ function createDrizzlePostgresWorkflowStore(options) {
             input = excluded.input,
             output = excluded.output,
             error = excluded.error,
+            awaiting = excluded.awaiting,
             waiting_for = excluded.waiting_for,
             pending_approval = excluded.pending_approval,
             wake_at = excluded.wake_at,
@@ -293,6 +290,7 @@ function createDrizzlePostgresWorkflowStore(options) {
         update ${tableSql.runs}
         set
           status = 'paused',
+          awaiting = ${encodeJsonOrNull(args.awaiting)}::jsonb,
           waiting_for = ${encodeJsonOrNull(args.waitingFor)}::jsonb,
           pending_approval = ${encodeJsonOrNull(args.pendingApproval)}::jsonb,
           wake_at = ${args.wakeAt ?? null},
@@ -308,6 +306,7 @@ function createDrizzlePostgresWorkflowStore(options) {
         set
           status = 'finished',
           output = ${encodeJson(args.output)}::jsonb,
+          awaiting = null,
           waiting_for = null,
           pending_approval = null,
           wake_at = null,
@@ -324,6 +323,7 @@ function createDrizzlePostgresWorkflowStore(options) {
         set
           status = 'errored',
           error = ${encodeJson(args.error)}::jsonb,
+          awaiting = null,
           waiting_for = null,
           pending_approval = null,
           wake_at = null,
@@ -399,7 +399,7 @@ function createDrizzlePostgresWorkflowStore(options) {
 					kind: "duplicate",
 					run
 				};
-				if (run.waitingFor?.signalName !== args.delivery.name) return {
+				if (!isRunWaitingForSignal(run, args.delivery)) return {
 					kind: "not-waiting",
 					run
 				};
@@ -418,6 +418,7 @@ function createDrizzlePostgresWorkflowStore(options) {
             update ${tableSql.runs}
             set
               status = 'queued',
+              awaiting = null,
               waiting_for = null,
               pending_approval = null,
               wake_at = null,
@@ -437,7 +438,7 @@ function createDrizzlePostgresWorkflowStore(options) {
 					kind: "duplicate",
 					run
 				};
-				if (run.pendingApproval?.approvalId !== args.approval.approvalId) return {
+				if (!isRunWaitingForApproval(run, args.approval)) return {
 					kind: "not-waiting",
 					run
 				};
@@ -451,6 +452,7 @@ function createDrizzlePostgresWorkflowStore(options) {
             update ${tableSql.runs}
             set
               status = 'queued',
+              awaiting = null,
               waiting_for = null,
               pending_approval = null,
               wake_at = null,
@@ -498,12 +500,26 @@ function createDrizzlePostgresWorkflowStore(options) {
 		},
 		async claimDueScheduleBuckets(args) {
 			const schedules = await queryRows(db, drizzle_orm.sql`
-          select *
-          from ${tableSql.schedules}
-          where enabled = true
-            and next_fire_at is not null
-            and next_fire_at <= ${args.now}
-          order by next_fire_at asc, schedule_id asc
+          select schedule.*
+          from ${tableSql.schedules} schedule
+          left join ${tableSql.scheduleBuckets} bucket
+            on bucket.schedule_id = schedule.schedule_id
+            and bucket.bucket_id = schedule.next_fire_at::text
+          where schedule.enabled = true
+            and schedule.next_fire_at is not null
+            and schedule.next_fire_at <= ${args.now}
+            and (
+              bucket.schedule_id is null
+              or (
+                bucket.status <> 'started'
+                and (
+                  bucket.lease_owner is null
+                  or bucket.lease_owner = ${args.leaseOwner}
+                  or bucket.lease_expires_at <= ${args.now}
+                )
+              )
+            )
+          order by schedule.next_fire_at asc, schedule.schedule_id asc
           limit ${args.limit}
         `);
 			const buckets = [];
@@ -620,125 +636,16 @@ function createDrizzlePostgresWorkflowStore(options) {
 }
 function tableSqls(schema, tables) {
 	return {
-		runs: drizzle_orm.sql.raw(qualifiedTableName(schema, tables.runs)),
-		runStates: drizzle_orm.sql.raw(qualifiedTableName(schema, tables.runStates)),
-		eventLocks: drizzle_orm.sql.raw(qualifiedTableName(schema, tables.eventLocks)),
-		events: drizzle_orm.sql.raw(qualifiedTableName(schema, tables.events)),
-		timers: drizzle_orm.sql.raw(qualifiedTableName(schema, tables.timers)),
-		signalDeliveries: drizzle_orm.sql.raw(qualifiedTableName(schema, tables.signalDeliveries)),
-		schedules: drizzle_orm.sql.raw(qualifiedTableName(schema, tables.schedules)),
-		scheduleBuckets: drizzle_orm.sql.raw(qualifiedTableName(schema, tables.scheduleBuckets))
+		runs: drizzle_orm.sql.raw(require_schema_contract.qualifiedTableName(schema, tables.runs)),
+		runStates: drizzle_orm.sql.raw(require_schema_contract.qualifiedTableName(schema, tables.runStates)),
+		eventLocks: drizzle_orm.sql.raw(require_schema_contract.qualifiedTableName(schema, tables.eventLocks)),
+		events: drizzle_orm.sql.raw(require_schema_contract.qualifiedTableName(schema, tables.events)),
+		timers: drizzle_orm.sql.raw(require_schema_contract.qualifiedTableName(schema, tables.timers)),
+		signalDeliveries: drizzle_orm.sql.raw(require_schema_contract.qualifiedTableName(schema, tables.signalDeliveries)),
+		schedules: drizzle_orm.sql.raw(require_schema_contract.qualifiedTableName(schema, tables.schedules)),
+		scheduleBuckets: drizzle_orm.sql.raw(require_schema_contract.qualifiedTableName(schema, tables.scheduleBuckets))
 	};
 }
-function schemaStatements(schema, tables) {
-	const runs = qualifiedTableName(schema, tables.runs);
-	const runStates = qualifiedTableName(schema, tables.runStates);
-	const eventLocks = qualifiedTableName(schema, tables.eventLocks);
-	const events = qualifiedTableName(schema, tables.events);
-	const timers = qualifiedTableName(schema, tables.timers);
-	const signalDeliveries = qualifiedTableName(schema, tables.signalDeliveries);
-	const schedules = qualifiedTableName(schema, tables.schedules);
-	const scheduleBuckets = qualifiedTableName(schema, tables.scheduleBuckets);
-	return [
-		...schema ? [`create schema if not exists ${quoteIdent(schema)}`] : [],
-		`create table if not exists ${runs} (
-      run_id text primary key,
-      workflow_id text not null,
-      workflow_version text,
-      status text not null,
-      input jsonb not null,
-      output jsonb,
-      error jsonb,
-      waiting_for jsonb,
-      pending_approval jsonb,
-      wake_at bigint,
-      lease_owner text,
-      lease_expires_at bigint,
-      created_at bigint not null,
-      updated_at bigint not null
-    )`,
-		`create index if not exists ${quoteIdent(`${tables.runs}_status_idx`)}
-      on ${runs} (status, updated_at)`,
-		`create index if not exists ${quoteIdent(`${tables.runs}_lease_idx`)}
-      on ${runs} (status, lease_expires_at)`,
-		`create table if not exists ${runStates} (
-      run_id text primary key,
-      workflow_id text not null,
-      workflow_version text,
-      status text not null,
-      input jsonb not null,
-      output jsonb,
-      error jsonb,
-      waiting_for jsonb,
-      pending_approval jsonb,
-      created_at bigint not null,
-      updated_at bigint not null
-    )`,
-		`create table if not exists ${eventLocks} (
-      run_id text primary key,
-      created_at bigint not null
-    )`,
-		`create table if not exists ${events} (
-      run_id text not null,
-      event_index integer not null,
-      event_type text not null,
-      step_id text,
-      event jsonb not null,
-      created_at bigint not null,
-      primary key (run_id, event_index)
-    )`,
-		`create index if not exists ${quoteIdent(`${tables.events}_type_idx`)}
-      on ${events} (run_id, event_type)`,
-		`create table if not exists ${timers} (
-      run_id text not null,
-      signal_id text not null,
-      workflow_id text not null,
-      workflow_version text,
-      wake_at bigint not null,
-      lease_owner text,
-      lease_expires_at bigint,
-      primary key (run_id, signal_id)
-    )`,
-		`create index if not exists ${quoteIdent(`${tables.timers}_due_idx`)}
-      on ${timers} (wake_at, lease_expires_at)`,
-		`create table if not exists ${signalDeliveries} (
-      run_id text not null,
-      signal_id text not null,
-      created_at bigint not null,
-      primary key (run_id, signal_id)
-    )`,
-		`create table if not exists ${schedules} (
-      schedule_id text primary key,
-      workflow_id text not null,
-      workflow_version text,
-      schedule jsonb not null,
-      overlap_policy text not null,
-      input jsonb,
-      next_fire_at bigint,
-      enabled boolean not null,
-      updated_at bigint not null
-    )`,
-		`create index if not exists ${quoteIdent(`${tables.schedules}_due_idx`)}
-      on ${schedules} (enabled, next_fire_at)`,
-		`create table if not exists ${scheduleBuckets} (
-      schedule_id text not null,
-      bucket_id text not null,
-      workflow_id text not null,
-      workflow_version text,
-      run_id text not null,
-      fire_at bigint not null,
-      input jsonb,
-      overlap_policy text not null,
-      status text not null,
-      lease_owner text,
-      lease_expires_at bigint,
-      started_at bigint,
-      primary key (schedule_id, bucket_id)
-    )`,
-		`create index if not exists ${quoteIdent(`${tables.scheduleBuckets}_lease_idx`)}
-      on ${scheduleBuckets} (status, fire_at, lease_expires_at)`
-	];
-}
 async function loadRunById(db, tables, runId) {
 	const rows = await queryRows(db, drizzle_orm.sql`
       select *
@@ -817,6 +724,7 @@ function runFromRow(row) {
 		input: decodeJson(row.input),
 		output: decodeJsonOrUndefined(row.output),
 		error: decodeJsonOrUndefined(row.error),
+		awaiting: decodeJsonOrUndefined(row.awaiting),
 		waitingFor: decodeJsonOrUndefined(row.waiting_for),
 		pendingApproval: decodeJsonOrUndefined(row.pending_approval),
 		wakeAt: numberOrUndefined(row.wake_at),
@@ -837,6 +745,7 @@ function runStateFromRow(row) {
 		input: decodeJson(row.input),
 		output: decodeJsonOrUndefined(row.output),
 		error: decodeJsonOrUndefined(row.error),
+		awaiting: decodeJsonOrUndefined(row.awaiting),
 		waitingFor: decodeJsonOrUndefined(row.waiting_for),
 		pendingApproval: decodeJsonOrUndefined(row.pending_approval),
 		createdAt: Number(row.created_at),
@@ -862,6 +771,15 @@ function timerFromRow(row) {
 		signalId: row.signal_id
 	};
 }
+function isRunWaitingForSignal(run, delivery) {
+	return signalAwaitableMatches(run.waitingFor, delivery) || run.awaiting?.some((awaitable) => awaitable.type === "signal" && signalAwaitableMatches(awaitable, delivery)) === true;
+}
+function signalAwaitableMatches(awaitable, delivery) {
+	return awaitable?.signalName === delivery.name && (delivery.stepId === void 0 || awaitable.stepId === void 0 || awaitable.stepId === delivery.stepId);
+}
+function isRunWaitingForApproval(run, approval) {
+	return run.pendingApproval?.approvalId === approval.approvalId || run.awaiting?.some((awaitable) => awaitable.type === "approval" && awaitable.approvalId === approval.approvalId) === true;
+}
 function scheduleFromRow(row) {
 	return {
 		scheduleId: row.schedule_id,
@@ -891,6 +809,7 @@ function toRunSummary(row) {
 		workflowId: run.workflowId,
 		workflowVersion: run.workflowVersion,
 		status: run.status,
+		awaiting: run.awaiting,
 		waitingFor: run.waitingFor,
 		pendingApproval: run.pendingApproval,
 		wakeAt: run.wakeAt,
@@ -922,14 +841,7 @@ function numberOrUndefined(value) {
 function getStepId(event) {
 	return "stepId" in event ? event.stepId : void 0;
 }
-function qualifiedTableName(schema, table) {
-	return schema ? `${quoteIdent(schema)}.${quoteIdent(table)}` : quoteIdent(table);
-}
-function quoteIdent(identifier) {
-	return `"${identifier.replaceAll("\"", "\"\"")}"`;
-}
 
 //#endregion
 exports.createDrizzlePostgresWorkflowStore = createDrizzlePostgresWorkflowStore;
-exports.defaultDrizzlePostgresWorkflowStoreTables = defaultDrizzlePostgresWorkflowStoreTables;
 //# sourceMappingURL=store.cjs.map