@electric-ax/agents-server 0.4.19 → 0.5.0

package/src/entity-registry.ts

@@ -10,6 +10,7 @@ import {
   entityLineage,
   entityPermissionGrants,
   entityTypes,
+  pgSyncBridges,
   entityTypePermissionGrants,
   runnerRuntimeDiagnostics,
   runners,
@@ -42,8 +43,9 @@ import type {
   EntityTypePermission,
   EntityTypePermissionGrant,
   PermissionSubjectKind,
+  ExternallyWritableCollectionConfig,
 } from './electric-agents-types.js'
-import type { EntityTags } from '@electric-ax/agents-runtime'
+import type { EntityTags, PgSyncOptions } from '@electric-ax/agents-runtime'
 import type { Principal } from './principal.js'
 
 export class EntityAlreadyExistsError extends Error {
@@ -73,6 +75,19 @@ export interface EntityBridgeRow {
   updatedAt: Date
 }
 
+export interface PgSyncBridgeRow {
+  tenantId: string
+  sourceRef: string
+  options: PgSyncOptions
+  streamUrl: string
+  shapeHandle?: string
+  shapeOffset?: string
+  initialSnapshotComplete: boolean
+  lastTouchedAt: Date
+  createdAt: Date
+  updatedAt: Date
+}
+
 export interface TagStreamOutboxRow {
   id: number
   tenantId: string
@@ -623,6 +638,13 @@ export class PostgresRegistry {
     )
   }
 
+  private pgSyncBridgeWhere(sourceRef: string) {
+    return and(
+      eq(pgSyncBridges.tenantId, this.tenantId),
+      eq(pgSyncBridges.sourceRef, sourceRef)
+    )
+  }
+
   async createEntityType(et: ElectricAgentsEntityType): Promise<void> {
     await this.db
       .insert(entityTypes)
@@ -633,6 +655,8 @@ export class PostgresRegistry {
         creationSchema: et.creation_schema ?? null,
         inboxSchemas: et.inbox_schemas ?? null,
         stateSchemas: et.state_schemas ?? null,
+        externallyWritableCollections:
+          et.externally_writable_collections ?? null,
         slashCommands: et.slash_commands ?? null,
         serveEndpoint: et.serve_endpoint ?? null,
         defaultDispatchPolicy: et.default_dispatch_policy ?? null,
@@ -647,6 +671,8 @@ export class PostgresRegistry {
           creationSchema: et.creation_schema ?? null,
           inboxSchemas: et.inbox_schemas ?? null,
           stateSchemas: et.state_schemas ?? null,
+          externallyWritableCollections:
+            et.externally_writable_collections ?? null,
           slashCommands: et.slash_commands ?? null,
           serveEndpoint: et.serve_endpoint ?? null,
           defaultDispatchPolicy: et.default_dispatch_policy ?? null,
@@ -670,6 +696,8 @@ export class PostgresRegistry {
         creationSchema: et.creation_schema ?? null,
         inboxSchemas: et.inbox_schemas ?? null,
         stateSchemas: et.state_schemas ?? null,
+        externallyWritableCollections:
+          et.externally_writable_collections ?? null,
         slashCommands: et.slash_commands ?? null,
         serveEndpoint: et.serve_endpoint ?? null,
         defaultDispatchPolicy: et.default_dispatch_policy ?? null,
@@ -712,6 +740,8 @@ export class PostgresRegistry {
         creationSchema: et.creation_schema ?? null,
         inboxSchemas: et.inbox_schemas ?? null,
         stateSchemas: et.state_schemas ?? null,
+        externallyWritableCollections:
+          et.externally_writable_collections ?? null,
         slashCommands: et.slash_commands ?? null,
         serveEndpoint: et.serve_endpoint ?? null,
         defaultDispatchPolicy: et.default_dispatch_policy ?? null,
@@ -1422,6 +1452,7 @@ export class PostgresRegistry {
     entity: ElectricAgentsEntity | null
     changed: boolean
     op?: `insert` | `update` | `delete`
+    txid?: number
   }> {
     return this.mutateEntityTags(url, (oldTags) => {
       const previous = oldTags[key]
@@ -1440,7 +1471,11 @@ export class PostgresRegistry {
   async removeEntityTag(
     url: string,
     key: string
-  ): Promise<{ entity: ElectricAgentsEntity | null; changed: boolean }> {
+  ): Promise<{
+    entity: ElectricAgentsEntity | null
+    changed: boolean
+    txid?: number
+  }> {
     return this.mutateEntityTags(url, (oldTags) => {
       if (!(key in oldTags)) return null
       const { [key]: _removed, ...remaining } = oldTags
@@ -1465,6 +1500,7 @@ export class PostgresRegistry {
     entity: ElectricAgentsEntity | null
     changed: boolean
     op?: `insert` | `update`
+    txid?: number
   }> {
     return await this.db.transaction(async (tx) => {
       const [row] = await tx
@@ -1485,7 +1521,7 @@ export class PostgresRegistry {
 
       const nextTags = normalizeTags(mutation.nextTags)
       const updatedAt = Date.now()
-      await tx
+      const [updateResult] = await tx
         .update(entities)
         .set({
           tags: nextTags,
@@ -1493,6 +1529,10 @@ export class PostgresRegistry {
           updatedAt,
         })
         .where(this.entityWhere(url))
+        .returning({
+          txid: sql<string>`pg_current_xact_id()::xid::text`,
+        })
+      const txid = updateResult ? parseInt(updateResult.txid) : undefined
 
       await tx.insert(tagStreamOutbox).values({
         tenantId: this.tenantId,
@@ -1513,10 +1553,103 @@ export class PostgresRegistry {
         entity,
         changed: true,
         ...(op === `insert` || op === `update` ? { op } : {}),
+        ...(txid !== undefined ? { txid } : {}),
       }
     })
   }
 
+  async upsertPgSyncBridge(row: {
+    sourceRef: string
+    options: PgSyncOptions
+    streamUrl: string
+  }): Promise<PgSyncBridgeRow> {
+    await this.db
+      .insert(pgSyncBridges)
+      .values({
+        tenantId: this.tenantId,
+        sourceRef: row.sourceRef,
+        options: row.options,
+        streamUrl: row.streamUrl,
+        lastTouchedAt: new Date(),
+        updatedAt: new Date(),
+      })
+      .onConflictDoUpdate({
+        target: [pgSyncBridges.tenantId, pgSyncBridges.sourceRef],
+        set: {
+          options: row.options,
+          streamUrl: row.streamUrl,
+          initialSnapshotComplete: false,
+          lastTouchedAt: new Date(),
+          updatedAt: new Date(),
+        },
+      })
+
+    const existing = await this.getPgSyncBridge(row.sourceRef)
+    if (!existing)
+      throw new Error(`Failed to load pgSync bridge ${row.sourceRef}`)
+    return existing
+  }
+
+  async getPgSyncBridge(sourceRef: string): Promise<PgSyncBridgeRow | null> {
+    const rows = await this.db
+      .select()
+      .from(pgSyncBridges)
+      .where(this.pgSyncBridgeWhere(sourceRef))
+      .limit(1)
+    return rows[0] ? this.rowToPgSyncBridge(rows[0]) : null
+  }
+
+  async listPgSyncBridges(
+    tenantId: string | null = this.tenantId
+  ): Promise<Array<PgSyncBridgeRow>> {
+    const rows =
+      tenantId === null
+        ? await this.db.select().from(pgSyncBridges)
+        : await this.db
+            .select()
+            .from(pgSyncBridges)
+            .where(eq(pgSyncBridges.tenantId, tenantId))
+    return rows.map((row) => this.rowToPgSyncBridge(row))
+  }
+
+  async touchPgSyncBridge(sourceRef: string): Promise<void> {
+    await this.db
+      .update(pgSyncBridges)
+      .set({ lastTouchedAt: new Date(), updatedAt: new Date() })
+      .where(this.pgSyncBridgeWhere(sourceRef))
+  }
+
+  async updatePgSyncBridgeCursor(
+    sourceRef: string,
+    shapeHandle: string,
+    shapeOffset: string,
+    initialSnapshotComplete?: boolean
+  ): Promise<void> {
+    await this.db
+      .update(pgSyncBridges)
+      .set({
+        shapeHandle,
+        shapeOffset,
+        ...(initialSnapshotComplete !== undefined
+          ? { initialSnapshotComplete }
+          : {}),
+        updatedAt: new Date(),
+      })
+      .where(this.pgSyncBridgeWhere(sourceRef))
+  }
+
+  async clearPgSyncBridgeCursor(sourceRef: string): Promise<void> {
+    await this.db
+      .update(pgSyncBridges)
+      .set({
+        shapeHandle: null,
+        shapeOffset: null,
+        initialSnapshotComplete: false,
+        updatedAt: new Date(),
+      })
+      .where(this.pgSyncBridgeWhere(sourceRef))
+  }
+
   async upsertEntityBridge(row: {
     sourceRef: string
     tags: EntityTags
@@ -1833,6 +1966,11 @@ export class PostgresRegistry {
       state_schemas: row.stateSchemas as
         | Record<string, Record<string, unknown>>
         | undefined,
+      externally_writable_collections:
+        (row.externallyWritableCollections as Record<
+          string,
+          ExternallyWritableCollectionConfig
+        > | null) ?? undefined,
       slash_commands:
         (row.slashCommands as ElectricAgentsEntityType[`slash_commands`]) ??
         undefined,
@@ -1911,6 +2049,23 @@ export class PostgresRegistry {
     }
   }
 
+  private rowToPgSyncBridge(
+    row: typeof pgSyncBridges.$inferSelect
+  ): PgSyncBridgeRow {
+    return {
+      tenantId: row.tenantId,
+      sourceRef: row.sourceRef,
+      options: row.options as PgSyncOptions,
+      streamUrl: row.streamUrl,
+      shapeHandle: row.shapeHandle ?? undefined,
+      shapeOffset: row.shapeOffset ?? undefined,
+      initialSnapshotComplete: row.initialSnapshotComplete,
+      lastTouchedAt: row.lastTouchedAt,
+      createdAt: row.createdAt,
+      updatedAt: row.updatedAt,
+    }
+  }
+
   private rowToEntityBridge(
     row: typeof entityBridges.$inferSelect
   ): EntityBridgeRow {

package/src/manifest-side-effects.ts

@@ -10,6 +10,10 @@ export function isRecord(value: unknown): value is Record<string, unknown> {
   return typeof value === `object` && value !== null && !Array.isArray(value)
 }
 
+function getPgSyncManifestStreamPath(sourceRef: string): string {
+  return `/_electric/pg-sync/${sourceRef}`
+}
+
 export function extractManifestSourceUrl(
   manifest: Record<string, unknown> | undefined
 ): string | undefined {
@@ -57,6 +61,12 @@ export function extractManifestSourceUrl(
         : undefined
     }
 
+    if (manifest.sourceType === `pgSync`) {
+      return typeof manifest.sourceRef === `string`
+        ? getPgSyncManifestStreamPath(manifest.sourceRef)
+        : undefined
+    }
+
     if (manifest.sourceType === `webhook`) {
       if (typeof config?.streamUrl === `string`) return config.streamUrl
       if (typeof config?.endpointKey === `string`) {