@plurnk/plurnk-service 1.4.0 → 1.6.0

package/dist/schemes/_entry-manifest.js

@@ -1,8 +1,8 @@
 // The entry catalog ({§packet-catalog}) — the complete, unranked directory for
-// one addressed owner. FIND(**) serves it recursively; FIND(*) projects it as
+// one addressed owner. Recursive FIND serves it recursively; shallow FIND projects it as
 // a one-level map in _entry-find. An omitted owner selects the shared commons.
-// Each item carries its address, optional stream lifecycle and tags, and addressable
-// channels. Search indexing is owned separately by SearchIndex.
+// Each item is a non-empty, default-first array of addressable channels.
+// Search indexing is owned separately by SearchIndex.
 import { PathSyntax } from "@plurnk/plurnk-contracts";
 import { renderAddress } from "../core/plurnk-uri.js";
 import Owner from "../core/Owner.js";
@@ -24,27 +24,16 @@ export default class EntryManifest {
             owner_id: resolvedOwnerId,
         });
         const rows = schemeFilter === undefined ? all : all.filter((row) => row.scheme === schemeFilter);
-        const tagsById = new Map();
-        const tagRows = await db.engine_list_owner_entry_tags.all({
-            workspace_id: workspaceId,
-            owner_id: resolvedOwnerId,
-        });
-        for (const { entry_id, tag } of tagRows) {
-            const tags = tagsById.get(entry_id);
-            if (tags === undefined)
-                tagsById.set(entry_id, [tag]);
-            else
-                tags.push(tag);
-        }
         const byEntry = new Map();
         for (const row of rows) {
             const path = EntryManifest.toPath(row.scheme, row.pathname);
             let entry = byEntry.get(path);
             if (entry === undefined) {
-                entry = { path, channels: {} };
-                const tags = tagsById.get(row.entry_id);
-                if (tags !== undefined && tags.length > 0)
-                    entry.tags = tags;
+                entry = {
+                    path,
+                    defaultChannel: ctx.defaultChannelFor?.(row.scheme) ?? "body",
+                    channels: [],
+                };
                 byEntry.set(path, entry);
             }
             if (row.subscription_id !== null && entry.stream === undefined) {
@@ -69,17 +58,32 @@ export default class EntryManifest {
             catch {
                 totalLines = row.content.length === 0 ? 0 : row.content.split("\n").length;
             }
-            const defaultChannel = ctx.defaultChannelFor?.(row.scheme) ?? "body";
-            const channelKey = row.channel === defaultChannel
+            const channelPath = row.channel === entry.defaultChannel
                 ? entry.path
                 : `${entry.path}#${PathSyntax.escapeTarget(row.channel)}`;
-            entry.channels[channelKey] = {
+            entry.channels.push({
+                path: channelPath,
                 mimetype: row.mimetype,
                 tokens: tokenize(row.content),
                 lines: totalLines,
-            };
+                ...(row.channel === "body" && row.parse_issues !== null
+                    ? { parseIssues: row.parse_issues }
+                    : {}),
+            });
         }
-        return [...byEntry.values()];
+        return [...byEntry.values()].map(({ path, defaultChannel, stream, channels }) => {
+            const defaultIndex = channels.findIndex((channel) => channel.path === path);
+            if (defaultIndex === -1) {
+                throw new Error(`catalog entry ${JSON.stringify(path)} has no ${JSON.stringify(defaultChannel)} default channel`);
+            }
+            const defaultItem = channels[defaultIndex];
+            const primary = stream === undefined ? defaultItem : { ...defaultItem, stream };
+            return [
+                primary,
+                ...channels.slice(0, defaultIndex),
+                ...channels.slice(defaultIndex + 1),
+            ];
+        });
     }
 }
 //# sourceMappingURL=_entry-manifest.js.map

package/dist/schemes/_entry-manifest.js.map

