@electric-ax/agents-server 0.4.19 → 0.4.20

package/src/pg-sync-bridge-manager.ts

@@ -0,0 +1,552 @@
+import { DurableStream, IdempotentProducer } from '@durable-streams/client'
+import {
+  canonicalPgSyncOptions,
+  getPgSyncStreamPath,
+  sourceRefForPgSync,
+  type CanonicalPgSyncConfig,
+  type PgSyncOptions,
+  type PgSyncRequestMetadata,
+} from '@electric-ax/agents-runtime'
+import {
+  ShapeStream,
+  isChangeMessage,
+  isControlMessage,
+} from '@electric-sql/client'
+import { serverLog } from './utils/log.js'
+import type { StreamClient } from './stream-client.js'
+import type { PgSyncBridgeRow, PostgresRegistry } from './entity-registry.js'
+import type {
+  LogMode,
+  Offset,
+  ShapeStreamInterface,
+} from '@electric-sql/client'
+
+export const PG_SYNC_ELECTRIC_SHAPE_URL =
+  process.env.ELECTRIC_AGENTS_PG_SYNC_ELECTRIC_URL ??
+  `http://localhost:3000/v1/shape`
+
+type PgSyncOperation = `insert` | `update` | `delete`
+type WakeEvaluator = (
+  sourceUrl: string,
+  event: Record<string, unknown>
+) => Promise<void> | void
+
+export type PgSyncResolvedSource = {
+  url: string
+}
+
+export interface PgSyncBridgeManagerOptions {
+  url?: string
+  retry?: {
+    initialDelayMs?: number
+    maxDelayMs?: number
+    random?: () => number
+    sleep?: (ms: number) => Promise<void>
+  }
+}
+
+const DEFAULT_RETRY_INITIAL_DELAY_MS = 1_000
+const DEFAULT_RETRY_MAX_DELAY_MS = 30_000
+
+type PgSyncChangeMessage = {
+  headers: Record<string, unknown> & {
+    operation?: PgSyncOperation | string
+    offset?: unknown
+    key?: unknown
+    rowKey?: unknown
+  }
+  value?: Record<string, unknown>
+  key?: string
+  old_value?: Record<string, unknown>
+}
+
+type PgSyncCursor = {
+  handle: string
+  offset: string
+  initialSnapshotComplete: boolean
+}
+
+export interface PgSyncBridgeCoordinator {
+  start?(): Promise<void>
+  register(
+    options: PgSyncOptions,
+    metadata?: PgSyncRequestMetadata
+  ): Promise<{ sourceRef: string; streamUrl: string }>
+  stop(): Promise<void>
+}
+
+export function buildElectricShapeParams(
+  options: PgSyncOptions
+): Record<string, unknown> {
+  return {
+    table: options.table,
+    ...(options.columns !== undefined ? { columns: [...options.columns] } : {}),
+    ...(options.where !== undefined ? { where: options.where } : {}),
+    ...(options.params !== undefined
+      ? {
+          params: Array.isArray(options.params)
+            ? [...options.params]
+            : { ...options.params },
+        }
+      : {}),
+    ...(options.replica !== undefined ? { replica: options.replica } : {}),
+    ...(options.metadata?.tenantId
+      ? { electric_agents_tenant_id: options.metadata.tenantId }
+      : {}),
+    ...(options.metadata?.principalKind
+      ? { electric_agents_principal_kind: options.metadata.principalKind }
+      : {}),
+    ...(options.metadata?.principalId
+      ? { electric_agents_principal_id: options.metadata.principalId }
+      : {}),
+    ...(options.metadata?.principalKey
+      ? { electric_agents_principal_key: options.metadata.principalKey }
+      : {}),
+    ...(options.metadata?.principalUrl
+      ? { electric_agents_principal_url: options.metadata.principalUrl }
+      : {}),
+    ...(options.metadata?.entityUrl
+      ? { electric_agents_entity_url: options.metadata.entityUrl }
+      : {}),
+    ...(options.metadata?.entityType
+      ? { electric_agents_entity_type: options.metadata.entityType }
+      : {}),
+    ...(options.metadata?.streamPath
+      ? { electric_agents_stream_path: options.metadata.streamPath }
+      : {}),
+    ...(options.metadata?.runtimeConsumerId
+      ? {
+          electric_agents_runtime_consumer_id:
+            options.metadata.runtimeConsumerId,
+        }
+      : {}),
+    ...(options.metadata?.wakeId
+      ? { electric_agents_wake_id: options.metadata.wakeId }
+      : {}),
+  }
+}
+
+function jsonSafe(value: unknown): unknown {
+  if (typeof value === `bigint`) return value.toString()
+  if (value === null || typeof value !== `object`) return value
+  if (Array.isArray(value)) return value.map(jsonSafe)
+  return Object.fromEntries(
+    Object.entries(value as Record<string, unknown>).map(([key, item]) => [
+      key,
+      jsonSafe(item),
+    ])
+  )
+}
+
+function stableJson(value: unknown): string {
+  if (typeof value === `bigint`) return JSON.stringify(value.toString())
+  if (value === null || typeof value !== `object`) return JSON.stringify(value)
+  if (Array.isArray(value)) return `[${value.map(stableJson).join(`,`)}]`
+  return `{${Object.keys(value as Record<string, unknown>)
+    .sort()
+    .map(
+      (key) =>
+        `${JSON.stringify(key)}:${stableJson((value as Record<string, unknown>)[key])}`
+    )
+    .join(`,`)}}`
+}
+
+function parseElectricOffset(offset: string): Offset | null {
+  if (offset === `-1`) return offset
+  return /^\d+_\d+$/.test(offset) ? (offset as Offset) : null
+}
+
+function rowKeyForMessage(message: PgSyncChangeMessage): string | undefined {
+  const headers = message.headers as Record<string, unknown>
+  const candidate =
+    headers.key ??
+    headers.rowKey ??
+    message.value?.id ??
+    message.value?.key ??
+    message.old_value?.id ??
+    message.old_value?.key
+  return candidate === undefined ? undefined : stableJson(candidate)
+}
+
+export function pgSyncMessageToDurableEvent(
+  message: PgSyncChangeMessage,
+  optionsOrSourceRef: PgSyncOptions | string
+): {
+  type: `pg_sync_change`
+  key: string
+  value: Record<string, unknown>
+  headers: { operation: PgSyncOperation; timestamp: string }
+} | null {
+  const operation = message.headers.operation
+  if (
+    operation !== `insert` &&
+    operation !== `update` &&
+    operation !== `delete`
+  )
+    return null
+
+  const sourceRef =
+    typeof optionsOrSourceRef === `string`
+      ? optionsOrSourceRef
+      : sourceRefForPgSync(optionsOrSourceRef)
+  const rowKey = rowKeyForMessage(message)
+  const offset = message.headers.offset
+  if (typeof offset !== `string` || offset.length === 0) return null
+  const messageKeyPart = offset
+  const messageKey = `${sourceRef}:${operation}:${messageKeyPart}`
+  const timestamp = new Date().toISOString()
+  const oldValue = message.old_value
+  const safeValue = jsonSafe(message.value)
+  const safeOldValue = jsonSafe(oldValue)
+  const safeHeaders = jsonSafe(message.headers)
+
+  return {
+    type: `pg_sync_change`,
+    key: messageKey,
+    value: {
+      key: messageKey,
+      table:
+        typeof optionsOrSourceRef === `string`
+          ? undefined
+          : optionsOrSourceRef.table,
+      operation,
+      ...(rowKey !== undefined ? { rowKey } : {}),
+      ...(message.value !== undefined ? { value: safeValue } : {}),
+      ...(oldValue !== undefined ? { oldValue: safeOldValue } : {}),
+      headers: safeHeaders,
+      ...(typeof offset === `string` ? { offset } : {}),
+      receivedAt: timestamp,
+    },
+    headers: { operation, timestamp },
+  }
+}
+
+function cursorFromRow(
+  row:
+    | Pick<
+        PgSyncBridgeRow,
+        `shapeHandle` | `shapeOffset` | `initialSnapshotComplete`
+      >
+    | undefined
+): PgSyncCursor | undefined {
+  return row?.shapeHandle && row.shapeOffset
+    ? {
+        handle: row.shapeHandle,
+        offset: row.shapeOffset,
+        initialSnapshotComplete: row.initialSnapshotComplete,
+      }
+    : undefined
+}
+
+class PgSyncBridge {
+  private producer: IdempotentProducer | null = null
+  private unsubscribe: (() => void) | null = null
+  private abortController: AbortController | null = null
+  private skipChangesUntilUpToDate = false
+  private recovering = false
+  private committedCursor?: PgSyncCursor
+  private retryAttempt = 0
+
+  constructor(
+    readonly sourceRef: string,
+    readonly streamUrl: string,
+    private options: CanonicalPgSyncConfig,
+    private resolvedSource: PgSyncResolvedSource,
+    private retry: Required<NonNullable<PgSyncBridgeManagerOptions[`retry`]>>,
+    private streamClient: StreamClient,
+    private registry?: PostgresRegistry,
+    private evaluateWakes?: WakeEvaluator,
+    private initialCursor?: PgSyncCursor
+  ) {
+    this.committedCursor = initialCursor
+  }
+
+  async start(): Promise<void> {
+    if (!this.producer) {
+      this.producer = new IdempotentProducer(
+        new DurableStream({
+          url: `${this.streamClient.baseUrl}${this.streamUrl}`,
+          contentType: `application/json`,
+        }),
+        `pg-sync-bridge-${this.sourceRef}`
+      )
+    }
+    if (this.initialCursor) {
+      const offset = parseElectricOffset(this.initialCursor.offset)
+      if (offset) {
+        this.startStream(
+          offset,
+          this.initialCursor.handle,
+          !this.initialCursor.initialSnapshotComplete
+        )
+        return
+      }
+    }
+    await this.registry?.clearPgSyncBridgeCursor(this.sourceRef)
+    this.startStream(`now`, undefined, true)
+  }
+
+  async stop(): Promise<void> {
+    this.unsubscribe?.()
+    this.abortController?.abort()
+    this.unsubscribe = null
+    this.abortController = null
+    try {
+      await this.producer?.flush()
+    } finally {
+      await this.producer?.detach()
+      this.producer = null
+    }
+  }
+
+  private startStream(
+    offset: Offset,
+    handle?: string,
+    skipChangesUntilUpToDate = false,
+    log: LogMode = offset === `now` ? `changes_only` : `full`
+  ): void {
+    this.unsubscribe?.()
+    this.abortController?.abort()
+    this.skipChangesUntilUpToDate = skipChangesUntilUpToDate
+    this.abortController = new AbortController()
+    const stream: ShapeStreamInterface<Record<string, unknown>> =
+      new ShapeStream({
+        url: this.resolvedSource.url,
+        params: buildElectricShapeParams(this.options) as never,
+        offset,
+        log,
+        ...(handle ? { handle } : {}),
+        signal: this.abortController.signal,
+      })
+    this.unsubscribe = stream.subscribe(
+      async (messages) => {
+        try {
+          for (const message of messages) {
+            if (isControlMessage(message)) {
+              if (message.headers.control === `must-refetch`) {
+                await this.registry?.clearPgSyncBridgeCursor(this.sourceRef)
+                this.startStream(`now`, undefined, true)
+                return
+              }
+              if (message.headers.control === `up-to-date`) {
+                this.skipChangesUntilUpToDate = false
+                await this.persistCursor(stream, true)
+                continue
+              }
+              await this.persistCursor(stream)
+              continue
+            }
+            if (!isChangeMessage(message)) continue
+            if (!this.skipChangesUntilUpToDate) {
+              const event = pgSyncMessageToDurableEvent(message, this.options)
+              if (event) {
+                if (!this.producer)
+                  throw new Error(`pg-sync producer is not started`)
+                await this.producer.append(JSON.stringify(event))
+                await this.producer.flush?.()
+                await this.evaluateWakes?.(this.streamUrl, event)
+              }
+            }
+            await this.persistCursor(stream)
+            this.retryAttempt = 0
+          }
+        } catch (error) {
+          serverLog.warn(
+            `[pg-sync-bridge] subscription callback failed for ${this.sourceRef}:`,
+            error
+          )
+          await this.recoverStream()
+        }
+      },
+      (error) => {
+        if (this.abortController?.signal.aborted) return
+        serverLog.warn(
+          `[pg-sync-bridge] subscription failed for ${this.sourceRef}:`,
+          error
+        )
+        void this.recoverStream()
+      }
+    )
+  }
+
+  private async recoverStream(): Promise<void> {
+    if (this.recovering) return
+    this.recovering = true
+    try {
+      const attempt = this.retryAttempt++
+      const baseDelay = Math.min(
+        this.retry.initialDelayMs * 2 ** attempt,
+        this.retry.maxDelayMs
+      )
+      const jitter = Math.floor(baseDelay * 0.2 * this.retry.random())
+      const delay = baseDelay + jitter
+      if (delay > 0) await this.retry.sleep(delay)
+
+      const offset = this.committedCursor
+        ? parseElectricOffset(this.committedCursor.offset)
+        : null
+      if (offset && this.committedCursor) {
+        this.startStream(
+          offset,
+          this.committedCursor.handle,
+          !this.committedCursor.initialSnapshotComplete
+        )
+      } else {
+        await this.registry?.clearPgSyncBridgeCursor(this.sourceRef)
+        this.startStream(`now`, undefined, true)
+      }
+    } finally {
+      this.recovering = false
+    }
+  }
+
+  private async persistCursor(
+    stream: ShapeStreamInterface<Record<string, unknown>>,
+    initialSnapshotComplete = !this.skipChangesUntilUpToDate
+  ): Promise<void> {
+    const shapeHandle = stream.shapeHandle
+    const shapeOffset = stream.lastOffset
+    if (!shapeHandle || !shapeOffset || shapeOffset === `-1`) return
+    await this.registry?.updatePgSyncBridgeCursor(
+      this.sourceRef,
+      shapeHandle,
+      shapeOffset,
+      initialSnapshotComplete
+    )
+    this.committedCursor = {
+      handle: shapeHandle,
+      offset: shapeOffset,
+      initialSnapshotComplete,
+    }
+  }
+}
+
+export class PgSyncBridgeManager implements PgSyncBridgeCoordinator {
+  private bridges = new Map<string, PgSyncBridge>()
+  private starting = new Map<string, Promise<void>>()
+
+  private readonly url: string
+  private readonly retry: Required<
+    NonNullable<PgSyncBridgeManagerOptions[`retry`]>
+  >
+
+  constructor(
+    private streamClient: StreamClient,
+    private evaluateWakes?: WakeEvaluator,
+    private registry?: PostgresRegistry,
+    options: PgSyncBridgeManagerOptions = {}
+  ) {
+    this.url = options.url ?? PG_SYNC_ELECTRIC_SHAPE_URL
+    this.retry = {
+      initialDelayMs:
+        options.retry?.initialDelayMs ?? DEFAULT_RETRY_INITIAL_DELAY_MS,
+      maxDelayMs: options.retry?.maxDelayMs ?? DEFAULT_RETRY_MAX_DELAY_MS,
+      random: options.retry?.random ?? Math.random,
+      sleep:
+        options.retry?.sleep ??
+        ((ms: number) =>
+          new Promise<void>((resolve) => setTimeout(resolve, ms))),
+    }
+  }
+
+  async start(): Promise<void> {
+    const rows = await this.registry?.listPgSyncBridges?.()
+    if (!rows) return
+    await Promise.all(
+      rows.map((row) =>
+        this.ensureBridge(row).catch((error) => {
+          serverLog.warn(
+            `[pg-sync-bridge] failed to start ${row.sourceRef}:`,
+            error
+          )
+        })
+      )
+    )
+  }
+
+  async register(
+    options: PgSyncOptions,
+    metadata?: PgSyncRequestMetadata
+  ): Promise<{ sourceRef: string; streamUrl: string }> {
+    const mergedMetadata = { ...options.metadata, ...metadata }
+    const canonicalOptions = {
+      ...canonicalPgSyncOptions(options),
+      ...(Object.keys(mergedMetadata).length > 0
+        ? { metadata: mergedMetadata }
+        : {}),
+    }
+    const resolvedSource = this.resolveSource(canonicalOptions)
+    const sourceRef = sourceRefForPgSync(canonicalOptions)
+    const streamUrl = getPgSyncStreamPath(sourceRef, this.registry?.tenantId)
+    const row = await this.registry?.upsertPgSyncBridge({
+      sourceRef,
+      options: canonicalOptions,
+      streamUrl,
+    })
+    await this.streamClient.ensure(streamUrl, {
+      contentType: `application/json`,
+    })
+    if (!this.bridges.has(sourceRef)) {
+      let start = this.starting.get(sourceRef)
+      if (!start) {
+        start = (async () => {
+          const bridge = new PgSyncBridge(
+            sourceRef,
+            streamUrl,
+            canonicalOptions,
+            resolvedSource,
+            this.retry,
+            this.streamClient,
+            this.registry,
+            this.evaluateWakes,
+            cursorFromRow(row)
+          )
+          await bridge.start()
+          this.bridges.set(sourceRef, bridge)
+        })().finally(() => this.starting.delete(sourceRef))
+        this.starting.set(sourceRef, start)
+      }
+      await start
+    }
+    return { sourceRef, streamUrl }
+  }
+
+  private async ensureBridge(row: PgSyncBridgeRow): Promise<void> {
+    if (this.bridges.has(row.sourceRef)) return
+    let start = this.starting.get(row.sourceRef)
+    if (!start) {
+      start = (async () => {
+        await this.streamClient.ensure(row.streamUrl, {
+          contentType: `application/json`,
+        })
+        const canonicalOptions = canonicalPgSyncOptions(row.options)
+        const resolvedSource = this.resolveSource(canonicalOptions)
+        const bridge = new PgSyncBridge(
+          row.sourceRef,
+          row.streamUrl,
+          canonicalOptions,
+          resolvedSource,
+          this.retry,
+          this.streamClient,
+          this.registry,
+          this.evaluateWakes,
+          cursorFromRow(row)
+        )
+        await bridge.start()
+        this.bridges.set(row.sourceRef, bridge)
+      })().finally(() => this.starting.delete(row.sourceRef))
+      this.starting.set(row.sourceRef, start)
+    }
+    await start
+  }
+
+  private resolveSource(options: CanonicalPgSyncConfig): PgSyncResolvedSource {
+    return { url: options.url ?? this.url }
+  }
+
+  async stop(): Promise<void> {
+    await Promise.allSettled(this.starting.values())
+    await Promise.all([...this.bridges.values()].map((bridge) => bridge.stop()))
+    this.bridges.clear()
+  }
+}

