@oml/server 0.14.17 → 0.15.0

package/out/rest/shacl-index.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"shacl-index.js","sourceRoot":"","sources":["../../src/rest/shacl-index.ts"],"names":[],"mappings":"AAAA,qDAAqD;AAErD,OAAO,KAAK,EAAE,MAAM,kBAAkB,CAAC;AACvC,OAAO,KAAK,IAAI,MAAM,WAAW,CAAC;AAClC,OAAO,EAAE,UAAU,EAAE,MAAM,aAAa,CAAC;AACzC,OAAO,EAAE,aAAa,EAAE,MAAM,UAAU,CAAC;AACzC,OAAO,EAAE,WAAW,EAAE,MAAM,EAAE,MAAM,IAAI,CAAC;AACzC,OAAO,EAAE,yBAAyB,EAAE,uBAAuB,EAAE,sBAAsB,EAAE,MAAM,eAAe,CAAC;AAC3G,OAAO,EAAE,qBAAqB,EAAE,MAAM,eAAe,CAAC;AACtD,OAAO,EACH,oBAAoB,EACpB,2BAA2B,EAC3B,oBAAoB,EACpB,iBAAiB,EACjB,sBAAsB,EACtB,2BAA2B,GAC9B,MAAM,eAAe,CAAC;AAEvB,MAAM,EAAE,SAAS,EAAE,IAAI,EAAE,GAAG,WAAW,CAAC;AAExC,MAAM,oBAAoB,GAAG,0CAA0C,CAAC;AAsBxE,MAAM,eAAe,GAAoB;IACrC,SAAS,EAAE,IAAI,OAAO,EAAE;CAC3B,CAAC;AAEF,SAAS,QAAQ,CAAC,KAAa;IAC3B,OAAO,UAAU,CAAC,QAAQ,CAAC,CAAC,MAAM,CAAC,KAAK,EAAE,OAAO,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;AACrE,CAAC;AAED,SAAS,eAAe,CAAC,aAAqB;IAC1C,MAAM,QAAQ,GAAG,eAAe,CAAC,SAAS,CAAC,GAAG,CAAC,aAAa,CAAC,CAAC;IAC9D,IAAI,QAAQ,EAAE,CAAC;QACX,OAAO,QAAQ,CAAC;IACpB,CAAC;IACD,MAAM,OAAO,GAAG;QACZ,gBAAgB,EAAE,EAAE;QACpB,mBAAmB,EAAE,IAAI,GAAG,EAAkB;QAC9C,MAAM,EAAE,EAAyB;KACpC,CAAC;IACF,eAAe,CAAC,SAAS,CAAC,GAAG,CAAC,aAAa,EAAE,OAAO,CAAC,CAAC;IACtD,OAAO,OAAO,CAAC;AACnB,CAAC;AAED,MAAM,UAAU,qBAAqB,CAAC,aAAqB;IACvD,OAAO,CAAC,GAAG,eAAe,CAAC,aAAa,CAAC,CAAC,MAAM,CAAC,CAAC;AACtD,CAAC;AAED,SAAS,gBAAgB,CAAC,IAAY;IAClC,MAAM,YAAY,GAAG,IAAI,CAAC,SAAS,EAAE,CAAC;IACtC,IAAI,CAAC,YAAY,CAAC,UAAU,CAAC,KAAK,CAAC,EAAE,CAAC;QAClC,OAAO,IAAI,CAAC;IAChB,CAAC;IACD,MAAM,WAAW,GAAG,IAAI,CAAC,OAAO,CAAC,YAAY,CAAC,CAAC;IAC/C,MAAM,UAAU,GAAG,qBAAqB,CAAC,IAAI,CAAC,YAAY,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC;IACrE,IAAI,CAAC,UAAU,EAAE,CAAC;QACd,OAAO,IAAI,CAAC;IAChB,CAAC;IACD,MAAM,QAAQ,GAAG,CAAC,GAAG,UAAU,CAAC,KAAK,GAAG,UAAU,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC;IAC7D,OAAO,GAAG,IAAI,CAAC,KAAK,CAAC,CAAC,EAAE,WAAW,CAAC,GAAG,YAAY,CAAC,KAAK,CAAC,QAAQ,CAAC,EAAE,CAAC;AAC1E,CAAC;AAED,KAAK,UAAU,uBAAuB,CAAC,aAAqB,EAAE,aAAuB;IACjF,MAAM,OAAO,GAAG,MAAM,OAAO,CAAC,GAAG,CAAC,aAAa,CAAC,GAAG,CAAC,KAAK,EAAE,YAAY,EAAE,EAAE;QACvE,MAAM,IAAI,GAAG,MAAM,EAAE,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC;QACzC,OAAO;YACH,IAAI,CAAC,QAAQ,CAAC,aAAa,EAAE,YAAY,CAAC,CAAC,KAAK,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC;YACpE,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC;YACjB,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC;SACvB,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;IAChB,CAAC,CAAC,CAAC,CAAC;IACJ,OAAO,CAAC,IAAI,CAAC,CAAC,IAAI,EAAE,KAAK,EAAE,EAAE,CAAC,IAAI,CAAC,aAAa,CAAC,KAAK,CAAC,CAAC,CAAC;IACzD,OAAO,QAAQ,CAAC,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC;AACxC,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,qBAAqB,CAAC,MAG3C;IACG,MAAM,aAAa,GAAG,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,aAAa,CAAC,CAAC;IACzD,MAAM,aAAa,GAAG,MAAM,CAAC,OAAO,CAAC,MAAgB,CAAC;IACtD,MAAM,KAAK,GAAG,eAAe,CAAC,aAAa,CAAC,CAAC;IAC7C,MAAM,KAAK,GAAI,MAAM,CAAC,OAAO,CAAC,GAAG,CAAC,SAAS,CAAC,gBAAwB,CAAC,QAAQ,EAAE,CAAC,QAAQ,EAAE,CAAC;IAE3F,MAAM,aAAa,GAAG,qBAAqB,CAAC,MAAM,CAAC,OAAO,CAAC,MAAa,CAAC,CAAC;IAC1E,MAAM,aAAa,GAAG,MAAM,oBAAoB,CAAC,aAAa,EAAE,KAAK,CAAC,CAAC;IACvE,MAAM,gBAAgB,GAAG,MAAM,uBAAuB,CAAC,aAAa,EAAE,aAAa,CAAC,CAAC;IACrF,2EAA2E;IAC3E,wEAAwE;IACxE,+DAA+D;IAC/D,IAAI,KAAK,CAAC,gBAAgB,KAAK,gBAAgB,IAAI,KAAK,CAAC,MAAM,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;QACzE,OAAO;IACX,CAAC;IACD,MAAM,eAAe,GAAG,MAAM,oBAAoB,CAAC,aAAa,CAAC,CAAC;IAClE,MAAM,OAAO,GAAG,IAAI,sBAAsB,CAAC,IAAI,uBAAuB,EAAE,CAAC,CAAC;IAC1E,MAAM,MAAM,GAAG,IAAI,MAAM,EAAE,CAAC;IAC5B,MAAM,uBAAuB,GAAG,IAAI,GAAG,EAAkB,CAAC;IAC1D,MAAM,UAAU,GAAwB,EAAE,CAAC;IAE3C,KAAK,MAAM,YAAY,IAAI,aAAa,EAAE,CAAC;QACvC,MAAM,QAAQ,GAAG,MAAM,EAAE,CAAC,QAAQ,CAAC,YAAY,EAAE,OAAO,CAAC,CAAC;QAC1D,IAAI,sBAAsB,CAAC,QAAQ,CAAC,EAAE,CAAC;YACnC,SAAS;QACb,CAAC;QACD,MAAM,WAAW,GAAG,yBAAyB,CAAC,QAAQ,CAAC,CAAC;QACxD,+DAA+D;QAC/D,MAAM,kBAAkB,GAAG,2BAA2B,CAAC,WAAW,EAAE,QAAQ,CAAC,CAAC;QAC9E,IAAI,CAAC,kBAAkB,EAAE,CAAC;YACtB,SAAS;QACb,CAAC;QACD,MAAM,gBAAgB,GAAG,iBAAiB,CAAC,WAAW,EAAE,IAAI,EAAE,WAAW,CAAC;eACnE,iBAAiB,CAAC,WAAW,EAAE,IAAI,EAAE,kBAAkB,CAAC,CAAC;QAChE,MAAM,WAAW,GAAG,aAAa,CAAC,YAAY,CAAC,CAAC,QAAQ,EAAE,CAAC;QAC3D,MAAM,QAAQ,GAAG,aAAa,CAAC,eAAe,CAAC,kBAAkB,EAAE,WAAW,CAAC,CAAC;QAChF,IAAI,CAAC,QAAQ,EAAE,CAAC;YACZ,SAAS;QACb,CAAC;QACD,MAAM,QAAQ,GAAG,MAAM,2BAA2B,CAAC,QAAQ,EAAE,eAAe,EAAE;YAC1E,aAAa;YACb,kBAAkB,EAAE,YAAY;YAChC,kBAAkB;YAClB,eAAe,EAAE,QAAQ;YACzB,gBAAgB;SACnB,CAAC,CAAC;QACH,MAAM,QAAQ,GAAG,OAAO,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC;QAC3C,MAAM,MAAM,GAAG,QAAQ,CAAC,UAAU,CAAC,MAAM,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK,CAAC,QAAQ,KAAK,cAAc,CAAC,CAAC;QACxF,IAAI,MAAM,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;YACtB,SAAS;QACb,CAAC;QAED,MAAM,UAAU,GAAG,EAAE,CAAC;QACtB,MAAM,WAAW,GAAa,EAAE,CAAC;QACjC,KAAK,MAAM,KAAK,IAAI,MAAM,EAAE,CAAC;YACzB,MAAM,MAAM,GAAG,gBAAgB,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,IAAI,EAAE,CAAC;YACtD,IAAI,CAAC,MAAM,EAAE,CAAC;gBACV,SAAS;YACb,CAAC;YACD,MAAM,MAAM,GAAG,MAAM,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC;YACpC,KAAK,MAAM,UAAU,IAAI,MAAM,EAAE,CAAC;gBAC9B,UAAU,CAAC,IAAI,CAAC,IAAI,CAAC,UAAU,CAAC,OAAO,EAAE,UAAU,CAAC,SAAS,EAAE,UAAU,CAAC,MAAM,EAAE,SAAS,CAAC,WAAW,CAAC,CAAC,CAAC,CAAC;YAC/G,CAAC;YACD,MAAM,UAAU,GAAG,QAAQ,CAAC,MAAM,CAAC,CAAC;YACpC,WAAW,CAAC,IAAI,CAAC,GAAG,KAAK,CAAC,EAAE,IAAI,UAAU,EAAE,CAAC,CAAC;YAC9C,UAAU,CAAC,IAAI,CAAC;gBACZ,WAAW;gBACX,YAAY;gBACZ,WAAW,EAAE,kBAAkB;gBAC/B,OAAO,EAAE,KAAK,CAAC,EAAE;gBACjB,SAAS,EAAE,MAAM,CAAC,KAAK,CAAC,SAAS,IAAI,CAAC,CAAC;gBACvC,OAAO,EAAE,MAAM,CAAC,KAAK,CAAC,OAAO,IAAI,MAAM,CAAC,KAAK,CAAC,SAAS,IAAI,CAAC,CAAC,CAAC;gBAC9D,MAAM;gBACN,UAAU;gBACV,QAAQ;aACX,CAAC,CAAC;QACP,CAAC;QACD,UAAU,CAAC,IAAI,CACX,IAAI,CACA,SAAS,CAAC,WAAW,CAAC,EACtB,SAAS,CAAC,oBAAoB,CAAC,EAC/B,SAAS,CAAC,kBAAkB,CAAC,EAC7B,SAAS,CAAC,WAAW,CAAC,CACzB,CACJ,CAAC;QACF,MAAM,gBAAgB,GAAG,QAAQ,CAAC;YAC9B,kBAAkB;YAClB,QAAQ;YACR,GAAG,WAAW,CAAC,IAAI,CAAC,CAAC,IAAI,EAAE,KAAK,EAAE,EAAE,CAAC,IAAI,CAAC,aAAa,CAAC,KAAK,CAAC,CAAC;SAClE,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC;QACd,uBAAuB,CAAC,GAAG,CAAC,WAAW,EAAE,gBAAgB,CAAC,CAAC;QAE3D,qEAAqE;QACrE,MAAM,QAAQ,GAAG,KAAK,CAAC,QAAQ,CAAC,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,SAAS,CAAC,WAAW,CAAC,CAAC,CAAC;QAC1E,MAAM,kBAAkB,GAAG,KAAK,CAAC,mBAAmB,CAAC,GAAG,CAAC,WAAW,CAAC,KAAK,gBAAgB,CAAC;QAE3F,IAAI,kBAAkB,IAAI,QAAQ,CAAC,MAAM,KAAK,UAAU,CAAC,MAAM,EAAE,CAAC;YAC9D,SAAS;QACb,CAAC;QACD,IAAI,QAAQ,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;YACtB,KAAK,CAAC,WAAW,CAAC,QAAQ,CAAC,CAAC;QAChC,CAAC;QACD,KAAK,MAAM,SAAS,IAAI,UAAU,EAAE,CAAC;YACjC,KAAK,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC;QAC7B,CAAC;IACL,CAAC;IAED,KAAK,MAAM,gBAAgB,IAAI,KAAK,CAAC,mBAAmB,CAAC,IAAI,EAAE,EAAE,CAAC;QAC9D,IAAI,uBAAuB,CAAC,GAAG,CAAC,gBAAgB,CAAC,EAAE,CAAC;YAChD,SAAS;QACb,CAAC;QACD,MAAM,QAAQ,GAAG,KAAK,CAAC,QAAQ,CAAC,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,SAAS,CAAC,gBAAgB,CAAC,CAAC,CAAC;QAC/E,IAAI,QAAQ,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;YACtB,KAAK,CAAC,WAAW,CAAC,QAAQ,CAAC,CAAC;QAChC,CAAC;IACL,CAAC;IAED,KAAK,CAAC,gBAAgB,GAAG,gBAAgB,CAAC;IAC1C,KAAK,CAAC,mBAAmB,GAAG,uBAAuB,CAAC;IACpD,KAAK,CAAC,MAAM,GAAG,UAAU,CAAC;AAC9B,CAAC"}