@@ -1 +1 @@
-{"version":3,"file":"_entry-manifest.js","sourceRoot":"","sources":["../../src/schemes/_entry-manifest.ts"],"names":[],"mappings":"AAAA,+EAA+E;AAC/E,8EAA8E;AAC9E,+EAA+E;AAC/E,qFAAqF;AACrF,gEAAgE;AAGhE,OAAO,EAAE,UAAU,EAAE,MAAM,0BAA0B,CAAC;AACtD,OAAO,EAAE,aAAa,EAAE,MAAM,uBAAuB,CAAC;AACtD,OAAO,KAAK,MAAM,kBAAkB,CAAC;AA2BrC,MAAM,CAAC,OAAO,OAAO,aAAa;IAC9B,MAAM,CAAC,MAAM,CAAC,MAAc,EAAE,QAAgB;QAC1C,IAAI,MAAM,KAAK,MAAM;YAAE,OAAO,UAAU,CAAC,YAAY,CAAC,UAAU,CAAC,YAAY,CAAC,QAAQ,CAAC,CAAC,CAAC;QACzF,OAAO,aAAa,CAAC,MAAM,EAAE,QAAQ,CAAC,CAAC;IAC3C,CAAC;IAED,MAAM,CAAC,KAAK,CAAC,cAAc,CAAC,GAAwB,EAAE,YAAqB,EAAE,OAAgB;QACzF,MAAM,EAAE,EAAE,EAAE,WAAW,EAAE,SAAS,EAAE,QAAQ,EAAE,GAAG,GAAG,CAAC;QACrD,IAAI,SAAS,KAAK,SAAS;YAAE,MAAM,IAAI,KAAK,CAAC,wEAAwE,CAAC,CAAC;QACvH,IAAI,QAAQ,KAAK,SAAS;YAAE,MAAM,IAAI,KAAK,CAAC,2FAA2F,CAAC,CAAC;QACzI,MAAM,eAAe,GAAG,OAAO,IAAI,MAAM,KAAK,CAAC,SAAS,CAAC,EAAE,EAAE,WAAW,CAAC,CAAC;QAC1E,MAAM,GAAG,GAAG,MAAM,EAAE,CAAC,yBAAyB,CAAC,GAAG,CAAc;YAC5D,YAAY,EAAE,WAAW;YACzB,QAAQ,EAAE,eAAe;SAC5B,CAAC,CAAC;QACH,MAAM,IAAI,GAAG,YAAY,KAAK,SAAS,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,GAAG,CAAC,MAAM,KAAK,YAAY,CAAC,CAAC;QACjG,MAAM,QAAQ,GAAG,IAAI,GAAG,EAAoB,CAAC;QAC7C,MAAM,OAAO,GAAG,MAAM,EAAE,CAAC,4BAA4B,CAAC,GAAG,CAAoC;YACzF,YAAY,EAAE,WAAW;YACzB,QAAQ,EAAE,eAAe;SAC5B,CAAC,CAAC;QACH,KAAK,MAAM,EAAE,QAAQ,EAAE,GAAG,EAAE,IAAI,OAAO,EAAE,CAAC;YACtC,MAAM,IAAI,GAAG,QAAQ,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;YACpC,IAAI,IAAI,KAAK,SAAS;gBAAE,QAAQ,CAAC,GAAG,CAAC,QAAQ,EAAE,CAAC,GAAG,CAAC,CAAC,CAAC;;gBACjD,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;QACxB,CAAC;QACD,MAAM,OAAO,GAAG,IAAI,GAAG,EAAwB,CAAC;QAChD,KAAK,MAAM,GAAG,IAAI,IAAI,EAAE,CAAC;YACrB,MAAM,IAAI,GAAG,aAAa,CAAC,MAAM,CAAC,GAAG,CAAC,MAAM,EAAE,GAAG,CAAC,QAAQ,CAAC,CAAC;YAC5D,IAAI,KAAK,GAAG,OAAO,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC;YAC9B,IAAI,KAAK,KAAK,SAAS,EAAE,CAAC;gBACtB,KAAK,GAAG,EAAE,IAAI,EAAE,QAAQ,EAAE,EAAE,EAAE,CAAC;gBAC/B,MAAM,IAAI,GAAG,QAAQ,CAAC,GAAG,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;gBACxC,IAAI,IAAI,KAAK,SAAS,IAAI,IAAI,CAAC,MAAM,GAAG,CAAC;oBAAE,KAAK,CAAC,IAAI,GAAG,IAAI,CAAC;gBAC7D,OAAO,CAAC,GAAG,CAAC,IAAI,EAAE,KAAK,CAAC,CAAC;YAC7B,CAAC;YACD,IAAI,GAAG,CAAC,eAAe,KAAK,IAAI,IAAI,KAAK,CAAC,MAAM,KAAK,SAAS,EAAE,CAAC;gBAC7D,IAAI,GAAG,CAAC,YAAY,KAAK,IAAI,EAAE,CAAC;oBAC5B,IAAI,GAAG,CAAC,OAAO,KAAK,IAAI;wBAAE,MAAM,IAAI,KAAK,CAAC,uBAAuB,GAAG,CAAC,eAAe,aAAa,CAAC,CAAC;oBACnG,KAAK,CAAC,MAAM,GAAG,EAAE,KAAK,EAAE,QAAQ,EAAE,OAAO,EAAE,GAAG,CAAC,OAAO,EAAE,CAAC;gBAC7D,CAAC;qBAAM,CAAC;oBACJ,KAAK,CAAC,MAAM,GAAG;wBACX,KAAK,EAAE,GAAG,CAAC,YAAY,KAAK,GAAG;4BAC3B,CAAC,CAAC,QAAQ;4BACV,CAAC,CAAC,GAAG,CAAC,YAAY,IAAI,GAAG,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,QAAQ;wBACnD,MAAM,EAAE,GAAG,CAAC,YAAY;qBAC3B,CAAC;gBACN,CAAC;YACL,CAAC;YACD,IAAI,UAAkB,CAAC;YACvB,IAAI,CAAC;gBACD,UAAU,GAAG,CAAC,MAAM,SAAS,CAAC,OAAO,CAAC,EAAE,OAAO,EAAE,GAAG,CAAC,OAAO,EAAE,IAAI,EAAE,GAAG,CAAC,QAAQ,EAAE,EAAE,EAAE,QAAQ,EAAE,EAAE,EAAE,CAAC,CAAC,CAAC,UAAU,CAAC;YACtH,CAAC;YAAC,MAAM,CAAC;gBACL,UAAU,GAAG,GAAG,CAAC,OAAO,CAAC,MAAM,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,OAAO,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,MAAM,CAAC;YAC/E,CAAC;YACD,MAAM,cAAc,GAAG,GAAG,CAAC,iBAAiB,EAAE,CAAC,GAAG,CAAC,MAAM,CAAC,IAAI,MAAM,CAAC;YACrE,MAAM,UAAU,GAAG,GAAG,CAAC,OAAO,KAAK,cAAc;gBAC7C,CAAC,CAAC,KAAK,CAAC,IAAI;gBACZ,CAAC,CAAC,GAAG,KAAK,CAAC,IAAI,IAAI,UAAU,CAAC,YAAY,CAAC,GAAG,CAAC,OAAO,CAAC,EAAE,CAAC;YAC9D,KAAK,CAAC,QAAQ,CAAC,UAAU,CAAC,GAAG;gBACzB,QAAQ,EAAE,GAAG,CAAC,QAAQ;gBACtB,MAAM,EAAE,QAAQ,CAAC,GAAG,CAAC,OAAO,CAAC;gBAC7B,KAAK,EAAE,UAAU;aACpB,CAAC;QACN,CAAC;QACD,OAAO,CAAC,GAAG,OAAO,CAAC,MAAM,EAAE,CAAC,CAAC;IACjC,CAAC;CACJ"}
+{"version":3,"file":"_entry-manifest.js","sourceRoot":"","sources":["../../src/schemes/_entry-manifest.ts"],"names":[],"mappings":"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"}

