@notionhq/custom-blocks 0.0.78 → 0.0.79

package/HOST.md

@@ -25,6 +25,7 @@ import { createCustomBlockHost } from "@notionhq/custom-blocks/host";
 
 const host = createCustomBlockHost({
   iframe,
+  minBridgeProtocolVersion: 3,
   initialState: {
     theme,
     blockId,
@@ -35,14 +36,20 @@ const host = createCustomBlockHost({
     dataSources: { bindings },
   },
   handlers: {
-    queryDataSource: async (message) => ({ status: "success", items: [], hasMore: false }),
+    queryDataSource: async (message) => ({
+      status: "success",
+      items: [],
+      hasMore: false,
+    }),
   },
 });
 ```
 
 Use it when the generic protocol loop is helpful. Hosts with more specialized runtime needs can keep using the schemas and message types directly.
 
-Related types: `CustomBlockHostOptions`, `CustomBlockHostInitialState`, `CustomBlockHostInitialDataSources`, `CustomBlockHostDataSourcesPayload`, `ConnectSuccessMessage`, `CustomBlockHostHandlers`, `CustomBlockHostHandle`, `CustomBlockHostLogDirection`, `CustomBlockHostQueryDataSourceResult`, `CustomBlockHostCreatePageResult`, `CustomBlockHostGetPageResult`, `CustomBlockHostUpdatePageResult`, `CustomBlockHostGetUserResult`, and `CustomBlockHostListUsersResult`.
+Responses return a `status`-discriminated result: `"success"` carries `items` and required `hasMore`; `"error"` carries the structured `error`. Set `hasMore` to `false` when no additional results are available.
+
+Related exports: `CustomBlockHostOptions`, `CustomBlockHostInitialState`, `CustomBlockHostInitialDataSources`, `CustomBlockHostDataSourcesPayload`, `ConnectSuccessMessage`, `CustomBlockHostHandlers`, `CustomBlockHostHandle`, `CustomBlockHostLogDirection`, `CustomBlockHostQueryDataSourceResult`, `CustomBlockHostCreatePageResult`, `CustomBlockHostGetPageResult`, `CustomBlockHostUpdatePageResult`, `CustomBlockHostGetUserResult`, and `CustomBlockHostListUsersResult`.
 
 ## Bridge protocol
 

package/README.md

@@ -35,7 +35,7 @@ export function App() {
 }
 ```
 
-`<NotionCustomBlock>` runs the SDK ↔ host handshake (sends `ready` with the manifest, awaits `init`) and only mounts `children` once it resolves. Inside the wrapper, every hook returns non-nullable values — there's no separate gating component to write. It also runs `useCustomBlockAutoResize` for you by default; pass `autoResize={false}` to opt out.
+`<NotionCustomBlock>` runs the SDK ↔ host handshake (`connect` → `init` → `initResult`) and only mounts `children` once it resolves. Inside the wrapper, every hook returns non-nullable values — there's no separate gating component to write. It also runs `useCustomBlockAutoResize` for you by default; pass `autoResize={false}` to opt out.
 
 ## Reference
 

package/dist/bridge/SandboxBridge.d.ts

@@ -9,7 +9,7 @@ import { type InitMessage } from "./messages/init.js";
  * single host needs to support multiple custom blocks built with different versions of the bridge
  * protocol. Increment this number any time a breaking change is made to the bridge protocol.
  */
-export declare const CUSTOM_BLOCK_BRIDGE_PROTOCOL_VERSION = 2;
+export declare const CUSTOM_BLOCK_BRIDGE_PROTOCOL_VERSION = 3;
 /**
  * A single entry in the bridge message log. Kept intentionally plain so the log
  * is copy-pasteable to a local coding agent without needing extra context.

package/dist/bridge/SandboxBridge.js

@@ -13,7 +13,7 @@ import { PendingRequests } from "./pendingRequests.js";
  * single host needs to support multiple custom blocks built with different versions of the bridge
  * protocol. Increment this number any time a breaking change is made to the bridge protocol.
  */
-export const CUSTOM_BLOCK_BRIDGE_PROTOCOL_VERSION = 2;
+export const CUSTOM_BLOCK_BRIDGE_PROTOCOL_VERSION = 3;
 export class SandboxBridge {
     constructor() {
         this.hostState = {

package/dist/bridge/messages/connect.d.ts

@@ -41,7 +41,7 @@ export declare const connectMessageSchema: v.VariantSchema<"status", [v.ObjectSc
     readonly error: v.ObjectSchema<{
         readonly code: v.StringSchema<undefined>;
         readonly message: v.StringSchema<undefined>;
-        readonly isRetryable: v.OptionalSchema<v.BooleanSchema<undefined>, false>;
+        readonly isRetryable: v.BooleanSchema<undefined>;
     }, undefined>;
 }, undefined>], undefined>;
 export type ConnectMessage = v.InferOutput<typeof connectMessageSchema>;

package/dist/bridge/messages/connect.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"connect.d.ts","sourceRoot":"","sources":["../../../../../home/runner/work/custom-blocks/custom-blocks/sdk/src/bridge/messages/connect.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,CAAC,MAAM,SAAS,CAAA;AA2B5B;;;GAGG;AACH,eAAO,MAAM,oBAAoB;;;;;;IAG/B;;;OAGG;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;0BASH,CAAA;AAEF,MAAM,MAAM,cAAc,GAAG,CAAC,CAAC,WAAW,CAAC,OAAO,oBAAoB,CAAC,CAAA"}
+{"version":3,"file":"connect.d.ts","sourceRoot":"","sources":["../../../../../home/runner/work/custom-blocks/custom-blocks/sdk/src/bridge/messages/connect.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,CAAC,MAAM,SAAS,CAAA;AAoB5B;;;GAGG;AACH,eAAO,MAAM,oBAAoB;;;;;;IAG/B;;;OAGG;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;0BASH,CAAA;AAEF,MAAM,MAAM,cAAc,GAAG,CAAC,CAAC,WAAW,CAAC,OAAO,oBAAoB,CAAC,CAAA"}

package/dist/bridge/messages/connect.js

@@ -1,4 +1,5 @@
 import * as v from "valibot";
+import { customBlockErrorInfoSchema } from "../errors.js";
 import { manifestSchema } from "../manifest.js";
 const connectMessageCommonEntries = {
     type: v.literal("connect"),
@@ -15,13 +16,6 @@ const connectMessageCommonEntries = {
      */
     sdkVersion: v.string(),
 };
-// TODO(custom-blocks): Replace with `customBlockErrorInfoSchema` which makes `isRetryable` required
-// once min supported bridge protocol version is bumped to 3.
-const connectErrorSchema = v.object({
-    code: v.string(),
-    message: v.string(),
-    isRetryable: v.optional(v.boolean(), false),
-});
 /**
  * First message the sandbox sends after mount. It identifies the sandbox and starts the bridge
  * initialization exchange. The host echoes `initializationId` in its `init` response.
@@ -38,7 +32,7 @@ export const connectMessageSchema = v.variant("status", [
     }),
     v.object({
         status: v.literal("error"),
-        error: connectErrorSchema,
+        error: customBlockErrorInfoSchema,
         ...connectMessageCommonEntries,
     }),
 ]);

package/dist/bridge/messages/sandboxToHost.d.ts

@@ -37,7 +37,7 @@ export declare const sandboxToHostMessageSchema: v.UnionSchema<[v.VariantSchema<
     readonly error: v.ObjectSchema<{
         readonly code: v.StringSchema<undefined>;
         readonly message: v.StringSchema<undefined>;
-        readonly isRetryable: v.OptionalSchema<v.BooleanSchema<undefined>, false>;
+        readonly isRetryable: v.BooleanSchema<undefined>;
     }, undefined>;
 }, undefined>], undefined>, v.VariantSchema<"status", [v.ObjectSchema<{
     readonly type: v.LiteralSchema<"initResult", undefined>;

package/dist/host/createCustomBlockHost.d.ts

@@ -11,7 +11,7 @@ import type { CustomBlockHostQueryDataSourceResult } from "./queries/types.js";
 export type CustomBlockHostOptions = {
     iframe: HTMLIFrameElement;
     targetOrigin?: string;
-    minBridgeProtocolVersion?: number;
+    minBridgeProtocolVersion: number;
     noConnectTimeoutMs?: number;
     noInitResultTimeoutMs?: number;
     initialState: CustomBlockHostInitialState;

package/dist/host/createCustomBlockHost.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"createCustomBlockHost.d.ts","sourceRoot":"","sources":["../../../../home/runner/work/custom-blocks/custom-blocks/sdk/src/host/createCustomBlockHost.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,kBAAkB,CAAA;AAc1D,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,qCAAqC,CAAA;AAM/E,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,kCAAkC,CAAA;AAazE,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,yBAAyB,CAAA;AAC9D,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,qBAAqB,CAAA;AACvD,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,oBAAoB,CAAA;AACrD,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,yBAAyB,CAAA;AAIzD,OAAO,KAAK,EACX,qBAAqB,EACrB,iCAAiC,EACjC,2BAA2B,EAE3B,MAAM,sBAAsB,CAAA;AAE7B,OAAO,KAAK,EACX,uBAAuB,EACvB,2BAA2B,EAC3B,MAAM,qBAAqB,CAAA;AAE5B,OAAO,KAAK,EAAE,oCAAoC,EAAE,MAAM,oBAAoB,CAAA;AAE9E,MAAM,MAAM,sBAAsB,GAAG;IACpC,MAAM,EAAE,iBAAiB,CAAA;IACzB,YAAY,CAAC,EAAE,MAAM,CAAA;IACrB,wBAAwB,CAAC,EAAE,MAAM,CAAA;IACjC,kBAAkB,CAAC,EAAE,MAAM,CAAA;IAC3B,qBAAqB,CAAC,EAAE,MAAM,CAAA;IAC9B,YAAY,EAAE,2BAA2B,CAAA;IACzC,QAAQ,EAAE,uBAAuB,CAAA;IACjC,SAAS,CAAC,EAAE,CAAC,OAAO,EAAE,qBAAqB,KAAK,IAAI,CAAA;IACpD,YAAY,CAAC,EAAE,CAAC,OAAO,EAAE,iBAAiB,KAAK,IAAI,CAAA;IACnD,KAAK,CAAC,EAAE,CAAC,SAAS,EAAE,2BAA2B,EAAE,OAAO,EAAE,OAAO,KAAK,IAAI,CAAA;CAC1E,CAAA;AAED,MAAM,MAAM,qBAAqB,GAAG;IACnC,IAAI,EAAE,MAAM,IAAI,CAAA;IAChB,IAAI,EAAE,CAAC,OAAO,EAAE,oBAAoB,KAAK,IAAI,CAAA;IAC7C,QAAQ,EAAE,CAAC,KAAK,EAAE,WAAW,KAAK,IAAI,CAAA;IACtC,SAAS,EAAE,CAAC,MAAM,EAAE,YAAY,KAAK,IAAI,CAAA;IACzC,OAAO,EAAE,CAAC,IAAI,EAAE,eAAe,KAAK,IAAI,CAAA;IACxC,cAAc,EAAE,CAAC,WAAW,EAAE,iCAAiC,KAAK,IAAI,CAAA;IACxE,cAAc,EAAE,CAAC,WAAW,EAAE,UAAU,KAAK,IAAI,CAAA;IACjD,YAAY,EAAE,CAAC,IAAI,EAAE;QACpB,YAAY,EAAE,kBAAkB,CAAA;QAChC,QAAQ,EAAE,oCAAoC,CAAA;KAC9C,KAAK,IAAI,CAAA;CACV,CAAA;AAMD,wBAAgB,qBAAqB,CACpC,OAAO,EAAE,sBAAsB,GAC7B,qBAAqB,CA8evB"}
+{"version":3,"file":"createCustomBlockHost.d.ts","sourceRoot":"","sources":["../../../../home/runner/work/custom-blocks/custom-blocks/sdk/src/host/createCustomBlockHost.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,kBAAkB,CAAA;AAc1D,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,qCAAqC,CAAA;AAM/E,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,kCAAkC,CAAA;AAazE,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,yBAAyB,CAAA;AAC9D,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,qBAAqB,CAAA;AAEvD,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,oBAAoB,CAAA;AACrD,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,yBAAyB,CAAA;AAIzD,OAAO,KAAK,EACX,qBAAqB,EACrB,iCAAiC,EACjC,2BAA2B,EAE3B,MAAM,sBAAsB,CAAA;AAE7B,OAAO,KAAK,EACX,uBAAuB,EACvB,2BAA2B,EAC3B,MAAM,qBAAqB,CAAA;AAE5B,OAAO,KAAK,EAAE,oCAAoC,EAAE,MAAM,oBAAoB,CAAA;AAE9E,MAAM,MAAM,sBAAsB,GAAG;IACpC,MAAM,EAAE,iBAAiB,CAAA;IACzB,YAAY,CAAC,EAAE,MAAM,CAAA;IACrB,wBAAwB,EAAE,MAAM,CAAA;IAChC,kBAAkB,CAAC,EAAE,MAAM,CAAA;IAC3B,qBAAqB,CAAC,EAAE,MAAM,CAAA;IAC9B,YAAY,EAAE,2BAA2B,CAAA;IACzC,QAAQ,EAAE,uBAAuB,CAAA;IACjC,SAAS,CAAC,EAAE,CAAC,OAAO,EAAE,qBAAqB,KAAK,IAAI,CAAA;IACpD,YAAY,CAAC,EAAE,CAAC,OAAO,EAAE,iBAAiB,KAAK,IAAI,CAAA;IACnD,KAAK,CAAC,EAAE,CAAC,SAAS,EAAE,2BAA2B,EAAE,OAAO,EAAE,OAAO,KAAK,IAAI,CAAA;CAC1E,CAAA;AAED,MAAM,MAAM,qBAAqB,GAAG;IACnC,IAAI,EAAE,MAAM,IAAI,CAAA;IAChB,IAAI,EAAE,CAAC,OAAO,EAAE,oBAAoB,KAAK,IAAI,CAAA;IAC7C,QAAQ,EAAE,CAAC,KAAK,EAAE,WAAW,KAAK,IAAI,CAAA;IACtC,SAAS,EAAE,CAAC,MAAM,EAAE,YAAY,KAAK,IAAI,CAAA;IACzC,OAAO,EAAE,CAAC,IAAI,EAAE,eAAe,KAAK,IAAI,CAAA;IACxC,cAAc,EAAE,CAAC,WAAW,EAAE,iCAAiC,KAAK,IAAI,CAAA;IACxE,cAAc,EAAE,CAAC,WAAW,EAAE,UAAU,KAAK,IAAI,CAAA;IACjD,YAAY,EAAE,CAAC,IAAI,EAAE;QACpB,YAAY,EAAE,kBAAkB,CAAA;QAChC,QAAQ,EAAE,oCAAoC,CAAA;KAC9C,KAAK,IAAI,CAAA;CACV,CAAA;AAQD,wBAAgB,qBAAqB,CACpC,OAAO,EAAE,sBAAsB,GAC7B,qBAAqB,CA+fvB"}

package/dist/host/createCustomBlockHost.js

@@ -1,15 +1,19 @@
 import * as v from "valibot";
 import { sandboxToHostMessageSchema } from "../bridge/messages/sandboxToHost.js";
+import { CUSTOM_BLOCK_BRIDGE_PROTOCOL_VERSION } from "../bridge/SandboxBridge.js";
 import { unreachable } from "../utils.js";
 import { initErrorForFailureReason } from "./lifecycle/initErrors.js";
-import { isValidBridgeProtocolVersion } from "./lifecycle/ready.js";
+import { isValidBridgeProtocolVersion } from "./lifecycle/protocolVersion.js";
 import { getInvalidSandboxMessageResponse } from "./messages/invalidSandboxMessage.js";
 import { QuerySubscriptions } from "./queries/querySubscriptions.js";
 const DEFAULT_NO_CONNECT_TIMEOUT_MS = 5000;
 const DEFAULT_NO_INIT_RESULT_TIMEOUT_MS = 5000;
-const DEFAULT_MIN_BRIDGE_PROTOCOL_VERSION = 2;
+const initializationIdentitySchema = v.object({
+    initializationId: v.string(),
+});
 export function createCustomBlockHost(options) {
-    const { iframe, initialState, handlers, onConnect, onInitResult, onLog, targetOrigin = "*", minBridgeProtocolVersion = DEFAULT_MIN_BRIDGE_PROTOCOL_VERSION, noConnectTimeoutMs = DEFAULT_NO_CONNECT_TIMEOUT_MS, noInitResultTimeoutMs = DEFAULT_NO_INIT_RESULT_TIMEOUT_MS, } = options;
+    const { iframe, initialState, handlers, onConnect, onInitResult, onLog, targetOrigin = "*", minBridgeProtocolVersion: configuredMinBridgeProtocolVersion, noConnectTimeoutMs = DEFAULT_NO_CONNECT_TIMEOUT_MS, noInitResultTimeoutMs = DEFAULT_NO_INIT_RESULT_TIMEOUT_MS, } = options;
+    const minBridgeProtocolVersion = Math.max(configuredMinBridgeProtocolVersion ?? CUSTOM_BLOCK_BRIDGE_PROTOCOL_VERSION, CUSTOM_BLOCK_BRIDGE_PROTOCOL_VERSION);
     let theme = initialState.theme;
     let parent = initialState.parent;
     let page = initialState.page;
@@ -286,7 +290,16 @@ export function createCustomBlockHost(options) {
             issues,
         });
         const response = getInvalidSandboxMessageResponse(data);
-        if (response.nack !== undefined) {
+        const parsedIdentity = v.safeParse(initializationIdentitySchema, data);
+        const initializationId = parsedIdentity.success
+            ? parsedIdentity.output.initializationId
+            : undefined;
+        if (initStatus === "waitingForConnect" &&
+            response.incomingType === "connect" &&
+            initializationId !== undefined) {
+            sendInitError(initializationId, initErrorForFailureReason("invalid_connect"));
+        }
+        else if (response.nack !== undefined) {
             post(response.nack);
         }
     }

package/dist/host/lifecycle/{ready.d.ts → protocolVersion.d.ts}

@@ -1,2 +1,2 @@
 export declare function isValidBridgeProtocolVersion(version: number): boolean;
-//# sourceMappingURL=ready.d.ts.map
+//# sourceMappingURL=protocolVersion.d.ts.map

package/dist/host/lifecycle/protocolVersion.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"protocolVersion.d.ts","sourceRoot":"","sources":["../../../../../home/runner/work/custom-blocks/custom-blocks/sdk/src/host/lifecycle/protocolVersion.ts"],"names":[],"mappings":"AAAA,wBAAgB,4BAA4B,CAAC,OAAO,EAAE,MAAM,GAAG,OAAO,CAErE"}

package/dist/version.js

@@ -4,4 +4,4 @@
  *
  * WARNING: Generated during SDK publish. Do not edit in the published package.
  */
-export const CUSTOM_BLOCKS_SDK_VERSION = "0.0.78"
+export const CUSTOM_BLOCKS_SDK_VERSION = "0.0.79"

package/docs/data-sources.md

@@ -115,8 +115,8 @@ export function ScoreList() {
   if (error) return <div role="alert">Couldn't load: {error.message}</div>;
   if (isLoading && items.length === 0) return <div>Loading…</div>;
 
-  const ready = items.filter(isComplete);
-  if (ready.length === 0) {
+  const displayItems = items.filter(isComplete);
+  if (displayItems.length === 0) {
     return (
       <div>
         Map a data source with key <code>{KEY}</code> exposing <code>name</code>{" "}
@@ -128,7 +128,7 @@ export function ScoreList() {
   return (
     <div>
       <ul>
-        {ready.map((item) => (
+        {displayItems.map((item) => (
           <li key={item.id}>
             {String(item.propertiesByKey.name)} —{" "}
             {Number(item.propertiesByKey.score)}

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@notionhq/custom-blocks",
-	"version": "0.0.78",
+	"version": "0.0.79",
 	"license": "MIT",
 	"type": "module",
 	"publishConfig": {

package/src/bridge/SandboxBridge.ts

@@ -63,7 +63,7 @@ import type { NotionUser } from "./users/user.js"
  * single host needs to support multiple custom blocks built with different versions of the bridge
  * protocol. Increment this number any time a breaking change is made to the bridge protocol.
  */
-export const CUSTOM_BLOCK_BRIDGE_PROTOCOL_VERSION = 2
+export const CUSTOM_BLOCK_BRIDGE_PROTOCOL_VERSION = 3
 
 /**
  * A single entry in the bridge message log. Kept intentionally plain so the log

package/src/bridge/messages/connect.ts

@@ -1,4 +1,5 @@
 import * as v from "valibot"
+import { customBlockErrorInfoSchema } from "../errors.js"
 import { manifestSchema } from "../manifest.js"
 
 const connectMessageCommonEntries = {
@@ -17,14 +18,6 @@ const connectMessageCommonEntries = {
 	sdkVersion: v.string(),
 }
 
-// TODO(custom-blocks): Replace with `customBlockErrorInfoSchema` which makes `isRetryable` required
-// once min supported bridge protocol version is bumped to 3.
-const connectErrorSchema = v.object({
-	code: v.string(),
-	message: v.string(),
-	isRetryable: v.optional(v.boolean(), false),
-})
-
 /**
  * First message the sandbox sends after mount. It identifies the sandbox and starts the bridge
  * initialization exchange. The host echoes `initializationId` in its `init` response.
@@ -41,7 +34,7 @@ export const connectMessageSchema = v.variant("status", [
 	}),
 	v.object({
 		status: v.literal("error"),
-		error: connectErrorSchema,
+		error: customBlockErrorInfoSchema,
 		...connectMessageCommonEntries,
 	}),
 ])

package/src/host/createCustomBlockHost.ts

@@ -34,11 +34,12 @@ import type { UpdatePageMessage } from "../bridge/messages/updatePage.js"
 import type { UpdatePageResultMessage } from "../bridge/messages/updatePageResult.js"
 import type { CustomBlockPage } from "../bridge/pages/page.js"
 import type { NotionParent } from "../bridge/parent.js"
+import { CUSTOM_BLOCK_BRIDGE_PROTOCOL_VERSION } from "../bridge/SandboxBridge.js"
 import type { NotionTheme } from "../bridge/theme.js"
 import type { NotionUser } from "../bridge/users/user.js"
 import { unreachable } from "../utils.js"
 import { initErrorForFailureReason } from "./lifecycle/initErrors.js"
-import { isValidBridgeProtocolVersion } from "./lifecycle/ready.js"
+import { isValidBridgeProtocolVersion } from "./lifecycle/protocolVersion.js"
 import type {
 	ConnectSuccessMessage,
 	CustomBlockHostDataSourcesPayload,
@@ -56,7 +57,7 @@ import type { CustomBlockHostQueryDataSourceResult } from "./queries/types.js"
 export type CustomBlockHostOptions = {
 	iframe: HTMLIFrameElement
 	targetOrigin?: string
-	minBridgeProtocolVersion?: number
+	minBridgeProtocolVersion: number
 	noConnectTimeoutMs?: number
 	noInitResultTimeoutMs?: number
 	initialState: CustomBlockHostInitialState
@@ -82,7 +83,9 @@ export type CustomBlockHostHandle = {
 
 const DEFAULT_NO_CONNECT_TIMEOUT_MS = 5_000
 const DEFAULT_NO_INIT_RESULT_TIMEOUT_MS = 5_000
-const DEFAULT_MIN_BRIDGE_PROTOCOL_VERSION = 2
+const initializationIdentitySchema = v.object({
+	initializationId: v.string(),
+})
 
 export function createCustomBlockHost(
 	options: CustomBlockHostOptions,
@@ -95,10 +98,14 @@ export function createCustomBlockHost(
 		onInitResult,
 		onLog,
 		targetOrigin = "*",
-		minBridgeProtocolVersion = DEFAULT_MIN_BRIDGE_PROTOCOL_VERSION,
+		minBridgeProtocolVersion: configuredMinBridgeProtocolVersion,
 		noConnectTimeoutMs = DEFAULT_NO_CONNECT_TIMEOUT_MS,
 		noInitResultTimeoutMs = DEFAULT_NO_INIT_RESULT_TIMEOUT_MS,
 	} = options
+	const minBridgeProtocolVersion = Math.max(
+		configuredMinBridgeProtocolVersion ?? CUSTOM_BLOCK_BRIDGE_PROTOCOL_VERSION,
+		CUSTOM_BLOCK_BRIDGE_PROTOCOL_VERSION,
+	)
 
 	let theme = initialState.theme
 	let parent = initialState.parent
@@ -418,7 +425,20 @@ export function createCustomBlockHost(
 		})
 		const response = getInvalidSandboxMessageResponse(data)
 
-		if (response.nack !== undefined) {
+		const parsedIdentity = v.safeParse(initializationIdentitySchema, data)
+		const initializationId = parsedIdentity.success
+			? parsedIdentity.output.initializationId
+			: undefined
+		if (
+			initStatus === "waitingForConnect" &&
+			response.incomingType === "connect" &&
+			initializationId !== undefined
+		) {
+			sendInitError(
+				initializationId,
+				initErrorForFailureReason("invalid_connect"),
+			)
+		} else if (response.nack !== undefined) {
 			post(response.nack)
 		}
 	}

package/dist/host/lifecycle/ready.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"ready.d.ts","sourceRoot":"","sources":["../../../../../home/runner/work/custom-blocks/custom-blocks/sdk/src/host/lifecycle/ready.ts"],"names":[],"mappings":"AAAA,wBAAgB,4BAA4B,CAAC,OAAO,EAAE,MAAM,GAAG,OAAO,CAErE"}