@bivy/bivy 0.18.0-staging.1 → 0.18.1-staging.1

package/dist/apps/gateway.js

@@ -137,6 +137,10 @@ const poll=async()=>{try{const r=await fetch(location.href,{method:'HEAD',cache:
 }
 /** Copied links are reusable until revoked, capped so a forgotten one lapses. */
 export const SHARE_TTL = 24 * HOUR;
+/** Bivy's packaged apps load the client from their own scheme, so a preview
+ * framed there has this ancestor instead of a web origin. (Node's URL gives
+ * these "null" origins, so they cannot be configured as return origins.) */
+const PACKAGED_CLIENT_ORIGINS = ["capacitor://localhost"];
 const HOP = new Set(["connection", "keep-alive", "proxy-authenticate", "proxy-authorization", "te", "trailer", "transfer-encoding", "upgrade"]);
 /** Separate per-app origins are mandatory. TLS terminates at the deployment's
  * preview ingress. Delivery reaches only this gateway, never the node API. */
@@ -160,11 +164,20 @@ function upstreamHeaders(req, origin) {
     headers["x-forwarded-proto"] = "https";
     return headers;
 }
-function responseHeaders(headers, ancestors, inspector) {
+/** Framed inside Bivy, an app's own cookies are third-party too, and browsers
+ * that block those (Safari) keep only Partitioned ones: key them to Bivy's
+ * top-level site like the preview cookie, so sign-ins and carts work there. */
+function partitionCookie(cookie) {
+    const [pair, ...attributes] = cookie.split(";");
+    const kept = attributes.filter((attribute) => !["samesite", "secure", "partitioned"].includes(attribute.split("=", 1)[0].trim().toLowerCase()));
+    return [pair, ...kept, " Secure", " SameSite=None", " Partitioned"].join(";");
+}
+function responseHeaders(headers, ancestors, inspector, partition = false) {
     const result = cleanHeaders(headers);
     if (headers["set-cookie"]) {
         result["set-cookie"] = headers["set-cookie"].filter((cookie) => cookie.split("=", 1)[0].trim() !== COOKIE)
-            .map((cookie) => cookie.replace(/;\s*domain=[^;]*/ig, ""));
+            .map((cookie) => cookie.replace(/;\s*domain=[^;]*/ig, ""))
+            .map((cookie) => partition ? partitionCookie(cookie) : cookie);
     }
     // Preview data must not become a shared proxy cache entry. Apps cannot frame
     // Bivy or retain an opener; service workers are refused (see handle).
@@ -193,7 +206,8 @@ export class AppGateway {
         ["/__bivy/tokens.css", readFileSync(new URL("./tokens.css", import.meta.url))],
         ["/__bivy/styles.css", readFileSync(new URL("./styles.css", import.meta.url))],
     ]);
-    /** `reviewer`: the browser session came from a copied (shared) link. */
+    /** `reviewer`: the browser session came from a copied (shared) link.
+     *  `embedded`: it runs framed inside a Bivy client (a third-party frame). */
     sessions = new Map();
     sockets = new Map();
     displays = new WebSocketServer({ noServer: true, maxPayload: 1024 * 1024, perMessageDeflate: false });
@@ -214,7 +228,9 @@ export class AppGateway {
     origin(id) { return this.template.replace("{app}", id); }
     shellOrigin(id) { return this.template.replace("{app}", `view-${id}`); }
     /** Bivy clients may frame the shell (Peek), so app content allows both. */
-    ancestors(id) { return [this.shellOrigin(id), ...this.returnOrigins()].join(" "); }
+    ancestors(id) { return [this.shellOrigin(id), ...this.clientOrigins()].join(" "); }
+    /** Where a Bivy client runs: configured web origins, and the packaged apps. */
+    clientOrigins() { const web = this.returnOrigins(); return web.length ? [...web, ...PACKAGED_CLIENT_ORIGINS] : []; }
     open(id, returnTo) {
         const entry = this.requireWeb(id);
         if (returnTo) {
@@ -315,7 +331,7 @@ export class AppGateway {
         const origin = this.shellOrigin(id);
         const nonce = randomBytes(16).toString("hex");
         res.setHeader("Cross-Origin-Opener-Policy", "same-origin");
-        res.setHeader("Content-Security-Policy", `default-src 'none'; script-src 'nonce-${nonce}'; style-src 'self' 'nonce-${nonce}'; connect-src 'self' ${this.origin(id)}; img-src blob:; frame-src ${this.origin(id)}; frame-ancestors ${this.returnOrigins().join(" ") || "'none'"}; base-uri 'none'; form-action 'none'`);
+        res.setHeader("Content-Security-Policy", `default-src 'none'; script-src 'nonce-${nonce}'; style-src 'self' 'nonce-${nonce}'; connect-src 'self' ${this.origin(id)}; img-src blob:; frame-src ${this.origin(id)}; frame-ancestors ${this.clientOrigins().join(" ") || "'none'"}; base-uri 'none'; form-action 'none'`);
         if (req.method === "GET" && this.styles.has(req.url ?? "")) {
             res.setHeader("Content-Type", "text/css; charset=utf-8");
             res.end(this.styles.get(req.url));
@@ -414,7 +430,7 @@ fetch('${REDEEM_PATH}',{method:'POST',headers:{'Content-Type':'text/plain'},body
             // A browser session never outlives the link that created it.
             const expires = Math.min(Date.now() + HOUR, grant.expires);
             const token = randomBytes(32).toString("hex");
-            this.sessions.set(token, { appId: id, expires, reviewer: grant.reusable === true });
+            this.sessions.set(token, { appId: id, expires, reviewer: grant.reusable === true, ...(embedded ? { embedded } : {}) });
             // Framed inside Bivy, the cookie is third-party: it must be SameSite=None,
             // and Partitioned keys it to Bivy's top-level site so no other site can use it.
             const scope = embedded ? "SameSite=None; Partitioned" : "SameSite=Lax";
@@ -423,7 +439,7 @@ fetch('${REDEEM_PATH}',{method:'POST',headers:{'Content-Type':'text/plain'},body
             res.end();
             return;
         }
-        const expires = this.authorize(req, id);
+        const session = this.session(req, id), expires = session?.expires;
         // A home-screen visit without access goes through Bivy to sign in, then
         // comes back to the same page. Framed loads keep the plain message.
         const signIn = !expires && req.method === "GET" && req.headers["sec-fetch-dest"] === "document" && req.url?.startsWith("/") ? this.signIn?.(entry, req.url) : undefined;
@@ -464,7 +480,7 @@ fetch('${REDEEM_PATH}',{method:'POST',headers:{'Content-Type':'text/plain'},body
         }
         if (req.url === INSPECTOR_PATH && req.method === "GET") {
             res.writeHead(200, { "content-type": "text/javascript; charset=utf-8", "cache-control": "no-store" });
-            res.end(inspectorScript(this.shellOrigin(id), this.session(req, id)?.reviewer === true));
+            res.end(inspectorScript(this.shellOrigin(id), session?.reviewer === true, session?.embedded === true));
             return;
         }
         if (req.url === NOTES_PATH && req.method === "POST") {
@@ -533,7 +549,7 @@ fetch('${REDEEM_PATH}',{method:'POST',headers:{'Content-Type':'text/plain'},body
             response.on("error", () => res.destroy());
             const html = inspect && /^text\/html/i.test(response.headers["content-type"] ?? "") && !response.headers["content-encoding"] && Number(response.headers["content-length"] ?? 0) <= MAX_INJECT_BYTES;
             if (!html) {
-                res.writeHead(response.statusCode ?? 502, responseHeaders(response.headers, this.ancestors(id)));
+                res.writeHead(response.statusCode ?? 502, responseHeaders(response.headers, this.ancestors(id), undefined, session?.embedded));
                 response.pipe(res);
                 return;
             }
@@ -546,7 +562,7 @@ fetch('${REDEEM_PATH}',{method:'POST',headers:{'Content-Type':'text/plain'},body
             } chunks.push(chunk); });
             response.on("end", () => {
                 const body = withInspector(Buffer.concat(chunks));
-                const headers = responseHeaders(response.headers, this.ancestors(id), `${this.origin(id)}${INSPECTOR_PATH}`);
+                const headers = responseHeaders(response.headers, this.ancestors(id), `${this.origin(id)}${INSPECTOR_PATH}`, session?.embedded);
                 delete headers["content-length"];
                 res.writeHead(response.statusCode ?? 200, { ...headers, "content-length": body.length });
                 res.end(body);

package/dist/apps/inspector.js

@@ -4,11 +4,14 @@
  * to the trusted shell that frames it, and everything it reports is untrusted
  * app data: the shell shows it and turns it into drafts, never into actions.
  * Agent-neutral: it observes the browser, not the framework or the agent. */
-export function inspectorScript(shellOrigin, reviewer = false) {
+export function inspectorScript(shellOrigin, reviewer = false, embedded = false) {
     return `(()=>{
 // Framed by the shell: report to it. Opened from a shared link: offer notes.
 const framed=parent!==window,REVIEWER=${reviewer};
 if(window.__bivyInspector||(!framed&&!REVIEWER))return;window.__bivyInspector=1;
+// Framed inside Bivy: cookies the page sets are partitioned, like the ones its
+// server sets (see partitionCookie in the gateway), or Safari drops them.
+if(${embedded}){const d=Object.getOwnPropertyDescriptor(Document.prototype,'cookie');if(d&&d.set)Object.defineProperty(document,'cookie',{configurable:true,get(){return d.get.call(document);},set(v){const [pair,...rest]=String(v).split(';');d.set.call(document,[pair,...rest.filter(a=>!['samesite','secure','partitioned'].includes(a.split('=',1)[0].trim().toLowerCase())),' Secure',' SameSite=None',' Partitioned'].join(';'));}});}
 const SHELL=${JSON.stringify(shellOrigin)};
 const post=m=>{if(!framed)return;try{parent.postMessage(Object.assign({source:'bivy-inspector'},m),SHELL);}catch{}};
 const fmt=v=>{if(v instanceof Error)return v.name+': '+v.message;if(typeof v==='string')return v;try{return JSON.stringify(v);}catch{return String(v);}};

package/dist/apps/preview-shell.js

@@ -131,7 +131,9 @@ const [ticket,startPage='']=location.hash.slice(1).split('~');history.replaceSta
 let metadata,currentPath='/';
 // Peek: framed by a Bivy client, which owns closing and the composer.
 const embedded=parent!==window;
-const toBivy=m=>parent.postMessage(Object.assign({source:'bivy-preview'},m),new URL(metadata.returnTo).origin);
+// The framing client's own origin: a packaged app's differs from returnTo's.
+// (frame-ancestors already limits who that can be.)
+const toBivy=m=>parent.postMessage(Object.assign({source:'bivy-preview'},m),location.ancestorOrigins?.[0]||new URL(metadata.returnTo).origin);
 const storageKey='bivy-preview';
 const safePath=p=>typeof p==='string'&&p.startsWith('/')&&!p.startsWith('//')&&p.length<=2048?p:'/';
 const open=(path,message)=>{status.hidden=false;status.textContent=message;resetConsole();frame.src=metadata.origin+safePath(path);};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@bivy/bivy",
-  "version": "0.18.0-staging.1",
+  "version": "0.18.1-staging.1",
   "type": "module",
   "license": "AGPL-3.0-only",
   "description": "Run coding agents on machines you own. Open-source, self-hostable agent workspace.",