@plurnk/plurnk-service 1.26.0 → 1.28.0

package/dist/content/matcher.js

@@ -1,4 +1,4 @@
-// {§matcher-dispatch} Core candidate-set composition over the public schemes
+// {§matcher-dispatch} {§matcher-selection-signal} {§matcher-index-readiness} Core candidate-set composition over the public schemes
 // matcher adapter. Mimetypes owns content-dialect execution and evidence; the
 // adapter owns operation-result mapping; this layer preserves caller identity
 // across heterogeneous entry/log candidate sets.
@@ -7,17 +7,61 @@
 // expression; 203 = source unparseable for its mimetype → raw bytes as text so the model
 // can fall back to regex/visual parsing (SPEC {§matcher-dispatch}).
 import { Problems } from "@plurnk/plurnk-contracts";
-import { TextCoordinates } from "@plurnk/plurnk-mimetypes";
 import { Matcher as SchemeMatcher, } from "@plurnk/plurnk-schemes";
 import ErrorDetail from "../core/ErrorDetail.js";
 import PatternEdits from "./pattern-edits.js";
+import SearchIndex from "../schemes/_search-index.js";
+import EntryFts from "../schemes/_entry-fts.js";
+import EntryGraph from "../schemes/_entry-graph.js";
+import { resolveSearchCandidates } from "../schemes/_search-candidate.js";
+import LineSelection from "./line-selection.js";
 export default class Matcher {
+    static async matchResource(body, source, ctx) {
+        if (ctx.mimetypes === undefined)
+            throw new Error("Resource matching requires mimetypes");
+        const { target, mimetype, visibleLines } = source;
+        const content = visibleLines === undefined ? source.content : LineSelection.retain(source.content, visibleLines).content;
+        let result;
+        if (body.dialect !== "fts" && body.dialect !== "graph") {
+            result = await Matcher.matchAgainstContent(PatternEdits.lineAnchored(body), content, mimetype, ctx.mimetypes);
+        }
+        else {
+            const scheme = target.kind === "url" ? target.scheme : "file";
+            result = await SearchIndex.snapshot(ctx, {
+                content, mimetype, scheme, pathname: target.kind === "url" ? target.pathname : target.raw,
+            }, async (snapshot) => {
+                if (snapshot.disposition === "excluded" || snapshot.disposition === "failed") {
+                    return { status: 422, problem: Problems.create("schemes:matcher", "search-unavailable", 422, `The selected representation is not indexed: ${snapshot.reason ?? snapshot.disposition}.`) };
+                }
+                const candidates = [{ key: target.raw, deepHash: snapshot.deepHash }];
+                if (body.dialect === "fts") {
+                    const ranked = await EntryFts.rankCandidates(ctx.db, candidates, body.raw.slice(1), ctx.signal);
+                    return { ...ranked, matches: ranked.matches.flatMap(({ matches }) => matches) };
+                }
+                else {
+                    await ctx.settleDerivations?.();
+                    const rows = scheme === "log"
+                        ? await ctx.db.log_find_candidates.all({ worker_id: ctx.workerId, scope_prefix: null, max_id: null })
+                        : scheme === "ops" || scheme === "reasoning" || scheme === "note"
+                            ? await ctx.db.turn_source_candidates.all({ workspace_id: ctx.workspaceId, worker_name: target.kind === "url" ? target.hostname : null, kind: scheme })
+                                .then((sources) => sources.filter(({ pathname }) => !/^\/\d+$/.test(pathname)))
+                            : await ctx.db.find_workspace_derivation_candidates.all({ workspace_id: ctx.workspaceId });
+                    const universe = resolveSearchCandidates(rows.map(({ deep_hash }, index) => ({ key: String(index), deepHash: deep_hash })));
+                    if (universe.state !== "ready")
+                        return { status: 503, problem: Problems.create("schemes:matcher", "search-index-incomplete", 503, "The relationship index is incomplete.", { retryable: true }) };
+                    const graph = await EntryGraph.matchCandidates(ctx.db, [...universe.candidates, ...candidates], candidates, body.raw);
+                    return { ...graph, matches: graph.matches.flatMap(({ matches }) => matches) };
+                }
+            });
+        }
+        if (result.status >= 300 || result.status === 203)
+            return result;
+        const matches = visibleLines === undefined ? result.matches : LineSelection.evidence(result.matches ?? [], visibleLines);
+        return { ...result, status: matches?.length ? 200 : 204, matches };
+    }
     static async matchAgainstContent(body, content, mimetype, mimetypes) {
-        // ~full-text and &graph resolve to resource selections with coordinate
-        // evidence through FIND's persistent index, never through this content
-        // matcher. Reaching here with a relation dialect is a routing bug.
         if (body.dialect === "fts" || body.dialect === "graph")
-            throw new Error(`matchAgainstContent is content-only; ${body.dialect} must resolve through FIND`);
+            throw new Error(`matchAgainstContent is content-only; ${body.dialect} requires the indexed matcher`);
         return SchemeMatcher.matchAgainstContent(body, content, mimetype, mimetypes, (value) => ErrorDetail.preview(value));
     }
     // {§find-source-agnostic} — apply a content matcher to a list of candidates from ANY source
@@ -29,7 +73,7 @@ export default class Matcher {
     // failure ends the whole operation; 204 no-match and 203 unlocated-match
     // candidates simply drop out. A regex anchors each line ({§find-line-anchors}).
     static async matchCandidates(body, candidates, mimetypes) {
-        const lineBody = PatternEdits.lineLimited(body);
+        const lineBody = PatternEdits.lineAnchored(body);
         const matches = [];
         let queryable = 0;
         let unsupported;
@@ -73,43 +117,5 @@ export default class Matcher {
         }
         return { status: 200, matches };
     }
-    // Project relation findings into honest text regions a scoped READ accepts,
-    // then group every finding on its resource.
-    static addTextRegions(matches, candidates) {
-        const byKey = new Map(candidates.map((candidate) => [candidate.key, candidate]));
-        const grouped = new Map();
-        const order = [];
-        for (const match of matches) {
-            if (!grouped.has(match.key))
-                order.push(match.key);
-            const findings = grouped.get(match.key) ?? [];
-            findings.push(match);
-            grouped.set(match.key, findings);
-        }
-        const resolved = [];
-        for (const key of order) {
-            const findings = grouped.get(key) ?? [];
-            const candidate = byKey.get(key);
-            if (candidate === undefined)
-                throw new Error(`Matcher.addTextRegions: matched candidate ${key} has no readable projection`);
-            resolved.push({
-                key,
-                matches: findings.flatMap((match) => {
-                    if (match.span === null) {
-                        return match.locator === undefined ? [] : [{ locator: match.locator }];
-                    }
-                    const region = TextCoordinates.lineRegion(candidate.content, match.span.lineStart, match.span.lineEnd);
-                    if (region === null) {
-                        throw new Error(`Matcher.addTextRegions: ${key} span ${match.span.lineStart}-${match.span.lineEnd} is outside the readable text`);
-                    }
-                    return [{
-                            ...(match.locator === undefined ? {} : { locator: match.locator }),
-                            region,
-                        }];
-                }),
-            });
-        }
-        return resolved;
-    }
 }
 //# sourceMappingURL=matcher.js.map

package/dist/content/matcher.js.map

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

package/dist/content/pattern-edits.d.ts

@@ -1,4 +1,4 @@
-import type { MatcherBody } from "@plurnk/plurnk-contracts";
+import type { MatcherBody, TextRegion } from "@plurnk/plurnk-contracts";
 import type { MatchEvidence } from "@plurnk/plurnk-schemes";
 import type { DispatchResult } from "../core/mutation-types.ts";
 export type PatternEdit = {
@@ -7,37 +7,18 @@ export type PatternEdit = {
     };
     readonly body: string;
 };
-export type PatternSpan = {
-    readonly line: number;
-    readonly startColumn: number;
-    readonly endLine: number;
-    readonly endColumn: number;
-};
 export default class PatternEdits {
-    static lineLimited(matcher: MatcherBody): MatcherBody;
-    static findOnly(matcher: MatcherBody & {
-        dialect: "fts" | "graph";
-    }, operation: string, target: string): {
-        detail: string;
-        recovery: string;
-    };
+    static lineAnchored(matcher: MatcherBody): MatcherBody;
     static lines(evidence: ReadonlyArray<MatchEvidence>, bounds: {
         from: number;
         to: number;
     } | null): number[];
-    static spans(matcher: MatcherBody, content: string, evidence: ReadonlyArray<MatchEvidence>, bounds: {
-        from: number;
-        to: number;
-    } | null): PatternSpan[] | {
-        readonly error: string;
-    };
-    static replacements(spans: readonly PatternSpan[], body: string): PatternEdit[];
+    static visible(evidence: readonly MatchEvidence[], lines: readonly number[], window?: TextRegion): MatchEvidence[];
+    static spans(evidence: readonly MatchEvidence[], bounds: TextRegion | null): TextRegion[];
+    static replacements(spans: readonly TextRegion[], body: string): PatternEdit[];
+    static text(content: string, spans: readonly TextRegion[]): string;
     static touchedLines(edits: readonly PatternEdit[]): number[];
-    static deletions(lines: readonly number[]): PatternEdit[];
-    static bounds(marks: readonly number[] | undefined, lineCount: number): {
-        from: number;
-        to: number;
-    } | null | {
+    static bounds(marks: readonly number[] | undefined, content: string): TextRegion | null | {
         readonly error: string;
     };
     static compactReceipt(result: DispatchResult, matched: number): DispatchResult;

package/dist/content/pattern-edits.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"pattern-edits.d.ts","sourceRoot":"","sources":["../../src/content/pattern-edits.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,0BAA0B,CAAC;AAC5D,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,wBAAwB,CAAC;AAG5D,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,2BAA2B,CAAC;AAOhE,MAAM,MAAM,WAAW,GAAG;IAAE,QAAQ,CAAC,MAAM,EAAE;QAAE,QAAQ,CAAC,KAAK,EAAE,CAAC,MAAM,CAAC,GAAG,CAAC,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,CAAC,CAAA;KAAE,CAAC;IAAC,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAA;CAAE,CAAC;AAEtI,MAAM,MAAM,WAAW,GAAG;IAAE,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC;IAAC,QAAQ,CAAC,WAAW,EAAE,MAAM,CAAC;IAAC,QAAQ,CAAC,OAAO,EAAE,MAAM,CAAC;IAAC,QAAQ,CAAC,SAAS,EAAE,MAAM,CAAA;CAAE,CAAC;AAExI,MAAM,CAAC,OAAO,OAAO,YAAY;IAG7B,MAAM,CAAC,WAAW,CAAC,OAAO,EAAE,WAAW,GAAG,WAAW,CAGpD;IAKD,MAAM,CAAC,QAAQ,CAAC,OAAO,EAAE,WAAW,GAAG;QAAE,OAAO,EAAE,KAAK,GAAG,OAAO,CAAA;KAAE,EAAE,SAAS,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,GAAG;QAAE,MAAM,EAAE,MAAM,CAAC;QAAC,QAAQ,EAAE,MAAM,CAAA;KAAE,CAU5I;IAGD,MAAM,CAAC,KAAK,CAAC,QAAQ,EAAE,aAAa,CAAC,aAAa,CAAC,EAAE,MAAM,EAAE;QAAE,IAAI,EAAE,MAAM,CAAC;QAAC,EAAE,EAAE,MAAM,CAAA;KAAE,GAAG,IAAI,GAAG,MAAM,EAAE,CAU1G;IAMD,MAAM,CAAC,KAAK,CAAC,OAAO,EAAE,WAAW,EAAE,OAAO,EAAE,MAAM,EAAE,QAAQ,EAAE,aAAa,CAAC,aAAa,CAAC,EAAE,MAAM,EAAE;QAAE,IAAI,EAAE,MAAM,CAAC;QAAC,EAAE,EAAE,MAAM,CAAA;KAAE,GAAG,IAAI,GAAG,WAAW,EAAE,GAAG;QAAE,QAAQ,CAAC,KAAK,EAAE,MAAM,CAAA;KAAE,CAiCnL;IAED,MAAM,CAAC,YAAY,CAAC,KAAK,EAAE,SAAS,WAAW,EAAE,EAAE,IAAI,EAAE,MAAM,GAAG,WAAW,EAAE,CAE9E;IAGD,MAAM,CAAC,YAAY,CAAC,KAAK,EAAE,SAAS,WAAW,EAAE,GAAG,MAAM,EAAE,CAO3D;IAED,MAAM,CAAC,SAAS,CAAC,KAAK,EAAE,SAAS,MAAM,EAAE,GAAG,WAAW,EAAE,CAExD;IAID,MAAM,CAAC,MAAM,CAAC,KAAK,EAAE,SAAS,MAAM,EAAE,GAAG,SAAS,EAAE,SAAS,EAAE,MAAM,GAAG;QAAE,IAAI,EAAE,MAAM,CAAC;QAAC,EAAE,EAAE,MAAM,CAAA;KAAE,GAAG,IAAI,GAAG;QAAE,QAAQ,CAAC,KAAK,EAAE,MAAM,CAAA;KAAE,CAcvI;IAID,MAAM,CAAC,cAAc,CAAC,MAAM,EAAE,cAAc,EAAE,OAAO,EAAE,MAAM,GAAG,cAAc,CAS7E;CACJ"}
+{"version":3,"file":"pattern-edits.d.ts","sourceRoot":"","sources":["../../src/content/pattern-edits.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,WAAW,EAAE,UAAU,EAAE,MAAM,0BAA0B,CAAC;AACxE,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,wBAAwB,CAAC;AAG5D,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,2BAA2B,CAAC;AAMhE,MAAM,MAAM,WAAW,GAAG;IAAE,QAAQ,CAAC,MAAM,EAAE;QAAE,QAAQ,CAAC,KAAK,EAAE,CAAC,MAAM,CAAC,GAAG,CAAC,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,CAAC,CAAA;KAAE,CAAC;IAAC,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAA;CAAE,CAAC;AAEtI,MAAM,CAAC,OAAO,OAAO,YAAY;IAE7B,MAAM,CAAC,YAAY,CAAC,OAAO,EAAE,WAAW,GAAG,WAAW,CAGrD;IAGD,MAAM,CAAC,KAAK,CAAC,QAAQ,EAAE,aAAa,CAAC,aAAa,CAAC,EAAE,MAAM,EAAE;QAAE,IAAI,EAAE,MAAM,CAAC;QAAC,EAAE,EAAE,MAAM,CAAA;KAAE,GAAG,IAAI,GAAG,MAAM,EAAE,CAY1G;IAGD,MAAM,CAAC,OAAO,CAAC,QAAQ,EAAE,SAAS,aAAa,EAAE,EAAE,KAAK,EAAE,SAAS,MAAM,EAAE,EAAE,MAAM,CAAC,EAAE,UAAU,GAAG,aAAa,EAAE,CAejH;IAGD,MAAM,CAAC,KAAK,CAAC,QAAQ,EAAE,SAAS,aAAa,EAAE,EAAE,MAAM,EAAE,UAAU,GAAG,IAAI,GAAG,UAAU,EAAE,CASxF;IAED,MAAM,CAAC,YAAY,CAAC,KAAK,EAAE,SAAS,UAAU,EAAE,EAAE,IAAI,EAAE,MAAM,GAAG,WAAW,EAAE,CAE7E;IAED,MAAM,CAAC,IAAI,CAAC,OAAO,EAAE,MAAM,EAAE,KAAK,EAAE,SAAS,UAAU,EAAE,GAAG,MAAM,CAMjE;IAGD,MAAM,CAAC,YAAY,CAAC,KAAK,EAAE,SAAS,WAAW,EAAE,GAAG,MAAM,EAAE,CAK3D;IAGD,MAAM,CAAC,MAAM,CAAC,KAAK,EAAE,SAAS,MAAM,EAAE,GAAG,SAAS,EAAE,OAAO,EAAE,MAAM,GAAG,UAAU,GAAG,IAAI,GAAG;QAAE,QAAQ,CAAC,KAAK,EAAE,MAAM,CAAA;KAAE,CAQnH;IAID,MAAM,CAAC,cAAc,CAAC,MAAM,EAAE,cAAc,EAAE,OAAO,EAAE,MAAM,GAAG,cAAc,CAS7E;CACJ"}

package/dist/content/pattern-edits.js

@@ -1,34 +1,22 @@
 import { TextCoordinates } from "@plurnk/plurnk-mimetypes";
 import { assertEditBatchReceipt, projectEditReceipt } from "./edit-receipt.js";
+import LineMarkerOps from "./line-marker.js";
 export default class PatternEdits {
-    // A pattern operation works line by line, so a regex anchors each line: `^` and `$` mean the
-    // line's ends, as they do in a FIND over one line.
-    static lineLimited(matcher) {
+    // {§read-pattern} Anchors refer to source lines; matches may still span lines.
+    static lineAnchored(matcher) {
         if (matcher.dialect !== "regex" || matcher.flags.includes("m"))
             return matcher;
         return { ...matcher, flags: `${matcher.flags}m` };
     }
-    // {§pattern-dialect-find-only} — `~` and `&` locate across resources and only FIND takes them; the
-    // refusal says so and gives both working forms: the FIND with the model's own matcher, and the
-    // same operation with a text pattern for the words or symbol it named.
-    static findOnly(matcher, operation, target) {
-        const words = matcher.dialect === "graph"
-            ? [matcher.raw.replace(/^&[<>]?/u, "").trim()]
-            : matcher.raw.slice(1).trim().split(/\s+/u).filter((word) => word !== "");
-        const text = `/${words.map((word) => word.replace(/[.*+?^${}()|[\]\\/]/gu, "\\$&")).join("|")}/`;
-        const kind = matcher.dialect === "graph" ? "&graph" : "~full-text";
-        return {
-            detail: `\`${matcher.raw}\` is a ${kind} matcher, and only FIND takes one: it locates across resources, not lines within one.`,
-            recovery: `Locate it with \`FIND (${target}) ${matcher.raw}\`, or select lines with a text pattern: \`${operation} (${target}) ${text}\`.`,
-        };
-    }
     // The whole lines a matcher's evidence touches, in source order, within an inclusive line bound.
     static lines(evidence, bounds) {
         const lines = new Set();
         for (const item of evidence) {
-            if (item.region === undefined)
+            const region = item.region ?? item.enclosingRegion;
+            if (region === undefined)
                 continue;
-            for (let line = item.region.startLine; line <= item.region.endLine; line += 1) {
+            const last = region.endLine - (region.endLine > region.startLine && region.endColumn === 1 ? 1 : 0);
+            for (let line = region.startLine; line <= last; line += 1) {
                 if (bounds !== null && (line < bounds.from || line > bounds.to))
                     continue;
                 lines.add(line);
@@ -36,86 +24,61 @@ export default class PatternEdits {
         }
         return [...lines].sort((a, b) => a - b);
     }
-    // Column-exact spans for a replacement. A regex's evidence already carries its span, limited
-    // to one line; a node dialect's evidence is the node's whole region, however many lines it
-    // spans; a glob with no metacharacters is a literal whose occurrences on each matched line are
-    // the spans; a glob with metacharacters selects whole lines, so its span is the whole line.
-    static spans(matcher, content, evidence, bounds) {
-        const spans = [];
-        const within = (line) => bounds === null || (line >= bounds.from && line <= bounds.to);
-        if (matcher.dialect === "regex" || matcher.dialect === "xpath" || matcher.dialect === "jsonpath") {
-            for (const item of evidence) {
-                const region = item.region;
-                if (region === undefined)
-                    continue;
-                if (matcher.dialect === "regex" && region.startLine !== region.endLine)
-                    return { error: "EDIT spans are line-limited; the pattern matched across a line break." };
-                if (!within(region.startLine) || !within(region.endLine))
-                    continue;
-                spans.push({ line: region.startLine, startColumn: region.startColumn, endLine: region.endLine, endColumn: region.endColumn });
-            }
-        }
-        else if (matcher.dialect === "glob") {
-            const literal = !/[*?[]/u.test(matcher.raw);
-            const lines = TextCoordinates.logicalLines(content);
-            for (const line of PatternEdits.lines(evidence, bounds)) {
-                const text = lines[line - 1] === undefined ? "" : content.slice(lines[line - 1].start, lines[line - 1].contentEnd);
-                const points = [...text];
-                if (!literal) {
-                    spans.push({ line, startColumn: 1, endLine: line, endColumn: points.length + 1 });
-                    continue;
-                }
-                const needle = [...matcher.raw];
-                for (let at = 0; at + needle.length <= points.length; at += 1) {
-                    if (needle.every((point, index) => points[at + index] === point)) {
-                        spans.push({ line, startColumn: at + 1, endLine: line, endColumn: at + needle.length + 1 });
-                        at += needle.length - 1;
-                    }
-                }
-            }
-        }
-        else {
-            return { error: `EDIT replaces text spans; a ${matcher.dialect} pattern selects resources, not spans.` };
-        }
-        return spans.sort((a, b) => a.line - b.line || a.startColumn - b.startColumn);
+    // {§read-pattern-evidence} — presentation may clip a match, but cannot redefine it.
+    static visible(evidence, lines, window) {
+        const shown = new Set(lines);
+        const compare = (line, column, otherLine, otherColumn) => line - otherLine || column - otherColumn;
+        return evidence.filter((item) => {
+            const region = item.region ?? item.enclosingRegion;
+            if (region === undefined || !PatternEdits.lines([item], null).some((line) => shown.has(line)))
+                return false;
+            if (window === undefined)
+                return true;
+            const startsBeforeEnd = compare(region.startLine, region.startColumn, window.endLine, window.endColumn) < 0;
+            const endsAfterStart = compare(region.endLine, region.endColumn, window.startLine, window.startColumn) > 0;
+            const point = region.startLine === region.endLine && region.startColumn === region.endColumn;
+            return point
+                ? compare(region.startLine, region.startColumn, window.startLine, window.startColumn) >= 0
+                    && compare(region.startLine, region.startColumn, window.endLine, window.endColumn) <= 0
+                : startsBeforeEnd && endsAfterStart;
+        });
+    }
+    // {§slice-semantics-compose-pattern} Selection consumes evidence; it never matches again.
+    static spans(evidence, bounds) {
+        const compare = (line, column, otherLine, otherColumn) => line - otherLine || column - otherColumn;
+        return evidence.flatMap(({ region }) => region === undefined ? [] : [region])
+            .filter((region) => bounds === null || (compare(region.startLine, region.startColumn, bounds.startLine, bounds.startColumn) >= 0
+            && compare(region.endLine, region.endColumn, bounds.endLine, bounds.endColumn) <= 0))
+            .toSorted((left, right) => compare(left.startLine, left.startColumn, right.startLine, right.startColumn)
+            || compare(left.endLine, left.endColumn, right.endLine, right.endColumn));
     }
     static replacements(spans, body) {
-        return spans.map(({ line, startColumn, endLine, endColumn }) => ({ marker: { marks: [line, startColumn, endLine, endColumn] }, body }));
+        return spans.map(({ startLine, startColumn, endLine, endColumn }) => ({ marker: { marks: [startLine, startColumn, endLine, endColumn] }, body }));
+    }
+    static text(content, spans) {
+        const coordinates = new TextCoordinates(content);
+        return spans.map(({ startLine, startColumn, endLine, endColumn }) => content.slice(coordinates.offsetAtPosition(startLine, startColumn), coordinates.offsetAtPosition(endLine, endColumn))).join("");
     }
     // Every line an edit's marker covers: the one line of a line deletion, or a region's span.
     static touchedLines(edits) {
-        const lines = new Set();
-        for (const { marker } of edits) {
-            const [start, , end] = marker.marks;
-            for (let line = start; line <= (end ?? start); line += 1)
-                lines.add(line);
-        }
-        return [...lines].sort((a, b) => a - b);
-    }
-    static deletions(lines) {
-        return lines.map((line) => ({ marker: { marks: [line] }, body: "" }));
+        return PatternEdits.lines(edits.map(({ marker: { marks } }) => ({ region: {
+                startLine: marks[0], startColumn: marks[1] ?? 1,
+                endLine: marks[2] ?? marks[0], endColumn: marks[3] ?? 1,
+            } })), null);
     }
-    // A numeric scope on a pattern operation bounds the lines it may touch. Sentinels that mean
-    // prepend or append have no lines to match.
-    static bounds(marks, lineCount) {
+    // {§slice-semantics-compose-pattern} Resolve scopes through the existing text algebra.
+    static bounds(marks, content) {
         if (marks === undefined || marks.length === 0)
             return null;
-        const clamp = (mark) => mark === -1 ? lineCount : mark;
-        if (marks.length === 1) {
-            if (marks[0] <= 0)
-                return { error: "A pattern needs a line to match; <0> and <-1> name a position, not a line." };
-            return { from: marks[0], to: marks[0] };
-        }
-        if (marks.length === 2) {
-            const from = marks[0];
-            const to = clamp(marks[1]);
-            if (from <= 0 || to < from)
-                return { error: "A pattern needs an inclusive line range; <0> and <-1> name a position, not a line." };
-            return { from, to };
-        }
-        if (marks.length === 4)
-            return { from: marks[0], to: marks[2] };
-        return { error: "A pattern scope is one line, an inclusive line range, or a four-coordinate region." };
+        if (marks.length === 1 && marks[0] <= 0)
+            return { error: "A pattern scope selects source text, not a prepend or append position." };
+        const selected = LineMarkerOps.textReplacement(content, { marks: [marks[0], ...marks.slice(1)] }, "");
+        if ("error" in selected)
+            return selected;
+        const region = TextCoordinates.regionFromOffsets(content, selected.start, selected.end);
+        if (region === null)
+            throw new Error("A resolved text scope has no source coordinates.");
+        return region;
     }
     // The landed batch as one operation result: `matched` spans, the first span's receipt, and
     // the last span's effect as `last` when there is more than one.

package/dist/content/pattern-edits.js.map

@@ -1 +1 @@
-{"version":3,"file":"pattern-edits.js","sourceRoot":"","sources":["../../src/content/pattern-edits.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"pattern-edits.js","sourceRoot":"","sources":["../../src/content/pattern-edits.ts"],"names":[],"mappings":"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"}

package/dist/content/read-projector.d.ts

@@ -1,7 +1,7 @@
 import type { ReadStatement } from "@plurnk/plurnk-contracts";
 import { type Mimetypes } from "@plurnk/plurnk-mimetypes";
 import type { EntryReadResult, StoredEntryData } from "@plurnk/plurnk-schemes";
-import type { SchemeManifest } from "../core/scheme-types.ts";
+import type { SchemeManifest, PlurnkSchemeContext } from "../core/scheme-types.ts";
 import { type ByteSource } from "./byte-view.ts";
 export interface AnchoredReadResult extends EntryReadResult {
     readonly sourceMimetype?: string;
@@ -19,6 +19,7 @@ interface ReadProjectionOptions {
     readonly identity: string;
     readonly representation: StoredEntryData;
     readonly mimetypes: Mimetypes | undefined;
+    readonly context?: PlurnkSchemeContext;
     readonly bytes?: ByteSource;
     readonly visibleLines?: Readonly<Record<string, readonly number[]>>;
     readonly retainNative?: (bytes: Uint8Array) => Promise<string>;

package/dist/content/read-projector.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"read-projector.d.ts","sourceRoot":"","sources":["../../src/content/read-projector.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAc,aAAa,EAAE,MAAM,0BAA0B,CAAC;AAC1E,OAAO,EAA+C,KAAK,SAAS,EAAE,MAAM,0BAA0B,CAAC;AACvG,OAAO,KAAK,EACR,eAAe,EACf,eAAe,EAClB,MAAM,wBAAwB,CAAC;AAEhC,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,yBAAyB,CAAC;AAK9D,OAAiB,EAAE,KAAK,UAAU,EAAE,MAAM,gBAAgB,CAAC;AA0C3D,MAAM,WAAW,kBAAmB,SAAQ,eAAe;IAGvD,QAAQ,CAAC,cAAc,CAAC,EAAE,MAAM,CAAC;IACjC,QAAQ,CAAC,YAAY,CAAC,EAAE,SAAS,MAAM,EAAE,CAAC;IAC1C,QAAQ,CAAC,kBAAkB,CAAC,EAAE,MAAM,CAAC;IACrC,QAAQ,CAAC,WAAW,CAAC,EAAE,SAAS,MAAM,EAAE,CAAC;IACzC,QAAQ,CAAC,eAAe,CAAC,EAAE,MAAM,CAAC;IAClC,QAAQ,CAAC,iBAAiB,CAAC,EAAE,MAAM,CAAC;CACvC;AAED,UAAU,qBAAqB;IAC3B,QAAQ,CAAC,SAAS,EAAE,aAAa,CAAC;IAClC,QAAQ,CAAC,QAAQ,EAAE,cAAc,CAAC;IAClC,QAAQ,CAAC,oBAAoB,EAAE,OAAO,CAAC;IACvC,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAC;IACxB,QAAQ,CAAC,QAAQ,EAAE,MAAM,CAAC;IAC1B,QAAQ,CAAC,cAAc,EAAE,eAAe,CAAC;IACzC,QAAQ,CAAC,SAAS,EAAE,SAAS,GAAG,SAAS,CAAC;IAC1C,QAAQ,CAAC,KAAK,CAAC,EAAE,UAAU,CAAC;IAC5B,QAAQ,CAAC,YAAY,CAAC,EAAE,QAAQ,CAAC,MAAM,CAAC,MAAM,EAAE,SAAS,MAAM,EAAE,CAAC,CAAC,CAAC;IACpE,QAAQ,CAAC,YAAY,CAAC,EAAE,CAAC,KAAK,EAAE,UAAU,KAAK,OAAO,CAAC,MAAM,CAAC,CAAC;IAG/D,QAAQ,CAAC,KAAK,CAAC,EAAE,CAAC,IAAI,EAAE,MAAM,KAAK,MAAM,CAAC;CAC7C;AAMD,MAAM,CAAC,OAAO,OAAO,aAAa;;IA0E9B,OAAa,OAAO,CAAC,IAAI,EAAE,qBAAqB,GAAG,OAAO,CAAC,kBAAkB,CAAC,CA2C7E;CAoSJ"}
+{"version":3,"file":"read-projector.d.ts","sourceRoot":"","sources":["../../src/content/read-projector.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAc,aAAa,EAAE,MAAM,0BAA0B,CAAC;AAC1E,OAAO,EAA+C,KAAK,SAAS,EAAE,MAAM,0BAA0B,CAAC;AACvG,OAAO,KAAK,EACR,eAAe,EAEf,eAAe,EAClB,MAAM,wBAAwB,CAAC;AAEhC,OAAO,KAAK,EAAE,cAAc,EAAE,mBAAmB,EAAE,MAAM,yBAAyB,CAAC;AAKnF,OAAiB,EAAE,KAAK,UAAU,EAAE,MAAM,gBAAgB,CAAC;AA0C3D,MAAM,WAAW,kBAAmB,SAAQ,eAAe;IAGvD,QAAQ,CAAC,cAAc,CAAC,EAAE,MAAM,CAAC;IACjC,QAAQ,CAAC,YAAY,CAAC,EAAE,SAAS,MAAM,EAAE,CAAC;IAC1C,QAAQ,CAAC,kBAAkB,CAAC,EAAE,MAAM,CAAC;IACrC,QAAQ,CAAC,WAAW,CAAC,EAAE,SAAS,MAAM,EAAE,CAAC;IACzC,QAAQ,CAAC,eAAe,CAAC,EAAE,MAAM,CAAC;IAClC,QAAQ,CAAC,iBAAiB,CAAC,EAAE,MAAM,CAAC;CACvC;AAED,UAAU,qBAAqB;IAC3B,QAAQ,CAAC,SAAS,EAAE,aAAa,CAAC;IAClC,QAAQ,CAAC,QAAQ,EAAE,cAAc,CAAC;IAClC,QAAQ,CAAC,oBAAoB,EAAE,OAAO,CAAC;IACvC,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAC;IACxB,QAAQ,CAAC,QAAQ,EAAE,MAAM,CAAC;IAC1B,QAAQ,CAAC,cAAc,EAAE,eAAe,CAAC;IACzC,QAAQ,CAAC,SAAS,EAAE,SAAS,GAAG,SAAS,CAAC;IAC1C,QAAQ,CAAC,OAAO,CAAC,EAAE,mBAAmB,CAAC;IACvC,QAAQ,CAAC,KAAK,CAAC,EAAE,UAAU,CAAC;IAC5B,QAAQ,CAAC,YAAY,CAAC,EAAE,QAAQ,CAAC,MAAM,CAAC,MAAM,EAAE,SAAS,MAAM,EAAE,CAAC,CAAC,CAAC;IACpE,QAAQ,CAAC,YAAY,CAAC,EAAE,CAAC,KAAK,EAAE,UAAU,KAAK,OAAO,CAAC,MAAM,CAAC,CAAC;IAG/D,QAAQ,CAAC,KAAK,CAAC,EAAE,CAAC,IAAI,EAAE,MAAM,KAAK,MAAM,CAAC;CAC7C;AAMD,MAAM,CAAC,OAAO,OAAO,aAAa;;IAgG9B,OAAa,OAAO,CAAC,IAAI,EAAE,qBAAqB,GAAG,OAAO,CAAC,kBAAkB,CAAC,CA2C7E;CA2SJ"}

package/dist/content/read-projector.js

@@ -1,9 +1,9 @@
 import { binaryInputMaximum, MimetypeInputLimitError } from "@plurnk/plurnk-mimetypes";
 import { Slicer } from "@plurnk/plurnk-schemes";
 import Results from "../core/results.js";
-import BodyPreview from "./body-preview.js";
 import LineAnchors from "./line-anchors.js";
 import LineMarkerOps from "./line-marker.js";
+import BodyPreview from "./body-preview.js";
 import ByteView from "./byte-view.js";
 import MimetypeBinary from "./mimetype-binary.js";
 import ReadResolve from "./read-resolve.js";
@@ -74,8 +74,8 @@ export default class ReadProjector {
             yield await source.read(start, Math.min(size, start + chunkSize - 1));
         }
     }
-    // {§read-bytes} — one hexadecimal octet per line under the text coordinate algebra: the
-    // markerless default is the same `<1,16>`, `<a,b>` selects bytes, `<1,-1>` is everything.
+    // {§read-bytes} — one hexadecimal octet per line under the text coordinate algebra: without a
+    // scope the first page of bytes ({§markerless-first-page}), `<a,b>` selects bytes, `<1,-1>` is everything.
     // The source is sized, then only the window is read; the source mimetype is never relabelled.
     static async #projectBytes(statement, target, source, sourceMimetype, channel, failure) {
         if (LineAnchors.hasAnchor(statement.lineMarker)) {
@@ -84,6 +84,31 @@ export default class ReadProjector {
         const total = await source.size();
         if (total === null)
             return failure("entry-not-found", 404, `No bytes exist at ${target}.`);
+        if (statement.matcher !== null) {
+            if (statement.lineMarker !== null) {
+                const bounds = LineMarkerOps.window(statement.lineMarker, total, "byte");
+                if (bounds.status !== 200)
+                    return { ...bounds, content: null, mimetype: sourceMimetype, channel };
+            }
+            const loaded = await ByteView.load(source, target);
+            if (!("bytes" in loaded))
+                return { ...loaded, content: null, mimetype: sourceMimetype, channel };
+            const match = await ByteView.match(statement.matcher, loaded.bytes);
+            if (match.status >= 400)
+                return { status: match.status, problem: match.problem, content: null, mimetype: sourceMimetype, channel };
+            const matches = match.matches ?? [];
+            const visibleLines = PatternEdits.lines(matches, { from: 1, to: total });
+            const projected = await ReadResolve.resolve({
+                content: ByteView.hexLines(loaded.bytes), mimetype: "text/plain",
+                lineMarker: statement.lineMarker, visibleLines,
+            });
+            return {
+                ...projected, mimetype: sourceMimetype, channel, projection: ByteView.PROJECTION,
+                ...(projected.range === undefined ? {} : { range: { ...projected.range, unit: "byte" } }),
+                matched: statement.lineMarker === null ? visibleLines.length : (projected.lineOrdinals?.length ?? 0),
+                matches: PatternEdits.visible(matches, projected.lineOrdinals ?? []),
+            };
+        }
         const marker = statement.lineMarker ?? BodyPreview.firstPage();
         const window = LineMarkerOps.window(marker, total, "byte");
         if (window.status !== 200) {
@@ -257,14 +282,16 @@ export default class ReadProjector {
         // touches, in source order, inside the scope, with its ordinary anchors. Zero matches is
         // an empty read, never a failure; `matched` counts the selected lines inside the scope.
         let visibleLines = opts.visibleLines?.[selected];
+        let matches;
         if (statement.matcher !== null) {
-            if (statement.matcher.dialect === "fts" || statement.matcher.dialect === "graph") {
-                const { detail, recovery } = PatternEdits.findOnly({ ...statement.matcher, dialect: statement.matcher.dialect }, "READ", target);
-                return failure("pattern-dialect-unsupported", 400, detail, {}, { target, recovery, retryable: false });
-            }
             if (mimetypes === undefined)
                 throw new Error("ReadProjector: a READ pattern requires the mimetypes capability");
-            const match = await Matcher.matchAgainstContent(PatternEdits.lineLimited(statement.matcher), selectedRepresentation.content, selectedRepresentation.mimetype, mimetypes);
+            const match = opts.context === undefined || statement.target === null
+                ? await Matcher.matchAgainstContent(PatternEdits.lineAnchored(statement.matcher), selectedRepresentation.content, selectedRepresentation.mimetype, mimetypes)
+                : await Matcher.matchResource(statement.matcher, {
+                    content: selectedRepresentation.content, mimetype: selectedRepresentation.mimetype,
+                    target: statement.target, ...(visibleLines === undefined ? {} : { visibleLines }),
+                }, opts.context);
             if (match.status >= 400 || match.status === 203) {
                 return Results.assertReadResult({
                     ...(match.problem === undefined
@@ -275,7 +302,11 @@ export default class ReadProjector {
                     channel,
                 });
             }
-            const ordered = PatternEdits.lines(match.matches ?? [], null);
+            matches = match.matches ?? [];
+            if (matches.some(({ region, enclosingRegion }) => region === undefined && enclosingRegion === undefined)) {
+                return failure("pattern-source-unlocated", 422, "The pattern selected a value without source coordinates.");
+            }
+            const ordered = PatternEdits.lines(matches, null);
             visibleLines = visibleLines === undefined ? ordered : ordered.filter((line) => visibleLines.includes(line));
         }
         let resolved = await ReadResolve.resolve({
@@ -343,9 +374,10 @@ export default class ReadProjector {
             channel,
             ...(resolved.mimetype === selectedRepresentation.mimetype ? {} : { sourceMimetype: selectedRepresentation.mimetype }),
             ...(matched === undefined ? {} : { matched }),
+            ...(matches === undefined ? {} : { matches: PatternEdits.visible(matches, resolved.lineOrdinals ?? [], resolved.region) }),
         });
         const result = ReadProjector.#producerResult(projected, selectedRepresentation, channel !== null && manifest.channels[channel] === "text/stream");
-        if (result.status !== 200
+        if ((result.status !== 200 && result.status !== 204)
             || typeof result.content !== "string") {
             return result;
         }