@plannotator/pi-extension 0.27.5 → 0.27.7

package/generated/live-proxy-node.ts

@@ -0,0 +1,419 @@
+// @generated — DO NOT EDIT. Source: packages/shared/live-proxy-node.ts
+/**
+ * Loopback reverse proxy for live local app annotation — Node transport.
+ *
+ * The node:http mirror of packages/server/live-proxy.ts, run by the Pi
+ * extension (vendored to apps/pi-extension/generated/). Every DECISION —
+ * Host/Origin validation, the streaming injector state machine, the
+ * CSP/X-Frame-Options policy, the redirect rewrite, the WS origin gate — is
+ * imported from ./live-proxy-core and therefore byte-identical to the Bun
+ * transport; this file is only the node:http plumbing around them.
+ *
+ * Transport notes:
+ * - Request/response bodies are PIPED, never buffered: the upstream response
+ *   streams through a Transform running the shared injector for HTML, and
+ *   verbatim otherwise, with backpressure handled by stream.pipeline.
+ * - WebSocket passthrough (HMR) rides node's 'upgrade' event: the client's
+ *   own handshake (its Sec-WebSocket-Key et al., raw header casing intact)
+ *   is replayed upstream over a raw node:net connection, the upstream's 101
+ *   is relayed back verbatim, and from then on the two sockets are piped
+ *   byte-for-byte — no WS framing library, no pending-message queue (TCP
+ *   holds early client bytes until the 101 lands; the 'upgrade' head buffer
+ *   is forwarded explicitly). Raw TCP rather than an http.request client on
+ *   purpose: 101 handling differs between Node's http client and other
+ *   runtimes' node:http shims, while a socket is a socket everywhere. The
+ *   upstream connect carries no Origin header, which is exactly why the
+ *   Origin gate refuses foreign browser origins BEFORE any upstream contact
+ *   (Vite CVE-2025-24010 class).
+ *
+ * Security posture (identical to the Bun transport; binding is the
+ * contract): binds 127.0.0.1 UNCONDITIONALLY — never the shared
+ * env-dependent hostname helper — validates Host before any URL parsing or
+ * upstream contact (a Host-less HTTP/1.0 request answers the plain 403,
+ * never a runtime error), and PLANNOTATOR_URL_HOST is never applied to the
+ * proxy origin.
+ */
+
+import { createServer, request as httpRequest } from "node:http";
+import type { IncomingHttpHeaders, IncomingMessage, ServerResponse } from "node:http";
+import { connect as netConnect, type Socket } from "node:net";
+import { Transform, pipeline } from "node:stream";
+import {
+  HOP_BY_HOP_HEADERS,
+  LIVE_PROXY_BRIDGE_PATH,
+  LIVE_PROXY_RESERVED_PREFIX,
+  applyHtmlFramingHeaders,
+  buildFrameAncestorsPolicy,
+  createHtmlInjector,
+  isAllowedBridgeFetchSite,
+  isAllowedProxyHost,
+  isAllowedWsUpgradeOrigin,
+  isDocumentIntentRequest,
+  isHtmlContentType,
+  rewriteLoopbackLocation,
+  type HeaderReader,
+  type LiveAppProxy,
+  type LiveAppProxyOptions,
+} from "./live-proxy-core.ts";
+
+// The literal loopback address is the security contract (see header).
+const LOOPBACK_HOST = "127.0.0.1";
+
+/** Read adapter over node's lowercased incoming header object. */
+function nodeHeaderReader(headers: IncomingHttpHeaders): HeaderReader {
+  return {
+    get(name: string): string | null {
+      const value = headers[name.toLowerCase()];
+      if (value === undefined) return null;
+      return Array.isArray(value) ? value.join(", ") : value;
+    },
+  };
+}
+
+function firstHeaderValue(value: string | string[] | undefined): string | null {
+  if (value === undefined) return null;
+  return Array.isArray(value) ? value[0] ?? null : value;
+}
+
+/** Outgoing header map (lowercased names; set-cookie may repeat). */
+type HeaderRecord = Record<string, string | string[]>;
+
+function copyWithoutHopByHop(headers: IncomingHttpHeaders): HeaderRecord {
+  const out: HeaderRecord = {};
+  for (const [name, value] of Object.entries(headers)) {
+    if (value === undefined) continue;
+    if (HOP_BY_HOP_HEADERS.includes(name)) continue; // node keys are lowercased
+    out[name] = value;
+  }
+  return out;
+}
+
+function writeRawResponse(socket: Socket, statusLine: string, body: string): void {
+  try {
+    // end(), not write()+destroy(): destroy discards buffered bytes, and the
+    // refusal must actually reach the client before the FIN.
+    socket.end(
+      `HTTP/1.1 ${statusLine}\r\n`
+      + "Content-Type: text/plain\r\n"
+      + `Content-Length: ${Buffer.byteLength(body)}\r\n`
+      + "Connection: close\r\n\r\n"
+      + body,
+    );
+  } catch {
+    // Socket already gone: nothing to refuse.
+    socket.destroy();
+  }
+}
+
+function sendForbidden(res: ServerResponse): void {
+  res.writeHead(403, { "Content-Type": "text/plain" });
+  res.end("Forbidden");
+}
+
+/**
+ * Start the loopback reverse proxy for one live annotate session on
+ * node:http. The caller owns its lifecycle: stop() destroys tracked upgrade
+ * sockets and closes the listener (plus its remaining keep-alive
+ * connections).
+ */
+export function startLiveAppProxyNode(opts: LiveAppProxyOptions): Promise<LiveAppProxy> {
+  const target = new URL(opts.targetUrl);
+  if (target.protocol !== "http:") {
+    throw new Error("Live app proxy supports http upstreams only.");
+  }
+  const targetHost = target.host;
+  const targetHostname = target.hostname;
+  const targetPort = Number(target.port || "80");
+  const frameAncestors = buildFrameAncestorsPolicy(opts.editorOrigins);
+  /** Client+upstream sockets of live WS upgrades, destroyed on stop(). */
+  const upgradeSockets = new Set<Socket>();
+  let warnedEncodedHtml = false;
+  let port = 0;
+
+  const server = createServer((req, res) => {
+    // Host validation FIRST, before any URL construction: the invariant is
+    // "Host validation runs before any upstream contact" for ALL inputs,
+    // well-formed or not — a Host-less HTTP/1.0 request answers the plain
+    // 403, never a runtime error page.
+    const hostHeader = firstHeaderValue(req.headers.host);
+    if (!isAllowedProxyHost(hostHeader, port)) {
+      sendForbidden(res);
+      return;
+    }
+
+    // A Host that passed the check should always yield a parseable URL, but
+    // parsing must not be the thing that decides: an unparseable request
+    // takes the same refusal path rather than any error page.
+    let url: URL;
+    try {
+      url = new URL(req.url ?? "", `http://${hostHeader}`);
+    } catch {
+      sendForbidden(res);
+      return;
+    }
+
+    // Reserved namespace: never forwarded upstream.
+    if (url.pathname.startsWith(LIVE_PROXY_RESERVED_PREFIX)) {
+      if (url.pathname === LIVE_PROXY_BRIDGE_PATH && (req.method === "GET" || req.method === "HEAD")) {
+        // The bridge body embeds the per-session token; only same-origin
+        // includes and direct navigation may fetch it (see
+        // isAllowedBridgeFetchSite in live-proxy-core).
+        if (!isAllowedBridgeFetchSite(firstHeaderValue(req.headers["sec-fetch-site"]))) {
+          sendForbidden(res);
+          return;
+        }
+        res.writeHead(200, {
+          "Content-Type": "text/javascript; charset=utf-8",
+          "Cache-Control": "no-store",
+        });
+        res.end(req.method === "HEAD" ? undefined : opts.bridgeJs);
+        return;
+      }
+      res.writeHead(404, { "Content-Type": "text/plain" });
+      res.end("Not found");
+      return;
+    }
+
+    // Whole-origin forward, streaming both directions.
+    const upstreamHeaders = copyWithoutHopByHop(req.headers);
+    upstreamHeaders["host"] = targetHost;
+    upstreamHeaders["x-forwarded-host"] = hostHeader ?? "";
+    upstreamHeaders["x-forwarded-proto"] = "http";
+    if (isDocumentIntentRequest(nodeHeaderReader(req.headers))) {
+      // HTML must arrive decodable for injection; assets keep encoding.
+      upstreamHeaders["accept-encoding"] = "identity";
+    }
+
+    const upstreamReq = httpRequest(
+      {
+        host: targetHostname,
+        port: targetPort,
+        method: req.method,
+        path: url.pathname + url.search,
+        headers: upstreamHeaders,
+      },
+      (upstreamRes) => {
+        const responseHeaders = copyWithoutHopByHop(upstreamRes.headers);
+
+        const location = firstHeaderValue(upstreamRes.headers.location);
+        if (location) {
+          const rewritten = rewriteLoopbackLocation(
+            location,
+            target,
+            `http://${LOOPBACK_HOST}:${port}`,
+          );
+          if (rewritten !== null) responseHeaders["location"] = rewritten;
+        }
+
+        const isHtml = isHtmlContentType(firstHeaderValue(upstreamRes.headers["content-type"]));
+        if (isHtml) {
+          // Decided posture: drop any app CSP on HTML and replace it with our
+          // frame-ancestors policy; non-HTML responses keep their CSP and
+          // X-Frame-Options (see applyHtmlFramingHeaders in live-proxy-core).
+          applyHtmlFramingHeaders(
+            {
+              delete: (name) => {
+                delete responseHeaders[name];
+              },
+              set: (name, value) => {
+                responseHeaders[name] = value;
+              },
+            },
+            frameAncestors,
+          );
+        }
+
+        const hasEncoding = !!responseHeaders["content-encoding"];
+        if (!isHtml || hasEncoding) {
+          if (isHtml && hasEncoding && !warnedEncodedHtml) {
+            // Fail open on rendering, closed on injection: the page renders,
+            // annotation does not attach on it.
+            warnedEncodedHtml = true;
+            console.error(
+              "[plannotator] Live app proxy: upstream returned content-encoded HTML despite the Accept-Encoding strip; the annotation bridge was not injected.",
+            );
+          }
+          res.writeHead(upstreamRes.statusCode ?? 502, responseHeaders);
+          pipeline(upstreamRes, res, () => {});
+          return;
+        }
+
+        // Streaming injection of the bridge script tag.
+        delete responseHeaders["content-length"];
+        const injector = createHtmlInjector(
+          `<script src="${LIVE_PROXY_BRIDGE_PATH}"></script>`,
+        );
+        const inject = new Transform({
+          transform(chunk: Buffer, _encoding, callback) {
+            for (const part of injector.push(chunk)) {
+              if (part.length) this.push(Buffer.from(part));
+            }
+            callback();
+          },
+          flush(callback) {
+            for (const part of injector.flush()) {
+              if (part.length) this.push(Buffer.from(part));
+            }
+            callback();
+          },
+        });
+        res.writeHead(upstreamRes.statusCode ?? 502, responseHeaders);
+        pipeline(upstreamRes, inject, res, () => {});
+      },
+    );
+
+    upstreamReq.on("error", (err) => {
+      if (res.headersSent) {
+        res.destroy();
+        return;
+      }
+      res.writeHead(502, { "Content-Type": "text/plain" });
+      res.end(`Live app upstream unreachable: ${err instanceof Error ? err.message : String(err)}`);
+    });
+
+    // Stream the request body upstream; GET/HEAD have none by contract.
+    if (req.method === "GET" || req.method === "HEAD") {
+      upstreamReq.end();
+      req.resume();
+    } else {
+      pipeline(req, upstreamReq, () => {});
+    }
+  });
+
+  // WebSocket passthrough (HMR): raw duplex piping after the same gate
+  // sequence as plain requests — Host first, then the Origin gate, both
+  // before any upstream contact.
+  server.on("upgrade", (req: IncomingMessage, socket: Socket, head: Buffer) => {
+    const hostHeader = firstHeaderValue(req.headers.host);
+    if (!isAllowedProxyHost(hostHeader, port)) {
+      writeRawResponse(socket, "403 Forbidden", "Forbidden");
+      return;
+    }
+    let url: URL;
+    try {
+      url = new URL(req.url ?? "", `http://${hostHeader}`);
+    } catch {
+      writeRawResponse(socket, "403 Forbidden", "Forbidden");
+      return;
+    }
+    if (url.pathname.startsWith(LIVE_PROXY_RESERVED_PREFIX)) {
+      // Reserved namespace is never forwarded upstream, upgrades included.
+      writeRawResponse(socket, "404 Not Found", "Not found");
+      return;
+    }
+    if (!isAllowedWsUpgradeOrigin(firstHeaderValue(req.headers.origin), port)) {
+      writeRawResponse(socket, "403 Forbidden", "Forbidden");
+      return;
+    }
+
+    // Replay the client's own handshake upstream over raw TCP so the
+    // upstream's Sec-WebSocket-Accept matches the client's key. rawHeaders
+    // keeps original casing and repeats; Host is rewritten to the target and
+    // Origin is dropped to match the Bun transport's origin-less upstream
+    // connect (safe because the gate above already ran).
+    let handshake = `GET ${url.pathname + url.search} HTTP/1.1\r\n`;
+    for (let i = 0; i + 1 < req.rawHeaders.length; i += 2) {
+      const name = req.rawHeaders[i]!;
+      const lower = name.toLowerCase();
+      if (lower === "host") {
+        handshake += `Host: ${targetHost}\r\n`;
+        continue;
+      }
+      if (lower === "origin") continue;
+      handshake += `${name}: ${req.rawHeaders[i + 1]}\r\n`;
+    }
+
+    const upstreamSocket = netConnect(targetPort, targetHostname);
+    upgradeSockets.add(socket);
+    upgradeSockets.add(upstreamSocket);
+
+    const teardown = () => {
+      upgradeSockets.delete(socket);
+      upgradeSockets.delete(upstreamSocket);
+      socket.destroy();
+      upstreamSocket.destroy();
+    };
+
+    upstreamSocket.on("connect", () => {
+      upstreamSocket.write(handshake + "\r\n");
+    });
+
+    // Accumulate the upstream's response head; once complete, relay it
+    // verbatim and decide by status line: 101 pipes both ways, anything else
+    // is a refusal relayed to the client before closing. Capped so a
+    // malformed upstream cannot buffer unboundedly.
+    const MAX_UPGRADE_HEAD_BYTES = 64 * 1024;
+    let received = Buffer.alloc(0);
+    let established = false;
+    const onUpstreamData = (chunk: Buffer) => {
+      received = Buffer.concat([received, chunk]);
+      const headerEnd = received.indexOf("\r\n\r\n");
+      if (headerEnd === -1) {
+        if (received.length > MAX_UPGRADE_HEAD_BYTES) teardown();
+        return;
+      }
+      upstreamSocket.off("data", onUpstreamData);
+      const statusLine = received.subarray(0, received.indexOf("\r\n")).toString("latin1");
+      const is101 = /^HTTP\/1\.1 101 /i.test(statusLine);
+      socket.write(received);
+      if (!is101) {
+        // Refusal relayed; nothing further to pipe.
+        teardown();
+        return;
+      }
+      established = true;
+      if (head.length) upstreamSocket.write(head);
+      upstreamSocket.pipe(socket);
+      socket.pipe(upstreamSocket);
+    };
+    upstreamSocket.on("data", onUpstreamData);
+
+    upstreamSocket.on("close", teardown);
+    upstreamSocket.on("error", () => {
+      if (!established) {
+        writeRawResponse(socket, "502 Bad Gateway", "Live app upstream unreachable");
+        upgradeSockets.delete(socket);
+        upgradeSockets.delete(upstreamSocket);
+        upstreamSocket.destroy();
+        return;
+      }
+      teardown();
+    });
+    socket.on("close", teardown);
+    socket.on("error", teardown);
+  });
+
+  // Long-lived streams (SSE) must not be killed by a server-side timer;
+  // mirrors the Bun transport's idleTimeout: 0.
+  server.requestTimeout = 0;
+
+  return new Promise((resolve, reject) => {
+    server.once("error", reject);
+    // The literal loopback address is the security contract (see header).
+    server.listen(0, LOOPBACK_HOST, () => {
+      const address = server.address();
+      if (!address || typeof address === "string") {
+        server.close();
+        reject(new Error("Live app proxy failed to bind a loopback port"));
+        return;
+      }
+      port = address.port;
+      resolve({
+        port,
+        // Always the literal loopback origin: PLANNOTATOR_URL_HOST and
+        // buildAdvertisedUrl are never applied here.
+        origin: `http://${LOOPBACK_HOST}:${port}`,
+        stop() {
+          for (const s of upgradeSockets) s.destroy();
+          upgradeSockets.clear();
+          server.close();
+          // close() only stops the listener; drain keep-alive connections so
+          // a stopped session's sockets die immediately (parity with Bun's
+          // server.stop(true)). Guarded: jiti can run under hosts whose
+          // node:http lacks closeAllConnections.
+          (server as { closeAllConnections?: () => void }).closeAllConnections?.();
+        },
+      });
+    });
+  });
+}

