orez 0.1.7 → 0.1.8

package/dist/sqlite-mode/resolve-mode.js

@@ -1,38 +1,42 @@
 /**
  * mode resolution - canonical place to determine sqlite mode from config/env
+ *
+ * priority:
+ * 1. explicit --disable-wasm-sqlite flag → native
+ * 2. explicit --force-wasm-sqlite flag → wasm
+ * 3. native binary available → native (auto-detect)
+ * 4. fallback → wasm
  */
-import { createRequire } from 'node:module';
-/**
- * resolve a package entry path
- * import.meta.resolve doesn't work in vitest, so we fall back to require.resolve
- */
-export function resolvePackage(pkg) {
-    try {
-        const resolved = import.meta.resolve(pkg);
-        if (resolved)
-            return resolved.replace('file://', '');
-    }
-    catch { }
-    try {
-        const require = createRequire(import.meta.url);
-        return require.resolve(pkg);
-    }
-    catch { }
-    return '';
-}
+import { inspectNativeSqliteBinary } from './native-binary.js';
+import { resolvePackage } from './package-resolve.js';
+export { resolvePackage } from './package-resolve.js';
 /**
  * resolve sqlite mode from config
  * single source of truth for mode selection
+ *
+ * @param disableWasmSqlite - explicit flag to force native mode
+ * @param forceWasmSqlite - explicit flag to force wasm mode (overrides auto-detect)
  */
