pi-supernova 0.8.2 → 0.9.1

package/src/fs/lines.js

@@ -0,0 +1,117 @@
+import {isNumber} from '../shared/decode.js';
+
+function totalContentLines(text) {
+  if (text === "") return 1;
+
+  return contentLineInfo(text).count + (text.endsWith("\n") ? 1 : 0);
+}
+
+function emptySliceInfo(text, totalLines) {
+  return { text: "", end: totalLines, total: totalLines, count: 0, eof: true, whole: totalLines === 1 && text === "" };
+}
+
+function sliceWindow(text, startIndex, count, totalLines) {
+  const endExclusive = Math.min(totalLines, startIndex + count);
+  const start = lineStartIndex(text, startIndex + 1);
+  const end = lineEndIndex(text, start, endExclusive - startIndex);
+  let selected = text.slice(start, end);
+  const eof = endExclusive >= totalLines || (endExclusive === totalLines - 1 && text.endsWith("\n"));
+
+  if (endExclusive < totalLines && !selected.endsWith("\n")) selected += "\n";
+
+  return { text: selected, end: endExclusive, total: totalLines, count: endExclusive - startIndex, eof, whole: startIndex === 0 && eof };
+}
+
+export function sliceLinesRawInfo(text, offset, limit) {
+  const totalLines = totalContentLines(text);
+
+  if (!isNumber(offset) && !isNumber(limit)) {
+    return { text, end: totalLines, total: totalLines, count: totalLines, eof: true, whole: true };
+  }
+
+  const startIndex = (isNumber(offset) ? Math.max(1, Math.floor(offset)) : 1) - 1;
+  const count = isNumber(limit) ? Math.max(0, Math.floor(limit)) : totalLines;
+
+  if (count === 0 || startIndex >= totalLines) return emptySliceInfo(text, totalLines);
+
+  return sliceWindow(text, startIndex, count, totalLines);
+}
+
+/** Read-window slicing preserves the selected lines' own line ending. */
+export function sliceLinesRaw(text, offset, limit) {
+  return sliceLinesRawInfo(text, offset, limit).text;
+}
+
+export function sourceLines(content) {
+  const raw = content.split("\n");
+
+  if (raw.at(-1) === "") raw.pop();
+
+  return raw;
+}
+
+export function lineNumberAt(content, index) {
+  let line = 1;
+
+  for (let i = 0; i < index; i++) if (content.charCodeAt(i) === 10) line++;
+
+  return line;
+}
+
+export function formatNumberedLine(n, text) {
+  return String(n).padStart(5) + " " + text;
+}
+
+export function numberedPreview(content, cap = EDIT_PREVIEW_LINES) {
+  const { count, preview } = contentLineInfo(content, cap);
+
+  if (count === 0) return "0 lines";
+  const body = preview.map((line, i) => formatNumberedLine(i + 1, line)).join("\n");
+  const suffix = count + " lines total";
+
+  return body + "\n" + suffix;
+}
+
+export function lineStartIndex(content, line) {
+  return lineEndIndex(content, 0, line - 1);
+}
+
+export function lineEndIndex(content, startIndex, lineCount) {
+  let index = startIndex;
+
+  for (let i = 0; i < lineCount; i++) {
+    const next = content.indexOf("\n", index);
+
+    if (next < 0) return content.length;
+    index = next + 1;
+  }
+
+  return index;
+}
+
+export function lineTextRange(content, line) {
+  const start = lineStartIndex(content, line);
+
+  return { start, end: lineEndIndex(content, start, 1) };
+}
+
+export function contentLineInfo(text, previewLimit = 0) {
+  if (text === "") return { count: 0, preview: [], newlines: 0 };
+  const preview = [];
+  let count = 0;
+  let start = 0;
+
+  do {
+    const newline = text.indexOf("\n", start);
+    const end = newline < 0 ? text.length : newline;
+
+    if (preview.length < previewLimit) preview.push(text.slice(start, end).replace(/\r$/, ""));
+    count++;
+    if (newline < 0) break;
+    start = newline + 1;
+  } while (start < text.length);
+
+  return { count, preview, newlines: count - Number(!text.endsWith("\n")) };
+}
+
+export const EDIT_PREVIEW_LINES = 16;

