pi-studio 0.5.47 → 0.5.49

package/client/studio.css

@@ -898,6 +898,24 @@
       scroll-margin-top: 24px;
     }
 
+    .preview-comment-line-block {
+      min-height: 1.5em;
+    }
+
+    .preview-code-lines {
+      white-space: pre-wrap;
+      word-break: break-word;
+      overflow-wrap: anywhere;
+    }
+
+    .preview-code-line-content {
+      display: block;
+      min-height: 1.5em;
+      white-space: inherit;
+      word-break: inherit;
+      overflow-wrap: inherit;
+    }
+
     .preview-comment-controls {
       position: absolute;
       top: 0;

package/index.ts

@@ -10,6 +10,7 @@ import { basename, dirname, extname, isAbsolute, join, resolve } from "node:path
 import { URL, pathToFileURL } from "node:url";
 import { WebSocketServer, WebSocket, type RawData } from "ws";
 import {
+	advancePastStudioInlineBacktickSpan,
 	collectStudioInlineAnnotationMarkers,
 	hasStudioMarkdownAnnotationMarkers,
 	isStudioAnnotationWordChar,
@@ -18,6 +19,7 @@ import {
 	replaceStudioInlineAnnotationMarkers,
 	transformStudioMarkdownOutsideFences,
 } from "./shared/studio-annotation-scanner.js";
+import { stripStudioMarkdownHtmlComments } from "./shared/studio-markdown-html-comments.js";
 import { escapeStudioPdfLatexTextFragment } from "./shared/studio-pdf-escape.js";
 
 type Lens = "writing" | "code";
@@ -2892,114 +2894,6 @@ function normalizeMathDelimiters(markdown: string): string {
 	return out.join("\n");
 }
 
-function stripStudioMarkdownHtmlCommentsInSegment(markdown: string): string {
-	const source = String(markdown ?? "");
-	let out = "";
-	let i = 0;
-	let codeSpanFenceLength = 0;
-	let inHtmlComment = false;
-
-	while (i < source.length) {
-		if (inHtmlComment) {
-			if (source.startsWith("-->", i)) {
-				inHtmlComment = false;
-				i += 3;
-				continue;
-			}
-			const ch = source[i]!;
-			if (ch === "\n" || ch === "\r") out += ch;
-			i += 1;
-			continue;
-		}
-
-		if (codeSpanFenceLength > 0) {
-			const fence = "`".repeat(codeSpanFenceLength);
-			if (source.startsWith(fence, i)) {
-				out += fence;
-				i += codeSpanFenceLength;
-				codeSpanFenceLength = 0;
-				continue;
-			}
-			out += source[i]!;
-			i += 1;
-			continue;
-		}
-
-		const backtickMatch = source.slice(i).match(/^`+/);
-		if (backtickMatch) {
-			const fence = backtickMatch[0]!;
-			codeSpanFenceLength = fence.length;
-			out += fence;
-			i += fence.length;
-			continue;
-		}
-
-		if (source.startsWith("<!--", i)) {
-			inHtmlComment = true;
-			i += 4;
-			continue;
-		}
-
-		out += source[i]!;
-		i += 1;
-	}
-
-	return out;
-}
-
-function stripStudioMarkdownHtmlComments(markdown: string): string {
-	const lines = String(markdown ?? "").split("\n");
-	const out: string[] = [];
-	let plainBuffer: string[] = [];
-	let inFence = false;
-	let fenceChar: "`" | "~" | undefined;
-	let fenceLength = 0;
-
-	const flushPlain = () => {
-		if (plainBuffer.length === 0) return;
-		out.push(stripStudioMarkdownHtmlCommentsInSegment(plainBuffer.join("\n")));
-		plainBuffer = [];
-	};
-
-	for (const line of lines) {
-		const trimmed = line.trimStart();
-		const fenceMatch = trimmed.match(/^(`{3,}|~{3,})/);
-
-		if (fenceMatch) {
-			const marker = fenceMatch[1]!;
-			const markerChar = marker[0] as "`" | "~";
-			const markerLength = marker.length;
-
-			if (!inFence) {
-				flushPlain();
-				inFence = true;
-				fenceChar = markerChar;
-				fenceLength = markerLength;
-				out.push(line);
-				continue;
-			}
-
-			if (fenceChar === markerChar && markerLength >= fenceLength) {
-				inFence = false;
-				fenceChar = undefined;
-				fenceLength = 0;
-			}
-
-			out.push(line);
-			continue;
-		}
-
-		if (inFence) {
-			out.push(line);
-		} else {
-			plainBuffer.push(line);
-		}
-	}
-
-	flushPlain();
-	return out.join("\n");
-}
-
 const STUDIO_PREVIEW_PAGE_BREAK_SENTINEL_PREFIX = "PI_STUDIO_PAGE_BREAK__";
 
 function replaceStudioPreviewPageBreakCommands(markdown: string): string {
@@ -3263,6 +3157,26 @@ function inferStudioPdfLanguage(markdown: string, editorLanguage?: string): stri
 	return undefined;
 }
 
+function stripStudioMarkdownInlineCodeSpans(markdown: string): string {
+	const source = String(markdown ?? "");
+	let out = "";
+	let index = 0;
+	while (index < source.length) {
+		if (source[index] === "`") {
+			index = advancePastStudioInlineBacktickSpan(source, index);
+			continue;
+		}
+		out += source[index];
+		index += 1;
+	}
+	return out;
+}
+
+function isLikelyStandaloneLatexPreview(markdown: string): boolean {
+	const outsideFences = transformStudioMarkdownOutsideFences(markdown, (segment: string) => stripStudioMarkdownInlineCodeSpans(segment));
+	return /\\documentclass\b|\\begin\{document\}/.test(outsideFences);
+}
+
 function escapeStudioPdfLatexText(text: string): string {
 	const normalized = String(text ?? "")
 		.replace(/\r\n/g, "\n")
@@ -4043,9 +3957,15 @@ function prepareStudioPdfMarkdown(markdown: string, isLatex?: boolean, editorLan
 }
 
 function stripMathMlAnnotationTags(html: string): string {
-	return html
-		.replace(/<annotation-xml\b[\s\S]*?<\/annotation-xml>/gi, "")
-		.replace(/<annotation\b[\s\S]*?<\/annotation>/gi, "");
+	return String(html ?? "").replace(/<math\b([^>]*)>([\s\S]*?)<\/math>/gi, (_match, attrs, inner) => {
+		const texAnnotationMatch = String(inner ?? "").match(/<annotation\b[^>]*encoding="application\/x-tex"[^>]*>([\s\S]*?)<\/annotation>/i);
+		const texSource = texAnnotationMatch ? String(texAnnotationMatch[1] ?? "").trim() : "";
+		const cleanedInner = String(inner ?? "")
+			.replace(/<annotation-xml\b[\s\S]*?<\/annotation-xml>/gi, "")
+			.replace(/<annotation\b[\s\S]*?<\/annotation>/gi, "");
+		const texAttr = texSource ? ` data-tex-source="${escapeStudioHtmlText(texSource)}"` : "";
+		return `<math${attrs}${texAttr}>${cleanedInner}</math>`;
+	});
 }
 
 function normalizeObsidianImages(markdown: string): string {
@@ -7869,8 +7789,17 @@ export default function (pi: ExtensionAPI) {
 				parsedBody && typeof parsedBody === "object" && typeof (parsedBody as { resourceDir?: unknown }).resourceDir === "string"
 					? (parsedBody as { resourceDir: string }).resourceDir
 					: "";
+			const requestedEditorLanguage =
+				parsedBody && typeof parsedBody === "object" && typeof (parsedBody as { editorLanguage?: unknown }).editorLanguage === "string"
+					? (parsedBody as { editorLanguage: string }).editorLanguage
+					: "";
 			const resourcePath = resolveStudioBaseDir(sourcePath || undefined, userResourceDir || undefined, studioCwd);
-			const isLatex = /\\documentclass\b|\\begin\{document\}/.test(markdown);
+			const editorPreviewLanguage = normalizeStudioEditorLanguage(requestedEditorLanguage);
+			const isLatex = editorPreviewLanguage === "latex"
+				|| (
+					(editorPreviewLanguage === undefined || editorPreviewLanguage === "markdown")
+					&& isLikelyStandaloneLatexPreview(markdown)
+				);
 			const html = await renderStudioMarkdownWithPandoc(markdown, isLatex, resourcePath, sourcePath || undefined);
 			respondJson(res, 200, { ok: true, html, renderer: "pandoc" });
 		} catch (error) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pi-studio",
-  "version": "0.5.47",
+  "version": "0.5.49",
   "description": "Two-pane browser workspace for pi with prompt/response editing, annotations, critiques, prompt/response history, and live Markdown/LaTeX/code preview",
   "type": "module",
   "license": "MIT",

package/shared/studio-markdown-html-comments.js

@@ -0,0 +1,111 @@
+export function stripStudioMarkdownHtmlCommentsInSegment(markdown) {
+  const source = String(markdown ?? "");
+  let out = "";
+  let index = 0;
+  let codeSpanFenceLength = 0;
+  let inHtmlComment = false;
+
+  while (index < source.length) {
+    if (inHtmlComment) {
+      if (source.startsWith("-->", index)) {
+        inHtmlComment = false;
+        index += 3;
+        continue;
+      }
+      const ch = source[index];
+      if (ch === "\n" || ch === "\r") out += ch;
+      index += 1;
+      continue;
+    }
+
+    if (codeSpanFenceLength > 0) {
+      const fence = "`".repeat(codeSpanFenceLength);
+      if (source.startsWith(fence, index)) {
+        out += fence;
+        index += codeSpanFenceLength;
+        codeSpanFenceLength = 0;
+        continue;
+      }
+      const ch = source[index];
+      out += ch;
+      index += 1;
+      if (ch === "\n" || ch === "\r") {
+        codeSpanFenceLength = 0;
+      }
+      continue;
+    }
+
+    const backtickMatch = source.slice(index).match(/^`+/);
+    if (backtickMatch) {
+      const fence = backtickMatch[0];
+      codeSpanFenceLength = fence.length;
+      out += fence;
+      index += fence.length;
+      continue;
+    }
+
+    if (source.startsWith("<!--", index)) {
+      inHtmlComment = true;
+      index += 4;
+      continue;
+    }
+
+    out += source[index];
+    index += 1;
+  }
+
+  return out;
+}
+
+export function stripStudioMarkdownHtmlComments(markdown) {
+  const lines = String(markdown ?? "").split("\n");
+  const out = [];
+  let plainBuffer = [];
+  let inFence = false;
+  let fenceChar;
+  let fenceLength = 0;
+
+  const flushPlain = () => {
+    if (plainBuffer.length === 0) return;
+    out.push(stripStudioMarkdownHtmlCommentsInSegment(plainBuffer.join("\n")));
+    plainBuffer = [];
+  };
+
+  for (const line of lines) {
+    const trimmed = line.trimStart();
+    const fenceMatch = trimmed.match(/^(`{3,}|~{3,})/);
+
+    if (fenceMatch) {
+      const marker = fenceMatch[1];
+      const markerChar = marker[0];
+      const markerLength = marker.length;
+
+      if (!inFence) {
+        flushPlain();
+        inFence = true;
+        fenceChar = markerChar;
+        fenceLength = markerLength;
+        out.push(line);
+        continue;
+      }
+
+      if (fenceChar === markerChar && markerLength >= fenceLength) {
+        inFence = false;
+        fenceChar = undefined;
+        fenceLength = 0;
+      }
+
+      out.push(line);
+      continue;
+    }
+
+    if (inFence) {
+      out.push(line);
+    } else {
+      plainBuffer.push(line);
+    }
+  }
+
+  flushPlain();
+  return out.join("\n");
+}