pi-supernova 0.6.0 → 0.7.0

package/src/shared/decode.js

@@ -60,60 +60,82 @@ function plainFromCollection(value, seen, depth) {
   return out;
 }
 
-/** Convert any guest value to structured-clone-safe, JSON-shaped data. */
-export function toPlain(value, seen = new Set(), depth = 0) {
-  if (value === null || value === undefined) return value;
-  const tag = toStr.call(value);
+function withSeen(value, seen, fn) {
+  seen.add(value);
 
-  if (tag === "[object String]") return value.valueOf();
+  try { return fn(); }
+  finally { seen.delete(value); }
+}
 
-  if (tag === "[object Number]" || tag === "[object Boolean]") return value.valueOf();
+function functionLabel(value) {
+  return "[Function" + (value.name ? " " + value.name : "") + "]";
+}
 
-  if (tag === "[object BigInt]") return value.toString() + "n";
+function plainByTag(value, tag) {
+  if (tag === "[object String]") return { hit: true, out: value.valueOf() };
 
-  if (isFunction(value)) return "[Function" + (value.name ? " " + value.name : "") + "]";
+  if (tag === "[object Number]" || tag === "[object Boolean]") return { hit: true, out: value.valueOf() };
 
-  if (tag === "[object Symbol]") return value.toString();
+  if (tag === "[object BigInt]") return { hit: true, out: value.toString() + "n" };
 
-  if (depth > MAX_DEPTH) return "[Depth]";
+  if (tag === "[object Symbol]") return { hit: true, out: value.toString() };
 
-  if (seen.has(value)) return "[Circular]";
+  return { hit: false };
+}
 
-  if (value instanceof Date) return Number.isNaN(value.getTime()) ? "Invalid Date" : value.toISOString();
+function plainAtom(value) {
+  if (value === null || value === undefined) return { hit: true, out: value };
+  const tagged = plainByTag(value, toStr.call(value));
 
-  if (value instanceof RegExp) return value.toString();
+  if (tagged.hit) return tagged;
 
-  if (value instanceof Error) {
-    const out = { name: value.name, message: value.message };
+  if (isFunction(value)) return { hit: true, out: functionLabel(value) };
 
-    if (value.cause !== undefined) {
-      seen.add(value);
+  return { hit: false };
+}
 
-      try { out.cause = toPlain(value.cause, seen, depth + 1); }
-      finally { seen.delete(value); }
-    }
+function plainDate(value) {
+  return Number.isNaN(value.getTime()) ? "Invalid Date" : value.toISOString();
+}
 
-    return out;
-  }
+function plainHosted(value) {
+  if (value instanceof Date) return { hit: true, out: plainDate(value) };
 
-  if (value instanceof Promise) return "[Promise]";
+  if (value instanceof RegExp) return { hit: true, out: value.toString() };
 
-  if (ArrayBuffer.isView(value) || value instanceof ArrayBuffer) return plainFromBinary(value);
+  if (value instanceof Promise) return { hit: true, out: "[Promise]" };
 
-  if (isFunction(value.toJSON)) {
-    seen.add(value);
+  if (ArrayBuffer.isView(value) || value instanceof ArrayBuffer) return { hit: true, out: plainFromBinary(value) };
 
-    try { return toPlain(value.toJSON(), seen, depth + 1); }
-    finally { seen.delete(value); }
-  }
-  seen.add(value);
+  return { hit: false };
+}
 
-  try {
-    return plainFromCollection(value, seen, depth);
-  } finally {
-    seen.delete(value);
-  }
+function plainError(value, seen, depth) {
+  const out = { name: value.name, message: value.message };
+
+  if (value.cause !== undefined) out.cause = withSeen(value, seen, () => toPlain(value.cause, seen, depth + 1));
+
+  return out;
 }
 
-// ---- RPC to the host thread ----
+/** Convert any guest value to structured-clone-safe, JSON-shaped data. */
+export function toPlain(value, seen = new Set(), depth = 0) {
+  const atom = plainAtom(value);
+
+  if (atom.hit) return atom.out;
+
+  if (depth > MAX_DEPTH) return "[Depth]";
+
+  if (seen.has(value)) return "[Circular]";
+
+  if (value instanceof Error) return plainError(value, seen, depth);
+  const hosted = plainHosted(value);
+
+  if (hosted.hit) return hosted.out;
+
+  if (isFunction(value.toJSON)) return withSeen(value, seen, () => toPlain(value.toJSON(), seen, depth + 1));
 
+  return withSeen(value, seen, () => plainFromCollection(value, seen, depth));
+}
+
+// ---- RPC to the host thread ----

package/src/ui/omp-frame.js

@@ -89,20 +89,17 @@ function wrapBg(paint) {
 	};
 }
 
