@animalabs/agent-framework 0.26.2 → 0.28.0

package/dist/src/modules/workspace/read-page.js

@@ -0,0 +1,219 @@
+import { answerText, fieldLine, sectionLead, sectionText, textAnswer } from './result-text.js';
+import { MAX_LINE_CHARS, numberedLine, safeCut } from './text.js';
+import { didNothing } from './answers.js';
+/**
+ * One page of a read, held to the result limit as its text measures it: a
+ * model reads the page's text (result-text.ts), and what passes the caller's
+ * limit doesn't reach it whole. A model's result spills into a file, cut, and
+ * a script gets ResultTooLarge in its place. So a page stops before its text
+ * would pass the limit, and its note says where to continue. A script's
+ * answer carries the page's fields, its content among them, beside its text,
+ * and the limit counts the text alone. A script's limit counts each character
+ * at the six bytes it takes at most in the answer, and no character but a
+ * control character takes more than three, so the text and the fields
+ * together pass what the script takes only on a page of more than half that
+ * limit (about 3.7 million characters at the default 128 MiB of script
+ * memory) holding control characters.
+ */
+/** How many lines a read shows when it isn't given a limit. */
+export const DEFAULT_READ_LINE_LIMIT = 2000;
+/** What a read says about the text it shows, besides the lines themselves. */
+export function textNotes(file) {
+    const notes = [];
+    if (file.crlfEnds > 0) {
+        // A line whose own text ends in a CR shows its line end's CR too (fileText).
+        const kept = file.crKept > 0
+            ? `, except on ${file.crKept} ${file.crKept === 1 ? 'line whose own text ends in a CR, which shows' : 'lines whose own text ends in a CR, which show'} both CRs`
+            : '';
+        notes.push(file.lfEnds > 0
+            ? `Line ends are mixed, ${file.crlfEnds} CRLF and ${file.lfEnds} LF, and a CRLF end is shown without its CR${kept}. An edit matches text as read shows it, and keeps each line's end.`
+            : `Line ends are CRLF, shown without the CR${kept}. An edit matches text as read shows it, and keeps the CRLF ends.`);
+    }
+    if (file.bom)
+        notes.push('The file starts with a UTF-8 BOM, which isn\'t shown. An edit keeps it.');
+    if (!file.utf8)
+        notes.push(NOT_UTF8);
+    return notes;
+}
+const NOT_UTF8 = 'The file isn\'t valid UTF-8: each invalid byte sequence shows as U+FFFD. Edit refuses this file, and write replaces it whole.';
+const joined = (notes) => {
+    const kept = notes.filter((n) => n !== null);
+    return kept.length > 0 ? kept.join(' ') : undefined;
+};
+/** A page's text: its fields, one to a line in their order, and then its content under its label. */
+function pageText(page) {
+    const header = Object.entries(page)
+        .filter((entry) => entry[0] !== 'content' && entry[1] !== undefined)
+        .map(([key, value]) => fieldLine(key, value));
+    return answerText(header, [sectionText('content', page.content)]);
+}
+/** A page as read answers it: its text for the model, and its fields for a script. */
+const pageAnswer = (page) => textAnswer(pageText(page), page);
+/**
+ * Lines from `offset` (1-based), at most `limit` of them, each numbered and a
+ * long one cut with the offsetChars and limitChars that read the rest. The
+ * page is the longest whose text fits within `maxChars`; where none fits
+ * with its first line as a page shows it, that line is cut shorter, at the
+ * most the page has room for. Where the page's last line is cut, its note
+ * names where that line's rest starts and how long it is, since reading on in
+ * order starts there: before the next line, or, on the page that ends the
+ * file, before the file is read whole. A page whose own fields and least
+ * content pass `maxChars` still moves on, and passes it. With no `maxChars`,
+ * for a call made in process, which takes the data itself, the page holds to
+ * `limit` alone and shows every line whole.
+ */
+export function linePage(path, file, offset, limit, maxChars, extraNotes = []) {
+    const { lines, starts } = file;
+    const total = lines.length;
+    const first = offset - 1;
+    const notes = [...textNotes(file), ...extraNotes];
+    if (first >= total) {
+        // Nothing to show: an empty file, or an offset past the last line. No
+        // range is claimed, and the line count says where the file ends.
+        const note = joined([
+            // Reading an empty file from its start is reading it whole.
+            first > 0 ? `Line ${first + 1} is past the end: the file has ${total} line${total === 1 ? '' : 's'}.` : null,
+            ...notes,
+        ]);
+        return pageAnswer({ path, totalLines: total, ...(note !== undefined ? { note } : {}), content: '' });
+    }
+    const last = Math.min(first + limit, total);
+    const shown = (i, maxLineChars = MAX_LINE_CHARS) => numberedLine(lines[i], i + 1, maxLineChars, (cut) => `read the rest with offsetChars=${starts[i] + cut} and limitChars=${lines[i].length - cut}`);
+    // Where the rest of line i starts in the stored text, shown at most
+    // maxLineChars long, as its marker says; null for a line shown whole.
+    const restOf = (i, maxLineChars) => lines[i].length > maxLineChars ? starts[i] + safeCut(lines[i], maxLineChars) : null;
+    // The rest's length is what's left of the line as a page shows it, so a
+    // character read of it ends where the line does.
+    const cutLine = (to, rest) => `Line ${to} is cut: read its rest with offsetChars=${rest} and limitChars=${starts[to - 1] + lines[to - 1].length - rest}`;
+    const limitNote = (to, rest) => `Truncated at ${limit} lines (file has ${total}).${rest === null ? '' : ` ${cutLine(to, rest)}.`} Use offset/limit to read more.`;
+    const budgetNote = (to, rest) => `Stopped at line ${to} to stay within the ${maxChars}-character result limit (file has ${total}). `
+        + (rest === null ? `Continue with offset=${to + 1}.` : `${cutLine(to, rest)}, then continue with offset=${to + 1}.`);
+    const page = (to, content, note) => ({
+        path, totalLines: total, fromLine: first + 1, toLine: to, ...(note !== undefined ? { note } : {}), content,
+    });
+    if (maxChars === undefined) {
+        const whole = lines.slice(first, last).map((line, k) => numberedLine(line, first + k + 1, Infinity)).join('\n');
+        return pageAnswer(page(last, whole, joined([last < total ? limitNote(last, null) : null, ...notes])));
+    }
+    // The note of the page that ends at line `to`, its last line shown at most
+    // lastMax long: the page that ends where it was asked to, at the file's end
+    // or the line limit, says so, and any other says it stopped for the limit.
+    const noteAt = (to, lastMax = MAX_LINE_CHARS) => {
+        const rest = restOf(to - 1, lastMax);
+        const endNote = to < total ? limitNote(to, rest) : rest === null ? null : `${cutLine(to, rest)}.`;
+        return joined([to === last ? endNote : budgetNote(to, rest), ...notes]);
+    };
+    // A page's text's length: its fields' and note's, measured with no content,
+    // and its content's, under the content's label. A page here has a line.
+    const lengthAt = (to, contentChars, note) => pageText(page(to, '', note)).length + sectionLead('content') + contentChars;
+    // The page is the longest that fits. Its length isn't monotone in its
+    // lines: the page that ends the file carries no stop note, the one at the
+    // line limit a shorter one than a stop, and one whose last line is cut a
+    // longer one. But every page carries `notes` and a longer page shows more,
+    // so once a page passes the limit with those alone, no longer one fits.
+    const shownLines = [];
+    let contentChars = 0;
+    let best = 0;
+    for (let i = first; i < last; i++) {
+        const line = shown(i);
+        shownLines.push(line);
+        // Each line after the first comes after a line feed.
+        contentChars += line.length + (i > first ? 1 : 0);
+        if (lengthAt(i + 1, contentChars, noteAt(i + 1)) <= maxChars)
+            best = shownLines.length;
+        else if (lengthAt(i + 1, contentChars, joined(notes)) > maxChars)
+            break;
+    }
+    if (best > 0) {
+        shownLines.length = best;
+        return pageAnswer(page(first + best, shownLines.join('\n'), noteAt(first + best)));
+    }
+    // No page fits with its first line as a page shows it: the loop tried that
+    // page first, since a read's limit is at least 1, and it is pageWith(top).
+    // So the line is cut shorter, at the most the page has room for, and ends
+    // the page: its note names where the line's rest starts and how long it is,
+    // since that comes next. Each cut is measured on the page itself, since its
+    // note names the cut. Every cut below `top` shows a marker. A longer cut
+    // adds a character of text at least, and the offsets only grow, but the
+    // rest's length is in the marker and in the note, so where it loses a digit
+    // the page loses two characters: it can be one character shorter than the
+    // page a cut before. The search takes the page as growing with the cut.
+    // Such a dip is one cut, and the next is many cuts away, so the longest cut
+    // that fits is the one the search finds or, past a dip, at most two cuts
+    // further, four code units at most, and those are tried too.
+    const pageWith = (chars) => page(first + 1, shown(first, chars), noteAt(first + 1, chars));
+    const fitsAt = (chars) => pageText(pageWith(chars)).length <= maxChars;
+    const top = Math.min(lines[first].length, MAX_LINE_CHARS);
+    let fits = 0;
+    let over = top;
+    while (over - fits > 1) {
+        const mid = Math.floor((fits + over) / 2);
+        if (fitsAt(mid))
+            fits = mid;
+        else
+            over = mid;
+    }
+    // The search ends with `fits + 1` measured as too long, or as `top`.
+    const found = fits;
+    for (let chars = found + 2; chars <= found + 4 && chars < top; chars++)
+        if (fitsAt(chars))
+            fits = chars;
+    return pageAnswer(pageWith(fits));
+}
+const splitsPair = (text, at) => at > 0 && at < text.length
+    && text.charCodeAt(at - 1) >= 0xd800 && text.charCodeAt(at - 1) <= 0xdbff
+    && text.charCodeAt(at) >= 0xdc00 && text.charCodeAt(at) <= 0xdfff;
+/**
+ * Raw text from `offsetChars`, at most `limitChars` code units (one more to
+ * keep a surrogate pair whole), stopped sooner where its page's text would
+ * pass `maxChars`, if there is one.
+ */
+export function characterPage(path, file, offsetChars, limitChars, maxChars, extraNotes = []) {
+    const text = file.raw;
+    const start = Math.min(offsetChars, text.length);
+    if (splitsPair(text, start)) {
+        return {
+            success: false,
+            isError: true,
+            error: didNothing('read', `"offsetChars" ${start} falls between the two halves of a surrogate pair, one character in UTF-16. `
+                + `Give ${start - 1} or ${start + 1}; a page's nextOffsetChars never splits one.`),
+        };
+    }
+    let end = start + Math.min(limitChars, text.length - start);
+    if (splitsPair(text, end))
+        end++;
+    const notes = [...(file.utf8 ? [] : [NOT_UTF8]), ...extraNotes];
+    // A page that stops short of what it was asked for gives what's left of
+    // that as limitChars, so a reader that follows its notes ends where it
+    // asked to: at a cut line's end, for the rest a line page's note names.
+    const stoppedNote = (to, left) => `Stopped at character ${to} to stay within the ${maxChars}-character result limit; read the rest of what you asked for with offsetChars=${to} and limitChars=${left}.`;
+    const page = (to, note) => ({
+        path,
+        totalChars: text.length,
+        offsetChars: start,
+        nextOffsetChars: to < text.length ? to : null,
+        ...(note !== undefined ? { note } : {}),
+        content: text.slice(start, to),
+    });
+    const whole = page(end, joined(notes));
+    if (maxChars === undefined || pageText(whole).length <= maxChars)
+        return pageAnswer(whole);
+    // As many characters as fit beside the rest of the page, which takes the
+    // most with the largest offset it could stop at and the most left. A page
+    // moves by whole characters, a surrogate pair at once, so it never stops
+    // inside one.
+    const overhead = pageText({ ...page(end, joined([stoppedNote(end, end - start), ...notes])), nextOffsetChars: end, content: '' }).length + sectionLead('content');
+    const step = (at) => (splitsPair(text, at + 1) ? 2 : 1);
+    let to = Math.min(end, start + Math.max(0, maxChars - overhead));
+    if (splitsPair(text, to))
+        to--;
+    // A page always moves on, by one character at least, though a limit too
+    // small for the page's own fields and its first character then passes it:
+    // with room for one code unit, a surrogate pair is still taken whole. Where
+    // that reaches the page's own end, it holds all it was asked for, so it
+    // names no stop.
+    if (to === start)
+        to = Math.min(end, start + step(start));
+    return pageAnswer(page(to, joined([to < end ? stoppedNote(to, end - to) : null, ...notes])));
+}
+//# sourceMappingURL=read-page.js.map

