@chat-de-hp/site 0.2.6 → 0.2.7

package/dist/astro.js

@@ -3,7 +3,7 @@ import react from "@astrojs/react";
 import { d1, r2 } from "@emdash-cms/cloudflare";
 import { defineConfig } from "astro/config";
 import emdash from "emdash/astro";
-import { createAnnotationOnlyIntegration } from "./internal/annotation-integration.js";
+import { createPublicAnnotationsIntegration } from "./internal/annotation-integration.js";
 import { createApprovedAstroPlugins } from "./internal/astro-plugins.js";
 import { resolveSiteDefinition } from "./internal/registry.js";
 const SITE_ASTRO_OPTION_KEYS = [
@@ -53,7 +53,7 @@ export function createChatDeHpAstroConfig(site, options = {}) {
                 plugins: plugins,
                 storage: r2({ binding: "MEDIA" }),
             }),
-            createAnnotationOnlyIntegration(),
+            createPublicAnnotationsIntegration(),
         ],
         output: "server",
     });

package/dist/emdash-annotation.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"emdash-annotation.d.ts","sourceRoot":"","sources":["../src/emdash-annotation.ts"],"names":[],"mappings":"AAKA,OAAO,KAAK,EACV,gBAAgB,EAChB,gBAAgB,EAEhB,WAAW,EACX,mBAAmB,EACpB,MAAM,QAAQ,CAAC;AAKhB,cAAc,QAAQ,CAAC;AAEvB,wBAAsB,mBAAmB,CACvC,CAAC,SAAS,MAAM,EAChB,CAAC,GAAG,mBAAmB,CAAC,CAAC,CAAC,EAC1B,IAAI,EAAE,CAAC,EAAE,MAAM,CAAC,EAAE,gBAAgB,GAAG,OAAO,CAAC,gBAAgB,CAAC,CAAC,CAAC,CAAC,CAUlE;AAED,wBAAsB,cAAc,CAClC,CAAC,SAAS,MAAM,EAChB,CAAC,GAAG,mBAAmB,CAAC,CAAC,CAAC,EAC1B,IAAI,EAAE,CAAC,EAAE,EAAE,EAAE,MAAM,EAAE,OAAO,CAAC,EAAE;IAAE,MAAM,CAAC,EAAE,MAAM,CAAA;CAAE,GAAG,OAAO,CAAC,WAAW,CAAC,CAAC,CAAC,CAAC,CAU7E"}
+{"version":3,"file":"emdash-annotation.d.ts","sourceRoot":"","sources":["../src/emdash-annotation.ts"],"names":[],"mappings":"AAKA,OAAO,KAAK,EACV,gBAAgB,EAChB,gBAAgB,EAEhB,WAAW,EACX,mBAAmB,EACpB,MAAM,QAAQ,CAAC;AAGhB,cAAc,QAAQ,CAAC;AAEvB,wBAAsB,mBAAmB,CACvC,CAAC,SAAS,MAAM,EAChB,CAAC,GAAG,mBAAmB,CAAC,CAAC,CAAC,EAC1B,IAAI,EAAE,CAAC,EAAE,MAAM,CAAC,EAAE,gBAAgB,GAAG,OAAO,CAAC,gBAAgB,CAAC,CAAC,CAAC,CAAC,CAMlE;AAED,wBAAsB,cAAc,CAClC,CAAC,SAAS,MAAM,EAChB,CAAC,GAAG,mBAAmB,CAAC,CAAC,CAAC,EAC1B,IAAI,EAAE,CAAC,EAAE,EAAE,EAAE,MAAM,EAAE,OAAO,CAAC,EAAE;IAAE,MAAM,CAAC,EAAE,MAAM,CAAA;CAAE,GAAG,OAAO,CAAC,WAAW,CAAC,CAAC,CAAC,CAAC,CAU7E"}

package/dist/emdash-annotation.js

@@ -1,12 +1,8 @@
 import { createEditable, getEmDashCollection as getPublishedEmDashCollection, getEmDashEntry as getPublishedEmDashEntry, } from "emdash";
