@inkandswitch/patchwork 0.0.1 → 0.1.0

package/CHANGELOG.md

@@ -0,0 +1,20 @@
+# @inkandswitch/patchwork
+
+## 0.1.0
+
+### Minor Changes
+
+- 0aa315d: Configure Subduction or Keyhive with exclusive `syncServers` configuration. `syncServers.keyhive` replaces the `keyhive` and `keyhiveSyncServer` site options and the runtime `setup({ keyhive })` option. Selecting a named ARK relay or providing a custom relay identity and URL enables Keyhive, and configured server URLs now control worker connections as well as connection hints.
+- bd63259: New package: one import for a Patchwork site. It owns the boot sequence (`repo`, `router`, `loading`), the vite plugin (config, html, importmap, manifest, netlify, icons, service worker), the site-kit config helpers, and the ambient client types — all previously spread across the bootloader and each site's own `index.html`, `vite.config.ts`, and `public/` directory.
+
+  A site is now a `package.json` dependency, a `vite.config.ts` with `patchwork({...})`, and a `main.ts` that imports `@inkandswitch/patchwork`.
+
+### Patch Changes
+
+- Updated dependencies [0aa315d]
+- Updated dependencies [bd63259]
+- Updated dependencies [bd63259]
+- Updated dependencies [bd63259]
+  - @inkandswitch/patchwork-bootloader@0.5.0
+  - @inkandswitch/patchwork-elements@4.0.2
+  - @inkandswitch/patchwork-filesystem@0.2.3

package/dist/client.d.ts

