pi-supernova 0.9.0 → 0.10.0

package/src/runtime/reference.js

@@ -1,16 +1,13 @@
 // Standing tool description: sent on every request. No result or history compression.
-export const REFERENCE = `JS body/async arrow: read/write/edit/bash; no fs/import/require. file: workspace scripts; data: literals (≤48000 JSON chars).
-read(path|paths,offset=1,limit?) → raw text/text[]; directories → entries; images: PNG/JPEG/GIF/WebP (≤16 images/20 MiB).
-Text ≤64 MiB internally; complete:true requires the whole file. Display alone is capped; return a summary or read(path,{offset:1,limit:80}). Larger files/JSONL: bounded bash parser.
-read({path,json:selector}) → parsed JSON: ".field", ".a[0:3]", ".a.length", quoted keys, true; input ≤16 MiB, selections ≤64 MiB storage, no jq. Values retain their types.
-read("symbol or question") = read({query,resolve:true}) → view; check status; view.text is a span, not the file.
-read(path,{about}) → windows; read({query,evidence:true}) → ranked evidence; read({path,outline:true}) → declarations.
-write(path,text) replaces unread workspace files; write({path,content,append:true}) appends without reading. After read: edit or replace:true.
-edit(path,oldText,newText) | edit({path,edits:[{oldText,newText}]}) unique exact read text; returns numbered windows/checks/references.
-edit(view,text) replaces span; edit(view,old,new) uniquely matches within it. edit(async()=>{...}) checkpoint: merge on success, rollback/rethrow on failure.
-bash(command,{cwd?,timeoutMs?}) | bash({command,args}) literal argv for scripts; bounded output, nonzero throws. Outer timeoutMs caps ALL waits/commands; bash inherits unless overridden.
-Edits commit on success/before bash. Promise.allSettled keeps partial results.
-programs:[{code?,file?,data?}] inherits source/data; entries override. mergeData:true shallow object merge (entry keys win).
-Promise.all: ≤8 reads or disjoint-file mutations; same-file serial; bash/checkpoint barriers.
-Fresh guests/separate commits. Sequential failure stops; prior commits stay. parallel:true for disjoint entries. ONE call for known work; split for new decisions.
+export const REFERENCE = `JS body/async arrow; read/write/edit/bash, no fs/import/require. file: workspace JS; data: literals ≤48000 JSON chars.
+read(path|paths,offset=1,limit?) → text/text[]; dirs→entries; PNG/JPEG/GIF/WebP ≤16/20MiB.
+Text ≤64 MiB internally; complete:true requires whole file. Display capped: summarize or read(path,{offset:1,limit:80}); larger files via bash.
+read({path,json:true|selector}) → JSON, no jq (16MiB input/64MiB selection). Values retain their types.
+read("symbol or question") = read({query,resolve:true}) → view; check status; view.text is a span. read(path,{about}) windows; read({query,evidence:true}) evidence; read({path,outline:true}) declarations.
+write/edit workspace-only; external changes need separately authorized command. write(path,text) or {path,content,append:true}; after read edit or replace:true.
+edit(path,oldText,newText) or {path,edits:[{oldText,newText}]}; unique exact match; numbered windows. edit(view,text) or edit(view,old,new). edit(async()=>{...}) checkpoint: no bash; merge/rollback+rethrow.
+bash(command,{cwd?,timeoutMs?}) or {command,args}; nonzero throws. Outer timeout bounds foreground; bash inherits. Shell mutations flush edits.
+bash({command,background:true,pty?:true,timeoutMs?:1800000})→sessionId. bash({action:"list"}) or {sessionId,action:"poll"|"write"|"stop",cursor?,waitMs?,input?}→status/output/cursor/exitCode. PTY macOS/Linux; jobs end at shutdown.
+programs:[{code?,file?,data?}] inherit defaults; mergeData:true shallow. Fresh guests/commits; sequential failure stops, prior commits stay; parallel:true disjoint work.
+Promise.all ≤8 disjoint reads/mutations; same-file serial; bash/checkpoints barriers. Optional reads: Promise.allSettled retains successes. ONE call for known work.
 `;

package/src/shared/syntax-context.js

@@ -1,12 +1,26 @@
+import stringWidth from "string-width";
+
 /** Bounded source context for parse and syntax diagnostics. */
+const JS_LINES = /\r\n|[\n\r\u2028\u2029]/;
+
+const JSON_LINES = /\r\n|[\n\r]/;
+
+// Source columns are UTF-16 offsets; expand controls identically before the
+// source token and the caret. JSON strings can contain literal Unicode LS/PS.
+const displaySource = text => text.replaceAll("\t","    ").replaceAll("\u2028","\\u2028").replaceAll("\u2029","\\u2029");
 
-export function sourceContext(source, line, column) {
+export function sourceContext(source, line, column, lineBreaks = JS_LINES) {
   if (!Number.isInteger(line) || line < 1) return "";
-  const text = String(source).split("\n")[line - 1];
+  const text = String(source).split(lineBreaks)[line - 1];
 
   if (text === undefined) return "";
-  const shown = text.length > 160 ? text.slice(0, 160) : text;
-  const caret = Number.isInteger(column) ? " ".repeat(Math.min(column, shown.length)) + "^" : "";
+  const located = Number.isInteger(column) && column >= 0;
+  const position = located ? Math.min(column, text.length) : 0;
+  const start = Math.max(0, Math.min(position - 80, text.length - 160));
+  const end = Math.min(text.length, start + 160);
+  const prefix = start > 0 ? "…" : "";
+  const shown = prefix + displaySource(text.slice(start, end)) + (end < text.length ? "…" : "");
+  const caret = located ? " ".repeat(stringWidth(prefix + displaySource(text.slice(start, position)))) + "^" : "";
 
   return "\n  " + shown + (caret ? "\n  " + caret : "");
 }
@@ -24,11 +38,12 @@ export function parsePosition(message, source) {
   const offsetMatch = /at position (\d+)/.exec(String(message));
 
   if (!offsetMatch) return null;
+
   return offsetPosition(source, Number(offsetMatch[1]));
 }
 
 function offsetPosition(source, offset) {
-  const lines = String(source).slice(0, offset).split("\n");
+  const lines = String(source).slice(0, offset).split(JSON_LINES);
 
   return { line: lines.length, column: lines.at(-1).length };
 }
@@ -37,6 +52,7 @@ function offsetPosition(source, offset) {
 // offsets. JSON.parse remains the authority; cap extra work at 65,536 characters.
 // eslint-disable-next-line no-control-regex -- RFC 8259 excludes unescaped control characters from strings.
 const JSON_TOKEN = /("(?:[^"\\\u0000-\u001f]|\\(?:["\\/bfnrt]|u[\da-fA-F]{4}))*")|(-?(?:0|[1-9]\d*)(?:\.\d+)?(?:[eE][+-]?\d+)?)|(true|false|null)|[{}[\]:,]/y;
+
 const JSON_NEXT = {
   end: { eof: [] },
   value: { string: [], number: [], literal: [], "{": ["object"], "[": ["array"] },
@@ -67,9 +83,12 @@ function invalidJsonOffset(source) {
   while (stack.length) {
     const token = jsonTokenAt(source, offset);
     let state = stack.pop();
+
     if (state === "array" && token.kind !== "]") { stack.push("arrayNext"); state = "value"; }
+
     if (state === "object" && token.kind !== "}") state = "key";
     const next = JSON_NEXT[state][token.kind];
+
     if (!next) return token.start;
     stack.push(...next);
     offset = token.end;
@@ -80,10 +99,12 @@ function invalidJsonOffset(source) {
 
 export function jsonErrorContext(message, source) {
   const native = parsePosition(message, source);
-  if (native) return sourceContext(source, native.line, native.column);
+
+  if (native) return sourceContext(source, native.line, native.column, JSON_LINES);
   const offset = invalidJsonOffset(source);
+
   if (offset === null) return "";
   const { line, column } = offsetPosition(source, offset);
 
-  return " (near line " + line + " column " + (column + 1) + ")" + sourceContext(source, line, column);
+  return " (near line " + line + " column " + (column + 1) + ")" + sourceContext(source, line, column, JSON_LINES);
 }