@plannotator/opencode 0.27.5 → 0.27.6

package/dist/embedded.js

@@ -105386,7 +105386,7 @@ var init_agent_terminal3 = __esm(() => {
   init_agent_terminal_runtime();
 });
 
-// ../../packages/server/live-proxy.ts
+// ../../packages/shared/live-proxy-core.ts
 function isLoopbackHostname(hostname) {
   const host = hostname.toLowerCase();
   if (host === "localhost" || host === "::1" || host === "[::1]")
@@ -105404,6 +105404,12 @@ function isAllowedProxyHost(hostHeader, port) {
 function isAllowedProxyOrigin(origin, port) {
   return origin === `http://127.0.0.1:${port}` || origin === `http://localhost:${port}` || origin === `http://[::1]:${port}`;
 }
+function isAllowedWsUpgradeOrigin(origin, port) {
+  return origin === null || isAllowedProxyOrigin(origin, port);
+}
+function isAllowedBridgeFetchSite(fetchSite) {
+  return !fetchSite || fetchSite === "same-origin" || fetchSite === "none";
+}
 function rewriteLoopbackLocation(location, target, proxyOrigin) {
   if (!/^http:\/\//i.test(location))
     return null;
@@ -105426,6 +105432,18 @@ function isDocumentIntentRequest(headers) {
   const accept = headers.get("accept");
   return !!accept && accept.includes("text/html");
 }
+function isHtmlContentType(contentType) {
+  return (contentType ?? "").toLowerCase().includes("text/html");
+}
+function buildFrameAncestorsPolicy(editorOrigins) {
+  return `frame-ancestors ${editorOrigins.join(" ")}`;
+}
+function applyHtmlFramingHeaders(headers, frameAncestors) {
+  headers.delete("x-frame-options");
+  headers.delete("content-security-policy");
+  headers.delete("content-security-policy-report-only");
+  headers.set("content-security-policy", frameAncestors);
+}
 function createHtmlInjector(injection) {
   const encoder2 = new TextEncoder;
   const injectionBytes = encoder2.encode(injection);
@@ -105593,6 +105611,54 @@ function createHtmlInjector(injection) {
     }
   };
 }
+function composeLiveBridgeJs(sources) {
+  return "window.__plannotatorLiveConfig = " + JSON.stringify({
+    live: true,
+    token: sources.token,
+    editorOrigins: sources.editorOrigins,
+    css: sources.annotationCss
+  }) + `;
+` + sources.bridgeBootstrap + `
+` + sources.bridgeScript;
+}
+function buildLiveEditorOrigins(port) {
+  return [`http://localhost:${port}`, `http://127.0.0.1:${port}`];
+}
+function buildLiveAppUrl(proxyPort, targetUrl) {
+  let targetPath = "/";
+  try {
+    const parsedTarget = new URL(targetUrl);
+    targetPath = parsedTarget.pathname + parsedTarget.search;
+  } catch {
+    targetPath = "/";
+  }
+  return `http://localhost:${proxyPort}${targetPath}`;
+}
+function liveAppDraftIdentity(targetUrl) {
+  try {
+    const url = new URL(targetUrl);
+    const path3 = url.pathname.replace(/\/+$/, "");
+    return `${url.origin}${path3}${url.search}`;
+  } catch {
+    return targetUrl.trim();
+  }
+}
+var LIVE_PROXY_RESERVED_PREFIX = "/__plannotator__/", LIVE_PROXY_BRIDGE_PATH = "/__plannotator__/bridge.js", LIVE_PROXY_BRIDGE_TAG, HOP_BY_HOP_HEADERS, LIVE_PROXY_MAX_PENDING_WS_MESSAGES = 200, HEAD_OPEN = "<head", HEAD_CLOSE = "</head>", COMMENT_OPEN = "<!--", GT2 = 62, LT2 = 60, BANG = 33, QUESTION = 63, HYPHEN = 45, HOLDBACK = 8;
+var init_live_proxy_core = __esm(() => {
+  LIVE_PROXY_BRIDGE_TAG = `<script src="${LIVE_PROXY_BRIDGE_PATH}"></script>`;
+  HOP_BY_HOP_HEADERS = [
+    "connection",
+    "keep-alive",
+    "proxy-authenticate",
+    "proxy-authorization",
+    "te",
+    "trailer",
+    "transfer-encoding",
+    "upgrade"
+  ];
+});
+
+// ../../packages/server/live-proxy.ts
 function stripHopByHop(headers) {
   for (const name of HOP_BY_HOP_HEADERS)
     headers.delete(name);
@@ -105617,7 +105683,7 @@ function startLiveAppProxy(opts) {
   }
   const targetOrigin = target.origin;
   const targetHost = target.host;
-  const frameAncestors = `frame-ancestors ${opts.editorOrigins.join(" ")}`;
+  const frameAncestors = buildFrameAncestorsPolicy(opts.editorOrigins);
   const wsUpstreams = new Set;
   let warnedEncodedHtml = false;
   const server2 = Bun.serve({
@@ -105636,8 +105702,7 @@ function startLiveAppProxy(opts) {
       }
       if (url.pathname.startsWith(LIVE_PROXY_RESERVED_PREFIX)) {
         if (url.pathname === LIVE_PROXY_BRIDGE_PATH && (req.method === "GET" || req.method === "HEAD")) {
-          const fetchSite = req.headers.get("sec-fetch-site");
-          if (fetchSite && fetchSite !== "same-origin" && fetchSite !== "none") {
+          if (!isAllowedBridgeFetchSite(req.headers.get("sec-fetch-site"))) {
             return new Response("Forbidden", { status: 403, headers: { "Content-Type": "text/plain" } });
           }
           return new Response(req.method === "HEAD" ? null : opts.bridgeJs, {
@@ -105650,8 +105715,7 @@ function startLiveAppProxy(opts) {
         return new Response("Not found", { status: 404 });
       }
       if ((req.headers.get("upgrade") ?? "").toLowerCase() === "websocket") {
-        const wsOrigin = req.headers.get("origin");
-        if (wsOrigin !== null && !isAllowedProxyOrigin(wsOrigin, srv.port)) {
+        if (!isAllowedWsUpgradeOrigin(req.headers.get("origin"), srv.port)) {
           return new Response("Forbidden", { status: 403, headers: { "Content-Type": "text/plain" } });
         }
         const upgraded = srv.upgrade(req, {
@@ -105695,13 +105759,9 @@ function startLiveAppProxy(opts) {
         if (rewritten !== null)
           responseHeaders.set("location", rewritten);
       }
-      const contentType = (responseHeaders.get("content-type") ?? "").toLowerCase();
-      const isHtml = contentType.includes("text/html");
+      const isHtml = isHtmlContentType(responseHeaders.get("content-type"));
       if (isHtml) {
-        responseHeaders.delete("x-frame-options");
-        responseHeaders.delete("content-security-policy");
-        responseHeaders.delete("content-security-policy-report-only");
-        responseHeaders.set("content-security-policy", frameAncestors);
+        applyHtmlFramingHeaders(responseHeaders, frameAncestors);
       }
       const hasEncoding = !!responseHeaders.get("content-encoding");
       if (!isHtml || hasEncoding || !upstreamResponse.body) {
@@ -105790,7 +105850,7 @@ function startLiveAppProxy(opts) {
           upstream.send(payload);
           return;
         }
-        if (ws.data.pending.length >= MAX_PENDING_WS_MESSAGES) {
+        if (ws.data.pending.length >= LIVE_PROXY_MAX_PENDING_WS_MESSAGES) {
           ws.close();
           if (upstream)
             upstream.close();
@@ -105821,18 +105881,10 @@ function startLiveAppProxy(opts) {
     }
   };
 }
-var LOOPBACK_HOST2 = "127.0.0.1", LIVE_PROXY_RESERVED_PREFIX = "/__plannotator__/", LIVE_PROXY_BRIDGE_PATH = "/__plannotator__/bridge.js", HOP_BY_HOP_HEADERS, MAX_PENDING_WS_MESSAGES = 200, HEAD_OPEN = "<head", HEAD_CLOSE = "</head>", COMMENT_OPEN = "<!--", GT2 = 62, LT2 = 60, BANG = 33, QUESTION = 63, HYPHEN = 45, HOLDBACK = 8;
+var LOOPBACK_HOST2 = "127.0.0.1";
 var init_live_proxy = __esm(() => {
-  HOP_BY_HOP_HEADERS = [
-    "connection",
-    "keep-alive",
-    "proxy-authenticate",
-    "proxy-authorization",
-    "te",
-    "trailer",
-    "transfer-encoding",
-    "upgrade"
-  ];
+  init_live_proxy_core();
+  init_live_proxy_core();
 });
 
 // ../../packages/server/annotate.ts
@@ -105852,15 +105904,6 @@ function runGuardedShutdown(steps, closeListener, log = (message, error) => cons
     closeListener();
   }
 }
-function liveAppDraftIdentity(targetUrl) {
-  try {
-    const url = new URL(targetUrl);
-    const path3 = url.pathname.replace(/\/+$/, "");
-    return `${url.origin}${path3}${url.search}`;
-  } catch {
-    return targetUrl.trim();
-  }
-}
 async function startAnnotateServer(options) {
   const {
     markdown,
@@ -106448,31 +106491,19 @@ async function startAnnotateServer(options) {
   const serverUrl = buildAdvertisedUrl(port);
   if (liveApp) {
     liveSessionToken = randomBytes2(16).toString("hex");
-    const editorOrigins = [
-      `http://localhost:${port}`,
-      `http://127.0.0.1:${port}`
-    ];
-    const bridgeJs = "window.__plannotatorLiveConfig = " + JSON.stringify({
-      live: true,
-      token: liveSessionToken,
-      editorOrigins,
-      css: liveApp.annotationCss
-    }) + `;
-` + liveApp.bridgeBootstrap + `
-` + liveApp.bridgeScript;
+    const editorOrigins = buildLiveEditorOrigins(port);
     liveProxy = startLiveAppProxy({
       targetUrl: liveApp.targetUrl,
       editorOrigins,
-      bridgeJs
+      bridgeJs: composeLiveBridgeJs({
+        token: liveSessionToken,
+        editorOrigins,
+        annotationCss: liveApp.annotationCss,
+        bridgeBootstrap: liveApp.bridgeBootstrap,
+        bridgeScript: liveApp.bridgeScript
+      })
     });
-    let targetPath = "/";
-    try {
-      const parsedTarget = new URL(liveApp.targetUrl);
-      targetPath = parsedTarget.pathname + parsedTarget.search;
-    } catch {
-      targetPath = "/";
-    }
-    liveAppUrl = `http://localhost:${liveProxy.port}${targetPath}`;
+    liveAppUrl = buildLiveAppUrl(liveProxy.port, liveApp.targetUrl);
   }
   warmFileListCache(process.cwd(), "code");
   const stop2 = () => {
@@ -106529,10 +106560,12 @@ var init_annotate = __esm(() => {
   init_html_assets2();
   init_agent_terminal3();
   init_live_proxy();
+  init_live_proxy_core();
   init_agent_terminal2();
   init_remote();
   init_browser();
   init_shared_handlers();
+  init_live_proxy_core();
 });
 
 // ../../packages/shared/at-reference.ts
@@ -106553,9 +106586,10 @@ var init_at_reference = __esm(() => {
 });
 
 // ../../packages/shared/annotate-args.ts
-function parseAnnotateArgs(raw2) {
+function parseAnnotateArgs(raw2, opts) {
   const s10 = (raw2 ?? "").trim();
-  const flags = { gate: false, json: false, hook: false, renderHtml: false, renderMarkdown: false, noJina: false };
+  const flags = { gate: false, json: false, hook: false, renderHtml: false, renderMarkdown: false, noJina: false, app: false, static: false };
+  const flagMap = opts?.liveFlags ? { ...FLAG_MAP, ...LIVE_FLAG_MAP } : { ...FLAG_MAP };
   const segments = [];
   for (let i7 = 0;i7 < s10.length; ) {
     const isWs = /\s/.test(s10[i7]);
@@ -106569,7 +106603,7 @@ function parseAnnotateArgs(raw2) {
     const seg = segments[j2];
     if (seg.type !== "tok")
       continue;
-    const key2 = FLAG_MAP[seg.text];
+    const key2 = flagMap[seg.text];
     if (!key2)
       continue;
     flags[key2] = true;
@@ -106585,7 +106619,7 @@ function parseAnnotateArgs(raw2) {
     flags.gate = true;
   return { filePath: stripAtPrefix(rawFilePath), rawFilePath, ...flags };
 }
-var FLAG_MAP;
+var FLAG_MAP, LIVE_FLAG_MAP;
 var init_annotate_args = __esm(() => {
   init_at_reference();
   init_resolve_file();
@@ -106597,6 +106631,10 @@ var init_annotate_args = __esm(() => {
     "--markdown": "renderMarkdown",
     "--no-jina": "noJina"
   };
+  LIVE_FLAG_MAP = {
+    "--app": "app",
+    "--static": "static"
+  };
 });
 
 // ../../packages/shared/annotate-target.ts

package/dist/index.js

@@ -12886,9 +12886,14 @@ var FLAG_MAP = {
   "--markdown": "renderMarkdown",
   "--no-jina": "noJina"
 };
-function parseAnnotateArgs(raw) {
+var LIVE_FLAG_MAP = {
+  "--app": "app",
+  "--static": "static"
+};
+function parseAnnotateArgs(raw, opts) {
   const s = (raw ?? "").trim();
-  const flags = { gate: false, json: false, hook: false, renderHtml: false, renderMarkdown: false, noJina: false };
+  const flags = { gate: false, json: false, hook: false, renderHtml: false, renderMarkdown: false, noJina: false, app: false, static: false };
+  const flagMap = opts?.liveFlags ? { ...FLAG_MAP, ...LIVE_FLAG_MAP } : { ...FLAG_MAP };
   const segments = [];
   for (let i = 0;i < s.length; ) {
     const isWs = /\s/.test(s[i]);
@@ -12902,7 +12907,7 @@ function parseAnnotateArgs(raw) {
     const seg = segments[j];
     if (seg.type !== "tok")
       continue;
-    const key = FLAG_MAP[seg.text];
+    const key = flagMap[seg.text];
     if (!key)
       continue;
     flags[key] = true;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@plannotator/opencode",
-  "version": "0.27.5",
+  "version": "0.27.6",
   "type": "module",
   "description": "Plannotator plugin for OpenCode - interactive plan review with visual annotation",
   "author": "backnotprop",