@botiverse/porthole 0.1.3 → 0.1.4

package/dist/react/frame.js

@@ -39,15 +39,27 @@ export function PortholeProvider(props) {
         return copied;
     }, []);
     const closeNotice = useCallback(() => setNotice(null), []);
-    const { hostInfo, locator } = props;
+    // Compared by value, and read when used: an inline hostInfo or locator doesn't start every
+    // frame again on each render.
+    const hostInfo = useByValue(props.hostInfo);
+    const ownLocator = useRef(props.locator);
+    useLayoutEffect(() => {
+        ownLocator.current = props.locator;
+    });
+    const locate = useCallback((instance, signal) => ownLocator.current === undefined
+        ? Promise.reject(new Error("No locator (PortholeProvider.locator)"))
+        : ownLocator.current.locate(instance, signal), []);
+    const locates = props.locator !== undefined;
+    const { nonce } = props;
     const value = useMemo(() => ({
         live,
         heights,
         confirm,
         copyText,
         ...(hostInfo === undefined ? {} : { hostInfo }),
-        ...(locator === undefined ? {} : { locator }),
-    }), [live, heights, confirm, copyText, hostInfo, locator]);
+        ...(locates ? { locate } : {}),
+        ...(nonce === undefined ? {} : { nonce }),
+    }), [live, heights, confirm, copyText, hostInfo, locates, locate, nonce]);
     const current = queue[0] ?? null;
     return (_jsxs(Page.Provider, { value: value, children: [props.children, props.confirm === undefined ? (_jsx(ConfirmDialog, { request: current?.request ?? null, ...(props.dialogClassName === undefined ? {} : { className: props.dialogClassName }), onAnswer: (accepted) => {
                     // A yes runs the effect inside this very click (a window it opens is the person's).
@@ -134,6 +146,8 @@ export function PortholeFrame(props) {
     return (_jsx("div", { ref: box, className: props.className, "data-porthole-display": props.displayId, "data-porthole-state": state, style: {
             position: "relative",
             width: "100%",
+            // A display that fills takes its parent's height (the host sizes the parent, or this box).
+            ...(props.fill === true || props.config.mode === "url" ? { height: "100%" } : {}),
             ...(state === "running" ? {} : { minHeight: Math.max(height, PLACEHOLDER_HEIGHT_PX) }),
             ...props.style,
         }, children: state === "running" ? (_jsx(Mount, { frame: props, page: page, initialHeightPx: height, placeholder: placeholder, run: run }, String(props.generation ?? 0))) : (placeholder({ state, title: props.title, run })) }));
@@ -145,8 +159,11 @@ function Mount({ frame, page, initialHeightPx, placeholder, run }) {
     const [ready, setReady] = useState(false);
     // The height this display started at: later reports don't make it start again.
     const [startHeight] = useState(initialHeightPx);
-    const { config, document: view, instance, content, partial, scheme } = frame;
-    const fills = config.mode === "url";
+    const { document: view, content, partial, scheme } = frame;
+    // By value: a config or instance made inline (each render) is the same display.
+    const config = useByValue(frame.config);
+    const instance = useByValue(frame.instance);
+    const fills = config.mode === "url" || frame.fill === true;
     // The latest props, read when the display calls back (never during render).
     const latest = useEffectEvent(() => frame);
     const notify = useEffectEvent((event, detail) => {
@@ -161,9 +178,17 @@ function Mount({ frame, page, initialHeightPx, placeholder, run }) {
                 frame.onResize?.(size);
                 return;
             }
-            case "error":
-                frame.onError?.(detail.message);
+            case "contentError":
+                frame.onContentError?.(detail.message);
+                return;
+            case "hostError":
+                frame.onHostError?.(detail);
                 return;
+            case "error": {
+                const { message, source } = detail;
+                frame.onError?.(message, source);
+                return;
+            }
             case "navigated":
                 frame.onNavigated?.();
                 return;
@@ -220,7 +245,8 @@ function Mount({ frame, page, initialHeightPx, placeholder, run }) {
                     : {}),
                 theme: (each) => latest().theme?.(each) ?? {},
                 ...(page.hostInfo === undefined ? {} : { hostInfo: page.hostInfo }),
-                ...(page.locator === undefined ? {} : { locator: page.locator }),
+                ...(page.locate === undefined ? {} : { locator: { locate: page.locate } }),
+                ...(page.nonce === undefined ? {} : { nonce: page.nonce }),
             }).mount(container, {
                 displayId: first.displayId,
                 title: first.title,
@@ -228,10 +254,11 @@ function Mount({ frame, page, initialHeightPx, placeholder, run }) {
                 initialHeightPx: startHeight,
                 ...(view === undefined ? {} : { document: view }),
                 ...(instance === undefined ? {} : { instance }),
+                ...(fills ? { fill: true } : {}),
             });
         }
         catch (error) {
-            first.onError?.(error instanceof Error ? error.message : String(error));
+            hostFailed(first, error, "mount");
             return;
         }
         handle.current = display;
@@ -244,6 +271,8 @@ function Mount({ frame, page, initialHeightPx, placeholder, run }) {
             "muted",
             "outcome",
             "annotation",
+            "contentError",
+            "hostError",
         ];
         for (const event of events) {
             display.on(event, (detail) => notify(event, detail));
@@ -260,7 +289,7 @@ function Mount({ frame, page, initialHeightPx, placeholder, run }) {
         };
         // A new display only for a new config, document, instance or page (or generation, by key);
         // content, theme, handlers, id and title are fed to the running one.
-    }, [config, view, instance, page, startHeight]);
+    }, [config, view, instance, page, startHeight, fills]);
     useEffect(() => {
         if (content !== undefined) {
             handle.current?.setContent(content, { partial: partial === true });
@@ -268,7 +297,15 @@ function Mount({ frame, page, initialHeightPx, placeholder, run }) {
     }, [content, partial]);
     // Annotations follow their props (a new display gets them all when it is made, above).
     const annotates = config.capabilities.annotate !== undefined;
-    const { annotating, annotations, focusedAnnotation } = frame;
+    const { annotating } = frame;
+    const focusedAnnotation = focusOf(frame.focusedAnnotation);
+    const focusToken = focusedAnnotation === null
+        ? ""
+        : typeof frame.focusedAnnotation === "object" && frame.focusedAnnotation !== null
+            ? JSON.stringify([frame.focusedAnnotation.id, frame.focusedAnnotation.key])
+            : JSON.stringify([focusedAnnotation]);
+    // By value: the same marks given again don't mark them again.
+    const annotations = useByValue(frame.annotations);
     const mode = annotating === undefined || annotating === null
         ? ""
         : JSON.stringify([annotating.elements ?? true, annotating.text ?? true]);
@@ -290,10 +327,11 @@ function Mount({ frame, page, initialHeightPx, placeholder, run }) {
     }, [annotates, annotations]);
     useEffect(() => {
         const display = handle.current;
-        if (annotates && display !== null && typeof focusedAnnotation === "string") {
-            attempt(() => display.annotations.focus(focusedAnnotation), latest());
+        const id = focusOf(latest().focusedAnnotation);
+        if (annotates && display !== null && focusToken !== "" && id !== null) {
+            attempt(() => display.annotations.focus(id), latest());
         }
-    }, [annotates, focusedAnnotation]);
+    }, [annotates, focusToken]);
     useEffect(() => {
         handle.current?.setTheme(scheme);
     }, [scheme]);
@@ -310,13 +348,19 @@ function Mount({ frame, page, initialHeightPx, placeholder, run }) {
             ...(ready ? {} : { minHeight: Math.max(startHeight, PLACEHOLDER_HEIGHT_PX) }),
         }, children: [_jsx("div", { ref: holder, "data-porthole-mount": "", style: { opacity: ready ? 1 : 0, ...(fills ? { height: "100%" } : {}) } }), ready ? null : placeholder({ state: "loading", title: frame.title, run })] }));
 }
-/** Runs an annotation call, telling the frame's `onError` what it threw (a bad anchor, say). */
+/** Tells the frame's props what failed on the host's side. */
+function hostFailed(frame, error, kind) {
+    const message = error instanceof Error ? error.message : String(error);
+    frame.onHostError?.({ message, kind });
+    frame.onError?.(message, "host");
+}
+/** Runs an annotation call, telling the frame's props what it threw (a bad anchor, say). */
 function attempt(run, frame) {
     try {
         run();
     }
     catch (error) {
-        frame.onError?.(error instanceof Error ? error.message : String(error));
+        hostFailed(frame, error, "annotations");
     }
 }
 /** A new display's annotations, from the props as they are. */
@@ -325,11 +369,29 @@ function applyAnnotations(display, frame) {
         if (frame.annotations !== undefined && frame.annotations.length > 0) {
             display.annotations.show(frame.annotations);
         }
-        if (typeof frame.focusedAnnotation === "string") {
-            display.annotations.focus(frame.focusedAnnotation);
+        const focused = focusOf(frame.focusedAnnotation);
+        if (focused !== null) {
+            display.annotations.focus(focused);
         }
         if (frame.annotating !== undefined && frame.annotating !== null) {
             display.annotations.start(frame.annotating);
         }
     }, frame);
 }
+/**
+ * `value` as long as it is equal by value (as JSON): plain data a host builds inline on each
+ * render (a config, an instance, marks, hostInfo) keeps one identity, so effects keyed on it run
+ * only when it really changes.
+ */
+function useByValue(value) {
+    const key = value === undefined ? "" : JSON.stringify(value);
+    return useMemo(() => (key === "" ? undefined : JSON.parse(key)), [key]);
+}
+/** The id `focusedAnnotation` names, if any. */
+function focusOf(value) {
+    return typeof value === "string"
+        ? value
+        : value === null || value === undefined
+            ? null
+            : value.id;
+}

package/dist/server/naming.d.ts

@@ -15,3 +15,9 @@ export declare function isHostLabel(label: unknown): label is string;
  * than being folded into another scope's name.
  */
 export declare function prefixedName(prefix: string): (scope: string) => string;
+/**
+ * Whether a label is reserved (`ContentDomain.reserved`): a whole label, a prefix ending in `*`
+ * (`p-*`), or the host's own function. Entries are checked once, here; a function that throws
+ * reserves the label (fail closed: the request goes to the host's routes, never served as ours).
+ */
+export declare function reservedLabels(reserved: readonly string[] | ((label: string) => boolean) | undefined): (label: string) => boolean;

package/dist/server/naming.js

@@ -32,3 +32,41 @@ export function prefixedName(prefix) {
         return label;
     };
 }
+const PREFIX_ENTRY = /^[a-z0-9]([a-z0-9-]{0,61})?\*$/u;
+/**
+ * Whether a label is reserved (`ContentDomain.reserved`): a whole label, a prefix ending in `*`
+ * (`p-*`), or the host's own function. Entries are checked once, here; a function that throws
+ * reserves the label (fail closed: the request goes to the host's routes, never served as ours).
+ */
+export function reservedLabels(reserved) {
+    if (reserved === undefined) {
+        return () => false;
+    }
+    if (typeof reserved === "function") {
+        return (label) => {
+            try {
+                return reserved(label);
+            }
+            catch {
+                return true;
+            }
+        };
+    }
+    if (!Array.isArray(reserved)) {
+        throw new TypeError("content.reserved: a list of labels and prefixes, or a function");
+    }
+    const whole = new Set();
+    const prefixes = [];
+    for (const entry of reserved) {
+        if (typeof entry === "string" && PREFIX_ENTRY.test(entry)) {
+            prefixes.push(entry.slice(0, -1));
+        }
+        else if (isHostLabel(entry)) {
+            whole.add(entry);
+        }
+        else {
+            throw new TypeError(`content.reserved: ${JSON.stringify(entry)} is not a lowercase DNS label or a prefix ending in *`);
+        }
+    }
+    return (label) => whole.has(label) || prefixes.some((prefix) => label.startsWith(prefix));
+}

package/dist/server/pages.js

@@ -77,6 +77,8 @@ const pageHeaders = (frameAncestors, connect) => ({
     "content-security-policy": policy(frameAncestors, connect),
     "referrer-policy": "no-referrer",
     "x-content-type-options": "nosniff",
+    // Content origins are behind tickets: nothing on them is for search engines.
+    "x-robots-tag": "noindex, nofollow",
 });
 export function statusPage(status, title, detail, frameAncestors, method = "GET", reason = "error", hostOrigins = [], code) {
     const body = `<!doctype html><html lang="en"><head><meta charset="utf-8"><meta name="viewport" content="width=device-width, initial-scale=1"><title>${escape(title)}</title><style>${STYLE}</style></head><body><main data-porthole-status="${status}" data-porthole-reason="${escape(reason)}"${code === undefined ? "" : ` data-porthole-code="${escape(code)}"`} data-porthole-hosts="${escape(JSON.stringify(hostOrigins))}"><h1>${escape(title)}</h1><p>${escape(detail)}</p></main><script src="${STATUS_SCRIPT_PATH}"></script></body></html>`;

package/dist/server/server.js

@@ -2,7 +2,7 @@ import { compile } from "../compile/compile.js";
 import { hostOriginProblem, maybeSameSite, originMatchesSource, parseOrigin, } from "../isolation/served.js";
 import { sandboxProxyDocument } from "../mcp/proxy.js";
 import { createKeys, newTicket, ticketId } from "./keys.js";
-import { isHostLabel } from "./naming.js";
+import { isHostLabel, reservedLabels } from "./naming.js";
 import { enterPage, pageScript, SESSION_PATH, statusPage } from "./pages.js";
 import { memoryTicketStore } from "./tickets.js";
 /**
@@ -26,6 +26,17 @@ const DEFAULT_SESSION_SECONDS = 3_600;
 const MAX_SESSION_SECONDS = 30 * 24 * 3_600;
 /** Browsers keep a cookie of up to 4 KB, name and attributes included. */
 const MAX_COOKIE_BYTES = 3_800;
+/** A host (and port) as it compares: lowercase, no trailing dot, no default port. */
+function normalHost(value, protocol) {
+    const host = value
+        .trim()
+        .toLowerCase()
+        .replace(/\.(?=:\d+$|$)/u, "");
+    const defaultPort = protocol === "https:" ? ":443" : protocol === "http:" ? ":80" : "";
+    return defaultPort !== "" && host.endsWith(defaultPort)
+        ? host.slice(0, -defaultPort.length)
+        : host;
+}
 const isRecord = (value) => value !== null && typeof value === "object" && !Array.isArray(value);
 /** Which configs a kind of served document may be served under. */
 const MODES = {
@@ -148,25 +159,20 @@ export function createServer(options) {
         throw new TypeError("content.port must be a port number");
     }
     const keys = createKeys(options.secret);
-    const reserved = new Set(content.reserved ?? []);
-    for (const label of reserved) {
-        if (!isHostLabel(label)) {
-            throw new TypeError(`content.reserved: ${JSON.stringify(label)} is not a lowercase DNS label`);
-        }
-    }
+    const isReserved = reservedLabels(content.reserved);
     /** The label a scope is served on: the host's naming, checked, or the keyed default. */
     const nameOf = (scope) => {
         if (content.name === undefined) {
             return keys.label(scope);
         }
         const label = content.name(scope);
-        if (!isHostLabel(label) || reserved.has(label)) {
+        if (!isHostLabel(label) || isReserved(label)) {
             throw new TypeError(`content.name gave ${JSON.stringify(label)} for a scope: it must be one lowercase DNS label (a-z 0-9 -, at most 63, not xn--), not reserved`);
         }
         return label;
     };
     /** Whether a request's label may be one this server named. */
-    const ours = (label) => !reserved.has(label) && (content.name === undefined ? LABEL.test(label) : isHostLabel(label));
+    const ours = (label) => !isReserved(label) && (content.name === undefined ? LABEL.test(label) : isHostLabel(label));
     const secure = content.scheme === "https";
     const defaultPort = secure ? 443 : 80;
     const portPart = content.port === undefined || content.port === defaultPort ? "" : `:${content.port}`;
@@ -431,6 +437,7 @@ export function createServer(options) {
             "cache-control": "no-store",
             "referrer-policy": "no-referrer",
             "x-content-type-options": "nosniff",
+            "x-robots-tag": "noindex, nofollow",
         });
     }
     async function serveDocument(request, url, label, key) {
@@ -563,7 +570,16 @@ export function createServer(options) {
             return page(502, "The app didn't answer", "Its server couldn't be reached.", method);
         }
     }
-    /** The label a request is for: null when it isn't under the content domain at all. */
+    const underDomain = (host) => host === domain || host.endsWith(`.${domain}`);
+    /**
+     * The label a request is for: null when it isn't under the content domain at all (or is in a
+     * reserved namespace), "mismatch" when its Host header names another host than its URL does
+     * and either is under the content domain. A Node adapter may build the URL from an
+     * absolute-form request target (`GET http://other/…`) while a host routes by the Host header
+     * (and a cache keys on it): the two must agree before anything is served. A Host that is a
+     * local server address (an IP literal, `localhost`), as a test runner or a dev proxy sends, is
+     * not a name and isn't compared.
+     */
     function labelOf(request) {
         let url;
         try {
@@ -573,13 +589,25 @@ export function createServer(options) {
             return null;
         }
         const host = url.hostname.toLowerCase().replace(/\.$/u, "");
-        if (host !== domain && !host.endsWith(`.${domain}`)) {
+        const header = request.headers.get("host");
+        if (header !== null) {
+            const named = normalHost(header, url.protocol);
+            const name = named.replace(/:\d+$/u, "");
+            const local = name === "localhost" || /^[\d.]+$/u.test(name) || name.startsWith("[");
+            if (!local &&
+                named !== normalHost(url.host, url.protocol) &&
+                (underDomain(host) || underDomain(name))) {
+                return "mismatch";
+            }
+        }
+        if (!underDomain(host)) {
             return null;
         }
         const label = host.slice(0, Math.max(0, host.length - domain.length - 1));
-        // A reserved label is another server's namespace (`f` for `<x>.f.<domain>`): it and the names
-        // under it go to the host's own routes. Any other deeper name is ours to refuse.
-        if (reserved.has(label.split(".").at(-1) ?? "")) {
+        // A reserved label is another server's namespace (`f` for `<x>.f.<domain>`), or the host's
+        // own: it and the names under it go to the host's own routes. Any other deeper name is ours
+        // to refuse.
+        if (isReserved(label.split(".").at(-1) ?? "")) {
             return null;
         }
         return { url, label };
@@ -639,7 +667,7 @@ export function createServer(options) {
         },
         async access(request) {
             const at = labelOf(request);
-            if (at === null || !ours(at.label)) {
+            if (at === null || at === "mismatch" || !ours(at.label)) {
                 return null;
             }
             const access = accessOf(request, at.label, null);
@@ -650,8 +678,11 @@ export function createServer(options) {
             if (at === null) {
                 return null;
             }
-            const { url, label } = at;
             const method = request.method.toUpperCase();
+            if (at === "mismatch") {
+                return page(400, "Bad request", "The request's Host header and its URL name different hosts.", method);
+            }
+            const { url, label } = at;
             try {
                 if (!ours(label)) {
                     return page(404, "Nothing here", "This address names no content.", method);
@@ -673,7 +704,8 @@ export function createServer(options) {
                 if (document?.[1] !== undefined) {
                     return await serveDocument(request, url, label, document[1]);
                 }
-                if (url.pathname.startsWith(PREFIX)) {
+                // Without an upstream, only Porthole's own paths are served here: any other is nothing.
+                if (url.pathname.startsWith(PREFIX) || options.upstream === undefined) {
                     return page(404, "Nothing here", "This address names no content.", method);
                 }
                 return await serveApp(request, label);

package/dist/server/types.d.ts

@@ -18,10 +18,13 @@ export interface ContentDomain {
      */
     readonly name?: (scope: string) => string;
     /**
-     * Labels this server never serves or names (another server's namespace under the same domain,
-     * `f` for `<instance>.f.<domain>`, or `www`). Requests for them get null (the host's routes).
+     * Labels this server never serves or names: another server's namespace under the same domain
+     * (`f` for `<instance>.f.<domain>`, `www`), or the host's own (`p-*`: every label starting
+     * `p-`). Each entry is a whole label, or a prefix ending in `*`; or a function that says
+     * whether a label is reserved. Requests for them, and for the names under them, get null (the
+     * host's routes), so a host routes them without wrapping `handle`.
      */
-    readonly reserved?: readonly string[];
+    readonly reserved?: readonly string[] | ((label: string) => boolean);
 }
 /**
  * Who may open an instance, decided by the host before it calls `issue`: a viewer the host

package/dist/shell/annotate.js

@@ -369,6 +369,9 @@ export const ANNOTATE_RUNTIME = String.raw `if (declared("annotate")) {
         const root = ensureLayer();
         const parts = [];
         const style = createElement.call(document, "style");
+        if (nonce !== "") {
+          style.nonce = nonce;
+        }
         style.textContent = STYLE;
         parts.push(style);
         const flashOn = Date.now() < flashUntil;
@@ -439,20 +442,41 @@ export const ANNOTATE_RUNTIME = String.raw `if (declared("annotate")) {
       let anchorTimer = 0;
       let deadline = 0;
       let reportAll = false;
+      // Nothing is reported before the content is in place (an empty shell would orphan every
+      // mark), nor before a run of changes settles; a focus asked for meanwhile waits for it.
+      let waitingForContent = false;
+      let pendingFocus = null;
+      const settling = () => anchorTimer !== 0 || waitingForContent || marks.some((mark) => mark.state === null);
       const scheduleAnchor = (all) => {
         if (all) {
           reportAll = true;
         }
+        if (!contentIsIn()) {
+          if (!waitingForContent) {
+            waitingForContent = true;
+            whenContentIsIn(() => {
+              waitingForContent = false;
+              scheduleAnchor(false);
+            });
+          }
+          return;
+        }
         const now = Date.now();
         if (deadline === 0) {
           deadline = now + 1000;
         }
         clearTimeout(anchorTimer);
         anchorTimer = setTimeout(() => {
+          anchorTimer = 0;
           deadline = 0;
           const every = reportAll;
           reportAll = false;
           anchorAll(every);
+          if (pendingFocus !== null) {
+            const id = pendingFocus;
+            pendingFocus = null;
+            focus(id);
+          }
         }, Math.max(0, Math.min(150, deadline - now)));
       };
       new MutationObserver((records) => {
@@ -475,6 +499,12 @@ export const ANNOTATE_RUNTIME = String.raw `if (declared("annotate")) {
         if (!mark) {
           return;
         }
+        if (settling()) {
+          // Where it is isn't known yet: focus it once anchoring has settled, then say where.
+          pendingFocus = id;
+          active = id;
+          return;
+        }
         active = id;
         if (mark.found !== null) {
           const rect = rectOf(mark.found);
@@ -657,6 +687,7 @@ export const ANNOTATE_RUNTIME = String.raw `if (declared("annotate")) {
             focus(String(params.id));
             break;
           case M.clear:
+            pendingFocus = null;
             marks = [];
             active = null;
             draw();

package/dist/shell/document.d.ts

@@ -21,6 +21,12 @@ export interface ShellDocumentOptions {
      * both apply, and the stricter wins.
      */
     readonly cspMeta?: boolean;
+    /**
+     * The embedding page's CSP nonce, where its `script-src` is nonce-based (P054): a `srcdoc` frame
+     * inherits the embedding page's policy, so the shell's script and style carry it, and so does
+     * every script the shell runs for the content. The frame can read it.
+     */
+    readonly nonce?: string;
 }
 /**
  * The frame's document: its policy first, then the base styles, an empty root, and the runtime.

package/dist/shell/document.js

@@ -1,6 +1,8 @@
 import { hostOriginProblem } from "../isolation/served.js";
 import { ANNOTATE_RUNTIME } from "./annotate.js";
 import { SHELL_RUNTIME } from "./runtime.js";
+/** A CSP nonce: base64 or base64url characters, 8 to 256 of them. */
+const NONCE = /^[A-Za-z0-9+/_=-]{8,256}$/u;
 const escapeAttribute = (value) => value.replace(/&/gu, "&amp;").replace(/"/gu, "&quot;").replace(/</gu, "&lt;");
 const escapeText = (value) => value.replace(/&/gu, "&amp;").replace(/</gu, "&lt;").replace(/>/gu, "&gt;");
 /** JSON that is safe inside a `<script>`: no `</script>`, no `<!--`. */
@@ -53,6 +55,10 @@ export function shellDocument(plan, csp, options) {
             throw new TypeError(`shellDocument: ${problem}`);
         }
     }
+    if (options.nonce !== undefined && !NONCE.test(options.nonce)) {
+        throw new TypeError("shellDocument: a nonce is 8 to 256 base64 characters");
+    }
+    const nonce = options.nonce === undefined ? "" : ` nonce="${options.nonce}"`;
     // The annotation runtime only where it is declared; spliced in before the plan, which may carry
     // any text (a document) and must not be searched.
     const runtime = SHELL_RUNTIME.replace("__ANNOTATE__", () => plan.capabilities.annotate === undefined ? "" : ANNOTATE_RUNTIME).replace("__PLAN__", () => scriptJson({
@@ -75,13 +81,13 @@ export function shellDocument(plan, csp, options) {
 ${head.join("\n")}
 <meta name="viewport" content="width=device-width, initial-scale=1">
 <title>${escapeText(options.title ?? "Content")}</title>
-<style>
+<style${nonce}>
 ${BASE_STYLE}
 </style>
 </head>
 <body>
 <div id="porthole-root"></div>
-<script>${runtime}</script>
+<script${nonce}>${runtime}</script>
 </body>
 </html>
 `;

package/dist/shell/runtime.js

@@ -31,6 +31,9 @@
 export const SHELL_RUNTIME = String.raw `(() => {
   "use strict";
   const plan = __PLAN__;
+  // The embedding page's nonce, where it gave one (a srcdoc frame inherits its policy): every
+  // script the shell runs for the content carries it.
+  const nonce = document.currentScript && document.currentScript.nonce ? document.currentScript.nonce : "";
   const declared = (name) => Object.prototype.hasOwnProperty.call(plan.capabilities, name);
   // Fixed in place: content can neither restore what is removed nor replace what is wrapped.
   const lock = (target, name, value) => {
@@ -485,6 +488,9 @@ export const SHELL_RUNTIME = String.raw `(() => {
       }
       // A script made by a script is async unless told otherwise: keep the page's order.
       live.async = script.hasAttribute("async");
+      if (nonce !== "") {
+        live.nonce = nonce;
+      }
       live.textContent = script.textContent;
       const external = live.hasAttribute("src") && !live.async && live.type !== "module";
       const loaded = external
@@ -509,6 +515,27 @@ export const SHELL_RUNTIME = String.raw `(() => {
     window.dispatchEvent(new Event("load"));
   };
 
+  // Whether the content is in place: a fragment or page the shell draws, once drawn whole; a
+  // view the plan carries, once rendered; a view that is the document itself, from the start.
+  const contentHooks = [];
+  let contentIn = typeof plan.document !== "string" && plan.protocol !== "shell";
+  const contentIsIn = () => contentIn;
+  const whenContentIsIn = (run) => {
+    if (contentIn) {
+      run();
+    } else {
+      contentHooks.push(run);
+    }
+  };
+  const contentArrived = () => {
+    if (!contentIn) {
+      contentIn = true;
+      for (const run of contentHooks.splice(0)) {
+        run();
+      }
+    }
+  };
+
   // A fragment takes the person's scheme; a whole document only if it declares that it supports
   // both (or the config says always), else it shows as its author styled it (P039).
   let lastContext = null;
@@ -544,6 +571,7 @@ export const SHELL_RUNTIME = String.raw `(() => {
     schemeFollows();
     await runScripts(scripts);
     announceLoaded();
+    contentArrived();
   };
 
   // A document the plan carries (a served page, an MCP Apps view) is rendered once the shell's own
@@ -672,7 +700,10 @@ export const SHELL_RUNTIME = String.raw `(() => {
   window.addEventListener("error", (event) => {
     const error = event.error;
     const where = event.lineno ? " (line " + event.lineno + ")" : "";
-    report(error && error.stack ? String(error.stack).split("\n").slice(0, 3).join(" ") : event.message + where);
+    // V8's stack starts with the message; WebKit's and Firefox's don't, so it goes first there.
+    const stack = error && error.stack ? String(error.stack).split("\n").slice(0, 3).join(" ") : "";
+    const said = error && error.message !== undefined ? String(error.name || "Error") + ": " + String(error.message) : event.message;
+    report(stack === "" ? said + where : stack.indexOf(String(error.message)) === -1 ? said + " " + stack : stack);
   });
   window.addEventListener("unhandledrejection", (event) => {
     const reason = event.reason;
@@ -804,6 +835,7 @@ export const SHELL_RUNTIME = String.raw `(() => {
     schedule();
     await runScripts(scripts);
     announceLoaded();
+    contentArrived();
     schedule();
   };
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@botiverse/porthole",
-  "version": "0.1.3",
+  "version": "0.1.4",
   "description": "A host-side sandbox for agent-made HTML: isolation, egress hardening, a themed shell, gated host functions, and the agent manual, from one config.",
   "license": "Apache-2.0",
   "files": [

package/src/compile/policy.ts

@@ -129,6 +129,15 @@ export function embedderFrameSources(config: PortholeConfig): string[] {
  * engine Porthole supports reads frames from `frame-src`, P038).
  */
 export function embedderCsp(configs: readonly PortholeConfig[]): string {
-  const sources = unique(configs.flatMap(embedderFrameSources));
+  const sources = embedderFrameSourcesOf(configs);
   return serializeCsp([["frame-src", ...(sources.length === 0 ? ["'none'"] : sources)]]);
 }
+
+/**
+ * The `frame-src` sources the embedding page must allow for every kind of display it shows, as a
+ * list, for a host that writes its own policy around them (empty: it frames nothing of
+ * Porthole's but `srcdoc`, which needs none).
+ */
+export function embedderFrameSourcesOf(configs: readonly PortholeConfig[]): string[] {
+  return unique(configs.flatMap(embedderFrameSources));
+}