package/generated/prompts.ts

@@ -25,6 +25,7 @@ export const PLAN_TOOL_NAMES: Record<PromptRuntime, string> = {
   pi: "plannotator_submit_plan",
   codex: "ExitPlanMode",
   "gemini-cli": "exit_plan_mode",
+  "oh-my-pi": "ExitPlanMode",
 };
 
 export function getPlanToolName(runtime?: PromptRuntime | null): string {

package/generated/review-core.ts

@@ -315,12 +315,23 @@ export function parseRemoteBookmark(target: string): { name: string; remote: str
   return { name: target.slice(0, at), remote: target.slice(at + 1) };
 }
 
+// A full `commit_id`: 40 hex digits for a SHA-1 repo, 64 for SHA-256. Matching
+// the full length only is deliberate, so an ordinary bookmark whose name
+// happens to be hex (`cafebabe`) is still treated as a bookmark.
+const JJ_FULL_COMMIT_ID = /^(?:[0-9a-f]{40}|[0-9a-f]{64})$/;
+
 export function jjCompareTargetRevset(target: string): string {
   const remoteBookmark = parseRemoteBookmark(target);
   if (remoteBookmark) {
     return `remote_bookmarks(exact:${quoteJjString(remoteBookmark.name)}, exact:${quoteJjString(remoteBookmark.remote)})`;
   }
 
+  // The resolved line base is a bare commit id whenever its fork point carries
+  // no usable bookmark. It has no separators, so it would otherwise read as a
+  // local bookmark name and build `bookmarks(exact:"<sha>")`, which resolves to
+  // no revisions at all and makes the whole Line of work diff fail.
+  if (JJ_FULL_COMMIT_ID.test(target)) return target;
+
   const localBookmark = parseJjBookmarkName(target);
   return localBookmark ? `bookmarks(exact:${quoteJjString(localBookmark)})` : target;
 }

package/index.ts

@@ -733,10 +733,16 @@ export default function plannotator(pi: ExtensionAPI): void {
 			// Split known annotate flags from the path. --json is silently
 			// accepted (Pi writes back via sendUserMessage, not stdout).
 			// `rawFilePath` keeps any leading `@` for the literal-@ fallback
-			// (scoped-package-style names).
-			let { filePath, rawFilePath, gate, renderHtml: renderHtmlFlag, renderMarkdown: renderMarkdownFlag, noJina } = parseAnnotateArgs(args ?? "");
+			// (scoped-package-style names). liveFlags: Pi supports live app
+			// sessions, so --app / --static are recognized here.
+			let { filePath, rawFilePath, gate, renderHtml: renderHtmlFlag, renderMarkdown: renderMarkdownFlag, noJina, app: appFlag, static: staticFlag } = parseAnnotateArgs(args ?? "", { liveFlags: true });
+			// Same flag-conflict-first ordering as the Bun CLI.
+			if (appFlag && staticFlag) {
+				ctx.ui.notify("--app and --static are mutually exclusive", "error");
+				return;
+			}
 			if (!filePath) {
-				ctx.ui.notify("Usage: /plannotator-annotate <file.md | file.txt | file.html | https://... | folder/> [--markdown] [--no-jina] [--gate] [--json]", "error");
+				ctx.ui.notify("Usage: /plannotator-annotate <file.md | file.txt | file.html | https://... | folder/> [--markdown] [--no-jina] [--app] [--static] [--gate] [--json]", "error");
 				return;
 			}
 
@@ -784,28 +790,91 @@ export default function plannotator(pi: ExtensionAPI): void {
 			let rawHtml: string | undefined;
 			let absolutePath: string;
 			let folderPath: string | undefined;
-			let mode: "annotate" | "annotate-folder" | undefined;
+			let mode: "annotate" | "annotate-folder" | "annotate-app" | undefined;
 			let sourceInfo: string | undefined;
 			let sourceConverted = false;
 			let isFolder = false;
+			let liveTargetUrl: string | undefined;
 
 			// --- URL annotation ---
 			const isUrl = /^https?:\/\//i.test(filePath);
 
+			// --app is contracted to fail loudly whenever it cannot apply; a
+			// file or folder target silently swallowing it would hide the
+			// flag's typo'd use (same contract as the Bun CLI).
+			if (!isUrl && appFlag) {
+				const { LIVE_APP_REQUIRES_URL_MESSAGE } = await import("./generated/live-probe.ts");
+				ctx.ui.notify(LIVE_APP_REQUIRES_URL_MESSAGE, "error");
+				return;
+			}
+
 			if (isUrl) {
-				const useJina = resolveUseJina(noJina, loadConfig());
-				ctx.ui.notify(`Fetching: ${filePath}${useJina ? " (via Jina Reader)" : " (via fetch+Turndown)"}...`, "info");
-				try {
-					const { isConvertedSource, urlToMarkdown } = await import("./generated/url-to-markdown.ts");
-					const result = await urlToMarkdown(filePath, { useJina });
-					markdown = result.markdown;
-					sourceConverted = isConvertedSource(result.source);
-				} catch (err) {
-					ctx.ui.notify(`Failed to fetch URL: ${err instanceof Error ? err.message : String(err)}`, "error");
+				// --- Live app detection (shared probe: same 3s timeout, same
+				// "< 500 + HTML + same loopback origin" gate as the Bun CLI) ---
+				const {
+					LIVE_APP_REMOTE_MESSAGE,
+					LIVE_APP_REQUIRES_HTTP_MESSAGE,
+					LIVE_APP_REQUIRES_LOOPBACK_MESSAGE,
+					buildForceAppFailureMessage,
+					buildLiveProbeFallbackNotice,
+					classifyLiveAppCandidate,
+					probeLiveAppTarget,
+				} = await import("./generated/live-probe.ts");
+				const { parsed: parsedUrl, loopback } = classifyLiveAppCandidate(filePath);
+
+				if (appFlag && !loopback) {
+					ctx.ui.notify(LIVE_APP_REQUIRES_LOOPBACK_MESSAGE, "error");
 					return;
 				}
-				absolutePath = filePath;
-				sourceInfo = filePath;
+				if (appFlag && parsedUrl?.protocol === "https:") {
+					// The live proxy is http-only.
+					ctx.ui.notify(LIVE_APP_REQUIRES_HTTP_MESSAGE, "error");
+					return;
+				}
+
+				if (loopback && parsedUrl?.protocol === "http:" && !staticFlag) {
+					const probe = await probeLiveAppTarget(filePath, parsedUrl);
+					if (probe.liveEligible) {
+						// Remote hard-off (layer 1 of 2; the server throw in
+						// serverAnnotate.ts backstops it): a live proxy relays
+						// the user's authenticated dev app, and a remote Pi
+						// session is reachable beyond loopback.
+						if (isRemoteSession()) {
+							ctx.ui.notify(LIVE_APP_REMOTE_MESSAGE, "error");
+							return;
+						}
+						liveTargetUrl = filePath;
+						mode = "annotate-app";
+						ctx.ui.notify(`Live app: ${filePath}`, "info");
+					} else if (appFlag) {
+						ctx.ui.notify(buildForceAppFailureMessage(filePath, probe), "error");
+						return;
+					} else if (probe.probeError !== null) {
+						// A dev server still starting up probes as unreachable;
+						// say so instead of silently downgrading to static.
+						ctx.ui.notify(buildLiveProbeFallbackNotice(filePath, probe.probeError), "info");
+					}
+				}
+
+				if (liveTargetUrl) {
+					markdown = "";
+					absolutePath = filePath;
+					sourceInfo = filePath;
+				} else {
+					const useJina = resolveUseJina(noJina, loadConfig());
+					ctx.ui.notify(`Fetching: ${filePath}${useJina ? " (via Jina Reader)" : " (via fetch+Turndown)"}...`, "info");
+					try {
+						const { isConvertedSource, urlToMarkdown } = await import("./generated/url-to-markdown.ts");
+						const result = await urlToMarkdown(filePath, { useJina });
+						markdown = result.markdown;
+						sourceConverted = isConvertedSource(result.source);
+					} catch (err) {
+						ctx.ui.notify(`Failed to fetch URL: ${err instanceof Error ? err.message : String(err)}`, "error");
+						return;
+					}
+					absolutePath = filePath;
+					sourceInfo = filePath;
+				}
 			} else {
 				// Pick the interpretation of the user input that actually exists:
 				// stripped form first (reference-mode primary), literal as fallback
@@ -881,6 +950,8 @@ export default function plannotator(pi: ExtensionAPI): void {
 					rawHtml,
 					!!rawHtml,
 					renderMarkdownFlag,
+					undefined,
+					liveTargetUrl,
 				);
 				ctx.ui.notify(sessionOpenedMessage("Annotation opened", session.url), "info");
 				void session

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@plannotator/pi-extension",
-  "version": "0.27.5",
+  "version": "0.27.7",
   "type": "module",
   "description": "Plannotator Pi extension - interactive plan review with annotations, annotate agent messages, and review code/PRs",
   "author": "backnotprop",
@@ -21,9 +21,13 @@
     "ai-agent",
     "coding-agent"
   ],
+  "//pi": "skills/ is vendored by vendor.sh from apps/skills/core/plannotator and is gitignored, so the shipped copy cannot drift from the single source.",
   "pi": {
     "extensions": [
       "./"
+    ],
+    "skills": [
+      "skills/plannotator/SKILL.md"
     ]
   },
   "files": [
@@ -42,6 +46,7 @@
     "server/",
     "todo-providers/",
     "generated/",
+    "skills/",
     "README.md",
     "plannotator.html",
     "review-editor.html"

package/plannotator-browser.ts

@@ -53,7 +53,7 @@ export {
 	hasReviewBrowserHtml,
 } from "./plannotator-browser-runtime.ts";
 
-export type AnnotateMode = "annotate" | "annotate-folder" | "annotate-last";
+export type AnnotateMode = "annotate" | "annotate-folder" | "annotate-last" | "annotate-app";
 export interface PlanReviewDecision {
 	approved: boolean;
 	feedback?: string;
@@ -661,6 +661,10 @@ export async function startMarkdownAnnotationSession(
 	renderHtml?: boolean,
 	convertHtml?: boolean,
 	recentMessages?: { messageId: string; text: string; timestamp?: string }[],
+	/** Live app session (mode "annotate-app"): the loopback dev-server URL to
+	 * proxy. The bridge sources are loaded here from the vendored
+	 * bridge-script module, mirroring how the Bun CLI supplies them. */
+	liveTargetUrl?: string,
 ): Promise<BrowserDecisionSession<{ feedback: string; exit?: boolean; approved?: boolean; selectedMessageId?: string; feedbackScope?: "message" | "messages" }>> {
 	if (!ctx.hasUI) {
 		throw new Error("Plannotator annotation browser is unavailable in this session.");
@@ -670,6 +674,22 @@ export async function startMarkdownAnnotationSession(
 		throw new Error("Plannotator annotation browser is unavailable in this session.");
 	}
 
+	// Live sessions serve the page through the proxy; the bridge constants are
+	// lazy-imported so plain annotate sessions never pay for the ~large
+	// string module.
+	let liveApp:
+		| { targetUrl: string; bridgeScript: string; bridgeBootstrap: string; annotationCss: string }
+		| undefined;
+	if (mode === "annotate-app" && liveTargetUrl) {
+		const bridge = await import("./generated/bridge-script.ts");
+		liveApp = {
+			targetUrl: liveTargetUrl,
+			bridgeScript: bridge.BRIDGE_SCRIPT,
+			bridgeBootstrap: bridge.LIVE_BRIDGE_BOOTSTRAP,
+			annotationCss: bridge.ANNOTATION_HIGHLIGHT_CSS,
+		};
+	}
+
 	let resolvedMarkdown = markdown;
 	if (!renderHtml && !resolvedMarkdown.trim() && existsSync(filePath)) {
 		try {
@@ -687,6 +707,7 @@ export async function startMarkdownAnnotationSession(
 		filePath,
 		origin: "pi",
 		mode,
+		liveApp,
 		folderPath,
 		recentMessages,
 		sourceInfo,