pi-supernova 0.5.0 → 0.6.0

package/src/runtime/runtime.js

@@ -47,7 +47,7 @@ function prepareProgram(code) {
 
     if (candidate && FUNCTION_TYPES.has(candidate.type)) {
       expression = candidate;
-      expressionSource = code.slice(0, statement.end).replace(/;\s*$/, "");
+      expressionSource = code.slice(statement.start, statement.end).replace(/;\s*$/, "");
     }
   } catch (bodyError) {
     expressionSource = code.trimEnd().replace(/;+\s*$/, "");
@@ -185,7 +185,10 @@ export async function runGuestProgram({ code, file, cwd = process.cwd(), data, n
 
   if (signal?.aborted) return fail(ABORT_MESSAGE);
   const runId = ++runSeq;
-  const timeoutMs = config.timeoutMs ?? 60000;
+  const requestedTimeout = Number(config.timeoutMs === undefined ? 60000 : config.timeoutMs);
+
+  if (!Number.isFinite(requestedTimeout) || requestedTimeout <= 0) return fail("timeoutMs must be a positive finite number");
+  const timeoutMs = Math.max(1, Math.min(2_147_483_647, Math.floor(requestedTimeout)));
   const rssLimit = rssBytes() + (config.maxHeapMb ?? 512) * MEMORY_SLACK * 1048576;
 
   return new Promise((resolve) => {
@@ -195,6 +198,7 @@ export async function runGuestProgram({ code, file, cwd = process.cwd(), data, n
     let completing = false;
     let hostError;
     let notifyingHost = false;
+    let aborting = false;
     const pending = new Set();
     const inputController = new AbortController();
 
@@ -224,11 +228,13 @@ export async function runGuestProgram({ code, file, cwd = process.cwd(), data, n
     };
 
     const abort = () => {
-      if (finished) return;
+      if (finished || aborting) return;
+      aborting = true;
       cancelHost();
 
       try { onTimeout?.(); } catch {}
 
+      aborting = false;
       finish(fail(ABORT_MESSAGE));
     };
 
@@ -267,8 +273,11 @@ export async function runGuestProgram({ code, file, cwd = process.cwd(), data, n
       handle?.worker.off("exit", onExit);
       void killWorker(handle);
 
-      if (!outcome.ok) cancelHost();
-      await Promise.allSettled(pending);
+      if (pending.size || !outcome.ok) cancelHost();
+      // A host tool that ignores cancellation must not keep the result unsettled
+      // after the guest worker is gone. Give it a brief drain window only.
+      await Promise.race([Promise.allSettled(pending), new Promise(resolve => setTimeout(resolve, 250))]);
+      if (pending.size && outcome.ok) hostError ??= "program completed with a host call still running";
 
       if (finished) return;
       finish(outcome.ok && hostError ? fail(hostError) : outcome);
@@ -339,7 +348,9 @@ export async function runGuestProgram({ code, file, cwd = process.cwd(), data, n
         await handle.ready;
 
         if (finished || signal?.aborted) return abort();
-        const available = isFunction(nova.names) ? await nova.names() : [];
+        let available = isFunction(nova.names) ? await nova.names() : [];
+
+        if (!Array.isArray(available)) available = [];
 
         if (finished || signal?.aborted) return abort();
         handle.worker.on("message", onMessage);

package/src/shared/decode.js

@@ -65,7 +65,9 @@ export function toPlain(value, seen = new Set(), depth = 0) {
   if (value === null || value === undefined) return value;
   const tag = toStr.call(value);
 
-  if (tag === "[object String]" || tag === "[object Number]" || tag === "[object Boolean]") return value.valueOf();
+  if (tag === "[object String]") return value.valueOf();
+
+  if (tag === "[object Number]" || tag === "[object Boolean]") return value.valueOf();
 
   if (tag === "[object BigInt]") return value.toString() + "n";
 
@@ -84,7 +86,12 @@ export function toPlain(value, seen = new Set(), depth = 0) {
   if (value instanceof Error) {
     const out = { name: value.name, message: value.message };
 
-    if (value.cause !== undefined) out.cause = toPlain(value.cause, seen, depth + 1);
+    if (value.cause !== undefined) {
+      seen.add(value);
+
+      try { out.cause = toPlain(value.cause, seen, depth + 1); }
+      finally { seen.delete(value); }
+    }
 
     return out;
   }
@@ -93,7 +100,12 @@ export function toPlain(value, seen = new Set(), depth = 0) {
 
   if (ArrayBuffer.isView(value) || value instanceof ArrayBuffer) return plainFromBinary(value);
 
-  if (isFunction(value.toJSON)) return toPlain(value.toJSON(), seen, depth + 1);
+  if (isFunction(value.toJSON)) {
+    seen.add(value);
+
+    try { return toPlain(value.toJSON(), seen, depth + 1); }
+    finally { seen.delete(value); }
+  }
   seen.add(value);
 
   try {

package/src/ui/omp-frame.js

@@ -38,7 +38,10 @@ function borderPaint(theme, state, borderColor) {
 
 	if (theme && isFunction(theme.fg)) {
 		try {
-			return (text) => theme.fg(key, text);
+			return (text) => {
+				try { return theme.fg(key, text); }
+				catch { return text; }
+			};
 		} catch {
 			/* fall through */
 		}
@@ -51,10 +54,14 @@ const STATUS_PREFIX = { error: ["error", "✗ "], running: ["dim", "… "] };
 
 function statusHeader(theme, { title, description, state, icon }) {
 	const resolved = icon ?? (state === "error" ? "error" : undefined);
+	const fg = (key, text) => {
+		try { return isFunction(theme?.fg) ? theme.fg(key, text) : text; }
+		catch { return text; }
+	};
 	const prefixSpec = STATUS_PREFIX[resolved];
-	const prefix = prefixSpec ? (theme?.fg ? theme.fg(prefixSpec[0], prefixSpec[1]) : prefixSpec[1]) : "";
-	const titleText = theme?.fg ? theme.fg("accent", title) : title;
-	const descText = description ? (theme?.fg ? theme.fg("muted", description) : description) : "";
+	const prefix = prefixSpec ? fg(prefixSpec[0], prefixSpec[1]) : "";
+	const titleText = fg("accent", title);
+	const descText = description ? fg("muted", description) : "";
 
 	return descText ? `${prefix}${titleText}: ${descText}` : `${prefix}${titleText}`;
 }

package/src/ui/render.js

@@ -363,9 +363,9 @@ function opDuration(op, isPartial) {
  */
 function formatOpRow(theme, op, width, isPartial, isError) {
 	const marker = opMarker(theme, op, isPartial, isError);
-	const toolText = op.tool.padEnd(TOOL_COL);
+	const toolText = op.tool.slice(0, TOOL_COL).padEnd(TOOL_COL);
 	const tool = theme.fg("syntaxFunction", toolText);
-	const durationText = opDuration(op, isPartial);
+	const durationText = opDuration(op, isPartial).slice(-DURATION_COL);
 	const duration = theme.fg("dim", durationText.padStart(DURATION_COL));
 	let prefix = `${marker} ${tool} ${duration}  `;
 	let used = 2 + toolText.length + 1 + DURATION_COL + 2;