package/src/fs/read-window.js

@@ -0,0 +1,74 @@
+import * as fs from "node:fs/promises";
+import { decodeUtf8Strict, decodeUtf8Window } from "../shared/utf8.js";
+import { sliceLinesRawInfo } from "./lines.js";
+import { fileChunks, remapReadError } from "./file-io.js";
+
+/** Advance through newline-delimited bytes without decoding or retaining skipped data. */
+function advanceLines(bytes, start, remaining) {
+  while (remaining > 0) {
+    const newline = bytes.indexOf(10, start);
+    if (newline < 0) return { offset: bytes.length, remaining };
+    start = newline + 1;
+    remaining--;
+  }
+  return { offset: start, remaining };
+}
+
+async function scanWindow(file, stat, startLine, lineCount, maxBytes, signal) {
+  const scan = { parts: [], collected: 0, startByte: undefined, endByte: undefined };
+  let skip = startLine - 1, take = lineCount ?? Infinity, position = 0;
+  for await (const chunk of fileChunks(file, signal, stat.size)) {
+    const head = advanceLines(chunk, 0, skip);
+    skip = head.remaining;
+    const start = position;
+    position += chunk.length;
+    if (skip) continue;
+    scan.startByte ??= start + head.offset;
+    const tail = advanceLines(chunk, head.offset, take);
+    take = tail.remaining;
+    if (take === 0) scan.endByte = start + tail.offset;
+    const end = Math.min(tail.offset, head.offset + maxBytes + 1 - scan.collected);
+    if (end > head.offset) {
+      scan.parts.push(Buffer.from(chunk.subarray(head.offset, end)));
+      scan.collected += end - head.offset;
+    }
+    if (take === 0 || scan.collected > maxBytes) break;
+  }
+  return scan;
+}
+
+function overlayWindow(overlay, startLine, lineCount) {
+  const window = sliceLinesRawInfo(overlay, startLine, lineCount);
+  const satisfied = lineCount === undefined || lineCount === 0 || window.text === "" || window.count >= lineCount || window.eof;
+  return { text: window.text, satisfied, whole: window.whole };
+}
+
+async function openReadFile(target) {
+  try { return await fs.open(target, fs.constants.O_RDONLY | (fs.constants.O_NONBLOCK ?? 0)); }
+  catch (error) { remapReadError(error, target); }
+}
+
+export function createWindowReader(vfs) {
+  return async function readWindow(target, startLine, lineCount, maxBytes, signal) {
+    const overlay = vfs.getOverlay(target);
+    if (overlay !== undefined) {
+      const window = overlayWindow(overlay,startLine,lineCount);
+      window.satisfied &&= Buffer.byteLength(window.text,"utf8") <= maxBytes;
+      return window;
+    }
+    const file = await openReadFile(target);
+    try {
+      const stat = await file.stat();
+      if (!stat.isFile()) throw new Error("read requires a regular file: " + target);
+      if (lineCount === 0) return { text: "", satisfied: true, whole: stat.size === 0 };
+      const scan = await scanWindow(file, stat, startLine, lineCount, maxBytes, signal);
+      if (scan.startByte === undefined) return { text: "", satisfied: true, whole: stat.size === 0 };
+      const bytes = Buffer.concat(scan.parts, scan.collected);
+      const end = scan.startByte + scan.collected;
+      const eof = end >= stat.size;
+      const text = eof ? decodeUtf8Strict(bytes, target) : decodeUtf8Window(bytes);
+      await vfs.recordExpected(target, stat);
+      return { text, satisfied: end >= scan.endByte || eof, whole: startLine === 1 && scan.startByte === 0 && eof };
+    } finally { await file.close(); }
+  };
+}

package/src/fs/session-resource.js