@@ -13,8 +13,6 @@ import "@inkandswitch/patchwork-providers";
 
 declare global {
   const __SITE_NAME__: string;
-  const __KEYHIVE__: boolean;
-  const __KEYHIVE_SYNC_SERVER__: boolean;
 
   interface ImportMetaEnv {
     /**

package/dist/index.js

@@ -84,7 +84,7 @@ async function doSetup(options) {
             }
         });
         let workerAdapter = new MessageChannelNetworkAdapter(workerPort);
-        ({ repo, hive, signerIdentity } = await createRepo(options, siteName, workerAdapter));
+        ({ repo, hive, signerIdentity } = await createRepo(siteName, workerAdapter));
         // The worker was recreated with cold state: wire the repo onto the fresh
         // port and drop the adapter stranded on the dead one.
         const bootHive = hive;

package/dist/repo.d.ts

@@ -3,9 +3,7 @@ import { type AutomergeRepoKeyhive } from "@automerge/automerge-repo-keyhive";
 import setupServiceWorker from "@inkandswitch/patchwork-bootloader";
 import type { SignerIdentity } from "./types.js";
 export declare function initWasm(): Promise<void>;
-export declare function createRepo(config: {
-    keyhive?: boolean;
-}, siteName: string, workerAdapter: MessageChannelNetworkAdapter): Promise<{
+export declare function createRepo(siteName: string, workerAdapter: MessageChannelNetworkAdapter): Promise<{
     repo: Repo;
     hive?: AutomergeRepoKeyhive;
     signerIdentity?: SignerIdentity;

package/dist/repo.js

@@ -7,7 +7,9 @@ import { initSync as initSubductionSync } from "@automerge/automerge-subduction/
 import { MemorySigner } from "@automerge/automerge-subduction/slim";
 import debug from "debug";
 const log = debug("patchwork:setup:repo");
-const useKeyhiveSyncServer = typeof __KEYHIVE_SYNC_SERVER__ !== "undefined" && __KEYHIVE_SYNC_SERVER__;
+const syncServer = typeof __SYNC_SERVER__ !== "undefined"
+    ? __SYNC_SERVER__
+    : { url: "wss://subduction.sync.inkandswitch.com" };
 // Fetch and initialize automerge + subduction wasm. Memoized: the fetches start
 // on the first call and every later caller awaits the same init. Skipped
 // entirely when the site brings its own Repo (it did this itself).
@@ -25,8 +27,8 @@ export function initWasm() {
     }
     return wasmReady;
 }
-export async function createRepo(config, siteName, workerAdapter) {
-    if (config.keyhive) {
+export async function createRepo(siteName, workerAdapter) {
+    if (syncServer.keyhive) {
         log("setting up keyhive");
         initKeyhiveWasm();
         const { hive, repo } = await initializeAutomergeRepoKeyhiveWithRepo({
@@ -38,7 +40,7 @@ export async function createRepo(config, siteName, workerAdapter) {
             cachingMode: "periodic",
             onlyShareWithHardcodedServerPeerId: false,
             // ARK selects the relay via `syncServer`, defaulting to "subduction".
-            ...(useKeyhiveSyncServer ? { syncServer: "keyhive" } : {}),
+            syncServer: syncServer.keyhive,
             repo: {
                 storage: new IndexedDBWorkerStorageAdapter(),
                 enableRemoteHeadsGossiping: true,

package/dist/site-kit/index.d.ts

@@ -7,7 +7,7 @@
  * wires these into vite's plugin hooks (dev middleware, emitFile, virtual
  * modules, config()).
  */
-export type { PatchworkSiteOptions, PatchworkIconsOptions, PatchworkHtmlOptions, PatchworkNetlifyOptions, PatchworkSyncServersOptions, } from "./options.js";
+export type { PatchworkSiteOptions, PatchworkIconsOptions, PatchworkHtmlOptions, PatchworkNetlifyOptions, PatchworkKeyhiveSyncServer, PatchworkSyncServersOptions, } from "./options.js";
 export { resolveSyncServers, PRELOAD_WASM_ASSETS } from "./sync-servers.js";
 export { getIcons, ICON_SPECS, type IconSpec } from "./icons.js";
 export { buildHtml, escapeHtml } from "./html.js";

package/dist/site-kit/options.d.ts

@@ -1,3 +1,4 @@
+import type { SyncServerIdentity } from "@automerge/automerge-repo-keyhive";
 /**
  * The bundler-agnostic option shape for a Patchwork site's generated
  * static assets (icons, index.html, manifest.webmanifest, Netlify config).
@@ -22,14 +23,20 @@ export interface PatchworkNetlifyOptions {
     /** Cache-Control: immutable on /assets/*. Default true. */
     immutableAssets?: boolean;
 }
-export interface PatchworkSyncServersOptions {
+type PatchworkPrimarySyncServerOptions = {
+    subduction?: string;
+    keyhive?: never;
+} | {
+    subduction?: never;
+    keyhive: PatchworkKeyhiveSyncServer;
+};
+export type PatchworkKeyhiveSyncServer = "keyhive" | "subduction" | ({
+    url: string;
+} & SyncServerIdentity);
+export type PatchworkSyncServersOptions = {
     /** wss:// URL for the legacy automerge-repo sync-server channel (connected on demand via connectClassicSync). Default: wss://sync3.automerge.org. Pass false to skip its preconnect hint. */
     classic?: string | false;
-    /** wss:// URL for subduction sync — live when keyhiveSyncServer is false. Default: wss://subduction.sync.inkandswitch.com */
-    subduction?: string;
-    /** wss:// URL for keyhive sync — live when keyhiveSyncServer is true. Default: wss://keyhive.sync.automerge.org */
-    keyhive?: string;
-}
+} & PatchworkPrimarySyncServerOptions;
 export interface PatchworkSiteOptions {
     /** -> __SITE_NAME__ define */
     siteName?: string;
@@ -41,10 +48,6 @@ export interface PatchworkSiteOptions {
     description?: string;
     /** default "/src/main.ts" — must be root-absolute, since the generated index.html doesn't live at the project root */
     entry?: string;
-    /** -> __KEYHIVE__ define */
-    keyhive?: boolean;
-    /** -> __KEYHIVE_SYNC_SERVER__ define */
-    keyhiveSyncServer?: boolean;
     themeColor?: string | {
         light: string;
         dark: string;
@@ -52,12 +55,12 @@ export interface PatchworkSiteOptions {
     /** manifest background_color */
     backgroundColor?: string;
     /**
-     * Which sync-server hosts to preconnect/dns-prefetch from the html and
-     * list in the Netlify Link header. Only the channel actually live for
-     * this build is included — subduction xor keyhive, picked by
-     * `keyhiveSyncServer`, matching automerge-worker.ts's own selection —
-     * plus `classic` (on-demand, but cheap to hint) unless set to `false`.
-     * Pass `false` to skip all sync-server hints.
+     * Sync-server configuration for this build. Providing `keyhive` enables
+     * keyhive and selects the relay identity ARK grants access to. Custom
+     * identities also require their WebSocket URL. `subduction` and `keyhive`
+     * are mutually exclusive. The live server and `classic` are also emitted as
+     * connection hints. Pass `false` to keep the default servers but skip those
+     * hints.
      */
     syncServers?: false | PatchworkSyncServersOptions;
     icons?: false | PatchworkIconsOptions;
@@ -65,3 +68,4 @@ export interface PatchworkSiteOptions {
     manifest?: false | Record<string, unknown>;
     netlify?: false | PatchworkNetlifyOptions;
 }
+export {};

package/dist/site-kit/options.js

@@ -1,9 +1 @@
-/**
- * The bundler-agnostic option shape for a Patchwork site's generated
- * static assets (icons, index.html, manifest.webmanifest, Netlify config).
- * `../vite/patchwork-plugin.ts` extends this with vite-only config
- * (importmap, server/preview/worker/build) — a different bundler adapter
- * can reuse this same shape and the pure builders in this directory without
- * pulling in anything vite-specific.
- */
 export {};

package/dist/site-kit/sync-servers.d.ts

@@ -1,11 +1,18 @@
 import type { PatchworkSiteOptions } from "./options.js";
+import type { SyncServerSelection } from "@automerge/automerge-repo-keyhive";
+export declare const DEFAULT_SYNC_SERVERS: {
+    classic: string;
+    subduction: string;
+    keyhive: string;
+};
+export declare function resolvePrimarySyncServer(options: PatchworkSiteOptions): {
+    url: string;
+    keyhive?: SyncServerSelection;
+};
 /**
  * Resolves which sync-server origins are actually live for this build: the
- * channel that's live is subduction xor keyhive (picked by
- * `keyhiveSyncServer`, matching automerge-worker.ts's own selection) plus
- * classic (on-demand, but still worth a preconnect hint) unless disabled.
- * A flat list would drift from `keyhiveSyncServer` — e.g. always hinting
- * subduction even on a build that actually connects to keyhive.
+ * channel that's live is subduction xor keyhive plus classic (on-demand,
+ * but still worth a preconnect hint) unless disabled.
  */
 export declare function resolveSyncServers(options: PatchworkSiteOptions): string[];
 export declare const PRELOAD_WASM_ASSETS: string[];

package/dist/site-kit/sync-servers.js

@@ -2,33 +2,46 @@
 // and automerge-worker.ts's SUBDUCTION_SYNC_URL selection — kept here as
 // plain constants (rather than importing those runtime modules) since this
 // only needs the hostnames, not the browser-only logic that reads them.
-const DEFAULT_SYNC_SERVERS = {
+export const DEFAULT_SYNC_SERVERS = {
     classic: "wss://sync3.automerge.org",
     subduction: "wss://subduction.sync.inkandswitch.com",
     keyhive: "wss://keyhive.sync.automerge.org",
 };
+export function resolvePrimarySyncServer(options) {
+    const servers = options.syncServers || undefined;
+    if (servers?.keyhive) {
+        if (typeof servers.keyhive === "string") {
+            return {
+                keyhive: servers.keyhive,
+                url: DEFAULT_SYNC_SERVERS[servers.keyhive],
+            };
+        }
+        const { url, ...identity } = servers.keyhive;
+        return {
+            keyhive: identity,
+            url,
+        };
+    }
+    return {
+        url: servers?.subduction ?? DEFAULT_SYNC_SERVERS.subduction,
+    };
+}
 function wsToHttpOrigin(wsUrl) {
     return wsUrl.replace(/^ws/, "http");
 }
 /**
  * Resolves which sync-server origins are actually live for this build: the
- * channel that's live is subduction xor keyhive (picked by
- * `keyhiveSyncServer`, matching automerge-worker.ts's own selection) plus
- * classic (on-demand, but still worth a preconnect hint) unless disabled.
- * A flat list would drift from `keyhiveSyncServer` — e.g. always hinting
- * subduction even on a build that actually connects to keyhive.
+ * channel that's live is subduction xor keyhive plus classic (on-demand,
+ * but still worth a preconnect hint) unless disabled.
  */
 export function resolveSyncServers(options) {
     if (options.syncServers === false)
         return [];
-    const servers = { ...DEFAULT_SYNC_SERVERS, ...options.syncServers };
-    const origins = [];
-    const primary = options.keyhiveSyncServer
-        ? servers.keyhive
-        : servers.subduction;
-    origins.push(primary);
-    if (servers.classic)
-        origins.push(servers.classic);
+    const primary = resolvePrimarySyncServer(options);
+    const classic = options.syncServers?.classic ?? DEFAULT_SYNC_SERVERS.classic;
+    const origins = [primary.url];
+    if (classic)
+        origins.push(classic);
     return origins.map(wsToHttpOrigin);
 }
 // Emitted by importmap-plugin.ts. keyhive_wasm.wasm is loaded lazily (only

package/dist/types.d.ts

@@ -57,11 +57,6 @@ export interface PatchworkOptions {
     name?: string;
     /** DOM id of the `<patchwork-view>` hosting the root tool. Defaults to "root". */
     rootElementId?: string;
-    /**
-     * Initialize keyhive for access control. The Repo then uses keyhive's network
-     * adapter, peerId and idFactory instead of a sharePolicy.
-     */
-    keyhive?: boolean;
     /**
      * Bring your own Repo. When provided, setup skips wasm initialization and
      * repo creation entirely — you are responsible for having initialized

package/dist/vite/config-plugin.d.ts

@@ -2,7 +2,7 @@ import type { Plugin } from "vite";
 import wasm from "vite-plugin-wasm";
 import type { PatchworkVitePluginOptions } from "./patchwork-plugin.js";
 /**
- * Owns envPrefix, define (__SITE_NAME__/__KEYHIVE__/__KEYHIVE_SYNC_SERVER__),
+ * Owns envPrefix, define (__SITE_NAME__/sync-server configuration),
  * server/preview CORS defaults, worker format + the wasm plugin, and build
  * defaults (firefox150 target, unminified, sourcemapped) — everything a site
  * used to hand-write in its own vite.config.ts. Each is switched off

package/dist/vite/config-plugin.js

@@ -1,7 +1,8 @@
 import wasm from "vite-plugin-wasm";
+import { DEFAULT_SYNC_SERVERS, resolvePrimarySyncServer, } from "../site-kit/sync-servers.js";
 const CORS_HEADERS = { "Access-Control-Allow-Origin": "*" };
 /**
- * Owns envPrefix, define (__SITE_NAME__/__KEYHIVE__/__KEYHIVE_SYNC_SERVER__),
+ * Owns envPrefix, define (__SITE_NAME__/sync-server configuration),
  * server/preview CORS defaults, worker format + the wasm plugin, and build
  * defaults (firefox150 target, unminified, sourcemapped) — everything a site
  * used to hand-write in its own vite.config.ts. Each is switched off
@@ -11,9 +12,13 @@ export function configPlugin(options = {}) {
     return {
         name: "@patchwork/config",
         config() {
+            const primarySyncServer = resolvePrimarySyncServer(options);
+            const classicSyncServer = options.syncServers && typeof options.syncServers.classic === "string"
+                ? options.syncServers.classic
+                : DEFAULT_SYNC_SERVERS.classic;
             const define = {
-                __KEYHIVE__: JSON.stringify(options.keyhive ?? false),
-                __KEYHIVE_SYNC_SERVER__: JSON.stringify(options.keyhiveSyncServer ?? false),
+                __SYNC_SERVER__: JSON.stringify(primarySyncServer),
+                __CLASSIC_SYNC_SERVER__: JSON.stringify(classicSyncServer),
             };
             if (options.siteName) {
                 define.__SITE_NAME__ = JSON.stringify(options.siteName);

package/dist/vite/patchwork-plugin.d.ts

@@ -31,7 +31,7 @@ export type ImportMap = {
         [scope: string]: Imports;
     };
 };
-export type { PatchworkSiteOptions, PatchworkIconsOptions, PatchworkHtmlOptions, PatchworkNetlifyOptions, PatchworkSyncServersOptions, } from "../site-kit/options.js";
+export type { PatchworkSiteOptions, PatchworkIconsOptions, PatchworkHtmlOptions, PatchworkNetlifyOptions, PatchworkKeyhiveSyncServer, PatchworkSyncServersOptions, } from "../site-kit/options.js";
 export interface PatchworkVitePluginOptions extends PatchworkSiteOptions {
     importmap?: ImportMap;
     server?: false | ServerOptions;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@inkandswitch/patchwork",
-  "version": "0.0.1",
+  "version": "0.1.0",
   "author": "Ink & Switch",
   "type": "module",
   "license": "MIT",
@@ -37,11 +37,11 @@
     "debug": "^4.4.3",
     "sharp": "^0.35.3",
     "vite-plugin-wasm": "^3.6.0",
-    "@inkandswitch/patchwork-bootloader": "^0.4.4",
-    "@inkandswitch/patchwork-filesystem": "^0.2.2",
-    "@inkandswitch/patchwork-providers": "^0.4.2",
-    "@inkandswitch/patchwork-elements": "^4.0.1",
-    "@inkandswitch/patchwork-plugins": "^1.0.1"
+    "@inkandswitch/patchwork-bootloader": "^0.5.0",
+    "@inkandswitch/patchwork-elements": "^4.0.2",
+    "@inkandswitch/patchwork-filesystem": "^0.2.3",
+    "@inkandswitch/patchwork-plugins": "^1.0.1",
+    "@inkandswitch/patchwork-providers": "^0.4.2"
   },
   "devDependencies": {
     "esbuild": "^0.23.1",

package/src/client.d.ts

@@ -13,8 +13,6 @@ import "@inkandswitch/patchwork-providers";
 
 declare global {
   const __SITE_NAME__: string;
-  const __KEYHIVE__: boolean;
-  const __KEYHIVE_SYNC_SERVER__: boolean;
 
   interface ImportMetaEnv {
     /**

package/src/index.ts

@@ -152,7 +152,6 @@ async function doSetup(options: PatchworkOptions): Promise<Patchwork> {
 
     let workerAdapter = new MessageChannelNetworkAdapter(workerPort);
     ({ repo, hive, signerIdentity } = await createRepo(
-      options,
       siteName,
       workerAdapter
     ));

package/src/repo.ts

@@ -10,6 +10,7 @@ import {
   initKeyhiveWasm,
   initializeAutomergeRepoKeyhiveWithRepo,
   type AutomergeRepoKeyhive,
+  type SyncServerSelection,
 } from "@automerge/automerge-repo-keyhive";
 // eslint-disable-next-line
 // @ts-ignore — initSync is a wasm-bindgen runtime helper not in the .d.ts
@@ -21,11 +22,14 @@ import debug from "debug";
 
 const log = debug("patchwork:setup:repo");
 
-// Must match the automerge-worker's selection, or the tab and the SW grant
-// relay access to different servers.
-declare const __KEYHIVE_SYNC_SERVER__: boolean;
-const useKeyhiveSyncServer =
-  typeof __KEYHIVE_SYNC_SERVER__ !== "undefined" && __KEYHIVE_SYNC_SERVER__;
+declare const __SYNC_SERVER__: {
+  url: string;
+  keyhive?: SyncServerSelection;
+};
+const syncServer =
+  typeof __SYNC_SERVER__ !== "undefined"
+    ? __SYNC_SERVER__
+    : { url: "wss://subduction.sync.inkandswitch.com" };
 
 // Fetch and initialize automerge + subduction wasm. Memoized: the fetches start
 // on the first call and every later caller awaits the same init. Skipped
@@ -46,7 +50,6 @@ export function initWasm(): Promise<void> {
 }
 
 export async function createRepo(
-  config: { keyhive?: boolean },
   siteName: string,
   workerAdapter: MessageChannelNetworkAdapter
 ): Promise<{
@@ -54,7 +57,7 @@ export async function createRepo(
   hive?: AutomergeRepoKeyhive;
   signerIdentity?: SignerIdentity;
 }> {
-  if (config.keyhive) {
+  if (syncServer.keyhive) {
     log("setting up keyhive");
     initKeyhiveWasm();
     const { hive, repo } = await initializeAutomergeRepoKeyhiveWithRepo({
@@ -66,7 +69,7 @@ export async function createRepo(
       cachingMode: "periodic",
       onlyShareWithHardcodedServerPeerId: false,
       // ARK selects the relay via `syncServer`, defaulting to "subduction".
-      ...(useKeyhiveSyncServer ? { syncServer: "keyhive" as const } : {}),
+      syncServer: syncServer.keyhive,
       repo: {
         storage: new IndexedDBWorkerStorageAdapter(),
         enableRemoteHeadsGossiping: true,

package/src/site-kit/index.ts

@@ -12,6 +12,7 @@ export type {
   PatchworkIconsOptions,
   PatchworkHtmlOptions,
   PatchworkNetlifyOptions,
+  PatchworkKeyhiveSyncServer,
   PatchworkSyncServersOptions,
 } from "./options.js";
 

package/src/site-kit/options.ts

@@ -1,3 +1,5 @@
+import type { SyncServerIdentity } from "@automerge/automerge-repo-keyhive";
+
 /**
  * The bundler-agnostic option shape for a Patchwork site's generated
  * static assets (icons, index.html, manifest.webmanifest, Netlify config).
@@ -26,14 +28,19 @@ export interface PatchworkNetlifyOptions {
   immutableAssets?: boolean;
 }
 
-export interface PatchworkSyncServersOptions {
+type PatchworkPrimarySyncServerOptions =
+  | { subduction?: string; keyhive?: never }
+  | { subduction?: never; keyhive: PatchworkKeyhiveSyncServer };
+
+export type PatchworkKeyhiveSyncServer =
+  | "keyhive"
+  | "subduction"
+  | ({ url: string } & SyncServerIdentity);
+
+export type PatchworkSyncServersOptions = {
   /** wss:// URL for the legacy automerge-repo sync-server channel (connected on demand via connectClassicSync). Default: wss://sync3.automerge.org. Pass false to skip its preconnect hint. */
   classic?: string | false;
-  /** wss:// URL for subduction sync — live when keyhiveSyncServer is false. Default: wss://subduction.sync.inkandswitch.com */
-  subduction?: string;
-  /** wss:// URL for keyhive sync — live when keyhiveSyncServer is true. Default: wss://keyhive.sync.automerge.org */
-  keyhive?: string;
-}
+} & PatchworkPrimarySyncServerOptions;
 
 export interface PatchworkSiteOptions {
   /** -> __SITE_NAME__ define */
@@ -47,22 +54,17 @@ export interface PatchworkSiteOptions {
   /** default "/src/main.ts" — must be root-absolute, since the generated index.html doesn't live at the project root */
   entry?: string;
 
-  /** -> __KEYHIVE__ define */
-  keyhive?: boolean;
-  /** -> __KEYHIVE_SYNC_SERVER__ define */
-  keyhiveSyncServer?: boolean;
-
   themeColor?: string | { light: string; dark: string };
   /** manifest background_color */
   backgroundColor?: string;
 
   /**
-   * Which sync-server hosts to preconnect/dns-prefetch from the html and
-   * list in the Netlify Link header. Only the channel actually live for
-   * this build is included — subduction xor keyhive, picked by
-   * `keyhiveSyncServer`, matching automerge-worker.ts's own selection —
-   * plus `classic` (on-demand, but cheap to hint) unless set to `false`.
-   * Pass `false` to skip all sync-server hints.
+   * Sync-server configuration for this build. Providing `keyhive` enables
+   * keyhive and selects the relay identity ARK grants access to. Custom
+   * identities also require their WebSocket URL. `subduction` and `keyhive`
+   * are mutually exclusive. The live server and `classic` are also emitted as
+   * connection hints. Pass `false` to keep the default servers but skip those
+   * hints.
    */
   syncServers?: false | PatchworkSyncServersOptions;
 

package/src/site-kit/sync-servers.ts

@@ -1,36 +1,54 @@
 import type { PatchworkSiteOptions } from "./options.js";
+import type { SyncServerSelection } from "@automerge/automerge-repo-keyhive";
 
 // Mirrors core/bootloader/src/sync-config.ts's DEFAULT_CLASSIC_SYNC_SERVER
 // and automerge-worker.ts's SUBDUCTION_SYNC_URL selection — kept here as
 // plain constants (rather than importing those runtime modules) since this
 // only needs the hostnames, not the browser-only logic that reads them.
-const DEFAULT_SYNC_SERVERS = {
+export const DEFAULT_SYNC_SERVERS = {
   classic: "wss://sync3.automerge.org",
   subduction: "wss://subduction.sync.inkandswitch.com",
   keyhive: "wss://keyhive.sync.automerge.org",
 };
 
+export function resolvePrimarySyncServer(options: PatchworkSiteOptions): {
+  url: string;
+  keyhive?: SyncServerSelection;
+} {
+  const servers = options.syncServers || undefined;
+  if (servers?.keyhive) {
+    if (typeof servers.keyhive === "string") {
+      return {
+        keyhive: servers.keyhive,
+        url: DEFAULT_SYNC_SERVERS[servers.keyhive],
+      };
+    }
+    const { url, ...identity } = servers.keyhive;
+    return {
+      keyhive: identity,
+      url,
+    };
+  }
+  return {
+    url: servers?.subduction ?? DEFAULT_SYNC_SERVERS.subduction,
+  };
+}
+
 function wsToHttpOrigin(wsUrl: string): string {
   return wsUrl.replace(/^ws/, "http");
 }
 
 /**
  * Resolves which sync-server origins are actually live for this build: the
- * channel that's live is subduction xor keyhive (picked by
- * `keyhiveSyncServer`, matching automerge-worker.ts's own selection) plus
- * classic (on-demand, but still worth a preconnect hint) unless disabled.
- * A flat list would drift from `keyhiveSyncServer` — e.g. always hinting
- * subduction even on a build that actually connects to keyhive.
+ * channel that's live is subduction xor keyhive plus classic (on-demand,
+ * but still worth a preconnect hint) unless disabled.
  */
 export function resolveSyncServers(options: PatchworkSiteOptions): string[] {
   if (options.syncServers === false) return [];
-  const servers = { ...DEFAULT_SYNC_SERVERS, ...options.syncServers };
-  const origins: string[] = [];
-  const primary = options.keyhiveSyncServer
-    ? servers.keyhive
-    : servers.subduction;
-  origins.push(primary);
-  if (servers.classic) origins.push(servers.classic);
+  const primary = resolvePrimarySyncServer(options);
+  const classic = options.syncServers?.classic ?? DEFAULT_SYNC_SERVERS.classic;
+  const origins = [primary.url];
+  if (classic) origins.push(classic);
   return origins.map(wsToHttpOrigin);
 }
 

package/src/types.ts

@@ -78,12 +78,6 @@ export interface PatchworkOptions {
   /** DOM id of the `<patchwork-view>` hosting the root tool. Defaults to "root". */
   rootElementId?: string;
 
-  /**
-   * Initialize keyhive for access control. The Repo then uses keyhive's network
-   * adapter, peerId and idFactory instead of a sharePolicy.
-   */
-  keyhive?: boolean;
-
   /**
    * Bring your own Repo. When provided, setup skips wasm initialization and
    * repo creation entirely — you are responsible for having initialized

package/src/vite/config-plugin.ts

@@ -1,11 +1,15 @@
 import type { Plugin } from "vite";
 import wasm from "vite-plugin-wasm";
 import type { PatchworkVitePluginOptions } from "./patchwork-plugin.js";
+import {
+  DEFAULT_SYNC_SERVERS,
+  resolvePrimarySyncServer,
+} from "../site-kit/sync-servers.js";
 
 const CORS_HEADERS = { "Access-Control-Allow-Origin": "*" };
 
 /**
- * Owns envPrefix, define (__SITE_NAME__/__KEYHIVE__/__KEYHIVE_SYNC_SERVER__),
+ * Owns envPrefix, define (__SITE_NAME__/sync-server configuration),
  * server/preview CORS defaults, worker format + the wasm plugin, and build
  * defaults (firefox150 target, unminified, sourcemapped) — everything a site
  * used to hand-write in its own vite.config.ts. Each is switched off
@@ -17,11 +21,14 @@ export function configPlugin(
   return {
     name: "@patchwork/config",
     config() {
+      const primarySyncServer = resolvePrimarySyncServer(options);
+      const classicSyncServer =
+        options.syncServers && typeof options.syncServers.classic === "string"
+          ? options.syncServers.classic
+          : DEFAULT_SYNC_SERVERS.classic;
       const define: Record<string, string> = {
-        __KEYHIVE__: JSON.stringify(options.keyhive ?? false),
-        __KEYHIVE_SYNC_SERVER__: JSON.stringify(
-          options.keyhiveSyncServer ?? false
-        ),
+        __SYNC_SERVER__: JSON.stringify(primarySyncServer),
+        __CLASSIC_SYNC_SERVER__: JSON.stringify(classicSyncServer),
       };
       if (options.siteName) {
         define.__SITE_NAME__ = JSON.stringify(options.siteName);

package/src/vite/patchwork-plugin.ts

@@ -54,6 +54,7 @@ export type {
   PatchworkIconsOptions,
   PatchworkHtmlOptions,
   PatchworkNetlifyOptions,
+  PatchworkKeyhiveSyncServer,
   PatchworkSyncServersOptions,
 } from "../site-kit/options.js";