package/src/routing/context.ts

@@ -5,6 +5,7 @@ import type {
 } from '@electric-ax/agents-runtime'
 import type { DrizzleDB } from '../db/index.js'
 import type { EntityBridgeCoordinator } from '../entity-bridge-manager.js'
+import type { PgSyncBridgeCoordinator } from '../pg-sync-bridge-manager.js'
 import type { EntityManager } from '../entity-manager.js'
 import type { ElectricAgentsTenantRuntime } from '../runtime.js'
 import type { StreamClient } from '../stream-client.js'
@@ -54,6 +55,7 @@ export interface TenantContext {
   streamClient: StreamClient
   runtime: ElectricAgentsTenantRuntime
   entityBridgeManager: EntityBridgeCoordinator
+  pgSyncBridgeManager?: PgSyncBridgeCoordinator
   eventSources?: EventSourceCatalog
   ensureEventSourceWakeSource?: (sourceUrl: string) => Promise<void> | void
   authorizeRequest?: AuthorizeRequest

package/src/routing/entities-router.ts

@@ -39,6 +39,7 @@ import type {
   ElectricAgentsEntity,
   ElectricAgentsEntityType,
   EntityPermission,
+  PublicElectricAgentsEntity,
   SendRequest,
 } from '../electric-agents-types.js'
 import type { JsonRouteRequest } from './schema.js'
@@ -658,7 +659,12 @@ async function parseAttachmentForm(
 }
 
 function contentDisposition(filename: string): string {
-  const fallback = filename.replace(/["\\\r\n]/g, `_`)
+  // Header values are converted to WebIDL ByteString by undici, so every
+  // character in the raw header value must fit in a single byte. Keep the
+  // RFC 5987 filename* parameter for the full UTF-8 filename, but make the
+  // legacy filename fallback ASCII-only to avoid throwing on names containing
+  // e.g. narrow no-break spaces or emoji.
+  const fallback = filename.replace(/[^\x20-\x7e]|["\\]/g, `_`)
   return `attachment; filename="${fallback}"; filename*=UTF-8''${encodeURIComponent(filename)}`
 }
 
@@ -1083,6 +1089,16 @@ async function deleteEventSourceSubscription(
   return json(result)
 }
 
+function tagResponseBody(
+  entity: ElectricAgentsEntity & { txid?: number }
+): PublicElectricAgentsEntity & { txid?: number } {
+  const publicEntity = toPublicEntity(entity)
+  if (entity.txid !== undefined) {
+    return { ...publicEntity, txid: entity.txid }
+  }
+  return publicEntity
+}
+
 async function setTag(
   request: AgentsRouteRequest,
   ctx: TenantContext
@@ -1095,14 +1111,12 @@ async function setTag(
 
   const parsed = routeBody<SetTagBody>(request)
   const { entityUrl } = requireExistingEntityRoute(request)
-  const token = writeTokenFromRequest(request)
   const updated = await ctx.entityManager.setTag(
     entityUrl,
     decodeURIComponent(request.params.tagKey),
-    { value: parsed.value },
-    token
+    { value: parsed.value }
   )
-  return json(toPublicEntity(updated))
+  return json(tagResponseBody(updated))
 }
 
 async function deleteTag(
@@ -1116,13 +1130,11 @@ async function deleteTag(
   if (principalMutationError) return principalMutationError
 
   const { entityUrl } = requireExistingEntityRoute(request)
-  const token = writeTokenFromRequest(request)
   const updated = await ctx.entityManager.deleteTag(
     entityUrl,
-    decodeURIComponent(request.params.tagKey),
-    token
+    decodeURIComponent(request.params.tagKey)
   )
-  return json(toPublicEntity(updated))
+  return json(tagResponseBody(updated))
 }
 
 async function forkEntity(
@@ -1289,11 +1301,11 @@ async function sendEntity(
       sendReq,
       new Date(Date.now() + parsed.afterMs)
     )
-  } else {
-    await ctx.entityManager.send(entityUrl, sendReq)
+    return status(204)
   }
 
-  return status(204)
+  const result = await ctx.entityManager.send(entityUrl, sendReq)
+  return json(result)
 }
 
 async function createAttachment(
@@ -1368,12 +1380,12 @@ async function updateInboxMessage(
 ): Promise<Response> {
   const parsed = routeBody<InboxMessageBody>(request)
   const { entityUrl } = requireExistingEntityRoute(request)
-  await ctx.entityManager.updateInboxMessage(
+  const result = await ctx.entityManager.updateInboxMessage(
     entityUrl,
     decodeURIComponent(request.params.messageKey),
     parsed
   )
-  return status(204)
+  return json(result)
 }
 
 async function deleteInboxMessage(
@@ -1381,11 +1393,11 @@ async function deleteInboxMessage(
   ctx: TenantContext
 ): Promise<Response> {
   const { entityUrl } = requireExistingEntityRoute(request)
-  await ctx.entityManager.deleteInboxMessage(
+  const result = await ctx.entityManager.deleteInboxMessage(
     entityUrl,
     decodeURIComponent(request.params.messageKey)
   )
-  return status(204)
+  return json(result)
 }
 
 async function spawnEntity(

package/src/routing/global-router.ts

@@ -29,5 +29,8 @@ export const globalRouter: GlobalRoutes = AutoRouter<
 })
 
 globalRouter.all(`/_electric/shared-state/*`, durableStreamsRouter.fetch)
+globalRouter.all(`/_electric/pg-sync/register`, internalRouter.fetch)
+globalRouter.get(`/_electric/pg-sync/*`, durableStreamsRouter.fetch)
+globalRouter.head(`/_electric/pg-sync/*`, durableStreamsRouter.fetch)
 globalRouter.all(`/_electric/*`, internalRouter.fetch)
 globalRouter.all(`*`, durableStreamsRouter.fetch)

package/src/routing/hooks.ts

@@ -1,6 +1,7 @@
 import { SpanKind, SpanStatusCode } from '@opentelemetry/api'
 import { apiError } from '../electric-agents-http.js'
 import { ElectricAgentsError } from '../entity-manager.js'
+import { ElectricProxyError } from '../utils/server-utils.js'
 import { ELECTRIC_PRINCIPAL_HEADER } from '../principal.js'
 import { ATTR, extractTraceContext, tracer } from '../tracing.js'
 import { serverLog } from '../utils/log.js'
@@ -112,6 +113,12 @@ export function errorMapper(err: unknown, req: IRequest): Response {
   if (err instanceof ElectricAgentsError) {
     return apiError(err.status, err.code, err.message, err.details)
   }
+  if (err instanceof ElectricProxyError) {
+    serverLog.warn(
+      `[agent-server] Electric proxy rejected request (${err.code}): ${req.url}`
+    )
+    return apiError(err.status, err.code, err.message)
+  }
   serverLog.error(`[agent-server] Unhandled error:`, err)
   return apiError(500, `INTERNAL_SERVER_ERROR`, `Internal server error`)
 }