-export function resolveSqliteMode(disableWasmSqlite) {
-    return disableWasmSqlite ? 'native' : 'wasm';
+export function resolveSqliteMode(disableWasmSqlite, forceWasmSqlite = false) {
+    // explicit native request
+    if (disableWasmSqlite)
+        return 'native';
+    // explicit wasm request
+    if (forceWasmSqlite)
+        return 'wasm';
+    // auto-detect: prefer native if binary is available
+    const nativeCheck = inspectNativeSqliteBinary();
+    if (nativeCheck.found)
+        return 'native';
+    // fallback to wasm
+    return 'wasm';
 }
 /**
  * resolve full sqlite mode config including paths
  * returns null if required packages aren't installed
  */
-export function resolveSqliteModeConfig(disableWasmSqlite) {
-    const mode = resolveSqliteMode(disableWasmSqlite);
+export function resolveSqliteModeConfig(disableWasmSqlite, forceWasmSqlite = false) {
+    const mode = resolveSqliteMode(disableWasmSqlite, forceWasmSqlite);
     const zeroSqlitePath = resolvePackage('@rocicorp/zero-sqlite3') || undefined;
     // native mode may still need zero-sqlite3 path for restoring from a prior shim
     if (mode === 'native') {

package/dist/sqlite-mode/resolve-mode.js.map

@@ -1 +1 @@
-{"version":3,"file":"resolve-mode.js","sourceRoot":"","sources":["../../src/sqlite-mode/resolve-mode.ts"],"names":[],"mappings":"AAAA;;GAEG;AAEH,OAAO,EAAE,aAAa,EAAE,MAAM,aAAa,CAAA;AAI3C;;;GAGG;AACH,MAAM,UAAU,cAAc,CAAC,GAAW;IACxC,IAAI,CAAC;QACH,MAAM,QAAQ,GAAG,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,CAAA;QACzC,IAAI,QAAQ;YAAE,OAAO,QAAQ,CAAC,OAAO,CAAC,SAAS,EAAE,EAAE,CAAC,CAAA;IACtD,CAAC;IAAC,MAAM,CAAC,CAAA,CAAC;IACV,IAAI,CAAC;QACH,MAAM,OAAO,GAAG,aAAa,CAAC,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,CAAA;QAC9C,OAAO,OAAO,CAAC,OAAO,CAAC,GAAG,CAAC,CAAA;IAC7B,CAAC;IAAC,MAAM,CAAC,CAAA,CAAC;IACV,OAAO,EAAE,CAAA;AACX,CAAC;AAED;;;GAGG;AACH,MAAM,UAAU,iBAAiB,CAAC,iBAA0B;IAC1D,OAAO,iBAAiB,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,MAAM,CAAA;AAC9C,CAAC;AAED;;;GAGG;AACH,MAAM,UAAU,uBAAuB,CACrC,iBAA0B;IAE1B,MAAM,IAAI,GAAG,iBAAiB,CAAC,iBAAiB,CAAC,CAAA;IACjD,MAAM,cAAc,GAAG,cAAc,CAAC,wBAAwB,CAAC,IAAI,SAAS,CAAA;IAE5E,+EAA+E;IAC/E,IAAI,IAAI,KAAK,QAAQ,EAAE,CAAC;QACtB,OAAO,EAAE,IAAI,EAAE,cAAc,EAAE,CAAA;IACjC,CAAC;IAED,wDAAwD;IACxD,MAAM,WAAW,GAAG,cAAc,CAAC,gBAAgB,CAAC,CAAA;IAEpD,IAAI,CAAC,WAAW,EAAE,CAAC;QACjB,OAAO,IAAI,CAAA,CAAC,+BAA+B;IAC7C,CAAC;IAED,IAAI,CAAC,cAAc,EAAE,CAAC;QACpB,OAAO,IAAI,CAAA,CAAC,6BAA6B;IAC3C,CAAC;IAED,OAAO;QACL,IAAI;QACJ,WAAW;QACX,cAAc;KACf,CAAA;AACH,CAAC;AAED;;GAEG;AACH,MAAM,UAAU,oBAAoB,CAAC,IAAgB;IACnD,OAAO,IAAI,CAAA;AACb,CAAC"}
+{"version":3,"file":"resolve-mode.js","sourceRoot":"","sources":["../../src/sqlite-mode/resolve-mode.ts"],"names":[],"mappings":"AAAA;;;;;;;;GAQG;AAEH,OAAO,EAAE,yBAAyB,EAAE,MAAM,oBAAoB,CAAA;AAC9D,OAAO,EAAE,cAAc,EAAE,MAAM,sBAAsB,CAAA;AAGrD,OAAO,EAAE,cAAc,EAAE,MAAM,sBAAsB,CAAA;AAErD;;;;;;GAMG;AACH,MAAM,UAAU,iBAAiB,CAC/B,iBAA0B,EAC1B,kBAA2B,KAAK;IAEhC,0BAA0B;IAC1B,IAAI,iBAAiB;QAAE,OAAO,QAAQ,CAAA;IAEtC,wBAAwB;IACxB,IAAI,eAAe;QAAE,OAAO,MAAM,CAAA;IAElC,oDAAoD;IACpD,MAAM,WAAW,GAAG,yBAAyB,EAAE,CAAA;IAC/C,IAAI,WAAW,CAAC,KAAK;QAAE,OAAO,QAAQ,CAAA;IAEtC,mBAAmB;IACnB,OAAO,MAAM,CAAA;AACf,CAAC;AAED;;;GAGG;AACH,MAAM,UAAU,uBAAuB,CACrC,iBAA0B,EAC1B,kBAA2B,KAAK;IAEhC,MAAM,IAAI,GAAG,iBAAiB,CAAC,iBAAiB,EAAE,eAAe,CAAC,CAAA;IAClE,MAAM,cAAc,GAAG,cAAc,CAAC,wBAAwB,CAAC,IAAI,SAAS,CAAA;IAE5E,+EAA+E;IAC/E,IAAI,IAAI,KAAK,QAAQ,EAAE,CAAC;QACtB,OAAO,EAAE,IAAI,EAAE,cAAc,EAAE,CAAA;IACjC,CAAC;IAED,wDAAwD;IACxD,MAAM,WAAW,GAAG,cAAc,CAAC,gBAAgB,CAAC,CAAA;IAEpD,IAAI,CAAC,WAAW,EAAE,CAAC;QACjB,OAAO,IAAI,CAAA,CAAC,+BAA+B;IAC7C,CAAC;IAED,IAAI,CAAC,cAAc,EAAE,CAAC;QACpB,OAAO,IAAI,CAAA,CAAC,6BAA6B;IAC3C,CAAC;IAED,OAAO;QACL,IAAI;QACJ,WAAW;QACX,cAAc;KACf,CAAA;AACH,CAAC;AAED;;GAEG;AACH,MAAM,UAAU,oBAAoB,CAAC,IAAgB;IACnD,OAAO,IAAI,CAAA;AACb,CAAC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "orez",
-  "version": "0.1.7",
+  "version": "0.1.8",
   "description": "PGlite-powered zero-sync development backend. No Docker required.",
   "type": "module",
   "license": "MIT",
@@ -52,7 +52,7 @@
     "@electric-sql/pglite": "^0.3.15",
     "@electric-sql/pglite-tools": "^0.2.20",
     "@rocicorp/zero": ">=0.1.0",
-    "bedrock-sqlite": "0.1.8",
+    "bedrock-sqlite": "0.1.9",
     "citty": "^0.2.0",
     "pg-gateway": "0.3.0-beta.4",
     "pgsql-parser": "^17.9.11",

package/src/cli.ts

@@ -930,7 +930,12 @@ const main = defineCommand({
     },
     'disable-wasm-sqlite': {
       type: 'boolean',
-      description: 'use native @rocicorp/zero-sqlite3 instead of wasm bedrock-sqlite',
+      description: 'force native @rocicorp/zero-sqlite3 (fails if not available)',
+      default: false,
+    },
+    'force-wasm-sqlite': {
+      type: 'boolean',
+      description: 'force wasm bedrock-sqlite even if native is available',
       default: false,
     },
     'on-db-ready': {
@@ -982,6 +987,7 @@ const main = defineCommand({
       pgPassword: args['pg-password'],
       skipZeroCache: args['skip-zero-cache'],
       disableWasmSqlite: args['disable-wasm-sqlite'],
+      forceWasmSqlite: args['force-wasm-sqlite'],
       logLevel: (args['log-level'] as 'error' | 'warn' | 'info' | 'debug') || undefined,
       onDbReady: args['on-db-ready'] || undefined,
       onHealthy: args['on-healthy'] || undefined,

package/src/config.ts

@@ -16,6 +16,7 @@ export interface ZeroLiteConfig {
   seedFile: string
   skipZeroCache: boolean
   disableWasmSqlite: boolean
+  forceWasmSqlite: boolean
   logLevel: LogLevel
   pgliteOptions: Partial<PGliteOptions>
   // lifecycle hooks
@@ -35,6 +36,7 @@ export function getConfig(overrides: Partial<ZeroLiteConfig> = {}): ZeroLiteConf
     seedFile: overrides.seedFile || 'src/database/seed.sql',
     skipZeroCache: overrides.skipZeroCache || false,
     disableWasmSqlite: overrides.disableWasmSqlite ?? false,
+    forceWasmSqlite: overrides.forceWasmSqlite ?? false,
     logLevel: overrides.logLevel || 'warn',
     pgliteOptions: overrides.pgliteOptions || {},
     onDbReady: overrides.onDbReady,

package/src/index.ts

@@ -75,6 +75,60 @@ async function runHook(
   })
 }
 
+function getManagedPublicationConfig(): { names: string[]; managedByOrez: boolean } {
+  const existing = process.env.ZERO_APP_PUBLICATIONS?.trim()
+  if (existing) {
+    const names = existing
+      .split(',')
+      .map((s) => s.trim())
+      .filter(Boolean)
+    return { names, managedByOrez: false }
+  }
+
+  const appId = (process.env.ZERO_APP_ID || 'zero').trim() || 'zero'
+  const fallback = `orez_${appId}_public`
+  process.env.ZERO_APP_PUBLICATIONS = fallback
+  return { names: [fallback], managedByOrez: true }
+}
+
+async function syncManagedPublications(
+  db: PGlite,
+  names: string[],
+  managedByOrez: boolean
+): Promise<void> {
+  if (!managedByOrez || names.length === 0) return
+
+  const tables = await db.query<{ tablename: string }>(
+    `SELECT tablename
+     FROM pg_tables
+     WHERE schemaname = 'public'
+       AND tablename NOT LIKE '_zero_%'`
+  )
+  const publicTables = tables.rows
+    .map((r) => r.tablename)
+    .filter((t) => !t.startsWith('_'))
+
+  for (const pub of names) {
+    const quotedPub = '"' + pub.replace(/"/g, '""') + '"'
+    await db.exec(`CREATE PUBLICATION ${quotedPub}`).catch(() => {})
+
+    if (publicTables.length === 0) continue
+    const inPub = await db.query<{ tablename: string }>(
+      `SELECT tablename
+       FROM pg_publication_tables
+       WHERE pubname = $1
+         AND schemaname = 'public'`,
+      [pub]
+    )
+    const inPubSet = new Set(inPub.rows.map((r) => r.tablename))
+    const toAdd = publicTables.filter((t) => !inPubSet.has(t))
+    if (toAdd.length === 0) continue
+    const tableList = toAdd.map((t) => `"public"."${t.replace(/"/g, '""')}"`).join(', ')
+    await db.exec(`ALTER PUBLICATION ${quotedPub} ADD TABLE ${tableList}`)
+    log.debug.orez(`added ${toAdd.length} table(s) to publication "${pub}"`)
+  }
+}
+
 // resolvePackage moved to sqlite-mode/resolve-mode.ts
 import { resolvePackage } from './sqlite-mode/resolve-mode.js'
 
@@ -112,18 +166,20 @@ export async function startZeroLite(overrides: Partial<ZeroLiteConfig> = {}) {
   log.debug.orez(`data dir: ${resolve(config.dataDir)}`)
 
   // resolve sqlite mode config early (used for shim application and cleanup)
-  // requested wasm can fall back to native if required packages are missing.
-  let sqliteMode = resolveSqliteMode(config.disableWasmSqlite)
-  let sqliteModeConfig = resolveSqliteModeConfig(config.disableWasmSqlite)
+  // auto-detects native if available, falls back to wasm
+  let sqliteMode = resolveSqliteMode(config.disableWasmSqlite, config.forceWasmSqlite)
+  let sqliteModeConfig = resolveSqliteModeConfig(
+    config.disableWasmSqlite,
+    config.forceWasmSqlite
+  )
   if (sqliteMode === 'wasm' && !sqliteModeConfig) {
     log.orez(
-      'warning: wasm sqlite requested but dependencies are missing, falling back to native sqlite'
+      'warning: wasm sqlite requested but dependencies are missing, falling back to native'
     )
     sqliteMode = 'native'
     config.disableWasmSqlite = true
-    sqliteModeConfig = resolveSqliteModeConfig(true)
+    sqliteModeConfig = resolveSqliteModeConfig(true, false)
   }
-  log.orez(`sqlite: ${sqliteMode}`)
 
   mkdirSync(config.dataDir, { recursive: true })
 
@@ -140,9 +196,14 @@ export async function startZeroLite(overrides: Partial<ZeroLiteConfig> = {}) {
   // start pglite (separate instances for postgres, zero_cvr, zero_cdb)
   const instances = await createPGliteInstances(config)
   const db = instances.postgres
+  const managedPub = getManagedPublicationConfig()
+  if (managedPub.managedByOrez) {
+    log.debug.orez(`using managed publication: ${managedPub.names.join(', ')}`)
+  }
 
   // run migrations (on postgres instance only)
   const migrationsApplied = await runMigrations(db, config)
+  await syncManagedPublications(db, managedPub.names, managedPub.managedByOrez)
 
   // install change tracking (on postgres instance only)
   log.debug.orez('installing change tracking')
@@ -173,6 +234,7 @@ export async function startZeroLite(overrides: Partial<ZeroLiteConfig> = {}) {
     })
 
     // re-install change tracking on tables created by on-db-ready
+    await syncManagedPublications(db, managedPub.names, managedPub.managedByOrez)
     log.debug.orez('re-installing change tracking after on-db-ready')
     await installChangeTracking(db)
   }
@@ -378,6 +440,7 @@ export async function startZeroLite(overrides: Partial<ZeroLiteConfig> = {}) {
 
       // always re-install change tracking after a full reset so public table
       // triggers reflect any schema changes introduced by restore.
+      await syncManagedPublications(db, managedPub.names, managedPub.managedByOrez)
       log.debug.orez('re-installing change tracking after full reset')
       await installChangeTracking(db)
 

package/src/integration/integration.test.ts

@@ -12,11 +12,27 @@ import WebSocket from 'ws'
 
 import { startZeroLite } from '../index.js'
 import { installChangeTracking } from '../replication/change-tracker.js'
-import { installAllowAllPermissions } from './test-permissions.js'
+import {
+  ensureTablesInPublications,
+  hasNonNullPermissions,
+  installAllowAllPermissions,
+} from './test-permissions.js'
 
 import type { PGlite } from '@electric-sql/pglite'
 
 const SYNC_PROTOCOL_VERSION = 45
+const CLIENT_SCHEMA = {
+  tables: {
+    foo: {
+      columns: {
+        id: { type: 'string' },
+        value: { type: 'string' },
+        num: { type: 'number' },
+      },
+      primaryKey: ['id'],
+    },
+  },
+}
 
 function encodeSecProtocols(
   initConnectionMessage: unknown,
@@ -70,6 +86,7 @@ describe('orez integration', { timeout: 120000 }, () => {
   let pgPort: number
   let shutdown: () => Promise<void>
   let restartZero: (() => Promise<void>) | undefined
+  let resetZeroFull: (() => Promise<void>) | undefined
   let dataDir: string
 
   beforeAll(async () => {
@@ -91,6 +108,7 @@ describe('orez integration', { timeout: 120000 }, () => {
     pgPort = result.pgPort
     shutdown = result.stop
     restartZero = result.restartZero
+    resetZeroFull = result.resetZeroFull
 
     console.log(`[test] orez started, creating tables`)
 
@@ -107,6 +125,7 @@ describe('orez integration', { timeout: 120000 }, () => {
         foo_id TEXT
       );
     `)
+    await ensureTablesInPublications(db, ['foo', 'bar'])
     const pubName = process.env.ZERO_APP_PUBLICATIONS?.trim()
     if (pubName) {
       const quotedPub = '"' + pubName.replace(/"/g, '""') + '"'
@@ -119,10 +138,30 @@ describe('orez integration', { timeout: 120000 }, () => {
       await installChangeTracking(db)
     }
     await installAllowAllPermissions(db, ['foo', 'bar'])
-    if (restartZero) {
+    expect(await hasNonNullPermissions(db)).toBe(true)
+    if (resetZeroFull) {
+      await resetZeroFull()
+    } else if (restartZero) {
       await restartZero()
     }
-    await ensureClientGroup(zeroPort, 'test-cg')
+    const pubNameAfterReset = process.env.ZERO_APP_PUBLICATIONS?.trim()
+    if (pubNameAfterReset) {
+      const pubRows = await db.query<{ tablename: string }>(
+        `SELECT tablename
+         FROM pg_publication_tables
+         WHERE pubname = $1
+           AND schemaname = 'public'`,
+        [pubNameAfterReset]
+      )
+      expect(pubRows.rows.map((r) => r.tablename)).toEqual(
+        expect.arrayContaining(['foo', 'bar'])
+      )
+      const shardCfg = await db.query<{ publications: string[] }>(
+        `SELECT publications FROM "zero_0"."shardConfig" WHERE lock = true`
+      )
+      expect(shardCfg.rows[0]?.publications || []).toContain(pubNameAfterReset)
+    }
+    expect(await hasNonNullPermissions(db)).toBe(true)
 
     console.log(`[test] tables created, waiting for zero-cache`)
     // wait for zero-cache to be ready
@@ -146,13 +185,15 @@ describe('orez integration', { timeout: 120000 }, () => {
   })
 
   test('zero-cache starts and accepts websocket connections', async () => {
+    const cg = `test-cg-${Date.now()}`
+    const cid = `test-client-${Date.now()}`
     const secProtocol = encodeSecProtocols(
       ['initConnection', { desiredQueriesPatch: [] }],
       undefined
     )
     const ws = new WebSocket(
       `ws://localhost:${zeroPort}/sync/v${SYNC_PROTOCOL_VERSION}/connect` +
-        `?clientGroupID=test-cg&clientID=test-client&wsid=ws1&schemaVersion=1&baseCookie=&ts=${Date.now()}&lmid=0`,
+        `?clientGroupID=${cg}&clientID=${cid}&wsid=ws1&schemaVersion=1&baseCookie=&ts=${Date.now()}&lmid=0`,
       secProtocol
     )
 
@@ -358,18 +399,21 @@ describe('orez integration', { timeout: 120000 }, () => {
     downstream: Queue<unknown>,
     query: Record<string, unknown>
   ): WebSocket {
+    const cg = `test-cg-${Date.now()}`
+    const cid = `test-client-${Date.now()}`
     const secProtocol = encodeSecProtocols(
       [
         'initConnection',
         {
           desiredQueriesPatch: [{ op: 'put', hash: 'q1', ast: query }],
+          clientSchema: CLIENT_SCHEMA,
         },
       ],
       undefined
     )
     const ws = new WebSocket(
       `ws://localhost:${port}/sync/v${SYNC_PROTOCOL_VERSION}/connect` +
-        `?clientGroupID=test-cg&clientID=test-client&wsid=ws1&schemaVersion=1&baseCookie=&ts=${Date.now()}&lmid=0`,
+        `?clientGroupID=${cg}&clientID=${cid}&wsid=ws1&schemaVersion=1&baseCookie=&ts=${Date.now()}&lmid=0`,
       secProtocol
     )
 
@@ -457,40 +501,3 @@ async function waitForZero(port: number, timeoutMs = 30000) {
   }
   throw new Error(`zero-cache not ready on port ${port} after ${timeoutMs}ms`)
 }
-
-async function ensureClientGroup(port: number, clientGroupID: string): Promise<void> {
-  const secProtocol = encodeSecProtocols(
-    ['initConnection', { desiredQueriesPatch: [], clientSchema: { tables: {} } }],
-    undefined
-  )
-  await new Promise<void>((resolve, reject) => {
-    const ws = new WebSocket(
-      `ws://localhost:${port}/sync/v${SYNC_PROTOCOL_VERSION}/connect` +
-        `?clientGroupID=${clientGroupID}&clientID=test-client&wsid=ws-bootstrap&schemaVersion=1&baseCookie=&ts=${Date.now()}&lmid=0`,
-      secProtocol
-    )
-
-    const timer = setTimeout(() => {
-      try {
-        ws.close()
-      } catch {}
-      reject(new Error('client-group bootstrap timeout'))
-    }, 7000)
-
-    ws.once('message', (data) => {
-      clearTimeout(timer)
-      const msg = JSON.parse(data.toString())
-      const isError = Array.isArray(msg) && msg[0] === 'error'
-      ws.close()
-      if (isError) {
-        reject(new Error(`client-group bootstrap failed: ${JSON.stringify(msg)}`))
-      } else {
-        resolve()
-      }
-    })
-    ws.once('error', (err) => {
-      clearTimeout(timer)
-      reject(err)
-    })
-  })
-}

package/src/integration/restore-live-stress.test.ts

@@ -18,11 +18,26 @@ import WebSocket from 'ws'
 import { execDumpFile } from '../cli.js'
 import { startZeroLite } from '../index.js'
 import { installChangeTracking } from '../replication/change-tracker.js'
-import { installAllowAllPermissions } from './test-permissions.js'
+import {
+  ensureTablesInPublications,
+  hasNonNullPermissions,
+  installAllowAllPermissions,
+} from './test-permissions.js'
 
 import type { PGlite } from '@electric-sql/pglite'
 
 const SYNC_PROTOCOL_VERSION = 45
+const LIVE_CLIENT_SCHEMA = {
+  tables: {
+    restore_live_probe: {
+      columns: {
+        id: { type: 'string' },
+        value: { type: 'string' },
+      },
+      primaryKey: ['id'],
+    },
+  },
+}
 
 function encodeSecProtocols(
   initConnectionMessage: unknown,
@@ -128,78 +143,52 @@ function connectAndSubscribe(
   query: Record<string, unknown>
 ): Promise<WebSocket> {
   return new Promise((resolve, reject) => {
-    const ts = Date.now()
-    const clientGroupID = `restore-live-cg-${ts}`
-    const urlBase =
+    const initConnectionMessage: [string, Record<string, unknown>] = [
+      'initConnection',
+      {
+        desiredQueriesPatch: [{ op: 'put', hash: 'q1', ast: query }],
+        clientSchema: LIVE_CLIENT_SCHEMA,
+      },
+    ]
+    const secProtocol = encodeSecProtocols(initConnectionMessage, undefined)
+    const ws = new WebSocket(
       `ws://127.0.0.1:${port}/sync/v${SYNC_PROTOCOL_VERSION}/connect` +
-      `?clientGroupID=${clientGroupID}` +
-      `&clientID=restore-live-client` +
-      `&schemaVersion=1&baseCookie=&ts=${Date.now()}&lmid=0`
-
-    const bootstrapProtocol = encodeSecProtocols(
-      ['initConnection', { desiredQueriesPatch: [] }],
-      undefined
+        `?clientGroupID=restore-live-cg-${Date.now()}` +
+        `&clientID=restore-live-client` +
+        `&wsid=ws1&schemaVersion=1&baseCookie=&ts=${Date.now()}&lmid=0`,
+      secProtocol
     )
-    const bootstrapWs = new WebSocket(`${urlBase}&wsid=bootstrap`, bootstrapProtocol)
 
-    const fail = (err: unknown) => {
-      clearTimeout(bootstrapTimer)
+    let settled = false
+    const failTimer = setTimeout(() => {
+      if (settled) return
+      settled = true
       try {
-        bootstrapWs.close()
+        ws.close()
       } catch {}
-      reject(err)
-    }
-
-    const bootstrapTimer = setTimeout(() => {
-      fail(new Error('bootstrap websocket timeout'))
+      reject(new Error('websocket connected but no downstream messages'))
     }, 7000)
-    bootstrapWs.once('error', fail)
-    bootstrapWs.once('message', () => {
-      clearTimeout(bootstrapTimer)
-      try {
-        bootstrapWs.close()
-      } catch {}
 
-      const initConnectionMessage: [string, Record<string, unknown>] = [
-        'initConnection',
-        {
-          desiredQueriesPatch: [{ op: 'put', hash: 'q1', ast: query }],
-        },
-      ]
-      const secProtocol = encodeSecProtocols(initConnectionMessage, undefined)
-      const ws = new WebSocket(`${urlBase}&wsid=ws1`, secProtocol)
-
-      let settled = false
-      const failTimer = setTimeout(() => {
-        if (settled) return
-        settled = true
-        try {
-          ws.close()
-        } catch {}
-        reject(new Error('websocket connected but no downstream messages'))
-      }, 7000)
-
-      ws.on('message', (data) => {
-        const msg = JSON.parse(data.toString())
-        downstream.enqueue(msg)
-        if (!settled) {
-          settled = true
-          clearTimeout(failTimer)
-          resolve(ws)
-        }
-      })
-      ws.once('error', (err) => {
-        if (settled) return
+    ws.on('message', (data) => {
+      const msg = JSON.parse(data.toString())
+      downstream.enqueue(msg)
+      if (!settled) {
         settled = true
         clearTimeout(failTimer)
-        reject(err)
-      })
-      ws.once('close', () => {
-        if (settled) return
-        settled = true
-        clearTimeout(failTimer)
-        reject(new Error('websocket closed before initial downstream message'))
-      })
+        resolve(ws)
+      }
+    })
+    ws.once('error', (err) => {
+      if (settled) return
+      settled = true
+      clearTimeout(failTimer)
+      reject(err)
+    })
+    ws.once('close', () => {
+      if (settled) return
+      settled = true
+      clearTimeout(failTimer)
+      reject(new Error('websocket closed before initial downstream message'))
     })
   })
 }
@@ -299,6 +288,7 @@ describe('live restore stress with connected frontend', { timeout: 360_000 }, ()
   let zeroPort: number
   let shutdown: () => Promise<void>
   let restartZero: (() => Promise<void>) | undefined
+  let resetZeroFull: (() => Promise<void>) | undefined
   let dataDir: string
   let dumpFile: string
 
@@ -330,6 +320,7 @@ describe('live restore stress with connected frontend', { timeout: 360_000 }, ()
     zeroPort = started.zeroPort
     shutdown = started.stop
     restartZero = started.restartZero
+    resetZeroFull = started.resetZeroFull
     await waitForZero(zeroPort, 90_000)
   }, 180_000)
 
@@ -352,8 +343,13 @@ describe('live restore stress with connected frontend', { timeout: 360_000 }, ()
         value TEXT NOT NULL
       )
     `)
+    await ensureTablesInPublications(db, ['restore_live_probe'])
     await installAllowAllPermissions(db, ['restore_live_probe'])
-    if (restartZero) {
+    expect(await hasNonNullPermissions(db)).toBe(true)
+    if (resetZeroFull) {
+      await resetZeroFull()
+      await waitForZero(zeroPort, 90_000)
+    } else if (restartZero) {
       await restartZero()
       await waitForZero(zeroPort, 60_000)
     }