@@ -0,0 +1,50 @@
+import * as fs from 'node:fs/promises';
+import * as path from 'node:path';
+import {isString} from '../shared/decode.js';
+
+function sessionUriParts(uri) {
+  const match = /^(agent|artifact):\/\/([^/?#]+)$/i.exec(uri);
+
+  if (!match) throw new Error("session resource reads support bare agent://<id> and artifact://<number>; use offset/limit for pagination");
+  const kind = match[1].toLowerCase();
+  const id = decodeURIComponent(match[2]);
+
+  if (!id || id === "." || id === ".." || (/[/\\]/u.test(id) || Array.from(id).some(char => char.charCodeAt(0) < 32)) || (kind === "artifact" && !/^\d+$/.test(id))) throw new Error("invalid session resource ID");
+
+  return { kind, id };
+}
+
+async function findArtifactFile(root, id, uri, signal) {
+  const matches = [];
+  let count = 0;
+
+  for await (const entry of await fs.opendir(root)) {
+    signal?.throwIfAborted();
+
+    if (++count > 4096) throw new Error("session artifact lookup exceeded its directory budget");
+
+    if (entry.name.startsWith(id + ".") && !entry.isDirectory()) matches.push(entry.name);
+  }
+
+  if (matches.length !== 1) throw new Error(matches.length ? "ambiguous session artifact: " + uri : "session artifact not found: " + uri);
+
+  return matches[0];
+}
+
+export async function resolveSessionResource(uri, signal, hooks) {
+  const { kind, id } = sessionUriParts(uri);
+  const dir = hooks.artifactsDir?.();
+
+  if (!isString(dir) || !dir) throw new Error("this host session does not expose an artifacts directory for " + uri);
+  signal?.throwIfAborted();
+  const root = await fs.realpath(dir);
+  const file = kind === "artifact" ? await findArtifactFile(root, id, uri, signal) : id + ".md";
+  const target = await fs.realpath(path.join(root, file));
+
+  if (!target.startsWith(root + path.sep)) throw new Error("session resource escapes its artifacts directory");
+
+  if (!(await fs.stat(target)).isFile()) throw new Error("session resource is not a file: " + uri);
+  signal?.throwIfAborted();
+
+  return target;
+}

package/src/fs/text-ops.js

@@ -1,3 +1,9 @@
+import { fileChunks } from "./file-io.js";
+export {MAX_DIRECTORY_ENTRIES,formatDirectoryEntry,formatLsEntry} from './directory.js';
+export {textResult,resultDiff} from '../shared/result.js';
+import {sliceLinesRaw,lineNumberAt,formatNumberedLine,numberedPreview,lineStartIndex,lineEndIndex,lineTextRange,contentLineInfo} from './lines.js';
+export * from './lines.js';
+export {jsonStringLength,maxJsonStringPrefix} from './json-size.js';
 import * as fs from "node:fs/promises";
 import * as path from "node:path";
 import { homedir } from "node:os";
@@ -5,124 +11,6 @@ import { isString, isNumber, isObject } from "../shared/decode.js";
 import { assertFilesystemPath } from "./workspace.js";
 import { MAX_DIFF_MATCHES } from "./diff.js";
 
-const JSON_TWO_BYTE = new Set([0x22, 0x5c, 8, 9, 10, 12, 13]);
-
-function jsonAsciiWidth(c) {
-  if (JSON_TWO_BYTE.has(c)) return 2;
-
-  if (c < 32) return 6;
-
-  return 1;
-}
-
-function jsonUnitWidth(s, i) {
-  const c = s.charCodeAt(i);
-
-  if (c >= 0xD800 && c <= 0xDBFF && i + 1 < s.length) {
-    const d = s.charCodeAt(i + 1);
-
-    if (d >= 0xDC00 && d <= 0xDFFF) return { add: 2, skip: 2 };
-
-    return { add: 6, skip: 1 };
-  }
-
-  if (c >= 0xD800 && c <= 0xDFFF) return { add: 6, skip: 1 };
-
-  return { add: jsonAsciiWidth(c), skip: 1 };
-}
-
-/** UTF-16 length of JSON.stringify(s) for a string, without allocating the JSON. */
-export function jsonStringLength(s) {
-  let n = 2;
-
-  for (let i = 0; i < s.length; ) {
-    const unit = jsonUnitWidth(s, i);
-    n += unit.add;
-    i += unit.skip;
-  }
-
-  return n;
-}
-
-/** Largest prefix whose JSON.stringify length is <= limit. */
-export function maxJsonStringPrefix(s, limit) {
-  let used = 2;
-  let i = 0;
-
-  while (i < s.length) {
-    const unit = jsonUnitWidth(s, i);
-
-    if (used + unit.add > limit) break;
-    used += unit.add;
-    i += unit.skip;
-  }
-
-  return i;
-}
-
-export function textResult(text, details) {
-  return {
-    content: [{ type: "text", text: String(text ?? "") }],
-    details: details || {},
-  };
-}
-
-export function resultDiff(response) {
-  let details = response?.details;
-
-  if (isString(details)) {
-    try {
-      details = JSON.parse(details);
-    } catch {
-      return undefined;
-    }
-  }
-
-  return isObject(details) ? details.diff : undefined;
-}
-
-function totalContentLines(text) {
-  if (text === "") return 1;
-
-  return contentLineInfo(text).count + (text.endsWith("\n") ? 1 : 0);
-}
-
-function emptySliceInfo(text, totalLines) {
-  return { text: "", end: totalLines, total: totalLines, count: 0, eof: true, whole: totalLines === 1 && text === "" };
-}
-
-function sliceWindow(text, startIndex, count, totalLines) {
-  const endExclusive = Math.min(totalLines, startIndex + count);
-  const start = lineStartIndex(text, startIndex + 1);
-  const end = lineEndIndex(text, start, endExclusive - startIndex);
-  let selected = text.slice(start, end);
-  const eof = endExclusive >= totalLines || (endExclusive === totalLines - 1 && text.endsWith("\n"));
-
-  if (endExclusive < totalLines && !selected.endsWith("\n")) selected += "\n";
-
-  return { text: selected, end: endExclusive, total: totalLines, count: endExclusive - startIndex, eof, whole: startIndex === 0 && eof };
-}
-
-export function sliceLinesRawInfo(text, offset, limit) {
-  const totalLines = totalContentLines(text);
-
-  if (!isNumber(offset) && !isNumber(limit)) {
-    return { text, end: totalLines, total: totalLines, count: totalLines, eof: true, whole: true };
-  }
-
-  const startIndex = (isNumber(offset) ? Math.max(1, Math.floor(offset)) : 1) - 1;
-  const count = isNumber(limit) ? Math.max(0, Math.floor(limit)) : totalLines;
-
-  if (count === 0 || startIndex >= totalLines) return emptySliceInfo(text, totalLines);
-
-  return sliceWindow(text, startIndex, count, totalLines);
-}
-
-/** Read-window slicing preserves the selected lines' own line ending. */
-export function sliceLinesRaw(text, offset, limit) {
-  return sliceLinesRawInfo(text, offset, limit).text;
-}
-
 export function readLineParam(value, name) {
   if (value === undefined) return undefined;
   const number = isNumber(value) ? value : isString(value) && value.trim() !== "" ? Number(value) : NaN;
@@ -173,40 +61,6 @@ export async function probeExistingPath(cwd, targetParam, vfs) {
   }
 }
 
-export const EDIT_PREVIEW_LINES = 16;
-
-export const MAX_DIRECTORY_ENTRIES = 10000;
-
-export function sourceLines(content) {
-  const raw = content.split("\n");
-
-  if (raw.at(-1) === "") raw.pop();
-
-  return raw;
-}
-
-export function lineNumberAt(content, index) {
-  let line = 1;
-
-  for (let i = 0; i < index; i++) if (content.charCodeAt(i) === 10) line++;
-
-  return line;
-}
-
-export function formatNumberedLine(n, text) {
-  return String(n).padStart(5) + " " + text;
-}
-
-export function numberedPreview(content, cap = EDIT_PREVIEW_LINES) {
-  const { count, preview } = contentLineInfo(content, cap);
-
-  if (count === 0) return "0 lines";
-  const body = preview.map((line, i) => formatNumberedLine(i + 1, line)).join("\n");
-  const suffix = count + " lines total";
-
-  return body + "\n" + suffix;
-}
-
 function lineAt(content, n) {
   const range = lineTextRange(content, n);
 
@@ -283,38 +137,6 @@ export function applyReplacements(target, content, requestedEdits) {
   return { updated, matches };
 }
 
-export function lineStartIndex(content, line) {
-  let index = 0;
-
-  for (let current = 1; current < line; current++) {
-    const next = content.indexOf("\n", index);
-
-    if (next < 0) return content.length;
-    index = next + 1;
-  }
-
-  return Math.min(index, content.length);
-}
-
-export function lineEndIndex(content, startIndex, lineCount) {
-  let index = startIndex;
-
-  for (let i = 0; i < lineCount; i++) {
-    const next = content.indexOf("\n", index);
-
-    if (next < 0) return content.length;
-    index = next + 1;
-  }
-
-  return index;
-}
-
-export function lineTextRange(content, line) {
-  const start = lineStartIndex(content, line);
-
-  return { start, end: lineEndIndex(content, start, 1) };
-}
-
 export function shiftDiffLines(diff, delta) {
   if (!diff || delta === 0) return diff;
 
@@ -429,7 +251,7 @@ export async function countContentLines(target, signal) {
     let last = -1;
     let total = 0;
 
-    for await (const chunk of file.createReadStream({ autoClose: false, signal })) {
+    for await (const chunk of fileChunks(file, signal)) {
       for (let i = 0; i < chunk.length; i++) if (chunk[i] === 10) newlines++;
       last = chunk.at(-1);
       total += chunk.length;
@@ -439,26 +261,6 @@ export async function countContentLines(target, signal) {
   } finally { await file.close(); }
 }
 
-export function contentLineInfo(text, previewLimit = 0) {
-  if (text === "") return { count: 0, preview: [], newlines: 0 };
-  const preview = [];
-  let count = 0;
-  let start = 0;
-
-  while (start <= text.length) {
-    const newline = text.indexOf("\n", start);
-    const end = newline < 0 ? text.length : newline;
-
-    if (end === text.length && end === start && text.endsWith("\n")) break;
-    if (preview.length < previewLimit) preview.push(text.slice(start, end).replace(/\r$/, ""));
-    count++;
-    if (newline < 0) break;
-    start = newline + 1;
-  }
-
-  return { count, preview, newlines: count - Number(!text.endsWith("\n")) };
-}
-
 export function boundedEditDiff(target, original, matches) {
   const rendered = matches.slice(0, MAX_DIFF_MATCHES);
   const lines = [];
@@ -498,25 +300,3 @@ export function boundedWriteDiff(target, content, removed) {
     lines: added.preview.map((text, i) => ({ type: "add", lineNum: i + 1, text })),
   };
 }
-
-export function formatDirectoryEntry(name, type, size = 0) {
-  const sizeSuffix = size ? `, ${size} bytes` : "";
-
-  return `${name}${type === "dir" ? "/" : ""} (${type}${sizeSuffix})`;
-}
-
-export async function formatLsEntry(dirPath, entry) {
-  const isDir = entry.isDirectory();
-  const isSym = entry.isSymbolicLink();
-  const typeLabel = isDir ? "dir" : isSym ? "sym" : "file";
-  let size = 0;
-
-  try {
-    if (!isDir && !isSym) {
-      const st = await fs.stat(path.join(dirPath, entry.name));
-      size = st.size;
-    }
-  } catch {}
-
-  return formatDirectoryEntry(entry.name, typeLabel, size);
-}