package/out/rest/template.js

@@ -83,7 +83,7 @@ export async function expandTemplateComposeBlocks(markdown, templateCatalog, con
     const maxExpansionPasses = 12;
     let current = markdown;
     for (let pass = 0; pass < maxExpansionPasses; pass++) {
-        const composeBlockPattern = /```template[^\n]*\r?\n([\s\S]*?)\r?\n```/g;
+        const composeBlockPattern = /```compose[^\n]*\r?\n([\s\S]*?)\r?\n```/g;
         let replaced = '';
         let lastIndex = 0;
         let expandedAny = false;
@@ -102,14 +102,8 @@ export async function expandTemplateComposeBlocks(markdown, templateCatalog, con
             if (!template) {
                 throw new Error(`No markdown template found for id '${directive.id}' in ${context.sourceMarkdownPath}.`);
             }
-            const invocationArgs = { ...directive.args };
-            for (const [parameterId, source] of Object.entries(directive.bind)) {
-                const value = resolveTemplateBindingValue(source, context);
-                if (value !== undefined) {
-                    invocationArgs[parameterId] = value;
-                }
-            }
-            const selection = context.contextMemberIri ? [context.contextMemberIri.trim()] : [];
+            const invocationVars = buildComposeInvocationVars(current, context.contextOntologyIri);
+            const invocationArgs = resolveComposeDirectiveArgs(directive.args, invocationVars);
             const invocation = {
                 templateId: template.definition.id,
                 mode: 'compose',
@@ -123,12 +117,7 @@ export async function expandTemplateComposeBlocks(markdown, templateCatalog, con
                         ontologyIri: context.contextOntologyIri,
                         modelUri: context.contextModelUri,
                     },
-                    focus: {
-                        memberIri: context.contextMemberIri,
-                    },
-                    selection: {
-                        iris: selection,
-                    },
+                    vars: invocationVars,
                 },
                 args: invocationArgs,
             };
@@ -155,35 +144,59 @@ function selectTemplateDefinition(templateCatalog, templateId) {
     const candidates = templateCatalog.get(normalized);
     return candidates?.[0];
 }
-function resolveTemplateBindingValue(source, context) {
-    const member = context.contextMemberIri?.trim();
-    const ontology = context.contextOntologyIri?.trim();
-    const modelUri = context.contextModelUri?.trim();
-    const selection = member ? [member] : [];
-    if (source === 'context.member') {
-        return member || undefined;
+function resolveComposeDirectiveArgs(args, variables) {
+    const resolved = {};
+    for (const [key, raw] of Object.entries(args)) {
+        resolved[key] = resolveComposeArgumentValue(raw, variables);
     }
-    if (source === 'context.ontology') {
-        return ontology || undefined;
-    }
-    if (source === 'context.modelUri') {
-        return modelUri || undefined;
+    return resolved;
+}
+function resolveComposeArgumentValue(value, variables) {
+    if (typeof value !== 'string') {
+        return value;
+    }
+    return value.replace(/\$\{([A-Za-z_][A-Za-z0-9_]*)\}/g, (_match, key) => {
+        const replacement = variables[key];
+        if (replacement === undefined || replacement === null) {
+            return '';
+        }
+        if (Array.isArray(replacement)) {
+            return replacement.map((entry) => String(entry)).join(', ');
+        }
+        if (typeof replacement === 'object') {
+            return JSON.stringify(replacement);
+        }
+        return String(replacement);
+    });
+}
+function buildComposeInvocationVars(markdown, contextOntologyIri) {
+    const vars = {};
+    const frontMatterData = extractLeadingFrontMatter(markdown)?.data;
+    if (frontMatterData) {
+        for (const [key, raw] of Object.entries(frontMatterData)) {
+            const converted = toTemplateValue(raw);
+            if (converted !== undefined) {
+                vars[key] = converted;
+            }
+        }
     }
-    if (source === 'context.selection[*]') {
-        return selection;
+    vars.ontology = contextOntologyIri?.trim() || (typeof vars.ontology === 'string' ? vars.ontology.trim() : '');
+    return vars;
+}
+function toTemplateValue(value) {
+    if (value === null) {
+        return null;
     }
-    if (source === 'user') {
-        return undefined;
+    if (typeof value === 'string' || typeof value === 'number' || typeof value === 'boolean') {
+        return value;
     }
-    const indexedSelection = /^context\.selection\[(\d+)]$/.exec(source);
-    if (!indexedSelection) {
-        return undefined;
+    if (Array.isArray(value)) {
+        return value.every((entry) => typeof entry === 'string') ? value : undefined;
     }
-    const index = Number.parseInt(indexedSelection[1] ?? '', 10);
-    if (!Number.isFinite(index) || index < 0 || index >= selection.length) {
-        return undefined;
+    if (isRecord(value)) {
+        return value;
     }
-    return selection[index];
+    return undefined;
 }
 function normalizeTemplateId(value) {
     let normalized = value.trim();
@@ -193,6 +206,9 @@ function normalizeTemplateId(value) {
     }
     return normalized.replace(/^<|>$/g, '');
 }
+function isRecord(value) {
+    return typeof value === 'object' && value !== null && !Array.isArray(value);
+}
 function absolutizeTemplateHrefValues(markdown, templateSourcePath, referenceMarkdownPath, workspaceRoot) {
     const templateDir = path.dirname(templateSourcePath);
     return markdown.replace(/(\bhref\s*:\s*)(["']?)([^"'\r\n]+)\2/g, (_m, prefix, quote, raw) => {

package/out/rest/template.js.map

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

package/out/rest/validation.d.ts

@@ -24,7 +24,8 @@ export type RestValidationContext = {
     };
     ensureInitialized: () => Promise<void>;
     ensureWorkspaceCurrent: () => Promise<void>;
+    waitForValidated: () => Promise<void>;
     getWorkspaceOmlDocuments: () => any[];
 };
-export declare function lintWorkspace(client: RestValidationContext): Promise<RestLintResult>;
+export declare function lintWorkspace(client: RestValidationContext, params?: Record<string, unknown>): Promise<RestLintResult>;
 export declare function validateWorkspace(client: RestValidationContext, params: Record<string, unknown>): Promise<Record<string, unknown>>;

package/out/rest/validation.js

@@ -1,13 +1,94 @@
 // Copyright (c) 2026 Modelware. All rights reserved.
-import * as fs from 'node:fs/promises';
-import * as path from 'node:path';
-import { pathToFileURL } from 'node:url';
 import { createHash } from 'node:crypto';
-import { extractLeadingFrontMatter, MarkdownHandlerRegistry, MarkdownPreviewRuntime } from '@oml/markdown';
 import { createDefaultShaclService } from '@oml/owl';
-import { getOntologyModelIndex, normalizeNamespace } from '@oml/language';
-import { buildTemplateCatalog, expandTemplateComposeBlocks, findFilesByExtension, frontMatterString, isTemplateMarkdownFile, normalizeContextOntologyIri, } from './template.js';
+import { normalizeNamespace } from '@oml/language';
+import { getIndexedShaclBlocks } from './shacl-index.js';
 const validationRuntimeCaches = new WeakMap();
+function collectDocumentVersions(client) {
+    const versions = new Map();
+    for (const doc of client.getWorkspaceOmlDocuments()) {
+        const uri = String(doc?.uri ?? '').trim();
+        if (!uri) {
+            continue;
+        }
+        versions.set(uri, Number(doc?.textDocument?.version ?? -1));
+    }
+    return versions;
+}
+function areDocumentVersionsEqual(left, right) {
+    if (left.size !== right.size) {
+        return false;
+    }
+    for (const [uri, version] of left.entries()) {
+        if ((right.get(uri) ?? Number.NaN) !== version) {
+            return false;
+        }
+    }
+    return true;
+}
+function diagnosticsFingerprint(doc) {
+    const diagnostics = Array.isArray(doc?.diagnostics) ? doc.diagnostics : [];
+    return diagnostics
+        .map((diagnostic) => [
+        Number(diagnostic?.severity ?? 0),
+        Number(diagnostic?.range?.start?.line ?? -1),
+        Number(diagnostic?.range?.start?.character ?? -1),
+        String(diagnostic?.message ?? ''),
+        String(diagnostic?.source ?? ''),
+        String(diagnostic?.code ?? ''),
+    ].join('|'))
+        .sort()
+        .join('\n');
+}
+function collectDiagnosticsSnapshot(client) {
+    const snapshot = new Map();
+    for (const doc of client.getWorkspaceOmlDocuments()) {
+        const uri = String(doc?.uri ?? '').trim();
+        if (!uri) {
+            continue;
+        }
+        const version = Number(doc?.textDocument?.version ?? -1);
+        snapshot.set(uri, `${version}::${diagnosticsFingerprint(doc)}`);
+    }
+    return snapshot;
+}
+function areSnapshotsEqual(left, right) {
+    if (left.size !== right.size) {
+        return false;
+    }
+    for (const [uri, fingerprint] of left.entries()) {
+        if ((right.get(uri) ?? '') !== fingerprint) {
+            return false;
+        }
+    }
+    return true;
+}
+async function waitForStableValidatedSnapshot(client) {
+    await client.waitForValidated();
+    let previous = collectDocumentVersions(client);
+    for (let i = 0; i < 3; i += 1) {
+        await Promise.resolve();
+        await client.waitForValidated();
+        const current = collectDocumentVersions(client);
+        if (areDocumentVersionsEqual(previous, current)) {
+            return;
+        }
+        previous = current;
+    }
+}
+async function waitForStableDiagnosticsSnapshot(client) {
+    await client.waitForValidated();
+    let previous = collectDiagnosticsSnapshot(client);
+    for (let i = 0; i < 4; i += 1) {
+        await Promise.resolve();
+        await client.waitForValidated();
+        const current = collectDiagnosticsSnapshot(client);
+        if (areSnapshotsEqual(previous, current)) {
+            return;
+        }
+        previous = current;
+    }
+}
 function diagnosticKindFromSeverity(severity) {
     if (severity === 1)
         return 'error';
@@ -49,11 +130,54 @@ function getModelContentFingerprints(client) {
     }
     return fingerprints;
 }
-export async function lintWorkspace(client) {
+function resolveFilterModelUris(client, ontologies) {
+    if (!Array.isArray(ontologies))
+        return new Set();
+    const ontologyIndex = client.runtime.shared.indexes?.OntologyModelIndex;
+    if (!ontologyIndex)
+        return new Set();
+    const modelUris = new Set();
+    for (const ontology of ontologies) {
+        const trimmed = String(ontology ?? '').trim();
+        if (!trimmed.startsWith('http://') && !trimmed.startsWith('https://'))
+            continue;
+        const modelUri = ontologyIndex.resolveModelUri?.(trimmed);
+        if (modelUri)
+            modelUris.add(modelUri);
+    }
+    return modelUris;
+}
+function resolveFilterOntologyIris(_client, ontologies) {
+    if (!Array.isArray(ontologies))
+        return new Set();
+    const ontologyIris = new Set();
+    for (const ontology of ontologies) {
+        const trimmed = String(ontology ?? '').trim();
+        if (trimmed.startsWith('http://') || trimmed.startsWith('https://')) {
+            ontologyIris.add(trimmed);
+        }
+    }
+    return ontologyIris;
+}
+function resolveIndexedShaclBlockModelUri(client, block) {
+    if (block.modelUri) {
+        return block.modelUri;
+    }
+    const ontologyIndex = client.runtime.shared.indexes?.OntologyModelIndex;
+    return ontologyIndex?.resolveModelUri?.(block.ontologyIri, block.markdownUri);
+}
+export async function lintWorkspace(client, params = {}) {
     const startedAt = Date.now();
     await client.ensureInitialized();
     await client.ensureWorkspaceCurrent();
-    const docs = client.getWorkspaceOmlDocuments();
+    await waitForStableValidatedSnapshot(client);
+    await waitForStableDiagnosticsSnapshot(client);
+    const allDocs = client.getWorkspaceOmlDocuments();
+    // Filter by ontologies if specified
+    const filterUris = resolveFilterModelUris(client, params.ontologies);
+    const docs = filterUris.size > 0
+        ? allDocs.filter((doc) => filterUris.has(String(doc?.uri ?? '')))
+        : allDocs;
     const allProblems = [];
     let errors = 0;
     let warnings = 0;
@@ -100,7 +224,8 @@ export async function validateWorkspace(client, params) {
     const startedAt = Date.now();
     await client.ensureInitialized();
     await client.ensureWorkspaceCurrent();
-    const lint = await lintWorkspace(client);
+    await waitForStableValidatedSnapshot(client);
+    const lint = await lintWorkspace(client, params);
     if (lint.errors > 0 || lint.warnings > 0) {
         return {
             success: false,
@@ -112,15 +237,16 @@ export async function validateWorkspace(client, params) {
             error: `lint failed with ${lint.errors} error(s) and ${lint.warnings} warning(s)`,
         };
     }
-    const workspaceRoot = path.resolve(client.workspaceRoot);
-    const markdownFiles = await findFilesByExtension(workspaceRoot, '.md');
-    const templateCatalog = await buildTemplateCatalog(workspaceRoot);
-    const runtime = new MarkdownPreviewRuntime(new MarkdownHandlerRegistry());
-    const ontologyIndex = getOntologyModelIndex(client.runtime.shared);
     const reasoningService = client.runtime.Oml.reasoning.ReasoningService;
     const shaclService = createDefaultShaclService(reasoningService.getSparqlService(), (uri) => reasoningService.ensureQueryContext(uri), (uri) => reasoningService.getContextIri(uri));
     const runtimeCache = getValidationRuntimeCache(client);
     const modelFingerprints = getModelContentFingerprints(client);
+    const allBlocks = getIndexedShaclBlocks(client.runtime.shared);
+    // Filter by ontologies if specified
+    const filterOntologyIris = resolveFilterOntologyIris(client, params.ontologies);
+    const indexedShaclBlocks = filterOntologyIris.size > 0
+        ? allBlocks.filter((block) => filterOntologyIris.has(block.ontologyIri))
+        : allBlocks;
     const seenValidateKeys = new Set();
     let filesChecked = 0;
     let errors = 0;
@@ -128,144 +254,80 @@ export async function validateWorkspace(client, params) {
     let failingItems = 0;
     const details = [];
     const validationProblems = [];
-    for (const markdownPath of markdownFiles) {
-        const markdown = await fs.readFile(markdownPath, 'utf-8');
-        if (isTemplateMarkdownFile(markdown)) {
+    for (const block of indexedShaclBlocks) {
+        const modelUri = resolveIndexedShaclBlockModelUri(client, block);
+        if (!modelUri) {
             continue;
         }
-        const frontMatter = extractLeadingFrontMatter(markdown);
-        const contextOntologyIri = normalizeContextOntologyIri(frontMatter?.contextOntologyIri
-            ?? frontMatterString(frontMatter?.data, 'ontologyIri')
-            ?? frontMatterString(frontMatter?.data, 'ontology'));
-        const contextMemberIri = frontMatterString(frontMatter?.data, 'memberIri')
-            ?? frontMatterString(frontMatter?.data, 'contextMemberIri');
-        const markdownUri = pathToFileURL(markdownPath).toString();
-        const modelUri = contextOntologyIri
-            ? ontologyIndex.resolveModelUri(contextOntologyIri, markdownUri)
-            : undefined;
-        const expanded = await expandTemplateComposeBlocks(markdown, templateCatalog, {
-            workspaceRoot,
-            sourceMarkdownPath: markdownPath,
-            contextOntologyIri,
-            contextModelUri: modelUri,
-            contextMemberIri,
-        });
-        const prepared = runtime.prepare(expanded);
-        const executableBlocks = prepared.codeBlocks
-            .filter((block) => block.language === 'table-editor')
-            .map((block) => ({ id: block.id, source: block.content, lineStart: block.lineStart, lineEnd: block.lineEnd }));
-        if (executableBlocks.length === 0) {
+        filesChecked += 1;
+        const blockLocation = `${block.markdownPath}:${Math.max(1, block.lineStart)}`;
+        const cacheKey = `${block.markdownUri}::${block.blockId}`;
+        const modelFingerprint = modelFingerprints.get(modelUri) ?? '';
+        const validateFingerprint = hashText([modelUri, modelFingerprint, block.sourceHash].join('\n'));
+        seenValidateKeys.add(cacheKey);
+        const cached = runtimeCache.validateBlockCache.get(cacheKey);
+        if (cached?.fingerprint === validateFingerprint) {
+            errors += cached.result.errors;
+            warnings += cached.result.warnings;
             continue;
         }
-        const relativeMarkdown = path.relative(workspaceRoot, markdownPath) || path.basename(markdownPath);
-        for (const block of executableBlocks) {
-            filesChecked += 1;
-            const blockLocation = `${relativeMarkdown}:${Math.max(1, Number(block.lineStart ?? 1))}`;
-            const shacl = block.source.trim();
-            if (!contextOntologyIri) {
-                errors += 1;
-                failingItems += 1;
-                details.push(`Violation: ${blockLocation}: missing contextOntologyIri front-matter.`);
-                validationProblems.push({
-                    modelUri: modelUri ?? '<unknown>',
-                    element: '-',
-                    property: '-',
-                    message: 'Missing contextOntologyIri front-matter.',
-                });
-                continue;
-            }
-            if (!modelUri) {
-                errors += 1;
-                failingItems += 1;
-                details.push(`Violation: ${blockLocation}: could not resolve context model URI for ${contextOntologyIri}.`);
-                validationProblems.push({
-                    modelUri: '<unknown>',
-                    element: '-',
-                    property: '-',
-                    message: `Could not resolve context model URI for ${contextOntologyIri}.`,
-                });
-                continue;
-            }
-            if (!shacl) {
-                errors += 1;
-                failingItems += 1;
-                details.push(`Violation: ${blockLocation}: empty table-editor block.`);
+        const result = await shaclService.validateShacl(modelUri, block.source);
+        let blockErrors = 0;
+        let blockWarnings = 0;
+        if (result.error) {
+            blockErrors += 1;
+            details.push(`Violation: ${blockLocation}: ${result.error}`);
+            validationProblems.push({
+                modelUri,
+                element: '-',
+                property: '-',
+                message: String(result.error),
+            });
+        }
+        else if (!result.conforms) {
+            for (const issue of result.issues) {
+                const severityText = String(issue.severity ?? '').toLowerCase();
+                const focusNode = issue.focusNode ? shortIri(issue.focusNode) : '-';
+                const propertyName = issue.propertyName ?? (issue.path ? shortIri(issue.path) : '-');
+                const severityLabel = shortIri(issue.severity || 'Violation');
+                if (severityText.includes('warning')) {
+                    blockWarnings += 1;
+                    details.push(`${severityLabel}: ${blockLocation} element=${focusNode} property=${propertyName}: ${describeIssue(issue)}`);
+                }
+                else {
+                    blockErrors += 1;
+                    details.push(`${severityLabel}: ${blockLocation} element=${focusNode} property=${propertyName}: ${describeIssue(issue)}`);
+                }
                 validationProblems.push({
                     modelUri,
-                    element: '-',
-                    property: '-',
-                    message: 'Empty table-editor block.',
+                    element: focusNode,
+                    property: propertyName,
+                    message: describeIssue(issue),
                 });
-                continue;
             }
-            const modelFingerprint = modelFingerprints.get(modelUri) ?? '';
-            const cacheKey = `${markdownUri}::${block.id}`;
-            const validateFingerprint = hashText([modelUri, modelFingerprint, shacl].join('\n'));
-            seenValidateKeys.add(cacheKey);
-            const cached = runtimeCache.validateBlockCache.get(cacheKey);
-            if (cached?.fingerprint === validateFingerprint) {
-                errors += cached.result.errors;
-                warnings += cached.result.warnings;
-                continue;
-            }
-            const result = await shaclService.validateShacl(modelUri, shacl);
-            let blockErrors = 0;
-            let blockWarnings = 0;
-            if (result.error) {
+            if (result.issues.length === 0) {
                 blockErrors += 1;
-                details.push(`Violation: ${blockLocation}: ${result.error}`);
+                details.push(`Violation: ${blockLocation}: SHACL validation failed without detailed issues.`);
                 validationProblems.push({
                     modelUri,
                     element: '-',
                     property: '-',
-                    message: String(result.error),
+                    message: 'SHACL validation failed without detailed issues.',
                 });
             }
-            else if (!result.conforms) {
-                for (const issue of result.issues) {
-                    const severityText = String(issue.severity ?? '').toLowerCase();
-                    const focusNode = issue.focusNode ? shortIri(issue.focusNode) : '-';
-                    const propertyName = issue.propertyName ?? (issue.path ? shortIri(issue.path) : '-');
-                    const severityLabel = shortIri(issue.severity || 'Violation');
-                    if (severityText.includes('warning')) {
-                        blockWarnings += 1;
-                        details.push(`${severityLabel}: ${blockLocation} element=${focusNode} property=${propertyName}: ${describeIssue(issue)}`);
-                    }
-                    else {
-                        blockErrors += 1;
-                        details.push(`${severityLabel}: ${blockLocation} element=${focusNode} property=${propertyName}: ${describeIssue(issue)}`);
-                    }
-                    validationProblems.push({
-                        modelUri,
-                        element: focusNode,
-                        property: propertyName,
-                        message: describeIssue(issue),
-                    });
-                }
-                if (result.issues.length === 0) {
-                    blockErrors += 1;
-                    details.push(`Violation: ${blockLocation}: SHACL validation failed without detailed issues.`);
-                    validationProblems.push({
-                        modelUri,
-                        element: '-',
-                        property: '-',
-                        message: 'SHACL validation failed without detailed issues.',
-                    });
-                }
-            }
-            errors += blockErrors;
-            warnings += blockWarnings;
-            if (blockErrors > 0 || blockWarnings > 0) {
-                failingItems += 1;
-            }
-            runtimeCache.validateBlockCache.set(cacheKey, {
-                fingerprint: validateFingerprint,
-                result: {
-                    errors: blockErrors,
-                    warnings: blockWarnings,
-                },
-            });
         }
+        errors += blockErrors;
+        warnings += blockWarnings;
+        if (blockErrors > 0 || blockWarnings > 0) {
+            failingItems += 1;
+        }
+        runtimeCache.validateBlockCache.set(cacheKey, {
+            fingerprint: validateFingerprint,
+            result: {
+                errors: blockErrors,
+                warnings: blockWarnings,
+            },
+        });
     }
     for (const key of runtimeCache.validateBlockCache.keys()) {
         if (!seenValidateKeys.has(key)) {