package/dist/schemes/_entry-ops.d.ts

@@ -1,8 +1,8 @@
-import type { EditStatement, ReadStatement } from "@plurnk/plurnk-contracts";
+import type { RangeExtent, ReadStatement, TextRegion } from "@plurnk/plurnk-contracts";
 import type { PlurnkSchemeContext, SchemeManifest } from "../core/scheme-types.ts";
-import type { EditBatchReceipt } from "../content/index.ts";
-import type { TextRegion } from "@plurnk/plurnk-contracts";
-import { type MatchEvidence, type SchemeResultBase } from "../core/results.ts";
+import type { EditBatchReceipt, LineAnchorPrecondition } from "../content/index.ts";
+import { type SchemeResultBase } from "../core/results.ts";
+import type { ResolvedEditStatement } from "@plurnk/plurnk-schemes";
 export type EditResult = SchemeResultBase & {
     entryId: number | null;
     channel: string | null;
@@ -14,17 +14,22 @@ export type ReadResult = SchemeResultBase & {
     channel: string | null;
     startLine?: number | null;
     region?: TextRegion;
-    matches?: ReadonlyArray<MatchEvidence>;
+    range?: RangeExtent;
     reason?: string;
     awaitWorker?: string;
 };
 export type OpenFoldResult = SchemeResultBase;
+interface ReadAddress {
+    readonly ownerId?: number;
+    readonly pathname?: string;
+}
 export default class EntryOps {
     #private;
-    static editWorkspaceEntryBatch(statements: readonly EditStatement[], ctx: PlurnkSchemeContext, manifest: SchemeManifest, explicitOwnerId?: number): Promise<EditResult>;
+    static editWorkspaceEntryBatch(statements: readonly ResolvedEditStatement[], ctx: PlurnkSchemeContext, manifest: SchemeManifest, explicitOwnerId?: number, precondition?: LineAnchorPrecondition | null): Promise<EditResult>;
     static deleteWorkspaceEntry(statement: {
-        target: EditStatement["target"];
+        target: ResolvedEditStatement["target"];
     }, ctx: PlurnkSchemeContext, manifest: SchemeManifest, explicitOwnerId?: number): Promise<SchemeResultBase>;
-    static readWorkspaceEntry(statement: ReadStatement, ctx: PlurnkSchemeContext, manifest: SchemeManifest, explicitOwnerId?: number): Promise<ReadResult>;
+    static readWorkspaceEntry(statement: ReadStatement, ctx: PlurnkSchemeContext, manifest: SchemeManifest, address?: ReadAddress): Promise<ReadResult>;
 }
+export {};
 //# sourceMappingURL=_entry-ops.d.ts.map

package/dist/schemes/_entry-ops.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"_entry-ops.d.ts","sourceRoot":"","sources":["../../src/schemes/_entry-ops.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,aAAa,EAAE,aAAa,EAAE,MAAM,0BAA0B,CAAC;AAG7E,OAAO,KAAK,EAAE,mBAAmB,EAAE,cAAc,EAAE,MAAM,yBAAyB,CAAC;AAInF,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,qBAAqB,CAAC;AAC5D,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,0BAA0B,CAAC;AAC3D,OAAgB,EAAE,KAAK,aAAa,EAAE,KAAK,gBAAgB,EAAE,MAAM,oBAAoB,CAAC;AAWxF,MAAM,MAAM,UAAU,GAAG,gBAAgB,GAAG;IAAE,OAAO,EAAE,MAAM,GAAG,IAAI,CAAC;IAAC,OAAO,EAAE,MAAM,GAAG,IAAI,CAAC;IAAC,WAAW,CAAC,EAAE,gBAAgB,GAAG,IAAI,CAAA;CAAE,CAAC;AAStI,MAAM,MAAM,UAAU,GAAG,gBAAgB,GAAG;IACxC,OAAO,EAAE,MAAM,GAAG,IAAI,CAAC;IACvB,QAAQ,EAAE,MAAM,GAAG,IAAI,CAAC;IACxB,OAAO,EAAE,MAAM,GAAG,IAAI,CAAC;IACvB,SAAS,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IAC1B,MAAM,CAAC,EAAE,UAAU,CAAC;IACpB,OAAO,CAAC,EAAE,aAAa,CAAC,aAAa,CAAC,CAAC;IACvC,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,WAAW,CAAC,EAAE,MAAM,CAAC;CACxB,CAAC;AACF,MAAM,MAAM,cAAc,GAAG,gBAAgB,CAAC;AAE9C,MAAM,CAAC,OAAO,OAAO,QAAQ;;IA2DzB,OAAa,uBAAuB,CAAC,UAAU,EAAE,SAAS,aAAa,EAAE,EAAE,GAAG,EAAE,mBAAmB,EAAE,QAAQ,EAAE,cAAc,EAAE,eAAe,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,UAAU,CAAC,CA0M5K;IAID,OAAa,oBAAoB,CAAC,SAAS,EAAE;QAAE,MAAM,EAAE,aAAa,CAAC,QAAQ,CAAC,CAAA;KAAE,EAAE,GAAG,EAAE,mBAAmB,EAAE,QAAQ,EAAE,cAAc,EAAE,eAAe,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,gBAAgB,CAAC,CA8BzL;IAED,OAAa,kBAAkB,CAAC,SAAS,EAAE,aAAa,EAAE,GAAG,EAAE,mBAAmB,EAAE,QAAQ,EAAE,cAAc,EAAE,eAAe,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,UAAU,CAAC,CA2G3J;CACJ"}
+{"version":3,"file":"_entry-ops.d.ts","sourceRoot":"","sources":["../../src/schemes/_entry-ops.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,WAAW,EAAE,aAAa,EAAE,UAAU,EAAE,MAAM,0BAA0B,CAAC;AAGvF,OAAO,KAAK,EAAE,mBAAmB,EAAE,cAAc,EAAE,MAAM,yBAAyB,CAAC;AAInF,OAAO,KAAK,EAAE,gBAAgB,EAAE,sBAAsB,EAAE,MAAM,qBAAqB,CAAC;AACpF,OAAgB,EAAE,KAAK,gBAAgB,EAAE,MAAM,oBAAoB,CAAC;AACpE,OAAO,KAAK,EAAE,qBAAqB,EAAsB,MAAM,wBAAwB,CAAC;AAYxF,MAAM,MAAM,UAAU,GAAG,gBAAgB,GAAG;IAAE,OAAO,EAAE,MAAM,GAAG,IAAI,CAAC;IAAC,OAAO,EAAE,MAAM,GAAG,IAAI,CAAC;IAAC,WAAW,CAAC,EAAE,gBAAgB,GAAG,IAAI,CAAA;CAAE,CAAC;AAKtI,MAAM,MAAM,UAAU,GAAG,gBAAgB,GAAG;IACxC,OAAO,EAAE,MAAM,GAAG,IAAI,CAAC;IACvB,QAAQ,EAAE,MAAM,GAAG,IAAI,CAAC;IACxB,OAAO,EAAE,MAAM,GAAG,IAAI,CAAC;IACvB,SAAS,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IAC1B,MAAM,CAAC,EAAE,UAAU,CAAC;IACpB,KAAK,CAAC,EAAE,WAAW,CAAC;IACpB,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,WAAW,CAAC,EAAE,MAAM,CAAC;CACxB,CAAC;AACF,MAAM,MAAM,cAAc,GAAG,gBAAgB,CAAC;AAE9C,UAAU,WAAW;IACjB,QAAQ,CAAC,OAAO,CAAC,EAAE,MAAM,CAAC;IAC1B,QAAQ,CAAC,QAAQ,CAAC,EAAE,MAAM,CAAC;CAC9B;AAED,MAAM,CAAC,OAAO,OAAO,QAAQ;;IA2DzB,OAAa,uBAAuB,CAChC,UAAU,EAAE,SAAS,qBAAqB,EAAE,EAC5C,GAAG,EAAE,mBAAmB,EACxB,QAAQ,EAAE,cAAc,EACxB,eAAe,CAAC,EAAE,MAAM,EACxB,YAAY,GAAE,sBAAsB,GAAG,IAAW,GACnD,OAAO,CAAC,UAAU,CAAC,CA0OrB;IAID,OAAa,oBAAoB,CAAC,SAAS,EAAE;QAAE,MAAM,EAAE,qBAAqB,CAAC,QAAQ,CAAC,CAAA;KAAE,EAAE,GAAG,EAAE,mBAAmB,EAAE,QAAQ,EAAE,cAAc,EAAE,eAAe,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,gBAAgB,CAAC,CA8BjM;IAED,OAAa,kBAAkB,CAC3B,SAAS,EAAE,aAAa,EACxB,GAAG,EAAE,mBAAmB,EACxB,QAAQ,EAAE,cAAc,EACxB,OAAO,GAAE,WAAgB,GAC1B,OAAO,CAAC,UAAU,CAAC,CA0DrB;CACJ"}

package/dist/schemes/_entry-ops.js

@@ -1,9 +1,11 @@
 import EntryCrud from "./_entry-crud.js";
-import { entryPathnameOf } from "../core/plurnk-uri.js";
+import { entryPathnameOf, renderTarget } from "../core/plurnk-uri.js";
 import Owner from "../core/Owner.js";
 import EntryManifest from "./_entry-manifest.js";
-import { LineMarkerOps, MimetypeBinary, PathMimetype, ReadResolve, editReceipt } from "../content/index.js";
+import { EditCollision, LineAnchors, LineMarkerOps, MimetypeBinary, PathMimetype, ReadProjector, editReceipt } from "../content/index.js";
 import Results from "../core/results.js";
+import { contentHash } from "../core/content-hash.js";
+import DbProjectionCaps from "../core/caps/DbProjectionCaps.js";
 export default class EntryOps {
     static #pathnameOf(statement) {
         const t = statement.target;
@@ -57,7 +59,8 @@ export default class EntryOps {
             return explicit;
         return Owner.commonsId(ctx.db, ctx.workspaceId);
     }
-    static async editWorkspaceEntryBatch(statements, ctx, manifest, explicitOwnerId) {
+    static async editWorkspaceEntryBatch(statements, ctx, manifest, explicitOwnerId, precondition = null) {
+        LineAnchors.assertResolved(statements);
         const failure = (code, status, detail, fields, extensions = {}) => Results.failure(`scheme:${manifest.name}`, code, status, detail, fields, extensions);
         const statement = statements[0];
         if (statement === undefined) {
@@ -103,9 +106,17 @@ export default class EntryOps {
         // `worker:///users`      → text/markdown (scheme manifest default).
         const channelManifestDefault = channels[targetChannel];
         const effectiveMimetype = await PathMimetype.resolveEntryMimetype(pathname, channelManifestDefault, ctx.mimetypes);
+        const channel = existing === undefined
+            ? undefined
+            : await db.ops_read_channel.get({
+                workspace_id: workspaceId,
+                scheme,
+                pathname,
+                channel: targetChannel,
+                owner_id: ownerId,
+            });
         // 415 on binary entries (SPEC.md {§op-invariants}).
         if (existing !== undefined) {
-            const channel = await db.ops_read_channel.get({ ...{ workspace_id: workspaceId, scheme, pathname, channel: targetChannel }, owner_id: ownerId });
             if (channel !== undefined && await MimetypeBinary.isBinaryMimetype(channel.mimetype, ctx.mimetypes)) {
                 return failure("binary-edit-unsupported", 415, `The #${targetChannel} channel is binary and cannot be edited.`, { entryId: existing.id, channel: targetChannel });
             }
@@ -115,26 +126,33 @@ export default class EntryOps {
         }
         // Read current content unconditionally for diff generation (M.12 —
         // surface diff in EDIT response so wrong-marker mistakes are visible).
-        let originalContent = "";
-        if (existing !== undefined) {
-            const channel = await db.ops_read_channel.get({ ...{ workspace_id: workspaceId, scheme, pathname, channel: targetChannel }, owner_id: ownerId });
-            originalContent = channel?.content ?? "";
+        const originalContent = channel?.content ?? "";
+        if (precondition !== null && !LineAnchors.satisfies(precondition, originalContent)) {
+            return EditCollision.result(precondition.identity, {
+                entryId: existing?.id ?? null,
+                channel: targetChannel,
+            });
         }
         // `<scope>` always addresses the selected channel's textual representation.
         // Structured query dialects locate content but never redefine mutation coordinates.
-        // A CREATE (no existing entry) has nothing to scope into, so a markerless body
-        // becomes the new entry's content. {§edit-marker-required-on-existing}: an
-        // EXISTING entry has no easy-clobber path: a marker is REQUIRED, even for a
-        // deliberate full rewrite (`<1,-1>` states that intent explicitly).
+        // A missing selected channel has nothing to scope into, so a markerless body
+        // becomes that channel's content. {§edit-marker-required-on-existing}: an
+        // existing selected channel has no easy-clobber path: a marker is REQUIRED,
+        // even for a deliberate full rewrite (`<1,-1>` states that intent explicitly).
         let newContent;
         let scopeNormalizations;
-        if (existing !== undefined && statements.some(({ lineMarker }) => lineMarker === null)) {
-            return failure("line-marker-required", 400, "EDIT of an existing entry requires a line marker.", { entryId: existing.id, channel: targetChannel }, {
+        const channelExists = channel !== undefined;
+        if (channelExists && existing === undefined) {
+            throw new Error("An entry channel cannot exist without its owning entry.");
+        }
+        const existingEntryId = existing?.id ?? null;
+        if (channelExists && statements.some(({ lineMarker }) => lineMarker === null)) {
+            return failure("line-marker-required", 400, "EDIT of an existing entry requires a line marker.", { entryId: existingEntryId, channel: targetChannel }, {
                 recovery: "Use <1,-1> to replace the whole entry or select a narrower range.",
                 retryable: false,
             });
         }
-        if (existing !== undefined) {
+        if (channelExists) {
             const edits = statements.map((candidate) => ({
                 marker: candidate.lineMarker,
                 body: candidate.body ?? "",
@@ -143,7 +161,7 @@ export default class EntryOps {
             if (result.status !== 200) {
                 return Results.assert({
                     ...result,
-                    entryId: existing.id,
+                    entryId: existingEntryId,
                     channel: targetChannel,
                 });
             }
@@ -159,31 +177,30 @@ export default class EntryOps {
             }
             newContent = statement.body ?? "";
         }
-        // 304 no-op (SPEC {§edit}): an existing entry whose write would change nothing —
-        // identical content and no new tag. Mirrors OPEN/FOLD's idempotence; hands the
+        // 304 no-op (SPEC {§edit}): an existing entry whose write would change nothing.
+        // Mirrors OPEN/FOLD's idempotence; hands the
         // model a "you already did this" signal instead of a phantom 200 it can't
         // distinguish from a real update.
-        if (existing !== undefined && newContent === originalContent) {
-            const signalTags = statements.flatMap(({ signal }) => Array.isArray(signal) ? signal : []);
-            let addsTag = false;
-            if (signalTags.length > 0) {
-                const have = new Set((await db.crud_read_tags.all({ entry_id: existing.id })).map((r) => r.tag));
-                addsTag = signalTags.some((t) => !have.has(t));
-            }
-            if (!addsTag)
-                return {
-                    status: 304,
-                    entryId: existing.id,
-                    channel: targetChannel,
-                    ...(scopeNormalizations === undefined ? {} : { scopeNormalizations }),
-                }; // {§edit-noop-304}
+        if (channelExists && newContent === originalContent) {
+            return {
+                status: 304,
+                entryId: existingEntryId,
+                channel: targetChannel,
+                ...(scopeNormalizations === undefined ? {} : { scopeNormalizations }),
+            }; // {§edit-noop-304}
         }
         let entryId;
         let createdNow;
         if (existing === undefined) {
-            const row = await db.crud_insert_workspace_entry.get({ workspace_id: workspaceId, owner_id: ownerId, scheme, pathname });
-            if (row === undefined)
-                throw new Error("editWorkspaceEntry: insert returned no row");
+            const row = await db.ops_insert_workspace_entry_if_absent.get({
+                workspace_id: workspaceId,
+                owner_id: ownerId,
+                scheme,
+                pathname,
+            });
+            if (row === undefined) {
+                return EditCollision.result(precondition?.identity ?? EntryManifest.toPath(scheme, pathname), { entryId: null, channel: targetChannel });
+            }
             entryId = row.id;
             createdNow = true;
         }
@@ -193,30 +210,40 @@ export default class EntryOps {
         }
         if (ctx.tokenize === undefined)
             throw new Error("editWorkspaceEntry: ctx.tokenize is required for token accounting");
-        await db.ops_upsert_channel.run({ entry_id: entryId, name: targetChannel, content: newContent, mimetype: effectiveMimetype, tokens: ctx.tokenize(newContent) }); // EDIT writes exactly the one resolved channel — {§per-entry-channels-edit-writes-only-body}
+        const write = {
+            entry_id: entryId,
+            name: targetChannel,
+            content: newContent,
+            mimetype: effectiveMimetype,
+            tokens: ctx.tokenize(newContent),
+            content_hash: contentHash(newContent),
+        };
+        const landed = channel === undefined
+            ? await db.ops_insert_channel_if_absent.get(write)
+            : await db.ops_update_channel_if_content.get({
+                ...write,
+                expected_content: originalContent,
+            });
+        if (landed === undefined) {
+            return EditCollision.result(precondition?.identity ?? EntryManifest.toPath(scheme, pathname), { entryId, channel: targetChannel });
+        }
+        // EDIT writes exactly the one resolved channel — {§per-entry-channels-edit-writes-only-body}.
         // Search derivation is not a write concern. SearchIndex attaches the
         // updated readable projection before the next model execution.
-        // Tags apply additively — each signal tag is written, never replacing existing ones. {§edit-tags-additive}
-        for (const candidate of statements) {
-            if (!Array.isArray(candidate.signal))
-                continue;
-            for (const tag of candidate.signal) {
-                await db.crud_write_tag.run({ entry_id: entryId, tag });
-            }
-        }
-        const receiptEdits = existing === undefined
+        const receiptEdits = !channelExists
             ? [{ marker: { marks: [1, -1] }, body: newContent }]
             : statements.map((candidate) => ({ marker: candidate.lineMarker, body: candidate.body ?? "" }));
+        const parseIssues = await new DbProjectionCaps(ctx).parseIssues(newContent, effectiveMimetype);
         return {
             status: createdNow ? 201 : 200,
             entryId,
             channel: targetChannel,
-            editReceipt: editReceipt(originalContent, newContent, receiptEdits),
+            editReceipt: editReceipt(originalContent, newContent, receiptEdits, parseIssues),
             ...(scopeNormalizations === undefined ? {} : { scopeNormalizations }),
         }; // {§edit-status-201-200}
     }
     // Owner-aware entry delete — the KILL counterpart of editWorkspaceEntry. Resolves
-    // the exact owner-held row, then deletes by id (channels/tags CASCADE). 404 when absent.
+    // the exact owner-held row, then deletes it (including channels by CASCADE). 404 when absent.
     static async deleteWorkspaceEntry(statement, ctx, manifest, explicitOwnerId) {
         if (statement.target === null) {
             return Results.failure(`scheme:${manifest.name}`, "delete-target-required", 400, "KILL requires a target path.", {}, {
@@ -234,7 +261,7 @@ export default class EntryOps {
         await db.crud_delete_entry.run({ entry_id: existing.id });
         return { status: 200 };
     }
-    static async readWorkspaceEntry(statement, ctx, manifest, explicitOwnerId) {
+    static async readWorkspaceEntry(statement, ctx, manifest, address = {}) {
         const failure = (code, status, detail, fields, extensions = {}) => Results.failure(`scheme:${manifest.name}`, code, status, detail, fields, extensions);
         if (statement.target === null) {
             return failure("read-target-required", 400, "READ requires a target path.", { content: null, mimetype: null, channel: null }, {
@@ -242,85 +269,37 @@ export default class EntryOps {
                 retryable: false,
             });
         }
-        const { db, workspaceId } = ctx;
-        const { channels, defaultChannel } = manifest;
         // Scope by the manifest's persisted entries.scheme (storedScheme; absent →
         // name). File persists under the reserved 'file' scheme ({§entry-identity-no-null}).
         const scheme = EntryCrud.identityScheme(manifest);
-        const fragment = EntryOps.#fragmentOf(statement);
-        const pathname = EntryOps.#pathnameOf(statement);
-        const targetChannel = EntryOps.#resolveChannel(fragment, channels, defaultChannel);
-        if (targetChannel === null) {
-            const miss = EntryOps.#channelMiss(fragment, scheme, pathname, channels, defaultChannel);
-            return failure("channel-not-found", 400, miss.detail, { content: null, mimetype: null, channel: null }, miss.extensions);
-        }
-        const ownerId = await EntryOps.#ownerOf(explicitOwnerId, ctx);
-        // An xpath is a question about the DOM — a fragmentless xpath READ routes to the raw `html`
-        // channel (the archive the decisive markdown body was projected from). A fragment still wins.
-        let readChannel = targetChannel;
-        if (fragment === null && statement.body !== null && statement.body.dialect === "xpath") {
-            const html = await db.ops_read_channel.get({ ...{ workspace_id: workspaceId, scheme, pathname, channel: "html" }, owner_id: ownerId });
-            if (html !== undefined)
-                readChannel = "html";
-        }
-        const row = await db.ops_read_channel.get({ ...{ workspace_id: workspaceId, scheme, pathname, channel: readChannel }, owner_id: ownerId });
+        const pathname = address.pathname ?? EntryOps.#pathnameOf(statement);
+        const selectedChannel = statement.target.kind === "url"
+            ? statement.target.fragment ?? manifest.defaultChannel
+            : manifest.defaultChannel;
+        const identity = statement.target.kind === "url"
+            ? renderTarget({
+                ...statement.target,
+                pathname,
+                fragment: selectedChannel === manifest.defaultChannel ? null : selectedChannel,
+            })
+            : renderTarget({ scheme: null, pathname });
+        if (identity === null)
+            throw new TypeError("READ resolved an unrenderable resource identity.");
+        const ownerId = await EntryOps.#ownerOf(address.ownerId, ctx);
+        const stored = await EntryCrud.readEntry(pathname, ctx, scheme, ownerId);
         // {§read-read-404} + {§fs-errno} — ENOENT carries its fact, the RESOLVED name in wire
         // canon: the model distinguishes wrong-address from wrong-range by the strings alone.
-        if (row === undefined)
-            return failure("entry-not-found", 404, `No entry exists at ${EntryManifest.toPath(scheme, pathname)}.`, { content: null, mimetype: null, channel: targetChannel });
-        if (await MimetypeBinary.isBinaryMimetype(row.mimetype, ctx.mimetypes)) {
-            return failure("binary-read-unsupported", 415, `The #${targetChannel} channel is binary and cannot be rendered.`, { content: null, mimetype: row.mimetype, channel: targetChannel });
-        }
-        // `[tag]` filter: entry must have ALL requested tags. Mismatch = 404
-        // (entry doesn't match the tag-scoped READ).
-        if (Array.isArray(statement.signal) && statement.signal.length > 0) {
-            const entry = await db.crud_find_workspace_entry.get({ workspace_id: workspaceId, owner_id: ownerId, scheme, pathname });
-            if (entry === undefined)
-                return failure("entry-not-found", 404, `No entry exists at ${EntryManifest.toPath(scheme, pathname)}.`, { content: null, mimetype: null, channel: targetChannel });
-            const tagRows = await db.crud_read_tags.all({ entry_id: entry.id });
-            const have = new Set(tagRows.map((r) => r.tag));
-            for (const want of statement.signal) {
-                if (!have.has(want))
-                    return failure("tag-not-found", 404, `The entry does not carry the required '${want}' tag.`, { content: null, mimetype: null, channel: targetChannel });
-            }
+        if (stored.entry === null) {
+            return failure("entry-not-found", 404, `No entry exists at ${EntryManifest.toPath(scheme, pathname)}.`, { content: null, mimetype: null, channel: null }, { target: EntryManifest.toPath(scheme, pathname) });
         }
-        const r = await ReadResolve.resolve({
-            content: row.content,
-            mimetype: row.mimetype,
-            lineMarker: statement.lineMarker,
-            body: statement.body,
+        return ReadProjector.project({
+            statement,
+            manifest: { ...manifest, name: scheme },
+            target: EntryManifest.toPath(scheme, pathname),
+            identity,
+            representation: stored.entry,
             mimetypes: ctx.mimetypes,
         });
-        if (r.status >= 400) {
-            if (r.problem !== undefined) {
-                return Results.assert({
-                    ...r,
-                    content: null,
-                    channel: readChannel,
-                });
-            }
-            if (r.reason === undefined) {
-                throw new Error(`EntryOps.readWorkspaceEntry: ReadResolve returned status ${r.status} without Problem Details or a diagnostic`);
-            }
-            return failure(r.status === 416
-                ? "range-not-satisfiable"
-                : r.status === 501
-                    ? "matcher-unavailable"
-                    : "read-resolution-failed", r.status, r.reason, { content: null, mimetype: r.mimetype, channel: readChannel }, {
-                ...(r.range === undefined ? {} : { range: r.range, stage: "projection" }),
-                ...(statement.body === null || r.status === 416
-                    ? {}
-                    : {
-                        stage: "matcher",
-                        dialect: statement.body.dialect,
-                        recovery: r.status === 501
-                            ? "Retry the READ without a content matcher."
-                            : "Correct or remove the matcher.",
-                        retryable: false,
-                    }),
-            });
-        }
-        return { ...r, channel: readChannel }; // READ returns the resolved channel's content + mimetype — {§read-read-content}
     }
 }
 //# sourceMappingURL=_entry-ops.js.map

package/dist/schemes/_entry-ops.js.map

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

package/dist/schemes/_entry-ops.sql

@@ -2,14 +2,40 @@
 -- Some queries reuse PREPs declared in _entry-crud.sql:
 --   crud_find_workspace_entry, crud_write_tag
 
--- PREP: ops_upsert_channel
--- EDIT semantics: replace channel content if it exists.
-INSERT OR REPLACE INTO entry_channels (entry_id, name, content, mimetype, tokens, state)
-VALUES ($entry_id, $name, $content, $mimetype, $tokens, 'static');
+-- PREP: ops_insert_workspace_entry_if_absent
+-- EDIT creation claims identity without surfacing a uniqueness exception when
+-- another correct writer wins the same resource concurrently.
+INSERT INTO entries (workspace_id, owner_id, scheme, pathname)
+VALUES ($workspace_id, $owner_id, $scheme, $pathname)
+ON CONFLICT (workspace_id, owner_id, scheme, pathname) DO NOTHING
+RETURNING id;
+
+-- PREP: ops_insert_channel_if_absent
+-- The creation half of EDIT's atomic landing. A concurrent creator wins cleanly;
+-- the caller translates an empty RETURNING set to the shared edit-collision.
+INSERT INTO entry_channels (entry_id, name, content, mimetype, tokens, content_hash, state, producer_result)
+VALUES ($entry_id, $name, $content, $mimetype, $tokens, $content_hash, 'static', NULL)
+ON CONFLICT (entry_id, name) DO NOTHING
+RETURNING name;
+
+-- PREP: ops_update_channel_if_content
+-- The replacement half of EDIT's atomic landing. The exact representation used
+-- to calculate line edits remains the compare-and-swap precondition at mutation.
+UPDATE entry_channels
+SET content = $content,
+    mimetype = $mimetype,
+    tokens = $tokens,
+    content_hash = $content_hash,
+    state = 'static',
+    producer_result = NULL
+WHERE entry_id = $entry_id
+  AND name = $name
+  AND content = $expected_content
+RETURNING name;
 
 -- PREP: ops_read_channel
 -- READ targeting a specific channel of an entry — identity is (workspace, owner, scheme, pathname).
-SELECT ec.content, ec.mimetype
+SELECT ec.content, ec.mimetype, ec.producer_result
 FROM entries e
 JOIN entry_channels ec ON ec.entry_id = e.id
 WHERE e.workspace_id = $workspace_id
@@ -17,4 +43,3 @@ WHERE e.workspace_id = $workspace_id
   AND e.scheme = $scheme
   AND e.pathname = $pathname
   AND ec.name = $channel;
-

package/dist/schemes/_entry-semantic.d.ts

@@ -1,23 +1,21 @@
 import type { Db } from "../core/Db.ts";
-import type { LineMarker, Notice } from "@plurnk/plurnk-contracts";
-import { type Mimetypes, type TokenizerResolution } from "@plurnk/plurnk-mimetypes";
+import { type LineMarker, type Notice } from "@plurnk/plurnk-contracts";
+import { type Mimetypes, type TokenCountOptions, type TokenizerResolution } from "@plurnk/plurnk-mimetypes";
 type EmbedderInfo = NonNullable<Awaited<ReturnType<Mimetypes["embedderInfo"]>>>;
 import type { SearchCandidate } from "./_search-candidate.ts";
 export interface SemanticPlan {
     readonly mimetypes: Mimetypes;
     readonly info: EmbedderInfo | null;
-    readonly countTokens: ((text: string) => Promise<number>) | null;
+    readonly countTokens: ((text: string, options?: TokenCountOptions) => Promise<number>) | null;
     readonly tokenizer: TokenizerResolution | null;
     readonly signature: string;
 }
 type SemanticResultSelection = {
     threshold: number | null;
-    page: LineMarker | null;
-    limit: number;
+    page: LineMarker;
 };
 export default class EntrySemantic {
     #private;
-    static defaultTopK(): number;
     static resultSelection(marker: LineMarker | null): SemanticResultSelection;
     static maxEmbedSize(): number;
     static embedSizeRejection(content: string): {
@@ -49,7 +47,7 @@ export default class EntrySemantic {
     static assertExactChunking(plan: SemanticPlan, pushNotice?: (notice: Notice) => void): void;
     static prepareEmbeddings(mimetypes: Mimetypes): Promise<SemanticPlan>;
     static ftsQueryFor(text: string): string;
-    static rankCandidates(db: Db, candidates: readonly SearchCandidate[], mimetypes: Mimetypes, queryText: string, selection: Pick<SemanticResultSelection, "threshold" | "limit">): Promise<{
+    static rankCandidates(db: Db, candidates: readonly SearchCandidate[], mimetypes: Mimetypes, queryText: string, selection: Pick<SemanticResultSelection, "threshold">): Promise<{
         status: number;
         results: Array<{
             key: string;