-function bgFnForState(theme, state) {
-	if (!state || !theme) return undefined;
-	const key = bgKeyFor(state);
-
-	if (isFunction(theme.bg)) {
-		try {
-			if (!isString(theme.bg(key, "x"))) return undefined;
-		} catch {
-			return undefined;
-		}
-
-		return wrapBg((text) => theme.bg(key, text));
+function probeThemeBg(theme, key) {
+	try {
+		if (!isString(theme.bg(key, "x"))) return undefined;
+	} catch {
+		return undefined;
 	}
 
+	return wrapBg((text) => theme.bg(key, text));
+}
+
+function themeAnsiBgFn(theme, key) {
 	if (!isFunction(theme.getBgAnsi)) return undefined;
 
 	try {
@@ -116,47 +113,56 @@ function bgFnForState(theme, state) {
 	}
 }
 
-function frameBodyLines(sections, contentWidth, box, border, bgFn, w, paintBar) {
+function bgFnForState(theme, state) {
+	if (!state || !theme) return undefined;
+	const key = bgKeyFor(state);
+
+	if (isFunction(theme.bg)) return probeThemeBg(theme, key);
+
+	return themeAnsiBgFn(theme, key);
+}
+
+function frameSectionLines(section, contentWidth, box, border, bgFn, w, paintBar) {
 	const lines = [];
-	const normalized = sections.length > 0 ? sections : [{ lines: [] }];
-	const v = box.vertical;
 
-	for (const section of normalized) {
-		if (section.label) lines.push(paintBar(box.teeRight || "├", box.teeLeft || "┤", section.label));
+	if (section.label) lines.push(paintBar(box.teeRight || "├", box.teeLeft || "┤", section.label));
 
-		for (const raw of section.lines || []) {
-			for (const piece of String(raw).split("\n")) {
-				const body = clampLine(piece, contentWidth);
-				const pad = Math.max(0, contentWidth - measureWidth(body));
-				lines.push(padLine(`${border(v)} ${body}${" ".repeat(pad)} ${border(v)}`, w, bgFn));
-			}
+	for (const raw of section.lines || []) {
+		for (const piece of String(raw).split("\n")) {
+			const body = clampLine(piece, contentWidth);
+			const pad = Math.max(0, contentWidth - measureWidth(body));
+			lines.push(padLine(`${border(box.vertical)} ${body}${" ".repeat(pad)} ${border(box.vertical)}`, w, bgFn));
 		}
 	}
 
 	return lines;
 }
 
-function renderPortableFrame(theme, { header, sections = [], state = "pending", borderColor, width }) {
-	const w = Math.max(1, width | 0);
+function frameBodyLines(sections, contentWidth, box, border, bgFn, w, paintBar) {
+	const normalized = sections.length > 0 ? sections : [{ lines: [] }];
+	const lines = [];
 
-	if (w < 8) {
-		const rawLines = [header];
+	for (const section of normalized) lines.push(...frameSectionLines(section, contentWidth, box, border, bgFn, w, paintBar));
 
-		for (const section of sections) {
-			if (section.label) rawLines.push(section.label);
-			rawLines.push(...(section.lines || []));
-		}
+	return lines;
+}
+
+function collapseNarrowFrame(header, sections, w) {
+	const rawLines = [header];
 
-		return rawLines.flatMap((line) => line ? [clampLine(line, w)] : []);
+	for (const section of sections) {
+		if (section.label) rawLines.push(section.label);
+		rawLines.push(...(section.lines || []));
 	}
 
-	const box = boxOf(theme);
-	const border = borderPaint(theme, state, borderColor);
-	const bgFn = bgFnForState(theme, state);
+	return rawLines.flatMap((line) => line ? [clampLine(line, w)] : []);
+}
+
+function paintBarFor(box, border, bgFn, w) {
 	const h = box.horizontal;
 	const cap = h.repeat(3);
 
-	const paintBar = (leftChar, rightChar, label) => {
+	return (leftChar, rightChar, label) => {
 		const left = `${leftChar}${cap}`;
 		const right = rightChar;
 
@@ -173,14 +179,25 @@ function renderPortableFrame(theme, { header, sections = [], state = "pending",
 
 		return padLine(`${border(left)}${trimmed}${border(h.repeat(fill))}${border(right)}`, w, bgFn);
 	};
+}
 
-	const contentWidth = Math.max(1, w - 2 - 2);
-	const lines = [];
-	lines.push(paintBar(box.topLeft, box.topRight, header));
-	lines.push(...frameBodyLines(sections, contentWidth, box, border, bgFn, w, paintBar));
-	lines.push(paintBar(box.bottomLeft, box.bottomRight, null));
+function renderPortableFrame(theme, { header, sections = [], state = "pending", borderColor, width, paintBg = true }) {
+	const w = Math.max(1, width | 0);
 
-	return lines;
+	if (w < 8) return collapseNarrowFrame(header, sections, w);
+	const box = boxOf(theme);
+	const border = borderPaint(theme, state, borderColor);
+	// Hosts that tint the whole tool block themselves (OMP's contentBox) must
+	// get unpainted rows: a second bg wrap here would clear the outer bg with
+	// \x1b[49m and strand the host's right pad as an unpainted bar.
+	const bgFn = paintBg ? bgFnForState(theme, state) : undefined;
+	const paintBar = paintBarFor(box, border, bgFn, w);
+
+	return [
+		paintBar(box.topLeft, box.topRight, header),
+		...frameBodyLines(sections, Math.max(1, w - 2 - 2), box, border, bgFn, w, paintBar),
+		paintBar(box.bottomLeft, box.bottomRight, null),
+	];
 }
 
 function createPortableFramedComponent(theme, build) {

package/src/ui/render-measure.js

@@ -11,6 +11,27 @@ let cachedWidthChars = 0;
 
 const MAX_WIDTH_CACHE_CHARS = 512_000;
 
+function asciiWidth(plain, normalized) {
+  return /^[\x20-\x7e\u2500-\u257f\u00b7\u00d7\u2026\u2713\u2717]*$/.test(plain)
+    ? plain.length
+    : stringWidth(normalized);
+}
+
+function rememberWidth(raw, width) {
+  if (raw.length > 4096) return width;
+
+  while (widthCache.size >= 4096 || cachedWidthChars + raw.length > MAX_WIDTH_CACHE_CHARS) {
+    const oldest = widthCache.keys().next().value;
+    widthCache.delete(oldest);
+    cachedWidthChars -= oldest.length;
+  }
+
+  widthCache.set(raw, width);
+  cachedWidthChars += raw.length;
+
+  return width;
+}
+
 export function measureWidth(text) {
   const raw = String(text ?? "");
   const cached = widthCache.get(raw);
@@ -22,24 +43,9 @@ export function measureWidth(text) {
 
   // ASCII and these single-column chrome glyphs need no Unicode segmentation.
   // Any other character/control/escape sequence uses the full oracle.
-  const width = /^[\x20-\x7e\u2500-\u257f\u00b7\u00d7\u2026\u2713\u2717]*$/.test(plain)
-    ? plain.length
-    : stringWidth(normalized);
-
   // Cache immutable text only, never host/theme/result objects. Bound both
   // bookkeeping and retained text; unusually long lines bypass retention.
-  if (raw.length <= 4096) {
-    while (widthCache.size >= 4096 || cachedWidthChars + raw.length > MAX_WIDTH_CACHE_CHARS) {
-      const oldest = widthCache.keys().next().value;
-      widthCache.delete(oldest);
-      cachedWidthChars -= oldest.length;
-    }
-
-    widthCache.set(raw, width);
-    cachedWidthChars += raw.length;
-  }
-
-  return width;
+  return rememberWidth(raw, asciiWidth(plain, normalized));
 }
 
 function takePrefix(text, width) {
@@ -76,6 +82,24 @@ export function clampLine(line, width) {
   return hardTruncate(line, width);
 }
 
+function pushWrapSegment(out, current, columns, segment, size, width) {
+  if (columns + size > width && current.text) {
+    out.push(current.text);
+    current.text = "";
+    columns = 0;
+  }
+
+  if (size > width) {
+    out.push(ELLIPSIS);
+
+    return columns;
+  }
+
+  current.text += segment;
+
+  return columns + size;
+}
+
 /** Wrap complete, already-sanitized result text without splitting graphemes. */
 export function wrapLine(line, width) {
   if (width <= 0) return [];
@@ -83,33 +107,31 @@ export function wrapLine(line, width) {
 
   if (measureWidth(text) <= width) return [text];
   const out = [];
-  let current = "";
+  const current = { text: "" };
   let columns = 0;
 
   for (const { segment } of segmenter.segment(text)) {
-    const size = measureWidth(segment);
-
-    if (columns + size > width && current) { out.push(current); current = ""; columns = 0; }
-
-    if (size > width) { out.push(ELLIPSIS); continue; }
-
-    current += segment;
-    columns += size;
+    columns = pushWrapSegment(out, current, columns, segment, measureWidth(segment), width);
   }
 
-  if (current) out.push(current);
+  if (current.text) out.push(current.text);
 
   return out;
 }
 
+function shortenedPath(text) {
+  const parts = text.split("/").filter(Boolean);
+  const base = parts.at(-1) ?? text;
+
+  return { base, suffix: parts.length > 1 ? "…/" + base : base };
+}
+
 export function fitPath(pathText, budget) {
   const width = Math.max(0, Math.floor(budget));
   const text = String(pathText ?? "").replace(/\\/g, "/");
 
   if (measureWidth(text) <= width) return text;
-  const parts = text.split("/").filter(Boolean);
-  const base = parts.at(-1) ?? text;
-  const suffix = parts.length > 1 ? "…/" + base : base;
+  const { base, suffix } = shortenedPath(text);
 
   return measureWidth(suffix) <= width ? suffix : hardTruncate(base, width);
 }