-import { isAnnotationMode } from "./internal/annotation-context.js";
 // oxlint-disable-next-line no-barrel-file -- this compatibility module preserves the existing EmDash API while overriding only its two content queries
 export * from "emdash";
 export async function getEmDashCollection(type, filter) {
     const result = await getPublishedEmDashCollection(type, filter);
-    if (!isAnnotationMode()) {
-        return result;
-    }
     return {
         ...result,
         entries: result.entries.map((entry) => annotateEntry(type, entry)),
@@ -14,7 +10,7 @@ export async function getEmDashCollection(type, filter) {
 }
 export async function getEmDashEntry(type, id, options) {
     const result = await getPublishedEmDashEntry(type, id, options);
-    if (!(isAnnotationMode() && result.entry)) {
+    if (!result.entry) {
         return result;
     }
     return {

package/dist/internal/annotation-integration.d.ts

@@ -1,3 +1,3 @@
 import type { AstroIntegration } from "astro";
-export declare function createAnnotationOnlyIntegration(): AstroIntegration;
+export declare function createPublicAnnotationsIntegration(): AstroIntegration;
 //# sourceMappingURL=annotation-integration.d.ts.map

package/dist/internal/annotation-integration.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"annotation-integration.d.ts","sourceRoot":"","sources":["../../src/internal/annotation-integration.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,OAAO,CAAC;AAK9C,wBAAgB,+BAA+B,IAAI,gBAAgB,CAqBlE"}
+{"version":3,"file":"annotation-integration.d.ts","sourceRoot":"","sources":["../../src/internal/annotation-integration.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,OAAO,CAAC;AAK9C,wBAAgB,kCAAkC,IAAI,gBAAgB,CAiBrE"}

package/dist/internal/annotation-integration.js

@@ -1,12 +1,8 @@
-const ANNOTATION_INTEGRATION_NAME = "@chat-de-hp/site/annotation-only";
-export function createAnnotationOnlyIntegration() {
+const ANNOTATION_INTEGRATION_NAME = "@chat-de-hp/site/public-annotations";
+export function createPublicAnnotationsIntegration() {
     return {
         hooks: {
-            "astro:config:setup": ({ addMiddleware, injectScript, updateConfig }) => {
-                addMiddleware({
-                    entrypoint: "@chat-de-hp/site/annotation-middleware",
-                    order: "pre",
-                });
+            "astro:config:setup": ({ injectScript, updateConfig }) => {
                 injectScript("page", 'import "@chat-de-hp/site/runtime/annotation-capture";');
                 updateConfig({
                     vite: {

package/dist/runtime/annotation-capture.d.ts

@@ -1,2 +1,2 @@
-export {};
+export declare function startAnnotationCapture(): () => void;
 //# sourceMappingURL=annotation-capture.d.ts.map

package/dist/runtime/annotation-capture.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"annotation-capture.d.ts","sourceRoot":"","sources":["../../src/runtime/annotation-capture.ts"],"names":[],"mappings":""}
+{"version":3,"file":"annotation-capture.d.ts","sourceRoot":"","sources":["../../src/runtime/annotation-capture.ts"],"names":[],"mappings":"AAkBA,wBAAgB,sBAAsB,eA2DrC"}

package/dist/runtime/annotation-capture.js

@@ -1,69 +1,61 @@
-import { isExpectedSiteCaptureParentMessage, SITE_CAPTURE_BOOT_NONCE_PARAM, SITE_CAPTURE_BOOT_PAGE_HASH_PARAM, SITE_CAPTURE_BOOT_PARENT_ORIGIN_PARAM, SITE_CAPTURE_MESSAGE_TYPE, SITE_CAPTURE_PARENT_ORIGIN_COOKIE, SITE_CAPTURE_SESSION_STORAGE_KEY, } from "./capture-contract.js";
+import { isExpectedSiteCaptureParentMessage, SITE_CAPTURE_BOOT_PAGE_HASH_PARAM, SITE_CAPTURE_BOOT_PARENT_ORIGIN_PARAM, SITE_CAPTURE_MESSAGE_TYPE, SITE_CAPTURE_SESSION_STORAGE_KEY, } from "./capture-contract.js";
 import { freezeCaptureViewport } from "./capture-viewport.js";
-import { SITE_ANNOTATION_END_PARAM } from "./contracts.js";
 import { extractElements } from "./element-extractor.js";
 let captureFrozen = false;
-let endSessionPromise = null;
 let resumeViewport = null;
-function startAnnotationCapture() {
+export function startAnnotationCapture() {
     if (window.parent === window) {
-        return;
+        return () => { };
     }
     const session = readCaptureSession();
     if (!session) {
-        return;
+        return () => { };
     }
-    window.addEventListener("message", (event) => {
+    const onMessage = (event) => {
         if (!isExpectedSiteCaptureParentMessage(event, {
-            nonce: session.nonce,
             origin: session.parentOrigin,
             source: window.parent,
         })) {
             return;
         }
+        if (event.data.type === SITE_CAPTURE_MESSAGE_TYPE.reload) {
+            window.location.reload();
+            return;
+        }
         if (event.data.type === SITE_CAPTURE_MESSAGE_TYPE.end) {
-            void endAnnotationSession(session, true);
+            cleanup();
+            endAnnotationSession(session, true);
+            return;
+        }
+        if (event.data.type === SITE_CAPTURE_MESSAGE_TYPE.probe) {
+            postReady(session);
             return;
         }
         if (event.data.type === SITE_CAPTURE_MESSAGE_TYPE.resume) {
             resumeViewport?.();
             resumeViewport = null;
             captureFrozen = false;
-            postToParent(session, {
-                nonce: session.nonce,
-                pagePath: currentPagePath(),
-                type: SITE_CAPTURE_MESSAGE_TYPE.ready,
-            });
+            postReady(session);
             return;
         }
         if (captureFrozen) {
             return;
         }
-        try {
-            const root = document.body ?? document.documentElement;
-            const elements = extractElements(root);
-            resumeViewport = freezeCaptureViewport();
-            captureFrozen = true;
-            postToParent(session, {
-                elements,
-                nonce: session.nonce,
-                pagePath: currentPagePath(),
-                type: SITE_CAPTURE_MESSAGE_TYPE.captured,
-            });
-        }
-        catch {
-            postToParent(session, {
-                message: "画面を読み取れませんでした。",
-                nonce: session.nonce,
-                type: SITE_CAPTURE_MESSAGE_TYPE.error,
-            });
-        }
-    });
-    postToParent(session, {
-        nonce: session.nonce,
-        pagePath: currentPagePath(),
-        type: SITE_CAPTURE_MESSAGE_TYPE.ready,
-    });
+        captureCurrentViewport(session);
+    };
+    const onBeforeUnload = () => {
+        postToParent(session, {
+            type: SITE_CAPTURE_MESSAGE_TYPE.loading,
+        });
+    };
+    window.addEventListener("message", onMessage);
+    window.addEventListener("beforeunload", onBeforeUnload);
+    const cleanup = () => {
+        window.removeEventListener("message", onMessage);
+        window.removeEventListener("beforeunload", onBeforeUnload);
+    };
+    postReady(session);
+    return cleanup;
 }
 function readCaptureSession() {
     const bootstrap = readCaptureBootstrap();
@@ -85,18 +77,14 @@ function readCaptureSession() {
 }
 function readCaptureBootstrap() {
     const hash = new URLSearchParams(window.location.hash.slice(1));
-    const nonce = hash.get(SITE_CAPTURE_BOOT_NONCE_PARAM);
     const parentOrigin = normalizeOrigin(hash.get(SITE_CAPTURE_BOOT_PARENT_ORIGIN_PARAM));
-    if (!(nonce?.trim() &&
-        nonce.length <= 256 &&
-        parentOrigin &&
-        parentOrigin === readAllowedParentOrigin())) {
+    if (!parentOrigin) {
         return null;
     }
     const pageHash = hash.get(SITE_CAPTURE_BOOT_PAGE_HASH_PARAM);
     const nextUrl = `${window.location.pathname}${window.location.search}${pageHash ? `#${pageHash}` : ""}`;
     window.history.replaceState(window.history.state, "", nextUrl);
-    return { nonce, parentOrigin };
+    return { parentOrigin };
 }
 function parseStoredSession(value) {
     if (!value) {
@@ -107,15 +95,8 @@ function parseStoredSession(value) {
         if (!parsed || typeof parsed !== "object") {
             return null;
         }
-        const nonce = Reflect.get(parsed, "nonce");
         const parentOrigin = normalizeOrigin(Reflect.get(parsed, "parentOrigin"));
-        return typeof nonce === "string" &&
-            nonce.trim() &&
-            nonce.length <= 256 &&
-            parentOrigin &&
-            parentOrigin === readAllowedParentOrigin()
-            ? { nonce, parentOrigin }
-            : null;
+        return parentOrigin ? { parentOrigin } : null;
     }
     catch {
         return null;
@@ -137,61 +118,53 @@ function normalizeOrigin(value) {
         return null;
     }
 }
-function readAllowedParentOrigin() {
-    for (const item of document.cookie.split(";")) {
-        const separator = item.indexOf("=");
-        if (separator < 1) {
-            continue;
-        }
-        if (item.slice(0, separator).trim() === SITE_CAPTURE_PARENT_ORIGIN_COOKIE) {
-            try {
-                return normalizeOrigin(decodeURIComponent(item.slice(separator + 1).trim()));
-            }
-            catch {
-                return null;
-            }
-        }
-    }
-    return null;
-}
 function currentPagePath() {
     return `${window.location.pathname}${window.location.search}${window.location.hash}`;
 }
+function captureCurrentViewport(session) {
+    try {
+        const root = document.body ?? document.documentElement;
+        const elements = extractElements(root);
+        resumeViewport = freezeCaptureViewport();
+        captureFrozen = true;
+        postToParent(session, {
+            elements,
+            pagePath: currentPagePath(),
+            type: SITE_CAPTURE_MESSAGE_TYPE.captured,
+        });
+    }
+    catch {
+        postToParent(session, {
+            message: "画面を読み取れませんでした。",
+            type: SITE_CAPTURE_MESSAGE_TYPE.error,
+        });
+    }
+}
 function endAnnotationSession(session, notifyParent) {
-    if (endSessionPromise) {
-        return endSessionPromise;
+    resumeViewport?.();
+    resumeViewport = null;
+    captureFrozen = false;
+    try {
+        window.sessionStorage.removeItem(SITE_CAPTURE_SESSION_STORAGE_KEY);
+    }
+    catch {
+        // The capture bridge is inactive after its message listeners are removed.
+    }
+    if (notifyParent) {
+        postToParent(session, {
+            type: SITE_CAPTURE_MESSAGE_TYPE.ended,
+        });
     }
-    endSessionPromise = (async () => {
-        try {
-            window.sessionStorage.removeItem(SITE_CAPTURE_SESSION_STORAGE_KEY);
-        }
-        catch {
-            // The server-side cookie expiration remains authoritative.
-        }
-        const endUrl = new URL(window.location.href);
-        endUrl.hash = "";
-        endUrl.search = "";
-        endUrl.searchParams.set(SITE_ANNOTATION_END_PARAM, "1");
-        try {
-            await window.fetch(endUrl, {
-                cache: "no-store",
-                credentials: "same-origin",
-            });
-        }
-        finally {
-            if (notifyParent) {
-                postToParent(session, {
-                    nonce: session.nonce,
-                    type: SITE_CAPTURE_MESSAGE_TYPE.ended,
-                });
-            }
-        }
-    })();
-    return endSessionPromise;
 }
 function postToParent(session, message) {
     window.parent.postMessage(message, session.parentOrigin);
 }
+function postReady(session) {
+    postToParent(session, {
+        pagePath: currentPagePath(),
+        type: SITE_CAPTURE_MESSAGE_TYPE.ready,
+    });
+}
 if (document.readyState === "loading") {
     document.addEventListener("DOMContentLoaded", startAnnotationCapture, {
         once: true,

package/dist/runtime/capture-contract.d.ts

@@ -1,8 +1,6 @@
 import type { ExtractedElement } from "./element-extractor.js";
-export declare const SITE_CAPTURE_BOOT_NONCE_PARAM = "__chat_de_hp_capture";
 export declare const SITE_CAPTURE_BOOT_PARENT_ORIGIN_PARAM = "__chat_de_hp_capture_parent";
 export declare const SITE_CAPTURE_BOOT_PAGE_HASH_PARAM = "__chat_de_hp_capture_page_hash";
-export declare const SITE_CAPTURE_PARENT_ORIGIN_COOKIE = "__Host-chat-de-hp-annotation-parent";
 export declare const SITE_CAPTURE_SESSION_STORAGE_KEY = "chat-de-hp:capture-session";
 export declare const SITE_CAPTURE_MESSAGE_TYPE: {
     readonly capture: "chat-de-hp:capture";
@@ -10,34 +8,36 @@ export declare const SITE_CAPTURE_MESSAGE_TYPE: {
     readonly end: "chat-de-hp:end-capture";
     readonly ended: "chat-de-hp:capture-ended";
     readonly error: "chat-de-hp:capture-error";
+    readonly loading: "chat-de-hp:capture-loading";
+    readonly probe: "chat-de-hp:capture-probe";
     readonly ready: "chat-de-hp:capture-ready";
+    readonly reload: "chat-de-hp:reload";
     readonly resume: "chat-de-hp:resume-capture";
 };
 export type SiteCaptureParentMessage = {
-    nonce: string;
     type: typeof SITE_CAPTURE_MESSAGE_TYPE.capture;
 } | {
-    nonce: string;
     type: typeof SITE_CAPTURE_MESSAGE_TYPE.end;
 } | {
-    nonce: string;
+    type: typeof SITE_CAPTURE_MESSAGE_TYPE.probe;
+} | {
+    type: typeof SITE_CAPTURE_MESSAGE_TYPE.reload;
+} | {
     type: typeof SITE_CAPTURE_MESSAGE_TYPE.resume;
 };
 export type SiteCaptureFrameMessage = {
-    nonce: string;
     pagePath: string;
     type: typeof SITE_CAPTURE_MESSAGE_TYPE.ready;
 } | {
     elements: ExtractedElement[];
-    nonce: string;
     pagePath: string;
     type: typeof SITE_CAPTURE_MESSAGE_TYPE.captured;
 } | {
     message: string;
-    nonce: string;
     type: typeof SITE_CAPTURE_MESSAGE_TYPE.error;
 } | {
-    nonce: string;
+    type: typeof SITE_CAPTURE_MESSAGE_TYPE.loading;
+} | {
     type: typeof SITE_CAPTURE_MESSAGE_TYPE.ended;
 };
 type CaptureMessageEvent = {
@@ -46,7 +46,6 @@ type CaptureMessageEvent = {
     source: unknown;
 };
 type CaptureMessageExpectation = {
-    nonce: string;
     origin: string;
     source: unknown;
 };
@@ -56,6 +55,7 @@ export declare function isExpectedSiteCaptureParentMessage(event: CaptureMessage
 export declare function isExpectedSiteCaptureFrameMessage(event: CaptureMessageEvent, expected: CaptureMessageExpectation): event is CaptureMessageEvent & {
     data: SiteCaptureFrameMessage;
 };
+export declare function isSiteCaptureFrameProtocolMessage(value: unknown): boolean;
 export declare function isSiteCaptureParentMessage(value: unknown): value is SiteCaptureParentMessage;
 export declare function isSiteCaptureFrameMessage(value: unknown): value is SiteCaptureFrameMessage;
 export {};

package/dist/runtime/capture-contract.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"capture-contract.d.ts","sourceRoot":"","sources":["../../src/runtime/capture-contract.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,wBAAwB,CAAC;AAE/D,eAAO,MAAM,6BAA6B,yBAAyB,CAAC;AACpE,eAAO,MAAM,qCAAqC,gCACnB,CAAC;AAChC,eAAO,MAAM,iCAAiC,mCACZ,CAAC;AACnC,eAAO,MAAM,iCAAiC,wCACP,CAAC;AACxC,eAAO,MAAM,gCAAgC,+BAA+B,CAAC;AAE7E,eAAO,MAAM,yBAAyB;;;;;;;;CAQ5B,CAAC;AAEX,MAAM,MAAM,wBAAwB,GAChC;IACE,KAAK,EAAE,MAAM,CAAC;IACd,IAAI,EAAE,OAAO,yBAAyB,CAAC,OAAO,CAAC;CAChD,GACD;IACE,KAAK,EAAE,MAAM,CAAC;IACd,IAAI,EAAE,OAAO,yBAAyB,CAAC,GAAG,CAAC;CAC5C,GACD;IACE,KAAK,EAAE,MAAM,CAAC;IACd,IAAI,EAAE,OAAO,yBAAyB,CAAC,MAAM,CAAC;CAC/C,CAAC;AAEN,MAAM,MAAM,uBAAuB,GAC/B;IACE,KAAK,EAAE,MAAM,CAAC;IACd,QAAQ,EAAE,MAAM,CAAC;IACjB,IAAI,EAAE,OAAO,yBAAyB,CAAC,KAAK,CAAC;CAC9C,GACD;IACE,QAAQ,EAAE,gBAAgB,EAAE,CAAC;IAC7B,KAAK,EAAE,MAAM,CAAC;IACd,QAAQ,EAAE,MAAM,CAAC;IACjB,IAAI,EAAE,OAAO,yBAAyB,CAAC,QAAQ,CAAC;CACjD,GACD;IACE,OAAO,EAAE,MAAM,CAAC;IAChB,KAAK,EAAE,MAAM,CAAC;IACd,IAAI,EAAE,OAAO,yBAAyB,CAAC,KAAK,CAAC;CAC9C,GACD;IACE,KAAK,EAAE,MAAM,CAAC;IACd,IAAI,EAAE,OAAO,yBAAyB,CAAC,KAAK,CAAC;CAC9C,CAAC;AAEN,KAAK,mBAAmB,GAAG;IACzB,IAAI,EAAE,OAAO,CAAC;IACd,MAAM,EAAE,MAAM,CAAC;IACf,MAAM,EAAE,OAAO,CAAC;CACjB,CAAC;AAEF,KAAK,yBAAyB,GAAG;IAC/B,KAAK,EAAE,MAAM,CAAC;IACd,MAAM,EAAE,MAAM,CAAC;IACf,MAAM,EAAE,OAAO,CAAC;CACjB,CAAC;AAEF,wBAAgB,kCAAkC,CAChD,KAAK,EAAE,mBAAmB,EAC1B,QAAQ,EAAE,yBAAyB,GAClC,KAAK,IAAI,mBAAmB,GAAG;IAAE,IAAI,EAAE,wBAAwB,CAAA;CAAE,CAOnE;AAED,wBAAgB,iCAAiC,CAC/C,KAAK,EAAE,mBAAmB,EAC1B,QAAQ,EAAE,yBAAyB,GAClC,KAAK,IAAI,mBAAmB,GAAG;IAAE,IAAI,EAAE,uBAAuB,CAAA;CAAE,CAOlE;AAED,wBAAgB,0BAA0B,CACxC,KAAK,EAAE,OAAO,GACb,KAAK,IAAI,wBAAwB,CASnC;AAED,wBAAgB,yBAAyB,CACvC,KAAK,EAAE,OAAO,GACb,KAAK,IAAI,uBAAuB,CAmBlC"}
+{"version":3,"file":"capture-contract.d.ts","sourceRoot":"","sources":["../../src/runtime/capture-contract.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,wBAAwB,CAAC;AAE/D,eAAO,MAAM,qCAAqC,gCACnB,CAAC;AAChC,eAAO,MAAM,iCAAiC,mCACZ,CAAC;AACnC,eAAO,MAAM,gCAAgC,+BAA+B,CAAC;AAE7E,eAAO,MAAM,yBAAyB;;;;;;;;;;;CAW5B,CAAC;AAEX,MAAM,MAAM,wBAAwB,GAChC;IACE,IAAI,EAAE,OAAO,yBAAyB,CAAC,OAAO,CAAC;CAChD,GACD;IACE,IAAI,EAAE,OAAO,yBAAyB,CAAC,GAAG,CAAC;CAC5C,GACD;IACE,IAAI,EAAE,OAAO,yBAAyB,CAAC,KAAK,CAAC;CAC9C,GACD;IACE,IAAI,EAAE,OAAO,yBAAyB,CAAC,MAAM,CAAC;CAC/C,GACD;IACE,IAAI,EAAE,OAAO,yBAAyB,CAAC,MAAM,CAAC;CAC/C,CAAC;AAEN,MAAM,MAAM,uBAAuB,GAC/B;IACE,QAAQ,EAAE,MAAM,CAAC;IACjB,IAAI,EAAE,OAAO,yBAAyB,CAAC,KAAK,CAAC;CAC9C,GACD;IACE,QAAQ,EAAE,gBAAgB,EAAE,CAAC;IAC7B,QAAQ,EAAE,MAAM,CAAC;IACjB,IAAI,EAAE,OAAO,yBAAyB,CAAC,QAAQ,CAAC;CACjD,GACD;IACE,OAAO,EAAE,MAAM,CAAC;IAChB,IAAI,EAAE,OAAO,yBAAyB,CAAC,KAAK,CAAC;CAC9C,GACD;IACE,IAAI,EAAE,OAAO,yBAAyB,CAAC,OAAO,CAAC;CAChD,GACD;IACE,IAAI,EAAE,OAAO,yBAAyB,CAAC,KAAK,CAAC;CAC9C,CAAC;AAEN,KAAK,mBAAmB,GAAG;IACzB,IAAI,EAAE,OAAO,CAAC;IACd,MAAM,EAAE,MAAM,CAAC;IACf,MAAM,EAAE,OAAO,CAAC;CACjB,CAAC;AAEF,KAAK,yBAAyB,GAAG;IAC/B,MAAM,EAAE,MAAM,CAAC;IACf,MAAM,EAAE,OAAO,CAAC;CACjB,CAAC;AAEF,wBAAgB,kCAAkC,CAChD,KAAK,EAAE,mBAAmB,EAC1B,QAAQ,EAAE,yBAAyB,GAClC,KAAK,IAAI,mBAAmB,GAAG;IAAE,IAAI,EAAE,wBAAwB,CAAA;CAAE,CAMnE;AAED,wBAAgB,iCAAiC,CAC/C,KAAK,EAAE,mBAAmB,EAC1B,QAAQ,EAAE,yBAAyB,GAClC,KAAK,IAAI,mBAAmB,GAAG;IAAE,IAAI,EAAE,uBAAuB,CAAA;CAAE,CAMlE;AAED,wBAAgB,iCAAiC,CAAC,KAAK,EAAE,OAAO,WAY/D;AAED,wBAAgB,0BAA0B,CACxC,KAAK,EAAE,OAAO,GACb,KAAK,IAAI,wBAAwB,CAWnC;AAED,wBAAgB,yBAAyB,CACvC,KAAK,EAAE,OAAO,GACb,KAAK,IAAI,uBAAuB,CAsBlC"}

package/dist/runtime/capture-contract.js

@@ -1,7 +1,5 @@
-export const SITE_CAPTURE_BOOT_NONCE_PARAM = "__chat_de_hp_capture";
 export const SITE_CAPTURE_BOOT_PARENT_ORIGIN_PARAM = "__chat_de_hp_capture_parent";
 export const SITE_CAPTURE_BOOT_PAGE_HASH_PARAM = "__chat_de_hp_capture_page_hash";
-export const SITE_CAPTURE_PARENT_ORIGIN_COOKIE = "__Host-chat-de-hp-annotation-parent";
 export const SITE_CAPTURE_SESSION_STORAGE_KEY = "chat-de-hp:capture-session";
 export const SITE_CAPTURE_MESSAGE_TYPE = {
     capture: "chat-de-hp:capture",
@@ -9,31 +7,45 @@ export const SITE_CAPTURE_MESSAGE_TYPE = {
     end: "chat-de-hp:end-capture",
     ended: "chat-de-hp:capture-ended",
     error: "chat-de-hp:capture-error",
+    loading: "chat-de-hp:capture-loading",
+    probe: "chat-de-hp:capture-probe",
     ready: "chat-de-hp:capture-ready",
+    reload: "chat-de-hp:reload",
     resume: "chat-de-hp:resume-capture",
 };
 export function isExpectedSiteCaptureParentMessage(event, expected) {
     return (event.origin === expected.origin &&
         event.source === expected.source &&
-        isSiteCaptureParentMessage(event.data) &&
-        event.data.nonce === expected.nonce);
+        isSiteCaptureParentMessage(event.data));
 }
 export function isExpectedSiteCaptureFrameMessage(event, expected) {
     return (event.origin === expected.origin &&
         event.source === expected.source &&
-        isSiteCaptureFrameMessage(event.data) &&
-        event.data.nonce === expected.nonce);
+        isSiteCaptureFrameMessage(event.data));
+}
+export function isSiteCaptureFrameProtocolMessage(value) {
+    if (!isRecord(value)) {
+        return false;
+    }
+    const { type } = value;
+    return (type === SITE_CAPTURE_MESSAGE_TYPE.captured ||
+        type === SITE_CAPTURE_MESSAGE_TYPE.ended ||
+        type === SITE_CAPTURE_MESSAGE_TYPE.error ||
+        type === SITE_CAPTURE_MESSAGE_TYPE.loading ||
+        type === SITE_CAPTURE_MESSAGE_TYPE.ready);
 }
 export function isSiteCaptureParentMessage(value) {
-    if (!isRecord(value) || !isNonce(value.nonce)) {
+    if (!isRecord(value)) {
         return false;
     }
     return (value.type === SITE_CAPTURE_MESSAGE_TYPE.capture ||
         value.type === SITE_CAPTURE_MESSAGE_TYPE.end ||
+        value.type === SITE_CAPTURE_MESSAGE_TYPE.probe ||
+        value.type === SITE_CAPTURE_MESSAGE_TYPE.reload ||
         value.type === SITE_CAPTURE_MESSAGE_TYPE.resume);
 }
 export function isSiteCaptureFrameMessage(value) {
-    if (!isRecord(value) || !isNonce(value.nonce)) {
+    if (!isRecord(value)) {
         return false;
     }
     if (value.type === SITE_CAPTURE_MESSAGE_TYPE.ready) {
@@ -47,7 +59,8 @@ export function isSiteCaptureFrameMessage(value) {
     if (value.type === SITE_CAPTURE_MESSAGE_TYPE.error) {
         return isNonEmptyString(value.message);
     }
-    return value.type === SITE_CAPTURE_MESSAGE_TYPE.ended;
+    return (value.type === SITE_CAPTURE_MESSAGE_TYPE.ended ||
+        value.type === SITE_CAPTURE_MESSAGE_TYPE.loading);
 }
 function isExtractedElement(value) {
     if (!isRecord(value) ||
@@ -96,9 +109,6 @@ function isPagePath(value) {
         !value.startsWith("//") &&
         !value.includes("\\"));
 }
-function isNonce(value) {
-    return isNonEmptyString(value) && value.length <= 256;
-}
 function isNonEmptyString(value) {
     return typeof value === "string" && value.trim().length > 0;
 }

package/dist/runtime/contracts.d.ts

@@ -1,5 +1,3 @@
-export declare const CHAT_DE_HP_ANNOTATION_MODE_HEADER = "x-chat-de-hp-annotation-mode";
-export declare const SITE_ANNOTATION_END_PARAM = "__chat_de_hp_annotation_end";
 export type ChatDeHpExecutionContext = {
     passThroughOnException?(): void;
     waitUntil(promise: Promise<unknown>): void;

package/dist/runtime/contracts.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"contracts.d.ts","sourceRoot":"","sources":["../../src/runtime/contracts.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"contracts.d.ts","sourceRoot":"","sources":["../../src/runtime/contracts.ts"],"names":[],"mappings":"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"}

package/dist/runtime/contracts.js

@@ -1,2 +1 @@
-export const CHAT_DE_HP_ANNOTATION_MODE_HEADER = "x-chat-de-hp-annotation-mode";
-export const SITE_ANNOTATION_END_PARAM = "__chat_de_hp_annotation_end";
+export {};

package/dist/runtime/index.d.ts

@@ -1,5 +1,4 @@
 export { PluginBridge } from "@emdash-cms/cloudflare/sandbox";
 export type { ChatDeHpExecutionContext, ChatDeHpRuntimeContribution, ChatDeHpRuntimeRoute, ChatDeHpSiteEnv, GeneratedSiteRuntime, } from "./contracts.js";
-export { CHAT_DE_HP_ANNOTATION_MODE_HEADER } from "./contracts.js";
 export { createChatDeHpSiteWorker } from "./worker.js";
 //# sourceMappingURL=index.d.ts.map

package/dist/runtime/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/runtime/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,gCAAgC,CAAC;AAE9D,YAAY,EACV,wBAAwB,EACxB,2BAA2B,EAC3B,oBAAoB,EACpB,eAAe,EACf,oBAAoB,GACrB,MAAM,gBAAgB,CAAC;AACxB,OAAO,EAAE,iCAAiC,EAAE,MAAM,gBAAgB,CAAC;AACnE,OAAO,EAAE,wBAAwB,EAAE,MAAM,aAAa,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/runtime/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,gCAAgC,CAAC;AAE9D,YAAY,EACV,wBAAwB,EACxB,2BAA2B,EAC3B,oBAAoB,EACpB,eAAe,EACf,oBAAoB,GACrB,MAAM,gBAAgB,CAAC;AACxB,OAAO,EAAE,wBAAwB,EAAE,MAAM,aAAa,CAAC"}

package/dist/runtime/index.js

@@ -1,3 +1,2 @@
 export { PluginBridge } from "@emdash-cms/cloudflare/sandbox";
-export { CHAT_DE_HP_ANNOTATION_MODE_HEADER } from "./contracts.js";
 export { createChatDeHpSiteWorker } from "./worker.js";

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@chat-de-hp/site",
-  "version": "0.2.6",
+  "version": "0.2.7",
   "private": false,
   "description": "Managed Astro site runtime and primitive composition for Chat de HP",
   "license": "MIT",
@@ -22,10 +22,6 @@
       "types": "./dist/astro.d.ts",
       "default": "./dist/astro.js"
     },
-    "./annotation-middleware": {
-      "types": "./dist/annotation-middleware.d.ts",
-      "default": "./dist/annotation-middleware.js"
-    },
     "./emdash": {
       "types": "./dist/emdash-annotation.d.ts",
       "default": "./dist/emdash-annotation.js"