package/dist/src/modules/workspace/read-page.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"read-page.js","sourceRoot":"","sources":["../../../../src/modules/workspace/read-page.ts"],"names":[],"mappings":"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"}

package/dist/src/modules/workspace/reconcile.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"reconcile.d.ts","sourceRoot":"","sources":["../../../../src/modules/workspace/reconcile.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"reconcile.d.ts","sourceRoot":"","sources":["../../../../src/modules/workspace/reconcile.ts"],"names":[],"mappings":"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"}

package/dist/src/modules/workspace/reconcile.js

@@ -38,8 +38,10 @@
  * a wrong adoption.
  */
 import { candidateOf, sameCandidate, sameRootIdentity, } from './disk-agreement.js';
-import { IGNORED, OTHER_MOUNT, ROOT_REPLACED, fingerprintVouches, ignoreBeneath, inOtherMount, locateRoot, looksBinary, observePath, passedOverAt, passedOverBetween, provenAbsent, readHead, readPath, sniffImageMime, walkScope, withinIncludes, } from './observe.js';
+import { storedBytes } from './sync.js';
+import { IGNORED, NOT_A_DIRECTORY, OTHER_MOUNT, ROOT_REPLACED, fingerprintVouches, ignoreBeneath, inOtherMount, locateRoot, looksBinary, observePath, passedOverAt, passedOverBetween, provenAbsent, readHead, readPath, sniffImageMime, walkScope, withinIncludes, } from './observe.js';
 import { EffectFailed, chainOf, chmodContained, narrowedTo, syncDirectories, unlinkContained, writeContained } from './effects.js';
+import { errnoWords } from './answers.js';
 const ABSENT = { kind: 'absent' };
 export const WALK_CAP = 5000;
 function diskCandidate(d) {
@@ -218,7 +220,7 @@ function inTheWay(reason, deletion) {
     }
     // A deletion below a file finds nothing there to unlink, so only a write
     // meets this one.
-    if (reason === 'a parent path is not a directory') {
+    if (reason === NOT_A_DIRECTORY) {
         return 'disk has a file or a symlink where this path needs a directory, and no push writes below one, forced or not — ' +
             'move or remove it on disk and materialize again, or write the file under another path';
     }
@@ -237,7 +239,7 @@ function inTheWay(reason, deletion) {
  * to pass.
  */
 function forcedWay(note, deletion, forced) {
-    if (note === 'cannot open (EACCES)')
+    if (note === `cannot open (${errnoWords('EACCES')})`)
         return `, or, if disk lets the workspace ${deletion ? 'unlink' : 'write'} the file, ${forced}`;
     return '';
 }
@@ -638,8 +640,8 @@ async function gather(store, agreement, mount, scope, opts) {
         }
         else if (!opts.named) {
             const slash = path.lastIndexOf('/');
-            const above = slash < 0 ? undefined : passedOverAt(path.slice(0, slash), mount.view.ignore, mount.view.others);
-            const own = above === undefined && !walk ? passedOverAt(path, mount.view.ignore, mount.view.others) : undefined;
+            const above = slash < 0 ? undefined : passedOverAt(path.slice(0, slash), mount.view.ignore, mount.view.others, true);
+            const own = above === undefined && !walk ? passedOverAt(path, mount.view.ignore, mount.view.others, false) : undefined;
             byDesign = above ?? own;
         }
         else if (scope.kind === 'dir') {
@@ -746,9 +748,13 @@ export async function reconcilePass(store, agreement, mount, scope, opts = {}) {
         planned.push({ path, verdict, d, s, p, bi });
     }
     // The evidence about to be recorded describes the root it was gathered
-    // under, which is recorded first (once per mount), so no crash can leave
-    // evidence without its root.
-    if (gathered.rootIdentity && planned.some((x) => x.verdict.adopt !== undefined || x.verdict.p !== undefined)) {
+    // under, which is recorded first, so no crash can leave evidence without
+    // its root. Once a root is recorded, every pass that found it offers it,
+    // evidence or none: the same root on a new device, or with its first
+    // birth time, is recorded again (recordRootIdentity writes nothing
+    // otherwise), and a quiet mount's passes are where an old record learns
+    // its birth time.
+    if (gathered.rootIdentity && (agreement.rootIdentity(mount.name) !== undefined || planned.some((x) => x.verdict.adopt !== undefined || x.verdict.p !== undefined))) {
         agreement.recordRootIdentity(mount.name, gathered.rootIdentity);
     }
     // 1. Intents for adoptions, durable before any tree commit.
@@ -1015,12 +1021,12 @@ export async function pushPaths(store, agreement, mount, paths, opts = {}) {
                 continue;
             }
             const priorP = p && (p.kind === 'absent' || p.kind === 'content') ? p : null;
-            const blob = store.getBlob(s.hash);
+            const stored = storedBytes(store, s.hash);
             const forcedMode = mount.modesObserved && s.mode !== undefined && s.mode !== (d.kind === 'file' ? d.mode : undefined) ? s.mode : undefined;
             const agreedMode = priorP?.kind === 'content' ? priorP.mode : undefined;
-            if (blob) {
+            if ('bytes' in stored) {
                 plans.push({
-                    path, kind: 'write', blob, hash: s.hash, prior: priorP, before: agreement.get(mount.name, path), expect,
+                    path, kind: 'write', blob: stored.bytes, hash: s.hash, prior: priorP, before: agreement.get(mount.name, path), expect,
                     ...(forcedMode !== undefined ? { apply: forcedMode } : {}),
                     ...(forcedMode !== undefined && d.kind === 'file' && agreedMode !== d.mode ? { overDisk: true } : {}),
                     ...(s.mode !== undefined ? { storeMode: s.mode } : {}),
@@ -1031,7 +1037,7 @@ export async function pushPaths(store, agreement, mount, paths, opts = {}) {
                 });
             }
             else
-                result.skipped.push({ path, reason: 'the workspace copy is missing from the store' });
+                result.skipped.push({ path, reason: unstoredCopy(stored) });
             continue;
         }
         if (v.mode === 'adopt' && s && d.kind === 'file') {
@@ -1057,7 +1063,7 @@ export async function pushPaths(store, agreement, mount, paths, opts = {}) {
         }
         // Whatever the verdict learned about disk (an agreement, a resolved
         // intent) is recorded before anything is pushed over it, and the root it
-        // was learned under before that (once per mount), as a pass does.
+        // was learned under before that, as a pass does.
         if (v.p !== undefined)
             agreement.recordRootIdentity(mount.name, root.identity);
         if (v.p === 'forget')
@@ -1192,11 +1198,12 @@ export async function pushPaths(store, agreement, mount, paths, opts = {}) {
             plans.push({ path, kind: 'unlink', prior, before: agreement.get(mount.name, path), expect });
             continue;
         }
-        const blob = store.getBlob(s.hash);
-        if (!blob) {
-            result.skipped.push({ path, reason: 'the workspace copy is missing from the store' });
+        const stored = storedBytes(store, s.hash);
+        if (!('bytes' in stored)) {
+            result.skipped.push({ path, reason: unstoredCopy(stored) });
             continue;
         }
+        const blob = stored.bytes;
         // The store's mode goes to disk with its bytes where the file is new,
         // the push is forced, or disk still has the mode they last agreed on. A
         // push that completes our own unconfirmed one, whose bytes landed, is a
@@ -1421,4 +1428,7 @@ export async function pushPaths(store, agreement, mount, paths, opts = {}) {
     agreement.maybeCheckpoint();
     return result;
 }
+function unstoredCopy(stored) {
+    return 'missing' in stored ? 'the workspace copy is missing from the store' : `the workspace copy is unreadable in the store (${stored.unreadable})`;
+}
 //# sourceMappingURL=reconcile.js.map